diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f3a58367e055f..fd04254871ede 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -103,6 +103,9 @@ [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. +- `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0). + `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable. + ## Other Notable Changes {#sec-release-25.05-notable-changes} diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 68c3286b22a06..6b459fa140854 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -35,6 +35,13 @@ let # See: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/106 mkdir -p $out/share/plymouth/themes/spinfinity ln -s $logo $out/share/plymouth/themes/spinfinity/header-image.png + + # Logo for catppuccin (two-step) theme + for flavour in mocha macchiato latte frappe + do + mkdir -p $out/share/plymouth/themes/catppuccin-"$flavour" + ln -s $logo $out/share/plymouth/themes/catppuccin-"$flavour"/header-image.png + done ''; themesEnv = pkgs.buildEnv { diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 33896a852698e..8d3450b30f603 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -4,7 +4,7 @@ stdenv, }: let - version = "6872"; + version = "6886"; src = let inherit (stdenv.hostPlatform) system; @@ -16,10 +16,10 @@ let aarch64-darwin = "mac-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-JhAW1Ot4ncLiEz/Y83D/capJ+H46GybYnWHpMChX6F0="; - aarch64-linux = "sha256-/8o+v8fIXYK8N7xdC14/fWk3LOr13xyjadMXJgploek="; - x86_64-darwin = "sha256-nVu3JhvjnqhCpNDSBzzZA1PHbT2y5b+kEeu4ZPqgf4Q="; - aarch64-darwin = "sha256-IyoeuNno+Y8nLi1u9tjl75ZJiULrnKyShe3oaSY9GF4="; + x86_64-linux = "sha256-8o2PgbyHqU1ST2clx2NRB6/E1eBWjuyx2oIVvc1/ujI="; + aarch64-linux = "sha256-SUxtX7NMK+sMi5Fybc2P+bNrXET0TTBJTUhsMw0eBTc="; + x86_64-darwin = "sha256-p4lHxr1Do3pLKXn2bOt8gh2R5KHPr4HpAM9hphFUimU="; + aarch64-darwin = "sha256-Eb9I17GcuBaMAVKI9K0Rf/iD+nhBFDgYhWth46yU0xE="; }; in fetchzip { diff --git a/pkgs/by-name/zf/zf/deps.nix b/pkgs/by-name/zf/zf/deps.nix index c814bd6c96457..7eeea9754d85a 100644 --- a/pkgs/by-name/zf/zf/deps.nix +++ b/pkgs/by-name/zf/zf/deps.nix @@ -1,13 +1,56 @@ # generated by zon2nix (https://github.com/nix-community/zon2nix) -{ linkFarm, fetchzip }: +{ + linkFarm, + fetchzip, + fetchgit, +}: linkFarm "zig-packages" [ { - name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25"; + name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40"; path = fetchzip { - url = "https://codeberg.org/dude_the_builder/ziglyph/archive/b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz"; - hash = "sha256-e/zYB9w6vvHUBJzjlocSjpJu3qao7sXjBsfUO9oDXyg="; + url = "https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz"; + hash = "sha256-4yLDdyQwPvglNzcRxlWbptjjOb0fsLv8jg/jFUp/uAU="; + }; + } + { + name = "12207b7a5b538ffb7fb18f954ae17d2f8490b6e3778a9e30564ad82c58ee8da52361"; + path = fetchgit { + url = "https://github.com/mitchellh/libxev"; + rev = "f6a672a78436d8efee1aa847a43a900ad773618b"; + hash = "sha256-NCRu+2UixKsm+tJMQiPyzAYL/kiKn4HFbJq3wpTF34Q="; + }; + } + { + name = "1220a55aedabdd10578d0c514719ea39ae1bc6d7ed990f508dc100db7f0ccf391437"; + path = fetchgit { + url = "https://github.com/Cloudef/zig-aio"; + rev = "b5a407344379508466c5dcbe4c74438a6166e2ca"; + hash = "sha256-OvM4CA2w9v2XpjAV26CjsLIWOILOQm89xaEwitYpciw="; + }; + } + { + name = "1220da4cab188b7b0e351de67626ca0dcadceddd16ca5997cfb578697f0525a59dac"; + path = fetchgit { + url = "https://github.com/marlersoft/zigwin32.git"; + rev = "4a78e716ae6496f52d9ddaf4fda2c4bb692631cd"; + hash = "sha256-/XvkZPxoq2oeEWREX0dDLdVro4NsCBsMHWKcytaD4Rg="; + }; + } + { + name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5"; + path = fetchgit { + url = "https://github.com/zigimg/zigimg"; + rev = "3a667bdb3d7f0955a5a51c8468eac83210c1439e"; + hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo="; + }; + } + { + name = "1220de23a3240e503397ea579de4fd85db422f537e10036ef74717c50164475813ce"; + path = fetchzip { + url = "https://github.com/rockorager/libvaxis/archive/refs/tags/v0.5.1.tar.gz"; + hash = "sha256-F0PSs2k2XzC1J/UTyBetuBdXvIm/6jDWtSLATpnp+QY="; }; } ] diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix index c04fa13e2ca83..8f03620b48ec7 100644 --- a/pkgs/by-name/zf/zf/package.nix +++ b/pkgs/by-name/zf/zf/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, installShellFiles -, testers -, zig_0_13 -, callPackage +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + testers, + zig_0_13, + callPackage, }: stdenv.mkDerivation (finalAttrs: { pname = "zf"; - version = "0.9.2"; + version = "0.10.2"; src = fetchFromGitHub { owner = "natecraddock"; repo = "zf"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-8KfzsDG9sZ/jMOusz2ydt3oytp891vKOpCUlPAwS8TE="; + hash = "sha256-Rsl8gAfVMeF5CLyPSrtzdgSCvEwPnBwHT4BOF9JQYYo="; }; nativeBuildInputs = [ @@ -43,7 +44,11 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/natecraddock/zf/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ dit7ya figsoda mmlb ]; + maintainers = with lib.maintainers; [ + dit7ya + figsoda + mmlb + ]; mainProgram = "zf"; }; }) diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index d11c806448212..aa9f43a7e4aa5 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "mdx"; - version = "2.4.1"; + version = "2.5.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - hash = "sha256-GkDMkcxVPe0KIMmNQ0NUlTvbdZ7Mka02u7mn3QQSrxM="; + hash = "sha256-wtpY19UYLxXARvsyC7AsFmAtLufLmfNJ4/SEHCY2UCk="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix new file mode 100644 index 0000000000000..c832c29865194 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-eio.nix @@ -0,0 +1,30 @@ +{ + buildDunePackage, + mirage-crypto, + mirage-crypto-rng, + dune-configurator, + eio, + eio_main, + ohex, +}: + +buildDunePackage rec { + pname = "mirage-crypto-rng-eio"; + + inherit (mirage-crypto) version src; + + doCheck = true; + checkInputs = [ + eio_main + ohex + ]; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + mirage-crypto + mirage-crypto-rng + eio + ]; + + meta = mirage-crypto-rng.meta; +} diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 24c75bf05e816..da2930e541908 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -7,40 +7,28 @@ apr, aprutil, bash, - e2fsprogs, - expat, gcc, - neon, - glibcLocales, - openssl, pycxx, subversion, }: buildPythonPackage rec { pname = "pysvn"; - version = "1.9.22"; - format = "other"; + version = "1.9.23"; + pyproject = false; src = fetchurl { url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; - hash = "sha256-KfLg9tuuKpXxJoniD002kDXGCTwOZ9jurCoPrWMRo7g="; + hash = "sha256-ABru1nng1RaYfZwe0Z0NxE90rU/J2h/BhzUnvgrasCk="; }; patches = [ ./replace-python-first.patch ]; - buildInputs = - [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + buildInputs = [ + subversion + apr + aprutil + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source @@ -56,8 +44,6 @@ buildPythonPackage rec { --svn-bin-dir=${subversion.out}/bin ''; - nativeCheckInputs = [ glibcLocales ]; - checkPhase = '' runHook preCheck diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 833d9a91ec607..3431c113c2fb8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1155,6 +1155,8 @@ let mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; + mirage-crypto-rng-eio = callPackage ../development/ocaml-modules/mirage-crypto/rng-eio.nix { }; + mirage-crypto-rng-lwt = callPackage ../development/ocaml-modules/mirage-crypto/rng-lwt.nix { }; mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1682fcddad15..635c2d2ac9471 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12629,7 +12629,7 @@ self: super: with self; { pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { }; pysvn = callPackage ../development/python-modules/pysvn { - inherit (pkgs) bash subversion apr aprutil expat neon openssl; + inherit (pkgs) bash subversion apr aprutil; }; pyswitchbee = callPackage ../development/python-modules/pyswitchbee { };