diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 2396dcef6fa3..83e38523f57c 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -4,7 +4,7 @@ -- Create the first release note entry in this section! +- The default kernel package has been updated from 6.12 to 6.18. All supported kernels remain available. ## New Modules {#sec-release-26.05-new-modules} diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index d6d08f232738..481773991206 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -242,9 +242,6 @@ in } ]; - # Use LTS that bcachefs is compatible with. - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_6_18; - # needed for systemd-remount-fs system.fsPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cdfed1d762d2..64a42153a7bd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -887,13 +887,13 @@ "vendorHash": "sha256-0Z2V8CyIZEHZFFqTNFnseBbvVenOnpNz9Tlbu7zaPOI=" }, "maxlaverse_bitwarden": { - "hash": "sha256-9HSxaU+/1HaN4mmi9JnKuTwP/HLCh72zcKecTAQJQpM=", + "hash": "sha256-n1d2n6CX8iV/bRqQSaivRxMAYKA/ctfWPQaFgS7ETgE=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.17.1", + "rev": "v0.17.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-vDvGIiUIMjMAz9ST/Qjo7aurkB9RIVeevSUkQ8eJ9tk=" + "vendorHash": "sha256-2IlD9IdiN+TBk/Eng2K4jZD8GB91IvQPeVAKhxI/6aY=" }, "metio_migadu": { "hash": "sha256-rAf+q/zNANhW8cFSJR3TtA0yYqiG5mjCStyBFG0U3tg=", @@ -1049,11 +1049,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-gzjvdAuT3HDMRULa+b2u75zqei4x1ylj3NGyHh4qa+U=", + "hash": "sha256-2uSMK9GvqCdIPjr/PI4FlOM5qXhPsEY6dnY3S795/vg=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.32.0", + "rev": "v8.0.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 5d7768b261ea..f56ffb529b71 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -46,17 +46,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.25.7"; + version = "0.26.2"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-+MdPo2THiwgRT4x/Xnf9+1C+Bu0BsV9P1yIXhgdA3CQ="; + hash = "sha256-qFJezmSNq6Uq6xvCGUITeidrChQiZWI6lw9ZX8PcwXc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-0SOuaMjVihmSBQhVKZHIZkIUs+MXnW5VkrhGRD6xNcM="; + hash = "sha256-3cvq3FV3juzEaKczw/SUHSXHLLEIEJlcv2LUAMxGVVQ="; }; # keep yarnOfflineCache same output style with offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; hash = "" }; @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-pPLnNsQ7+ao+MQw6Zmf/XA8ITWr+AeUA0gvu6qVUECw="; + outputHash = "sha256-TgrepMMOZkVK2uUEvwllrnFzVsEjgvRb8AtBsDzrHSg="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index aeae7b435523..ad0f45b3971b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -376,20 +376,20 @@ def main() -> None: try: execute(sys.argv) + except KeyboardInterrupt: + sys.exit(130) except CalledProcessError as ex: - _handle_called_process_error(ex) - except (Exception, KeyboardInterrupt) as ex: + sys.exit(_handle_called_process_error(ex)) + except Exception as ex: if logger.isEnabledFor(logging.DEBUG): raise else: sys.exit(str(ex)) -def _handle_called_process_error(ex: CalledProcessError) -> None: +def _handle_called_process_error(ex: CalledProcessError) -> int: if logger.isEnabledFor(logging.DEBUG): - import traceback - - traceback.print_exception(ex) + sys.excepthook(*sys.exc_info()) else: import shlex @@ -410,4 +410,4 @@ def _handle_called_process_error(ex: CalledProcessError) -> None: print(str(ex), file=sys.stderr) # Exit with the error code of the process that failed - sys.exit(ex.returncode) + return ex.returncode diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index a09fb90a91cc..5d25387b0ec6 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/grigio/obs-cmd"; changelog = "https://github.com/grigio/obs-cmd/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.ramblurr ]; mainProgram = "obs-cmd"; }; }) diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix new file mode 100644 index 000000000000..6256297621db --- /dev/null +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -0,0 +1,64 @@ +{ + lib, + clangStdenv, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, + useMoldLinker, + versionCheckHook, + withMold ? with clangStdenv.hostPlatform; isUnix && !isDarwin, +}: +let + stdenv = if withMold then useMoldLinker clangStdenv else clangStdenv; +in +rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { + pname = "pgdog"; + version = "0.1.28"; + + src = fetchFromGitHub { + owner = "pgdogdev"; + repo = "pgdog"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3TRpjLlyS9XKqBPCUqW0ilwaMiAXRzg1RdF9x3GYnxY="; + }; + + cargoHash = "sha256-iqUB9m2MXbl4rgwTH2TYF6lqbpkMFng5pUAzUXzhhJs="; + + # Hardcoded paths for C compiler and linker + postPatch = '' + rm .cargo/config.toml + ''; + + cargoBuildFlags = [ + "--package" + "pgdog" + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + openssl + ]; + + strictDeps = true; + + # Several tests rely on networking + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "PostgreSQL connection pooler, load balancer, and database sharder"; + homepage = "https://pgdog.dev/"; + changelog = "https://github.com/pgdogdev/pgdog/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + mainProgram = "pgdog"; + maintainers = with lib.maintainers; [ EpicEric ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix index f916f8d53377..781761698db3 100644 --- a/pkgs/by-name/su/sudo/package.nix +++ b/pkgs/by-name/su/sudo/package.nix @@ -54,6 +54,18 @@ stdenv.mkDerivation (finalAttrs: { "--with-sssd-lib=${sssd}/lib" ]; + outputs = [ + "out" + "man" + "doc" + "dev" + ]; + # The default stdenv ./configure flags for some reason cause the upstream's + # Makefile to `mkdir /var/db`, which fails in the sandbox. Since we split + # only trivial outputs - a single header and documentation, we can safely set + # the following: + setOutputFlags = false; + postConfigure = '' cat >> pathnames.h <<'EOF' #undef _PATH_MV diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 13944f58ff5d..d65868fa97ea 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -386,7 +386,7 @@ stdenv.mkDerivation { jdupes --hard-links --link-soft --recurse "$out" # add RPATH here so Zink can find libvulkan.so - patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so + patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so $opencl/lib/libRusticlOpenCL.so ''; passthru = { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d909526a5aef..5d45d4526774 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -591,6 +591,8 @@ let DRM_VC4_HDMI_CEC = yes; # Enable HDMI out on platforms using the RK3588 lineup of SoCs. ROCKCHIP_DW_HDMI_QP = whenAtLeast "6.13" yes; + # Enable DSI out on platforms using the RK3588 lineup of SoCs. + ROCKCHIP_DW_MIPI_DSI2 = whenAtLeast "6.16" yes; }; # Enable Rust and features that depend on it diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 59c9c411af81..9f2e36ed7bd0 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation { buildPhase = "make mkpasswd"; installPhase = "make install-mkpasswd"; + outputs = [ + "out" + "man" + ]; + meta = { homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 25903de56d17..ee208018b454 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -278,7 +278,7 @@ in linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; - linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; + linux_hardened = linux_6_12_hardened; } // lib.optionalAttrs config.allowAliases { linux_libre = throw "linux_libre has been removed due to lack of maintenance"; @@ -812,7 +812,7 @@ in ); packageAliases = { - linux_default = packages.linux_6_12; + linux_default = packages.linux_6_18; # Update this when adding the newest kernel major version! linux_latest = packages.linux_6_19; linux_rt_default = packages.linux_rt_5_15;