diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d1db79e5894..5720aff8e36c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 with: # Sandbox is disabled on MacOS by default. extra_nix_config: sandbox = true diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 59b801f0c0d1..b9f2246e768a 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -85,7 +85,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 continue-on-error: true diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index aaf26eae3014..28b5e8c99f61 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -54,7 +54,7 @@ jobs: ci/pinned.json - name: Install Nix - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - name: Load supported versions id: versions @@ -100,7 +100,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Install Nix - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 continue-on-error: true @@ -189,7 +189,7 @@ jobs: merge-multiple: true - name: Install Nix - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - name: Combine all output paths and eval stats run: | @@ -352,7 +352,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} - name: Install Nix - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - name: Run misc eval tasks in parallel run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 95ad536571a8..4c18d3f7d1b6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,7 +35,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well, # because the cache would be invalidated on every commit - treefmt checks every file. @@ -70,7 +70,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 continue-on-error: true @@ -100,7 +100,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@0b0e072294b088b73964f1d72dfdac0951439dbd # v31 + - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 continue-on-error: true diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index c4ec5d483532..677226bac978 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "143.0.7499.109", + "version": "143.0.7499.146", "chromedriver": { - "version": "143.0.7499.110", - "hash_darwin": "sha256-Yvq29D71/S1wlnG+7Dcd4IYuOcdSwxHSKLfdtitnmyQ=", - "hash_darwin_aarch64": "sha256-adwfK1Iymjla6lSID08SyEqbnYjJLKfB92Yrh5/9LuQ=" + "version": "143.0.7499.147", + "hash_darwin": "sha256-bsyTxvmiIDdV/ivUjbLk3K+Ve03DvVZG3HF/y4X9JUU=", + "hash_darwin_aarch64": "sha256-j5PbvqUsR+XlYZU7xB2MTPJncfSgCIy9tE298ww8Ux4=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "71a0dbd6672e2ccb6d1008376cbb7acd315cb8d6", - "hash": "sha256-K7HzC+M7WIMsyB4Wuy04WvGAX+QsTN5daOhkox1wxnA=", + "rev": "c1224fc40c96e7f17f0cdeb87a8f4c64b93c0d74", + "hash": "sha256-Sn4j7vs7g/D9GnL+BMCyg73iEeGn7Miq0k42mV6Z3hM=", "recompress": true }, "src/third_party/clang-format/script": { @@ -132,8 +132,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "e1ce227ebf75378c5f60a9d531579982bcdd93ee", - "hash": "sha256-RqGCh/InZagPemqMRnR/ziaxDm3ruS4dtnj87mBmIjc=" + "rev": "479f62d2194fd6e44c37d07654ca6e41c42bd332", + "hash": "sha256-rzZn9l0EFcir6k8Xv2svIrhRPwe/rq48H7CX/3yfgFE=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -777,8 +777,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "1788a81407183acc98163a4e1507c5c63fb175cc", - "hash": "sha256-7FIcH5MG7kNHmN2FE00Qyd1NlfYzb1xKmVDX7MCNyXQ=" + "rev": "4e31d1a1ff41bb1b79609c83f998458a111a149c", + "hash": "sha256-3tfB6jNsTLYozYqBfAmYNmq94wQ3OFxBSlOfRaj6wxc=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -807,8 +807,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "beee9f5cafde91bbd086077a11db16cb9768e62a", - "hash": "sha256-q1gVbNGls2izSDb3KZmteZQvcc6M0JyPuZFPfG4FIAs=" + "rev": "326f5f8cad3f0e436c8ea8f82a6894936a32e860", + "hash": "sha256-crTEZnN5iWTXOxpAkvIDPQ6hyfF54F1/ImoKrdmO2K4=" } } }, diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix index 1207ea2eb15e..c267a1335ca2 100644 --- a/pkgs/by-name/aw/aws-lc/package.nix +++ b/pkgs/by-name/aw/aws-lc/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aws-lc"; - version = "1.65.0"; + version = "1.66.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lc"; rev = "v${finalAttrs.version}"; - hash = "sha256-rpxEhOy9qYwIDa78u1BOgANfnkfGgGacKOjjlqXtn88="; + hash = "sha256-OO9TWwaV/GlyrLl4C6oCFxIAeYfWjzvY7o//7OuoRDc="; }; outputs = [ diff --git a/pkgs/by-name/ca/cavasik/package.nix b/pkgs/by-name/ca/cavasik/package.nix new file mode 100644 index 000000000000..6b28bd7753bb --- /dev/null +++ b/pkgs/by-name/ca/cavasik/package.nix @@ -0,0 +1,83 @@ +{ + cava, + desktop-file-utils, + fetchFromGitHub, + gobject-introspection, + gst_all_1, + gtk4, + lib, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + python3Packages, + wrapGAppsHook4, +}: + +let + pname = "cavasik"; + version = "3.2.0"; +in +python3Packages.buildPythonApplication { + inherit pname version; + + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "TheWisker"; + repo = "Cavasik"; + tag = "v${version}"; + hash = "sha256-O8rFtqzmDktXKF3219RAo1yxqjfPm1qkHhAyoT7N8AU="; + }; + + postPatch = '' + substituteInPlace src/cava.py \ + --replace-fail '"cava"' '"${lib.getExe cava}"' + ''; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gst_all_1.gstreamer + gtk4 + libadwaita + ]; + + dependencies = with python3Packages; [ + pycairo + pydbus + pygobject3 + ]; + + checkPhase = '' + runHook preCheck + + meson test --print-errorlog + + runHook postCheck + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]}) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Audio visualizer based on CAVA with extended capabilities"; + mainProgram = "cavasik"; + homepage = "https://github.com/TheWisker/Cavasik"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ starryreverie ]; + }; +} diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 3ee54e8e168d..92f6d53e3ace 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -33,14 +33,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.11.5"; + version = "2025.12.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = version; - hash = "sha256-ln+LuV//FVb+Jy6cMNth6RaFtusf/ZCLtYowlDnBybE="; + hash = "sha256-kp1pFNq5PNrmRzpQ2pUHXW4AEXyHEFKqofzmbe6zOJk="; }; patches = [ diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 6be30a70cd97..5a11e0c291c7 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "143.0.7499.109"; + version = "143.0.7499.146"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-36YeOTThfFzMQs+wxxFLwwUmp0uPBb0+b8TD7LG1e+0="; + hash = "sha256-GhEPDoloqlnEYZ/laVaQdNolxnW9DBVx2Ete9Mj0GDQ="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -272,11 +272,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "143.0.7499.110"; + version = "143.0.7499.147"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/p5xbkc3osahdfsgniofymq5nqq_143.0.7499.110/GoogleChrome-143.0.7499.110.dmg"; - hash = "sha256-Ed0THsSrWWK0x/h+yhzQdU8PBrZkM/tLiqDEnWAtCMw="; + url = "http://dl.google.com/release2/chrome/ad7e74qqebdgksg3f2kar635d3fq_143.0.7499.147/GoogleChrome-143.0.7499.147.dmg"; + hash = "sha256-/gwm6RxHsqd6cMiGI8P2ZhqKx+/LTcpXAs4dfNZnBn8="; }; dontPatch = true; diff --git a/pkgs/by-name/hy/hyprspace/package.nix b/pkgs/by-name/hy/hyprspace/package.nix index 5976f204f070..2aff2b9a28de 100644 --- a/pkgs/by-name/hy/hyprspace/package.nix +++ b/pkgs/by-name/hy/hyprspace/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hyprspace"; repo = "hyprspace"; tag = "v${version}"; - hash = "sha256-Lv/Mb7vj1bUj5TajIdM6bu8299y+B3sZfE6xlA6sXcM="; + hash = "sha256-VOufAPhCbLzVxrj/XKwunJkxUx0EAovV4+adrQLwcoI="; }; env.CGO_ENABLED = "0"; - vendorHash = "sha256-97uIl3b3hs3BCLH7UZX8NU3kLloVQOCN9ygsdxsfass="; + vendorHash = "sha256-m7asItMMFm/lHNl4nemvuMU0mn69kTrC1XK4rUCOor4="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index b5354c6261ea..0c9e582d1962 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "kubevpn"; - version = "2.9.10"; + version = "2.9.11"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; tag = "v${finalAttrs.version}"; - hash = "sha256-5yuJfGWNEQ/1ufV1rVze2JrL/67/UlYdG2YH9i+gI3w="; + hash = "sha256-x6GYkLGPiH061QQW9YnTeHLNTrM5Q8Odm0seODQRZgk="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libnspsl/package.nix b/pkgs/by-name/li/libnspsl/package.nix index a7905669ef5d..7206b5358b44 100644 --- a/pkgs/by-name/li/libnspsl/package.nix +++ b/pkgs/by-name/li/libnspsl/package.nix @@ -4,6 +4,7 @@ fetchurl, pkg-config, netsurf-buildsystem, + publicsuffix-list, }: stdenv.mkDerivation (finalAttrs: { @@ -15,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NoTOwy9VXa7UMZk+C/bL2TdPbJCERiN+CJ8LYdaUrIA="; }; + postPatch = '' + rm public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat public_suffix_list.dat + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ netsurf-buildsystem ]; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 757bceb94699..302ed505d19c 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.5.11"; + version = "3.5.13"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-YYsUyuJMYos8aiOCbQy7FlVRakfBXC63HiTbg3YBd8I+kR1zA38FWAkRZeAiA3WyUutmJLJxaDtwBzhq/QgQ7w=="; + hash = "sha512-MvR5gnJxCUuYstgpGoux2oA3evN9bqXmnEjPBSvBSGzMiZmz0Iox5cfBeaHf+GlwL+9rFs2bhKaeJSinI2FQaw=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix index 9811b2387d83..83d12cb011c9 100644 --- a/pkgs/by-name/ma/mathjax/package.nix +++ b/pkgs/by-name/ma/mathjax/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathjax"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "mathjax"; repo = "mathjax"; tag = finalAttrs.version; - hash = "sha256-36lTjx4zuFeT1+QFemiQcCZfAjyh7vFPpYeRhO2mzGI="; + hash = "sha256-ri8j/S0mS0I12y3o8NCCMcR3FHeuaNKg/+zEkNB2uXU="; }; installPhase = '' diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index bcdcd92a7a3d..8aa4ad3ce5f8 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - fetchpatch2, writeText, bluez, cjson, @@ -65,24 +64,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "monado"; - version = "25.0.0"; + version = "25.1.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; tag = "v${finalAttrs.version}"; - hash = "sha256-VxTxvw+ftqlh3qF5qWxpK1OJsRowkRXu0xEH2bDckUA="; + hash = "sha256-hUSm76PV+FhvzhiYMUbGcNDQMK1TZCPYh1PNADJmdSU="; }; - patches = [ - # Remove with v26 - (fetchpatch2 { - url = "https://gitlab.freedesktop.org/monado/monado/-/commit/2a6932d46dad9aa957205e8a47ec2baa33041076.patch"; - hash = "sha256-CZMbGgx7mEDcjcoRJHDZ5P6BecFW8CB4fpzxQ9bpAvE="; - }) - ]; - nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix index 68bbd0dd81ed..ec2fe0b6d99d 100644 --- a/pkgs/by-name/no/notesnook/package.nix +++ b/pkgs/by-name/no/notesnook/package.nix @@ -9,7 +9,7 @@ let pname = "notesnook"; - version = "3.2.4"; + version = "3.3.5"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -27,10 +27,10 @@ let url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-n4yDBaDq09idmjRZ+y2zT7rZcI4wsDhMidx9sNox5cM="; - aarch64-linux = "sha256-UQFySvvs+paCzt2XSrbYiChEQJIbef3rCOST1r+zZx8="; - x86_64-darwin = "sha256-42US8m6ZbGTUNkU0p4y0pgXKiSsjZZHlQhwv2/LDlO4="; - aarch64-darwin = "sha256-eJVyuL5nBGMr8WhOK4NOMNSMYBASQZbsbLPLgug7ZNs="; + x86_64-linux = "sha256-jvQph74dMQgino3K1ZFLT/fsJVdTHVqMQaW0RQhfci0="; + aarch64-linux = "sha256-jrKmZmdx1T1wrlM0y195Z2MsI1XpFn0gyFyf7N/aUzo="; + x86_64-darwin = "sha256-bJ+sq6/lZcLcM7R2KAigemdpRDqSiExfcSunNQ7cGw0="; + aarch64-darwin = "sha256-DTY0gq62aXOanZvYletyXl5xmcs30vWTKE4nZujRCq0="; } .${system} or throwSystem; }; @@ -52,6 +52,7 @@ let maintainers = with lib.maintainers; [ cig0 j0lol + keysmashes ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/pa/paq/package.nix b/pkgs/by-name/pa/paq/package.nix index 2468f8b00ac3..72e17b2dd54f 100644 --- a/pkgs/by-name/pa/paq/package.nix +++ b/pkgs/by-name/pa/paq/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "paq"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "gregl83"; repo = "paq"; tag = "v${finalAttrs.version}"; - hash = "sha256-2HlQzb3foNv/F35u7/737eJfNTsiQRCymggKAQ+mIS0="; + hash = "sha256-cG1xoe0mtijR5l1T2O/6C6yTdGhSXxYaGGugllOOZoE="; }; - cargoHash = "sha256-LlqKdJhmOYnmnZA+xh7sogcnMWgpgm5qV6vwM3n3vng="; + cargoHash = "sha256-M3UtXCX4caYYaXoS8F2kKheP5qX5xac2WPNCnw94B6Q="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 12f7e3e705e7..6dfc66220b0f 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-12-09"; + version = "0-unstable-2025-12-15"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "7dafa59905aea1f9f4a8d2f38c1505796d9b69b3"; - hash = "sha256-aNpvU/4FFNDJAn11Js+1I41GjLic6gF8MyJXS3TLeRA="; + rev = "4eb0af2c34bf5ae5d7e04cc47cd8f7b6269ef079"; + hash = "sha256-BpNB8wrb3vR5NXAxwRfrQjwcSllWB1YlQJU25OlS8Hw="; }; vendorHash = "sha256-6wgJNDzUzSCkwzjqGwzpa63+0HoN5PapKxMBFBuu16M="; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index a8ef71d47183..5090d9dd84ac 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -12,7 +12,8 @@ libapparmor, libseccomp, libselinux, - systemdMinimal, + # TODO: investigate why changing from `systemd` to `systemdMinimal` breaks `podman logs` + systemd, nixosTests, python3, makeBinaryWrapper, @@ -83,7 +84,7 @@ buildGoModule (finalAttrs: { libseccomp libselinux lvm2 - systemdMinimal + systemd ]; env = { @@ -135,7 +136,7 @@ buildGoModule (finalAttrs: { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) - patchelf --set-rpath "${lib.makeLibraryPath [ systemdMinimal ]}":$RPATH $out/bin/.podman-wrapped + patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped substituteInPlace "$out/share/systemd/user/podman-user-wait-network-online.service" \ --replace-fail sleep '${coreutils}/bin/sleep' \ --replace-fail /bin/sh '${runtimeShell}' diff --git a/pkgs/by-name/pr/proxsuite/fix-cmake-python-version.patch b/pkgs/by-name/pr/proxsuite/fix-cmake-python-version.patch new file mode 100644 index 000000000000..f880f7fb9df4 --- /dev/null +++ b/pkgs/by-name/pr/proxsuite/fix-cmake-python-version.patch @@ -0,0 +1,14 @@ +diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt +index 07678691f..1d85e5eb2 100644 +--- a/bindings/python/CMakeLists.txt ++++ b/bindings/python/CMakeLists.txt +@@ -31,6 +31,9 @@ execute_process( + OUTPUT_STRIP_TRAILING_WHITESPACE + OUTPUT_VARIABLE nanobind_ROOT + ) ++if(NOT Python_VERSION AND Python3_VERSION) ++ set(Python_VERSION ${Python3_VERSION}) ++endif() + find_package(nanobind CONFIG) + cmake_policy(POP) + if(NOT nanobind_FOUND) diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix index fc56b8ef0e5d..9b7ff3a213e2 100644 --- a/pkgs/by-name/pr/proxsuite/package.nix +++ b/pkgs/by-name/pr/proxsuite/package.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1+a5tFOlEwzhGZtll35EMFceD0iUOOQCbwJd9NcFDlk="; }; + patches = [ + # Set Python_VERSION to Python3_VERSION if not already set + ./fix-cmake-python-version.patch + ]; + # ref. https://github.com/Simple-Robotics/proxsuite/pull/408 merged upstream postPatch = '' substituteInPlace CMakeLists.txt --replace-fail \ diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 69e9b5281be0..532cdee531dc 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-DY/D2t1O2vsFisc3FR97A9oNic9wjxVnYWiAqQR3FwI="; + hash = "sha256-hef79QdqCgK0oni4wZVVJzyEkqTob7ek9l6GazbmygY="; }; - cargoHash = "sha256-cXr529d/PDLeFCwEo06vxfw9JkPjfhYB8MG2oqiGZUw="; + cargoHash = "sha256-ulbznI3qQDrzPircibC7xdEwCk/OVsFQW5lCYWrjfkg="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 1e2ec624894d..750ceec2b0e1 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kotlin"; - version = "2.2.21"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip"; - sha256 = "sha256-piOHHxzZyTiUaUi3DvkXCHnwdYBDiFu9MMMvAk5RFxQ="; + sha256 = "sha256-6harHKsp1Bm/QbYOzA4wXUSfpmHZwF+8xbKmZyUFRWo="; }; propagatedBuildInputs = [ jre ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index ad25c0f35d81..a900ee4a7372 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "43.2.1"; + version = "43.3.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-OUmnamtVCMobTI99aRr81MECG51JHfzQ9bZs0C1Mmcw="; + hash = "sha256-x6X1iqTrmBfPA6/gy/qBIUYtr0jv0hPO26pWaONAV3c="; }; build-system = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index b33d2451f55d..fc8f98bcc955 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.42.10"; + version = "1.42.11"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-Xw9tCzwwyE+z0aL8P8uusre/GTKb3qn2KHy9Du/TOgc="; + hash = "sha256-nb7AAYT3Abn7vy81VKuWtc2L0YVL91mdGRfGWdSI+GQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 3787868050c2..91a0df6969d3 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.42.10"; + version = "1.42.11"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-6G/LDWdVVZtxRIExaFTRmmtLmTAjYH2kfVagx11Pk4c="; + hash = "sha256-wrrJINjDAuFea+yVk9rq8Ed3cU+DCf4FL9JM8o64WnY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index eb7b05c0a5fc..c34d10d1a880 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -1,21 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "mwparserfromhell"; version = "0.7.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-9Bkwcunqk7noj3cvYKAhJcBgLTKJDQu9yyde1YyLN2M="; + src = fetchFromGitHub { + owner = "earwig"; + repo = "mwparserfromhell"; + tag = "v${version}"; + hash = "sha256-yPj272bMh/pLapc7lDgP4+AnDBpE2FrDICRUxizIcSA="; }; postPatch = '' @@ -23,14 +24,20 @@ buildPythonPackage rec { --replace '"pytest-runner"' "" ''; + build-system = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mwparserfromhell" ]; meta = { - description = "MWParserFromHell is a parser for MediaWiki wikicode"; + description = "Parser for MediaWiki wikicode"; homepage = "https://mwparserfromhell.readthedocs.io/"; - changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/v${version}"; + changelog = "https://github.com/earwig/mwparserfromhell/releases/tag/${src.tag}"; license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 99be0f822546..49000086bde2 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -633,8 +633,8 @@ in "sha256-rXXlHFkPI9DeMO2j+a0kLrieNt73t8//2UnUM2JskfI="; mypy-boto3-iot = - buildMypyBoto3Package "iot" "1.42.3" - "sha256-PRDFJ9sJAwbBndd8NNwWyadEEX6HFSPJ1yaMw9KzXVU="; + buildMypyBoto3Package "iot" "1.42.11" + "sha256-tYIcS9H15aIWVt/dfGtBQGuQIAZbva6zDyrlT8Yytbc="; mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.42.3" diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 3537e9f99356..4c4dd56d8745 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -26,7 +26,7 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "2.9.2"; + version = "2.10.1"; pyproject = true; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "nanobind"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-cC+sf2FUm1jdGMRdDoaQK8rjUVkWjn/53c1HQ5gsUWs="; + hash = "sha256-LNr3d0ytnkcJOps6DzdZtyiihFwNgv34s5RJsRBD844="; }; build-system = [ diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index b3cb03d01858..94a460a99332 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -4,6 +4,7 @@ fetchPypi, setuptools, pythonOlder, + publicsuffix-list, }: buildPythonPackage rec { @@ -22,6 +23,9 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/def test_fetch/i\\ \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py + + rm publicsuffix/public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat publicsuffix/public_suffix_list.dat ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index 227fab9e1ee5..0732ff4c9794 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + publicsuffix-list, }: let tagVersion = "2.2019-12-21"; @@ -27,6 +28,9 @@ buildPythonPackage { # only used to update the interal publicsuffix list substituteInPlace setup.py \ --replace "'requests >= 2.7.0'," "" + + rm src/publicsuffix2/public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat src/publicsuffix2/public_suffix_list.dat ''; pythonImportsCheck = [ "publicsuffix2" ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 16732c89b875..48391b04b586 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -6,6 +6,7 @@ pytestCheckHook, requests, setuptools, + publicsuffix-list, }: buildPythonPackage rec { @@ -18,6 +19,11 @@ buildPythonPackage rec { hash = "sha256-37hj0A37m8BxNAWWIpRoromnXWJUbqvOOOu9iw01DKk="; }; + postPatch = '' + rm publicsuffixlist/public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat publicsuffixlist/public_suffix_list.dat + ''; + build-system = [ setuptools ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/pywikibot/default.nix b/pkgs/development/python-modules/pywikibot/default.nix index 503a6d6309ca..dccccb13fa05 100644 --- a/pkgs/development/python-modules/pywikibot/default.nix +++ b/pkgs/development/python-modules/pywikibot/default.nix @@ -5,22 +5,22 @@ mwparserfromhell, requests, packaging, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pywikibot"; - version = "10.7.3"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "10.7.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ujkPgXqq5h4vISeUXHKWnMR2Mtt0a26Qjz20qdufT/4="; + hash = "sha256-/hHfZRLoEgaPKZLus9x/d5O62GnwU/1A7PAsebGj634="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ mwparserfromhell requests packaging diff --git a/pkgs/development/python-modules/sectxt/default.nix b/pkgs/development/python-modules/sectxt/default.nix index 1ca20dd90db4..42dad0d8aad1 100644 --- a/pkgs/development/python-modules/sectxt/default.nix +++ b/pkgs/development/python-modules/sectxt/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pythonOlder, requests, python-dateutil, langcodes, @@ -15,16 +14,14 @@ buildPythonPackage rec { pname = "sectxt"; - version = "0.9.7"; + version = "0.9.8"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "DigitalTrustCenter"; repo = "sectxt"; tag = version; - hash = "sha256-CDVfT3ANb4ugLEvrSRTbkZMvZA6rcEwBu2c3pnjsza8="; + hash = "sha256-x8HcERUZpOijTEXbbtnG0Co5PiQlO4v5bxKM4CAExnI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/streamlit-folium/default.nix b/pkgs/development/python-modules/streamlit-folium/default.nix new file mode 100644 index 000000000000..8500ba9beedd --- /dev/null +++ b/pkgs/development/python-modules/streamlit-folium/default.nix @@ -0,0 +1,68 @@ +{ + lib, + branca, + buildPythonPackage, + fetchFromGitHub, + folium, + jinja2, + pytest-playwright, + pytest-rerunfailures, + pytestCheckHook, + streamlit, + uv-build, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "streamlit-folium"; + version = "0.25.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "randyzwitch"; + repo = "streamlit-folium"; + tag = "v${version}"; + hash = "sha256-ACllvlT2zPyV7IS00LVgnf2u5jMChVJlDgNlWk0c9fo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.4,<0.9" "uv_build" + ''; + + build-system = [ uv-build ]; + + dependencies = [ + branca + folium + jinja2 + streamlit + ]; + + nativeCheckInputs = [ + pytest-playwright + pytest-rerunfailures + pytestCheckHook + streamlit + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ "streamlit_folium" ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + disabledTestPaths = [ + # Don't run tests that require chromium + "tests/test_frontend.py" + ]; + + meta = { + description = "Streamlit Component for rendering Folium maps"; + homepage = "https://github.com/randyzwitch/streamlit-folium"; + changelog = "https://github.com/randyzwitch/streamlit-folium/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix index 6af600c3c13e..91a9be4dde7b 100644 --- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix +++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "samoswall"; domain = "polaris"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "samoswall"; repo = "polaris-mqtt"; tag = "v${version}"; - hash = "sha256-LH5as1HaD+fgj2ZJ8su7Jz1lE+Dh0iJHZilOUoiy7jo="; + hash = "sha256-SpnrEW/gzUMZXlnoyzOC4/8ooIxUqrcRNIAdBzUR4oY="; }; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e45622952ab8..c9649073b073 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18176,6 +18176,8 @@ self: super: with self; { streamlit = callPackage ../development/python-modules/streamlit { }; + streamlit-folium = callPackage ../development/python-modules/streamlit-folium { }; + streamz = callPackage ../development/python-modules/streamz { }; strenum = callPackage ../development/python-modules/strenum { };