diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bad67fd029fe..ac01e331f983 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -485,14 +485,7 @@ with lib.maintainers; }; lxc = { - members = [ - aanderse - adamcstephens - megheaiulian - mkg20001 - ]; - scope = "All things linuxcontainers. Incus, LXC, and related packages."; - shortName = "lxc"; + github = "lxc"; }; lxqt = { diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 82b38d18c639..47311ce567e9 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -149,19 +149,4 @@ rec { paramsToRenderedStrings prefixedAttrs (mapAttrs (_n: _v: p) prefixedAttrs); }; - mkPostfixedAttrsOfParams = params: description: { - _type = "param"; - option = mkOption { - type = types.attrsOf (types.submodule { options = paramsToOptions params; }); - default = { }; - description = description; - }; - render = - postfix: attrs: - let - postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; - in - paramsToRenderedStrings postfixedAttrs (mapAttrs (_n: _v: params) postfixedAttrs); - }; - } diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 2da955cc07bd..f17d36341e1d 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -433,7 +433,7 @@ in located, the first certificate is used. ''; - cert = mkPostfixedAttrsOfParams certParams '' + cert = mkPrefixedAttrsOfParams certParams '' Section for a certificate candidate to use for authentication. Certificates in certs are transmitted as binary blobs, these sections offer more flexibility. @@ -568,7 +568,7 @@ in or an absolute path. ''; - cert = mkPostfixedAttrsOfParams certParams '' + cert = mkPrefixedAttrsOfParams certParams '' Section for a certificate candidate to use for authentication. Certificates in certs are transmitted as binary blobs, these sections offer more flexibility. @@ -590,7 +590,7 @@ in swanctl `x509ca` directory or an absolute path. ''; - cacert = mkPostfixedAttrsOfParams certParams '' + cacert = mkPrefixedAttrsOfParams certParams '' Section for a CA certificate to accept for authentication. Certificates in cacerts are transmitted as binary blobs, these sections offer more flexibility. diff --git a/nixos/modules/services/security/canaille.nix b/nixos/modules/services/security/canaille.nix index cda274012743..e41c6f227739 100644 --- a/nixos/modules/services/security/canaille.nix +++ b/nixos/modules/services/security/canaille.nix @@ -40,7 +40,7 @@ let ++ old.optional-dependencies.otp ++ old.optional-dependencies.sms; makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [ - "--set CONFIG /etc/canaille/config.toml" + "--set CANAILLE_CONFIG /etc/canaille/config.toml" "--set SECRETS_DIR \"${secretsDir}\"" ]; }); @@ -303,7 +303,7 @@ in ]; environment = { PYTHONPATH = "${pythonEnv}/${python.sitePackages}/"; - CONFIG = "/etc/canaille/config.toml"; + CANAILLE_CONFIG = "/etc/canaille/config.toml"; SECRETS_DIR = secretsDir; }; serviceConfig = commonServiceConfig // { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index aea54c3e4205..5f349b3dd62b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4588,6 +4588,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + devexcuses-nvim = buildVimPlugin { + pname = "devexcuses.nvim"; + version = "0-unstable-2026-03-11"; + src = fetchFromGitHub { + owner = "mahyarmirrashed"; + repo = "devexcuses.nvim"; + rev = "0bd585fd00f2c2290d541a8846a6649c1b71854a"; + hash = "sha256-Mz5FeZzFPaPGvzWAKLUhvJtnB1hW1kW0vTGArMTc2nc="; + }; + meta.homepage = "https://github.com/mahyarmirrashed/devexcuses.nvim/"; + meta.hydraPlatforms = [ ]; + }; + dhall-vim = buildVimPlugin { pname = "dhall-vim"; version = "0-unstable-2024-05-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ebfc5d978792..b928adf9c438 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -351,6 +351,7 @@ https://github.com/deoplete-plugins/deoplete-zsh/,, https://github.com/Shougo/deoplete.nvim/,, https://github.com/maskudo/devdocs.nvim/,HEAD, https://github.com/rhysd/devdocs.vim/,, +https://github.com/mahyarmirrashed/devexcuses.nvim/,HEAD, https://github.com/vmchale/dhall-vim/,, https://github.com/dgagn/diagflow.nvim/,HEAD, https://github.com/onsails/diaglist.nvim/,, diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 247cea1d2307..08bcc0b72d48 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.1.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-Pi8q64VykEfyIm9VlNOkWFeEhEhl7D6KLnNLpVsY+iU="; + sha256 = "sha256-xWLwtGeKu2W9u96jvLRRluSsnFjfad1/XSIcad00c3Y="; }; nativeBuildInputs = [ python ]; diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/partition.conf b/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/partition.conf index 75d04cec9dfa..557ebfae5663 100644 --- a/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/partition.conf +++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/config/modules/partition.conf @@ -22,17 +22,7 @@ availableFileSystemTypes: showNotEncryptedBootMessage: false -bios: - mountPoint: "/boot" - minimumSize: 512MiB - recommendedSize: 1GiB - label: "BOOT" - partitionLayout: - - name: "boot" - filesystem: "ext4" - mountPoint: "/boot" - size: 1GiB - name: "root" filesystem: "unknown" noEncrypt: false diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index 780460c31d01..7d0c5a36a0dd 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -2,9 +2,9 @@ lib, python3, fetchFromGitLab, - fetchpatch, openldap, nixosTests, + postgresql, }: let @@ -12,55 +12,52 @@ let in python.pkgs.buildPythonApplication rec { pname = "canaille"; - version = "0.0.74"; + version = "0.2.1"; pyproject = true; src = fetchFromGitLab { owner = "yaal"; repo = "canaille"; tag = version; - hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4="; + hash = "sha256-6Ksvl03HgpVQRhHtKWQwTrPBkaXcVWoejGaMFBAykHM="; }; - patches = [ - # https://gitlab.com/yaal/canaille/-/merge_requests/275 - (fetchpatch { - url = "https://gitlab.com/yaal/canaille/-/commit/1c7fc8b1034a4423f7f46ad8adeced854910b702.patch"; - hash = "sha256-fu7D010NG7yUChOve7HY3e7mm2c/UGpfcTAiTU8BnGg="; - }) - ]; - build-system = with python.pkgs; [ hatchling babel setuptools ]; - dependencies = - with python.pkgs; - [ - blinker - flask - flask-caching - flask-wtf - pydantic-settings - httpx - wtforms - ] - ++ sentry-sdk.optional-dependencies.flask; + dependencies = with python.pkgs; [ + blinker + click + dramatiq + dramatiq-eager-broker + flask + flask-caching + flask-dramatiq + flask-session + flask-wtf + httpx + pydantic-settings + wtforms + ]; nativeCheckInputs = with python.pkgs; [ pytestCheckHook + postgresql coverage flask-webtest pyquery pytest-cov-stub pytest-httpserver pytest-lazy-fixtures + pytest-postgresql pytest-smtpd pytest-xdist + python-avatars scim2-tester slapd toml @@ -68,13 +65,7 @@ python.pkgs.buildPythonApplication rec { time-machine pytest-scim2-server ] - ++ optional-dependencies.front - ++ optional-dependencies.oidc - ++ optional-dependencies.scim - ++ optional-dependencies.ldap - ++ optional-dependencies.postgresql - ++ optional-dependencies.otp - ++ optional-dependencies.sms; + ++ (lib.concatLists (builtins.attrValues optional-dependencies)); postInstall = '' mkdir -p $out/etc/schema @@ -87,17 +78,21 @@ python.pkgs.buildPythonApplication rec { export SBIN="${openldap}/bin" export SLAPD="${openldap}/libexec/slapd" export SCHEMA="${openldap}/etc/schema" - - # Just use their example config for testing - export CONFIG=tests/app/fixtures/default-config.toml ''; + disabledTests = [ + # Tries to use DNS resolution + "test_send_new_email_error" + "test_send_test_email_ssl" + ]; + optional-dependencies = with python.pkgs; { front = [ email-validator flask-babel flask-talisman flask-themer + isodate pycountry pytz tomlkit @@ -108,10 +103,10 @@ python.pkgs.buildPythonApplication rec { joserfc ]; scim = [ - httpx - scim2-models authlib + httpx scim2-client + scim2-models ]; ldap = [ python-ldap ]; sentry = [ sentry-sdk ]; @@ -128,8 +123,18 @@ python.pkgs.buildPythonApplication rec { pillow qrcode ]; + fido = [ webauthn ]; sms = [ smpplib ]; - server = [ hypercorn ]; + captcha = [ captcha ]; + server = [ + asgiref + hypercorn + isodate + pydanclick + tomlkit + ]; + redis = [ dramatiq ] ++ dramatiq.optional-dependencies.redis; + rabbitmq = [ dramatiq ] ++ dramatiq.optional-dependencies.rabbitmq; }; passthru = { diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch index dac558bce3e0..af1c5dc5295f 100644 --- a/pkgs/by-name/cl/clash-rs/Cargo.patch +++ b/pkgs/by-name/cl/clash-rs/Cargo.patch @@ -1,15 +1,15 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -1249,7 +1249,7 @@ - "sha2", +@@ -1265,7 +1265,7 @@ + "sha2 0.10.9", "shadowquic", "shadowsocks", - "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)", + "smoltcp", "sock2proc", - "socket2 0.6.1", - "tempfile", -@@ -4234,7 +4234,7 @@ + "socket2 0.6.2", + "ssh-key", +@@ -4636,7 +4636,7 @@ "etherparse 0.16.0", "futures", "rand 0.8.5", @@ -18,7 +18,7 @@ "spin 0.9.8", "tokio", "tokio-util", -@@ -6632,20 +6632,6 @@ +@@ -7293,20 +7293,6 @@ ] [[package]] @@ -38,13 +38,13 @@ -[[package]] name = "sock2proc" version = "0.1.0" - source = "git+https://github.com/Watfaq/sock2proc.git?rev=1097e6b#1097e6ba692025f80567446e0035af1222f5231f" -@@ -8964,7 +8950,7 @@ + source = "git+https://github.com/Watfaq/sock2proc.git?rev=9f9e630#9f9e6304d62285115b2e4fa632527ae563bf0fcc" +@@ -9797,7 +9783,7 @@ "netstack-lwip", "netstack-smoltcp", "rand 0.9.2", - "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp", - "socket2 0.6.1", + "socket2 0.6.2", "tokio", "tracing", diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 5330bcd2b9db..84066d4088a5 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-WtNnBw0/eAz/uO/dlD2yRZHW38CXIT8zhh4lZ3HaIFs="; + hash = "sha256-ymxT6AGBDTfiMbpU4Ou/SwAnUZF3vKvtt/BgWRtQTJc="; }; - cargoHash = "sha256-8SLBsYtO6qVihc/C9R3ZptHCKgl2iXiQrOWqgDBXdTc="; + cargoHash = "sha256-G1RLUFnQVX6tbLIF6ql6RDGZUwGPGFBHgx15KT3/tNQ="; cargoPatches = [ ./Cargo.patch ]; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { # requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip RUSTC_BOOTSTRAP = 1; - RUSTFLAGS = "--cfg tokio_unstable"; + RUSTFLAGS = "--cfg tokio_unstable -A stable_features"; NIX_CFLAGS_COMPILE = "-Wno-error"; }; diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 12a47d2bebd2..3972a43790b3 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "356"; + version = "357"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-Mmxp/rh+4YQovAUdnNkKnjZXz1kcdnhG2TuBhNSXY+Y="; + hash = "sha256-4KckFQmFin0dkq9ouHRXSrkmlmsTRtAcW8Ln/Vjhylc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 9221d75f6a14..3234c25c7632 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -20,13 +20,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.111.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-hdR70BhiMg9G/ibLCeHnRSY3PcGZDv0vnqBCbzSRD6I="; + hash = "sha256-7t+mVwP4+YrG1ciI+OLqsK7TUM9SrDbPsJNrt26iy9c="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-Ym2fB9IWQzYdgOX3hiBd9XUI00xF4cIoKO2jpal4eUA="; + cargoHash = "sha256-Ig3VMNN1oeC9DyjjVPTiXw4JXCuO01eRYJClcIXu8vQ="; nativeBuildInputs = [ clang diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix index 92e047b1b431..fde3b759d734 100644 --- a/pkgs/by-name/du/dump_syms/package.nix +++ b/pkgs/by-name/du/dump_syms/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dump_syms"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "mozilla"; repo = "dump_syms"; rev = "v${finalAttrs.version}"; - hash = "sha256-ABfjLV6WMIiaSiyfR/uxL6+VyO/pO6oZjbJSAxRGXuE="; + hash = "sha256-fCplZFp+yONBd2HDDlX/6XcmnQFbsnVmiS5b8fqGOAE="; }; - cargoHash = "sha256-t9xK7epfBp1XgewlAuAnInlKQDQ+3gVNmJoLNcey8YU="; + cargoHash = "sha256-guJgkcldcKvi3XWolAqyB5bFzlSMNQQMzri6axGJpLo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix index 5ee15fe2d29e..4700d958d68d 100644 --- a/pkgs/by-name/go/google-cloud-sdk/package.nix +++ b/pkgs/by-name/go/google-cloud-sdk/package.nix @@ -100,6 +100,13 @@ stdenv.mkDerivation rec { fi cp -R * .install $out/google-cloud-sdk/ + # Resolve readlink noise in shell initialization + # We patch the source script before wrapProgram renames it. + # This ensures that the resulting .gcloud-wrapped binary contains the fix. + substituteInPlace "$out/google-cloud-sdk/bin/gcloud" \ + --replace-fail 'while _cloudsdk_link=$(readlink "$_cloudsdk_path")' 'while _cloudsdk_link=$(readlink "$_cloudsdk_path" 2>/dev/null)' \ + --replace-fail 'CLOUDSDK_ROOT_DIR=$(_cloudsdk_root_dir "$0")' 'CLOUDSDK_ROOT_DIR=$(realpath "$(dirname "$0")/..")' + mkdir -p $out/google-cloud-sdk/lib/surface/{alpha,beta} cp ${./alpha__init__.py} $out/google-cloud-sdk/lib/surface/alpha/__init__.py cp ${./beta__init__.py} $out/google-cloud-sdk/lib/surface/beta/__init__.py diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 8820d4353765..e4cafaef36c6 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "harper"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${finalAttrs.version}"; - hash = "sha256-cmuusPSIRUPbpakSpLHjvDoBvp8ERkGimxsGpZnhC5o="; + hash = "sha256-QI9uwrYhXUle6ZeGb1J9A7D1mqRM8Pb62Sk93M8zrS4="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-stp/FYJBBG7wFUwAS/I8KWk4E9VqWAYnnp7IR0YavPM="; + cargoHash = "sha256-zPi3HhYJzPy/x/7/8LxuOGgCkwlC2qMfKWsuiPLHGOQ="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix index 88aa8710d0eb..1697387c2cbb 100644 --- a/pkgs/by-name/ka/kanboard/package.nix +++ b/pkgs/by-name/ka/kanboard/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kanboard"; - version = "1.2.50"; + version = "1.2.51"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-/nC+V8KfVdEFEBozFFsyinUfXzZbu7h8/ROpjJoDchI="; + hash = "sha256-2zNYlqn8Dk/GDdtSfuRLTPzOQfGKEytJtKz18mGmBM0="; }; dontBuild = true; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 9cfc220a69e2..f60b84bb508d 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -9,10 +9,10 @@ let version_aarch64-linux = "0.4.5-2"; hash_aarch64-linux = "sha256-BeF9FNMde9RW2icdq07zkWQafge7ViWKvR+xupRIdjE="; - version_aarch64-darwin = "0.4.5-2"; - hash_aarch64-darwin = "sha256-mSszzDsoXv2D9Ky3K/P2Nn/mixq3HzGMonS1I4mz5+s="; - version_x86_64-linux = "0.4.5-2"; - hash_x86_64-linux = "sha256-G+swwY9ff0Mqbdu8ZRbgm5KHrPhnOAaOYvH3dEVZ1+A="; + version_aarch64-darwin = "0.4.6-1"; + hash_aarch64-darwin = "sha256-CpeBUXpBAOJPEZAb3neY5pWRSGNcy4Usgsm6qyI5PVA="; + version_x86_64-linux = "0.4.6-1"; + hash_x86_64-linux = "sha256-FHZ64zmnqHrQyX4ift/lVUzW+HiCVkXpWVa4hkssX/k="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index f24c692dca1c..31ec3e7593fb 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitLab, glib, + gperf, meson, ninja, pkg-config, @@ -41,17 +42,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "megapixels"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "megapixels-org"; repo = "Megapixels"; tag = finalAttrs.version; - hash = "sha256-tuAMp92166WZJfGIEzEWal9BExzQJoYodd2uZHhqEuQ="; + hash = "sha256-fnG8fei3x0UkWJWBm8rB2r9bcKOhtFxG0Zaq+qjd7dE="; }; nativeBuildInputs = [ glib + gperf meson ninja pkg-config diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 1aeca54ea6f0..03fadbb0b803 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "minijinja"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = finalAttrs.version; - hash = "sha256-Q8s9NH2Su2IL2GlZIDUUmkwnfluMjOY/ULuLoL4+lEE="; + hash = "sha256-cuazG7Sm6gol6FIzcK0zvUU6EunJbetmaLiurYVeVko="; }; - cargoHash = "sha256-7uzSuBpRWIWmtCO81i7RXP9k8mp6tTe/lMHP5nKMX1I="; + cargoHash = "sha256-QsqixSyBeo4KAnZgnY7stdrczqRREoPN7EnLN9GMCu0="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index 8d2da8121516..c165663b89a3 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, pkg-config, bzip2, @@ -26,6 +27,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-R2Sx+DbT6gROI8X1fkxqOGbMqgmsnNiw2rUX6gSZuTs="; }; + patches = [ + (fetchpatch2 { + name = "Fix-build-with-Boost-1.89.0.patch"; + url = "https://github.com/Project-OSRM/osrm-backend/commit/a2e159d0d4f6b3922ee0cb058a800230cf90642e.patch?full_index=1"; + hash = "sha256-c+4Ll660jHLnFolehCpZQLca4pmyVsBfjwSY1BHBh40="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix index 68015da47ebe..e0b081be33a0 100644 --- a/pkgs/by-name/si/sig/package.nix +++ b/pkgs/by-name/si/sig/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sig"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ynqa"; repo = "sig"; rev = "v${finalAttrs.version}"; - hash = "sha256-KxLSZ4/idlDrhRKFUsC3Ko0DcpSzwLWjees1jObC5KQ="; + hash = "sha256-px2QdhhvBxfPCszGqeeYzsUrGwLP4DxXiKeNRAgZ23U="; }; - cargoHash = "sha256-nlW9pXgfn/8MjFFXs+HeIiBT9Ew8M1ETtuTZg5Qa4AE="; + cargoHash = "sha256-dqpapu6qnWfe0vMUXpEh2lXwEV9iqIG7B+P6XQbA9Q8="; meta = { description = "Interactive grep (for streaming)"; diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index 0d87ecc7af26..bd6091072ff4 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sudo-rs"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "trifectatechfoundation"; repo = "sudo-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-VTqjsbd5CsvsNEItl8tTWnfyKHZVlYQpOQXpah68VH8="; + hash = "sha256-T9QkdpNq7YTR2df1M+lIt+iocVzrFv1yUwq0wgBRHaA="; }; - cargoHash = "sha256-2h7ObKcrhtbJyoIinA1sawfpbY3Kt/8tEyZzjEdSQBI="; + cargoHash = "sha256-yfML0XO2/Xug0IhbzX1P7PL1YspxWR1FJYP5VtqZzRA="; nativeBuildInputs = [ installShellFiles ]; @@ -50,6 +50,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "common::context::tests::test_build_run_context" "common::resolve::test::canonicalization" "common::resolve::tests::test_resolve_path" + "system::audit::test::test_traverse_secure_open_negative" + "system::audit::test::test_traverse_secure_open_positive" "system::tests::kill_test" # Assumes $SHELL is an actual shell diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix index de054e1388c6..e108dbc517df 100644 --- a/pkgs/by-name/sw/swiftformat/package.nix +++ b/pkgs/by-name/sw/swiftformat/package.nix @@ -12,13 +12,13 @@ swift.stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.59.1"; + version = "0.60.1"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = version; - sha256 = "sha256-QOrDpLen1aRPtRmUcAIormM0XADyHZFuE9ls/LdjPzs="; + sha256 = "sha256-IOtp+TBcWPb6RR47AoITtR+7xAulP+ZQcWukX5YYnVc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xb/xbyak/package.nix b/pkgs/by-name/xb/xbyak/package.nix index fe1cc4d9bcd3..439421822365 100644 --- a/pkgs/by-name/xb/xbyak/package.nix +++ b/pkgs/by-name/xb/xbyak/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xbyak"; - version = "7.34.1"; + version = "7.35.3"; src = fetchFromGitHub { owner = "herumi"; repo = "xbyak"; tag = "v${finalAttrs.version}"; - hash = "sha256-cajYwHw9/RzPAQw3c0zpNRm/nBBym0OtowqqtYnpVWc="; + hash = "sha256-qsv0cgm5AmH9Ip1cNX8fKEA5D2b/255ZhYtCQb9Kr5I="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/dramatiq-eager-broker/default.nix b/pkgs/development/python-modules/dramatiq-eager-broker/default.nix new file mode 100644 index 000000000000..ae93a5c9535c --- /dev/null +++ b/pkgs/development/python-modules/dramatiq-eager-broker/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitea, + uv-build, + dramatiq, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "dramatiq-eager-broker"; + version = "0.3.0"; + + pyproject = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "yaal"; + repo = "dramatiq-eager-broker"; + tag = version; + hash = "sha256-tz4Gy31y5oaTHFAzb5L7bg0AhG1U/JKDySGloA7/A/8="; + }; + + build-system = [ uv-build ]; + + dependencies = [ dramatiq ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "An eager broker for Dramatiq that executes tasks synchronously and immediately, without queuing"; + homepage = "https://codeberg.org/yaal/dramatiq-eager-broker"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/flask-dramatiq/default.nix b/pkgs/development/python-modules/flask-dramatiq/default.nix index cded223066c1..3dece04ef7a3 100644 --- a/pkgs/development/python-modules/flask-dramatiq/default.nix +++ b/pkgs/development/python-modules/flask-dramatiq/default.nix @@ -38,6 +38,8 @@ buildPythonPackage { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "dramatiq" ]; + dependencies = [ dramatiq ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index e1adc1ffe18f..5256c53e1e2a 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -11,7 +11,6 @@ pyside6, pyyaml, requests, - sentencepiece, tqdm, # tests @@ -36,13 +35,15 @@ buildPythonPackage (finalAttrs: { dependencies = [ numpy - pyside6 pyyaml requests - sentencepiece tqdm ]; + optional-dependencies = { + gui = [ pyside6 ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gguf" ]; diff --git a/pkgs/development/python-modules/periodiq/default.nix b/pkgs/development/python-modules/periodiq/default.nix index 6cc7a301c2ca..701bc88bc670 100644 --- a/pkgs/development/python-modules/periodiq/default.nix +++ b/pkgs/development/python-modules/periodiq/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' ''; + pythonRelaxDeps = [ "dramatiq" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydanclick/default.nix b/pkgs/development/python-modules/pydanclick/default.nix new file mode 100644 index 000000000000..f113cc6f82bc --- /dev/null +++ b/pkgs/development/python-modules/pydanclick/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pydantic, + pydantic-core, + click, + pytest7CheckHook, + pydantic-settings, +}: + +buildPythonPackage rec { + pname = "pydanclick"; + version = "0.5.1"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "felix-martel"; + repo = "pydanclick"; + tag = "v${version}"; + hash = "sha256-Cgjq+9j6v7KILjfhK+4Y5joZPU2/ufJiIsdAfnSG9x4="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + pydantic + pydantic-core + click + ]; + + nativeCheckInputs = [ + # Still uses RaisesContext from pytest 7 + # https://github.com/felix-martel/pydanclick/issues/53 + pytest7CheckHook + pydantic-settings + ]; + + disabledTests = [ + # No idea about these two failures + "test_complex_types_example_help" + "test_simple_example_with_invalid_args" + ]; + + pythonImportsCheck = [ "pydanclick" ]; + + meta = { + description = "Add click options from a Pydantic model"; + homepage = "https://github.com/felix-martel/pydanclick"; + changelog = "https://github.com/felix-martel/pydanclick/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/python-avatars/default.nix b/pkgs/development/python-modules/python-avatars/default.nix new file mode 100644 index 000000000000..7ba731110076 --- /dev/null +++ b/pkgs/development/python-modules/python-avatars/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "python-avatars"; + version = "1.4.1"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "ibonn"; + repo = "python_avatars"; + tag = "v${version}"; + hash = "sha256-8/uhzOr0AukH0VgUhnsPNSEGJ2D5z1tqdIKzNHyHCgY="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "python_avatars" ]; + + meta = { + description = "Avatar generation package for Python"; + homepage = "https://github.com/ibonn/python_avatars"; + changelog = "https://github.com/ibonn/python_avatars/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.erictapen ]; + }; +} diff --git a/pkgs/development/python-modules/scim2-client/default.nix b/pkgs/development/python-modules/scim2-client/default.nix index e3b4245db7b1..011338a01859 100644 --- a/pkgs/development/python-modules/scim2-client/default.nix +++ b/pkgs/development/python-modules/scim2-client/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - hatchling, + fetchFromGitHub, + uv-build, scim2-models, pytestCheckHook, portpicker, @@ -16,17 +16,23 @@ buildPythonPackage rec { pname = "scim2-client"; - version = "0.6.1"; + version = "0.7.3"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "scim2_client"; - hash = "sha256-5XOUOKf0vYHkewY22x5NQdhICXCd+EftKhsxtQurgHQ="; + src = fetchFromGitHub { + owner = "python-scim"; + repo = "scim2-client"; + tag = version; + hash = "sha256-jw8Dp/PekM0JrgxRkN+A896O2twkSDxQpsGsljJFdB0="; }; - build-system = [ hatchling ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'uv_build>=0.8.9,<0.9.0' 'uv_build' + ''; + + build-system = [ uv-build ]; dependencies = [ scim2-models ]; @@ -41,12 +47,6 @@ buildPythonPackage rec { ] ++ optional-dependencies.httpx; - # Werkzeug returns 500, didn't deem it worth it to investigate - disabledTests = [ - "test_search_request" - "test_query_dont_check_request_payload" - ]; - pythonImportsCheck = [ "scim2_client" ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/scim2-models/default.nix b/pkgs/development/python-modules/scim2-models/default.nix index 310afb70b370..a54ff7ab78a9 100644 --- a/pkgs/development/python-modules/scim2-models/default.nix +++ b/pkgs/development/python-modules/scim2-models/default.nix @@ -9,7 +9,7 @@ buildPythonPackage (finalAttrs: { pname = "scim2-models"; - version = "0.5.1"; + version = "0.6.4"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { owner = "python-scim"; repo = "scim2-models"; tag = finalAttrs.version; - hash = "sha256-ahwHmWsM9IoK+yq0Qd0c2+kagMlXGi80/rAB4UQsf6U="; + hash = "sha256-MyKe1OeaYwqHCma/HEunNCJ49ssHM+pTtnM4XnDZBCE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scim2-server/default.nix b/pkgs/development/python-modules/scim2-server/default.nix index 4f5f468fb29b..540e9230b943 100644 --- a/pkgs/development/python-modules/scim2-server/default.nix +++ b/pkgs/development/python-modules/scim2-server/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - hatchling, + fetchFromGitHub, + uv-build, scim2-filter-parser, scim2-models, werkzeug, @@ -13,17 +13,23 @@ buildPythonPackage rec { pname = "scim2-server"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "scim2_server"; - hash = "sha256-nMS6vjMZ/Lyu0kiVH+IlmxZsuu7McY7AZS/xamfZSlk="; + src = fetchFromGitHub { + owner = "python-scim"; + repo = "scim2-server"; + tag = version; + hash = "sha256-7st/8KI8xWDkeUiID6TUKFdc2U8uFWe+xDUFbe9w22M="; }; - build-system = [ hatchling ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'uv_build>=0.8.9,<0.9.0' 'uv_build' + ''; + + build-system = [ uv-build ]; dependencies = [ scim2-filter-parser diff --git a/pkgs/development/python-modules/scim2-tester/default.nix b/pkgs/development/python-modules/scim2-tester/default.nix index 0b1e5f0824ce..2d744bc95727 100644 --- a/pkgs/development/python-modules/scim2-tester/default.nix +++ b/pkgs/development/python-modules/scim2-tester/default.nix @@ -1,38 +1,45 @@ { lib, buildPythonPackage, - fetchPypi, - hatchling, + pythonOlder, + fetchFromGitHub, + uv-build, scim2-client, + scim2-models, pytestCheckHook, - werkzeug, - scim2-server, + pytest-scim2-server, pytest-httpserver, - cacert, }: buildPythonPackage rec { pname = "scim2-tester"; - version = "0.2.4"; + version = "0.2.6"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "scim2_tester"; - hash = "sha256-r67e3AnqhLWVmtOFDj3P2Baa2Ch3TjyHm3Ol8ZwXH/g="; + src = fetchFromGitHub { + owner = "python-scim"; + repo = "scim2-tester"; + tag = version; + hash = "sha256-PoaY3gPSm+J/C1ad81Dmn7zrbf00pies8CLmLdV+gus="; }; - build-system = [ hatchling ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'uv_build>=0.8.9,<0.9.0' 'uv_build' + ''; - dependencies = [ scim2-client ]; + build-system = [ uv-build ]; + + dependencies = [ + scim2-client + scim2-models + ]; nativeCheckInputs = [ pytestCheckHook - werkzeug - scim2-server + pytest-scim2-server pytest-httpserver - cacert ] ++ optional-dependencies.httpx; diff --git a/pkgs/development/python-modules/smpclient/bleak-compat.patch b/pkgs/development/python-modules/smpclient/bleak-compat.patch deleted file mode 100644 index b05dac07d3dc..000000000000 --- a/pkgs/development/python-modules/smpclient/bleak-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/tests/test_smp_ble_transport.py b/tests/test_smp_ble_transport.py -index 95a7ade..f469438 100644 ---- a/tests/test_smp_ble_transport.py -+++ b/tests/test_smp_ble_transport.py -@@ -73,11 +73,11 @@ def test_SMP_gatt_consts() -> None: - - @patch( - "smpclient.transport.ble.BleakScanner.find_device_by_address", -- return_value=BLEDevice("address", "name", None, -60), -+ return_value=BLEDevice("address", "name", None), - ) - @patch( - "smpclient.transport.ble.BleakScanner.find_device_by_name", -- return_value=BLEDevice("address", "name", None, -60), -+ return_value=BLEDevice("address", "name", None), - ) - @patch("smpclient.transport.ble.BleakClient", new=MockBleakClient) - @pytest.mark.asyncio diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix index bf9b5569426e..f5e44edb8469 100644 --- a/pkgs/development/python-modules/smpclient/default.nix +++ b/pkgs/development/python-modules/smpclient/default.nix @@ -48,8 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ ./bleak-compat.patch ]; - pythonImportsCheck = [ "smpclient" ]; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix index 1ec3cfea2a7a..c8d42e345c4a 100644 --- a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix +++ b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "thomasloven"; domain = "browser_mod"; - version = "2.7.4"; + version = "2.9.0"; src = fetchFromGitHub { inherit owner; repo = "hass-browser_mod"; tag = "v${version}"; - hash = "sha256-UFHdoIfmN0BUBRAze3mC3mgbV00rrjmKlAiBc4FuiZA="; + hash = "sha256-LTXoehq7N2wURRuwXq6G0MlI8o24TxSU/EoHNiByeY0="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildHomeAssistantComponent rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-gvONQGQ91XZAygXDZnu7R/BPKa9T9l3f3EE6o39t0G0="; + hash = "sha256-FNf/8Ah1KV/Lmi0OYYQy2NaTCy17KuDEDOp3sWG2wH8="; }; npmBuildScript = "build"; @@ -35,7 +35,7 @@ buildHomeAssistantComponent rec { meta = { description = "Home Assistant integration to turn your browser into a controllable entity and media player"; homepage = "https://github.com/thomasloven/hass-browser_mod"; - changelog = "https://github.com/thomasloven/hass-browser_mod/releases/tag/${src.tag}"; + changelog = "https://github.com/thomasloven/hass-browser_mod/blob/${src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ SuperSandro2000 ]; license = lib.licenses.mit; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b9558201265..b2b7897944f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4688,6 +4688,8 @@ self: super: with self; { dramatiq-abort = callPackage ../development/python-modules/dramatiq-abort { }; + dramatiq-eager-broker = callPackage ../development/python-modules/dramatiq-eager-broker { }; + drawille = callPackage ../development/python-modules/drawille { }; drawilleplot = callPackage ../development/python-modules/drawilleplot { }; @@ -13504,6 +13506,8 @@ self: super: with self; { pydal = callPackage ../development/python-modules/pydal { }; + pydanclick = callPackage ../development/python-modules/pydanclick { }; + pydanfossair = callPackage ../development/python-modules/pydanfossair { }; pydantic = callPackage ../development/python-modules/pydantic { }; @@ -15484,6 +15488,8 @@ self: super: with self; { python-arango = callPackage ../development/python-modules/python-arango { }; + python-avatars = callPackage ../development/python-modules/python-avatars { }; + python-awair = callPackage ../development/python-modules/python-awair { }; python-axolotl = callPackage ../development/python-modules/python-axolotl { };