Merge master into staging-next

2025-09-26 12:07:11 +00:00
parent 3d0b49dce9 231b94ff35
commit ea925c766f
89 changed files with 990 additions and 699 deletions
@@ -72,6 +72,8 @@

 - `mx-puppet-discord` was removed from Nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.

+- `gradience` has been removed because it was archived upstream.
+
 - `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.

 - `spidermonkey_91` has been removed, as it has been EOL since September 2022.
@@ -18,6 +18,8 @@

 - Syncthing has been updated to version 2.0.0.

+- COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability.
+
 ## New Modules {#sec-release-25.11-new-modules}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -26,6 +26,7 @@ let
      cosmic-files
      config.services.displayManager.cosmic-greeter.package
      cosmic-idle
+      cosmic-initial-setup
      cosmic-launcher
      cosmic-notifications
      cosmic-osd
@@ -103,6 +104,8 @@ in
    services.graphical-desktop.enable = true;

    xdg = {
+      # Required for cosmic-osd
+      sounds.enable = true;
      icons.fallbackCursorThemes = lib.mkDefault [ "Cosmic" ];

      portal = {
@@ -29,7 +29,7 @@ in
      settings = {
        default_session = {
          user = "cosmic-greeter";
-          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}'';
+          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" ${lib.getExe' cfg.package "cosmic-greeter-start"}'';
        };
        initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {
          user = cfgAutoLogin.user;
@@ -369,8 +369,7 @@ in
          "journalctl -o cat -u vector.service | grep 'component_type=dnstap' | grep 'Listening... path=\"${dnstapSocket}\"'"
        )

-        machine.wait_for_file("${dnstapSocket}")
-        machine.succeed("test 770 -eq $(stat -c '%a' ${dnstapSocket})")
+        machine.wait_for_open_unix_socket("${dnstapSocket}")

      dnsclient.systemctl("start network-online.target")
      dnsclient.wait_for_unit("network-online.target")
@@ -17,7 +17,11 @@ let
    pname = "LanguageClient-neovim-bin";
    inherit version src;

-    cargoHash = "sha256-1tfeowqvjEjMXIfrhr388YhlZrk3ns+Y/2odQnkLw7k=";
+    cargoPatches = [
+      ./traitobject.patch
+    ];
+
+    cargoHash = "sha256-43alR84MktYTmsKeUMm4gK8AjUIkGqcsuFeQPusBKD0=";
  };
 in
 vimUtils.buildVimPlugin {
@@ -47,7 +51,5 @@ vimUtils.buildVimPlugin {
    homepage = "https://github.com/autozimu/LanguageClient-neovim/";
    changelog = "https://github.com/autozimu/LanguageClient-neovim/releases/tag/${src.tag}";
    license = lib.licenses.mit;
-    # Rust build error
-    broken = true;
  };
 }
@@ -0,0 +1,15 @@
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -1026,9 +1028,9 @@ dependencies = [
+
+ [[package]]
+ name = "traitobject"
+-version = "0.1.0"
+version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+checksum = "04a79e25382e2e852e8da874249358d382ebaf259d0d34e75d8db16a7efabbc7"
+
+ [[package]]
+ name = "treediff"
+
@@ -12,12 +12,12 @@
  pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-09-11";
+  version = "0.0.27-unstable-2025-09-18";
  src = fetchFromGitHub {
    owner = "yetone";
    repo = "avante.nvim";
-    rev = "56951378f10b25f8bb0f5bb516b8d778a1e498a7";
-    hash = "sha256-jLAzTLvhQLyG1zeTGBE02CwVCjtrC7V1LZhGUjNgD8w=";
+    rev = "44db8eba870f6c123da5efa70384b2889f3e3495";
+    hash = "sha256-x2lb7k/qfERXYMdM+Upf6kmsYS3Qp9iz2KEvzvgb8P4=";
  };
  avante-nvim-lib = rustPlatform.buildRustPackage {
    pname = "avante-nvim-lib";
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  configurePhase = ''
-    runHook preConfigurePhase
+    runHook preConfigure

    # cargo config
    mkdir -p .cargo
@@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
    (cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip
    export ELECTRON_SKIP_BINARY_DOWNLOAD=1

-    runHook postConfigurePhase
+    runHook postConfigure
  '';

  buildPhase = ''
@@ -14,7 +14,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "agate";
-  version = "3.3.18";
+  version = "3.3.19";

  __darwinAllowLocalNetworking = true;

@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "mbrubeck";
    repo = "agate";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Q4+0haPvhUfIAmexYkxsKObQtounbybQG/36cJImL9A=";
+    hash = "sha256-MPBjGtrQFM24ilBYJubfnfVHmTTIkNuWbfdbVYAXvtI=";
  };

-  cargoHash = "sha256-LdnLLCUFa8wpsA5Pi0HtiyLw5dkLLxtAoOnqSUx9HVI=";
+  cargoHash = "sha256-8llvdpF8kQtLxsu5Ynn7Cw/LXXdE0N7ACVVeJtccwuQ=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ];
@@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  installPhase = ''
-    runHook preInstallPhase
+    runHook preInstall

    install -v -m755 -D \
      *${stdenv.hostPlatform.extensions.sharedLibrary}* \
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
    Cflags: -I''${includedir}
    EOF

-    runHook postInstallPhase
+    runHook postInstall
  '';

  meta = {
@@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.82.170";
+  version = "1.82.172";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-mIz3ntO2NQX0NdNZ4puk+WPynm/ylqz40YgHaZ1fSQU=";
+      hash = "sha256-/RlrYfbUEfBVKzmVGtz9xI5h2++XaOZ8qD9sbN/4ZKA=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-6pJLrMmFK5jlLk+y5YEyBzpv7JVGlzDZsoS5IRcXHc0=";
+      hash = "sha256-tTByjOyzTXPu0wBzNmH2TETqFEATzfxDM6QIkgrxpHA=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-hfXtVhcI7bxNYWtlKxUduBSxHDnItaktIVkHz3azys8=";
+      hash = "sha256-mqhXIpE3IGiDq2cyN5T/Qa+nibuuRShKPsPe5lBlXls=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-QyZ0J3/+hkHnkSZSTYt2J2PmOJ60xZVLIaHRjWLQfk4=";
+      hash = "sha256-TJ3dqnUR+4VEUBZ+2S57F8kXxLX2llh8LbrFHA0PIqM=";
    };
  };

@@ -11,13 +11,13 @@
  (
    finalAttrs: _: {
      pname = "chatterino7";
-      version = "7.5.3";
+      version = "7.5.4";

      src = fetchFromGitHub {
        owner = "SevenTV";
        repo = "chatterino7";
        tag = "v${finalAttrs.version}";
-        hash = "sha256-tft0+vcE+LGPrlv4ZBgzmeF66Jf66iTjUr0pdF1vx24=";
+        hash = "sha256-zA198AIFIRx4qE5MZwrGOFFrpnVrZMVQx1SX0RJpDo4=";
        fetchSubmodules = true;
        leaveDotGit = true;
        postFetch = ''
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch2,
  rustPlatform,
  libcosmicAppHook,
  just,
@@ -12,6 +11,7 @@
  glib,
  libinput,
  pulseaudio,
+  pipewire,
  udev,
  xkeyboard_config,
  nix-update-script,
@@ -20,31 +20,24 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-applets";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-applets";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-DmU9Dlb8w3a8U+oSGwWARPh1SRbv/8TW7TO9SSvDe1U=";
+    hash = "sha256-uUcEwa9rGHLzmlutmLl/e38ZqybfYMU0Dhe+FsT5V/E=";
  };

-  cargoHash = "sha256-wWs3B5hh2DP93i+4gGDTi+7NT4bj8ULJ+fT95sXxUdg=";
-
-  patches = [
-    (fetchpatch2 {
-      name = "fix-bluetooth-dbus-spam.patch";
-      url = "https://github.com/pop-os/cosmic-applets/commit/b6bb982f2dace0a3d19c78b4b4247760a8010d5b.patch?full_index=1";
-      hash = "sha256-S5F9rqYrB38T9R6i/n/j3s79Xeh6BMmNkC+E2kTsus4=";
-    })
-  ];
+  cargoHash = "sha256-RnkyIlTJMxMGu+EsmZwvSIapSqdng+t8bqMVsDXprlU=";

  nativeBuildInputs = [
    just
    pkg-config
    util-linuxMinimal
    libcosmicAppHook
+    rustPlatform.bindgenHook
  ];

  buildInputs = [
@@ -52,6 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    glib
    libinput
    pulseaudio
+    pipewire
    udev
  ];

@@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-applibrary";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-applibrary";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-2rGw4Jmr2rL9X1URA5wVPIZocuroS8yaQs42sJqiTbw=";
+    hash = "sha256-LVNOUOVeX8QpTbUG3bOhMkdrjkF3M0sZg+agSQyWAfA=";
  };

-  cargoHash = "sha256-+nkXcbAPcIkg+p4ct/E0bm5O0n1MGN43AaWPjw13t9s=";
+  cargoHash = "sha256-f5uMgscentTlcPXFSan1kKcKh1nk88/3kQPTSuc0wz4=";

  nativeBuildInputs = [
    just
@@ -13,14 +13,14 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-bg";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-bg";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-KMP7TmamtbycF/nKctjYozMJwVr9zdp4A8AWriswo2g=";
+    hash = "sha256-t5tY7Axiz39lCDhDC/lKSRCURfHspeaP49kNXJvCLC4=";
  };

  postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg"
  '';

-  cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk=";
+  cargoHash = "sha256-+NkraWjWHIMIyktAUlp3q2Ot1ib1QRsBBvfdbr5BXto=";

  nativeBuildInputs = [
    just
@@ -20,17 +20,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-comp";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-comp";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-2AnGEUWumE1C4Mi5inN7enbxCdWCKbQdYpUvTK3jGQ4=";
+    hash = "sha256-RHeQk1yBNnDN/efuDDWNLn9O7FQTYLBsbs+h+gxi+Xo=";
  };

-  cargoHash = "sha256-fj6TIBuZ5hrds4WMHRa2krXN5fivKriO2Q/FWdnlGaA=";
+  cargoHash = "sha256-Jaw2v+02lA5wWRAhRNW/lcLnTI7beJIZ43dqcJ60EP0=";

  separateDebugInfo = true;

@@ -3,40 +3,30 @@
  stdenv,
  fetchFromGitHub,
  rustPlatform,
-  makeBinaryWrapper,
-  cosmic-icons,
+  libcosmicAppHook,
  just,
  pkg-config,
-  libglvnd,
-  libxkbcommon,
+  glib,
  libinput,
  fontconfig,
  freetype,
-  libgbm,
-  wayland,
-  xorg,
-  vulkan-loader,
  nixosTests,
+  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-edit";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-edit";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-mgUSkYtc+i9pXv0n3zLHwBXFxfeWlhbsFJKa7X+mI98=";
+    hash = "sha256-Zd/vTNZt9tPXryOwo2U68FtIul7xiRcz5N4Heuyicoc=";
  };

-  cargoHash = "sha256-qfPLDgGeYGSO0ZKJooXRK0NnTqzJ6zq6RhBpTTUusQY=";
-
-  # COSMIC applications now uses vergen for the About page
-  # Update the COMMIT_DATE to match when the commit was made
-  env.VERGEN_GIT_COMMIT_DATE = "2025-04-17";
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
+  cargoHash = "sha256-YfD06RAQPZRwapd0fhNsZ0tx+0JMNDXiPJIWwDhmG0M=";

  postPatch = ''
    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
@@ -45,21 +35,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
  nativeBuildInputs = [
    just
    pkg-config
-    makeBinaryWrapper
+    libcosmicAppHook
  ];
+
  buildInputs = [
-    libxkbcommon
-    xorg.libX11
+    glib
    libinput
-    libglvnd
    fontconfig
    freetype
-    libgbm
-    wayland
-    vulkan-loader
  ];

  dontUseJustBuild = true;
+  dontUseJustCheck = true;

  justFlags = [
    "--set"
@@ -70,36 +57,32 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-edit"
  ];

-  # Force linking to libEGL, which is always dlopen()ed, and to
-  # libwayland-client, which is always dlopen()ed except by the
-  # obscure winit backend.
-  RUSTFLAGS = map (a: "-C link-arg=${a}") [
-    "-Wl,--push-state,--no-as-needed"
-    "-lEGL"
-    "-lwayland-client"
-    "-Wl,--pop-state"
-  ];
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };

-  postInstall = ''
-    wrapProgram "$out/bin/cosmic-edit" \
-      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
-  '';
-
-  passthru.tests = {
-    inherit (nixosTests)
-      cosmic
-      cosmic-autologin
-      cosmic-noxwayland
-      cosmic-autologin-noxwayland
-      ;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
  };

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/pop-os/cosmic-edit";
    description = "Text Editor for the COSMIC Desktop Environment";
    mainProgram = "cosmic-edit";
-    license = licenses.gpl3Only;
-    teams = [ teams.cosmic ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    teams = [ lib.teams.cosmic ];
+    platforms = lib.platforms.linux;
  };
 })
@@ -12,26 +12,22 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-files";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-files";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-bI5yTpqU2N6hFwI9wi4b9N5onY5iN+8YDM3bSgdYxjQ=";
+    hash = "sha256-pSjmsWsGGhjCekMTX8iiNVbF5X33zg5YVDWtemjIDWU=";
  };

-  cargoHash = "sha256-7AOdSk9XIXFCDyCus3XgOK3ZBVa4CvX+NFM0jHf7Wbs=";
-
-  env = {
-    VERGEN_GIT_COMMIT_DATE = "2025-04-22";
-    VERGEN_GIT_SHA = finalAttrs.src.tag;
-  };
+  cargoHash = "sha256-7RANj+aXdmBVO66QDgcNrrU4qEGK4Py4+ZctYWU1OO8=";

  nativeBuildInputs = [
    just
    libcosmicAppHook
+    rustPlatform.bindgenHook
  ];

  buildInputs = [ glib ];
@@ -72,17 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

    defaultCargoTestFlags="$cargoTestFlags"

-    # Some tests with the `compio` runtime expect io_uring support but that
-    # is disabled in the Nix sandbox and the tests fail because they can't
-    # run in the sandbox. Ideally, the `compio` crate should fallback to a
-    # non-io_uring runtime but for some reason, that doesn't happen.
-    cargoTestFlags="$defaultCargoTestFlags --package cosmic-files -- \
-      --skip operation::tests::copy_dir_to_same_location \
-      --skip operation::tests::copy_file_to_same_location \
-      --skip operation::tests::copy_file_with_diff_name_to_diff_dir \
-      --skip operation::tests::copy_file_with_extension_to_same_loc \
-      --skip operation::tests::copy_to_diff_dir_doesnt_dupe_files \
-      --skip operation::tests::copying_file_multiple_times_to_same_location"
+    cargoTestFlags="$defaultCargoTestFlags --package cosmic-files"
    runHook cargoCheckHook

    cargoTestFlags="$defaultCargoTestFlags --package cosmic-files-applet"
@@ -6,6 +6,7 @@
  libcosmicAppHook,
  cmake,
  just,
+  cosmic-randr,
  libinput,
  linux-pam,
  udev,
@@ -17,19 +18,19 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-greeter";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-greeter";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-o9ZoRHi+k+HCSGfRz1lQFAeJMCqcTQEHf5rf9wn3qqY=";
+    hash = "sha256-rMZ+UbHarnvPaVAI5XeBfLduWEZHthguRSKLv3d/Eo0=";
  };

-  cargoHash = "sha256-hUHkyz/avFu9g1FMdC+4vz6xM75CauurrarhouuVZXc=";
+  cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4=";

-  env.VERGEN_GIT_COMMIT_DATE = "2025-04-25";
+  env.VERGEN_GIT_COMMIT_DATE = "2025-09-16";
  env.VERGEN_GIT_SHA = finalAttrs.src.tag;

  cargoBuildFlags = [ "--all" ];
@@ -42,6 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  ];

  buildInputs = [
+    cosmic-randr
    libinput
    linux-pam
    udev
@@ -9,14 +9,14 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "cosmic-icons";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-icons";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-KDmEYeuiDTYvqg2XJK8pMDfsmROKtN+if5Qxz57H5xs=";
+    hash = "sha256-jxt0x0Ctk0PaaFQjf8p9y1yEgWkuEi7bR2VtybwlQAs=";
  };

  nativeBuildInputs = [ just ];
@@ -16,7 +16,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-idle";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
@@ -0,0 +1,74 @@
+diff --git a/src/main.rs b/src/main.rs
+index a0e8f2e..07cf8b9 100644
+--- a/src/main.rs
+++ b/src/main.rs
+@@ -194,19 +194,19 @@ impl Application for App {
+                         }
+                     }
+ 
+-                    page::Message::Language(message) => {
+-                        if let Some(page) =
+-                            self.pages.get_mut(&TypeId::of::<page::language::Page>())
+-                        {
+-                            return page
+-                                .as_any()
+-                                .downcast_mut::<page::language::Page>()
+-                                .unwrap()
+-                                .update(message)
+-                                .map(Message::PageMessage)
+-                                .map(cosmic::Action::App);
+-                        }
+-                    }
+                    // page::Message::Language(message) => {
+                    //     if let Some(page) =
+                    //         self.pages.get_mut(&TypeId::of::<page::language::Page>())
+                    //     {
+                    //         return page
+                    //             .as_any()
+                    //             .downcast_mut::<page::language::Page>()
+                    //             .unwrap()
+                    //             .update(message)
+                    //             .map(Message::PageMessage)
+                    //             .map(cosmic::Action::App);
+                    //     }
+                    // }
+ 
+                     page::Message::Layout(message) => {
+                         if let Some(page) = self.pages.get_mut(&TypeId::of::<page::layout::Page>())
+diff --git a/src/page/mod.rs b/src/page/mod.rs
+index 389728c..937a1b3 100644
+--- a/src/page/mod.rs
+++ b/src/page/mod.rs
+@@ -4,7 +4,7 @@ use std::any::{Any, TypeId};
+ 
+ pub mod appearance;
+ pub mod keyboard;
+-pub mod language;
+// pub mod language;
+ pub mod launcher;
+ pub mod layout;
+ pub mod location;
+@@ -34,10 +34,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
+     if let AppMode::NewInstall { create_user } = mode {
+         pages.insert(TypeId::of::<wifi::Page>(), Box::new(wifi::Page::default()));
+ 
+-        pages.insert(
+-            TypeId::of::<language::Page>(),
+-            Box::new(language::Page::new()),
+-        );
+        // pages.insert(
+        //     TypeId::of::<language::Page>(),
+        //     Box::new(language::Page::new()),
+        // );
+ 
+         pages.insert(
+             TypeId::of::<keyboard::Page>(),
+@@ -95,7 +95,7 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
+ pub enum Message {
+     Appearance(appearance::Message),
+     Keyboard(keyboard::Message),
+-    Language(language::Message),
+    // Language(language::Message),
+     Layout(layout::Message),
+     Location(location::Message),
+     SetTheme(cosmic::Theme),
@@ -0,0 +1,64 @@
+diff --git a/src/main.rs b/src/main.rs
+index a0e8f2e..b6ff8dc 100644
+--- a/src/main.rs
+++ b/src/main.rs
+@@ -221,7 +221,7 @@ impl Application for App {
+                         }
+                     }
+ 
+-                    page::Message::Location(message) => {
+                    /* page::Message::Location(message) => {
+                         if let Some(page) =
+                             self.pages.get_mut(&TypeId::of::<page::location::Page>())
+                         {
+@@ -233,7 +233,7 @@ impl Application for App {
+                                 .map(Message::PageMessage)
+                                 .map(cosmic::Action::App);
+                         }
+-                    }
+                    } */
+ 
+                     page::Message::User(message) => {
+                         if let Some(page) = self.pages.get_mut(&TypeId::of::<page::user::Page>()) {
+diff --git a/src/page/mod.rs b/src/page/mod.rs
+index 389728c..38ced5e 100644
+--- a/src/page/mod.rs
+++ b/src/page/mod.rs
+@@ -7,7 +7,7 @@ pub mod keyboard;
+ pub mod language;
+ pub mod launcher;
+ pub mod layout;
+-pub mod location;
+// pub mod location;
+ pub mod new_apps;
+ pub mod new_shortcuts;
+ pub mod user;
+@@ -48,10 +48,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
+             pages.insert(TypeId::of::<user::Page>(), Box::new(user::Page::default()));
+         }
+ 
+-        pages.insert(
+        /* pages.insert(
+             TypeId::of::<location::Page>(),
+             Box::new(location::Page::new()),
+-        );
+        ); */
+     }
+ 
+     pages.insert(
+@@ -97,7 +97,7 @@ pub enum Message {
+     Keyboard(keyboard::Message),
+     Language(language::Message),
+     Layout(layout::Message),
+-    Location(location::Message),
+    // Location(location::Message),
+     SetTheme(cosmic::Theme),
+     User(user::Message),
+     Welcome(welcome::Message),
+@@ -150,4 +150,4 @@ pub trait Page {
+     fn view(&self) -> Element<'_, Message> {
+         widget::text::body("TODO").into()
+     }
+-}
+}
+\ No newline at end of file
@@ -0,0 +1,102 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  just,
+  libcosmicAppHook,
+  libinput,
+  openssl,
+  udev,
+  nixosTests,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cosmic-initial-setup";
+  version = "1.0.0-beta.1.1";
+
+  src = fetchFromGitHub {
+    owner = "pop-os";
+    repo = "cosmic-initial-setup";
+    tag = "epoch-${finalAttrs.version}";
+    hash = "sha256-kjJqGNcIlnzEsfA4eQ9D23ZGgRcmWQyWheAlwpjfALA=";
+  };
+
+  cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM=";
+
+  # cargo-auditable fails during the build when compiling the `crabtime::function`
+  # procedural macro. It panics because the `--out-dir` flag is not passed to
+  # the rustc wrapper.
+  #
+  # Reported this issue upstream in:
+  # https://github.com/rust-secure-code/cargo-auditable/issues/225
+  auditable = false;
+
+  nativeBuildInputs = [
+    libcosmicAppHook
+    just
+  ];
+
+  buildInputs = [
+    libinput
+    openssl
+    udev
+  ];
+
+  # These are not needed for NixOS
+  patches = [
+    ./disable-language-page.patch
+    ./disable-timezone-page.patch
+  ];
+
+  postPatch = ''
+    # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart
+    substituteInPlace justfile \
+      --replace-fail \
+      "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \
+      "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"
+  '';
+
+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+
+  justFlags = [
+    "--set"
+    "prefix"
+    (placeholder "out")
+    "--set"
+    "cargo-target-dir"
+    "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
+  ];
+
+  env.DISABLE_IF_EXISTS = "/iso/nix-store.squashfs";
+
+  passthru = {
+    tests = {
+      inherit (nixosTests)
+        cosmic
+        cosmic-autologin
+        cosmic-noxwayland
+        cosmic-autologin-noxwayland
+        ;
+    };
+
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version"
+        "unstable"
+        "--version-regex"
+        "epoch-(.*)"
+      ];
+    };
+  };
+
+  meta = {
+    description = "COSMIC Initial Setup";
+    homepage = "https://github.com/pop-os/cosmic-initial-setup";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "cosmic-initial-setup";
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.cosmic ];
+  };
+})
@@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-launcher";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-launcher";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-niMsDLVMUEr8VyubDm6RGgS7p22v5nH/F8cASJOszhs=";
+    hash = "sha256-vAuWH9qmstPcfPvcKoM/2VjGxAfdtO9hhOPaZ5Ft4Y0=";
  };

-  cargoHash = "sha256-Wh3vI42RBfXpI7mvPVUmGK3fITGi+EGyo+lG7VnZg3w=";
+  cargoHash = "sha256-57rkCufJPWm844/iMIfULfaGR9770q8VgZgnqCM57Zg=";

  nativeBuildInputs = [
    just
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-notifications";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-notifications";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xcGmcOoxHb7gj6fW7xPZ5R0MTkMVXNJgvr9d5LPy9kw=";
+    hash = "sha256-wgOjaiKJ1KYdYsynQV5+KKGhdneELiLTHYqjMEWaxt0=";
  };

-  cargoHash = "sha256-7EDe1OjGS6Xl0N/BrZG8lzWO0pFbwiEp+kn6WyydJQM=";
+  cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ=";

  nativeBuildInputs = [
    just
@@ -1,10 +1,11 @@
 {
  lib,
  fetchFromGitHub,
-  sound-theme-freedesktop,
  rustPlatform,
  libcosmicAppHook,
  pulseaudio,
+  pipewire,
+  libinput,
  udev,
  nix-update-script,
  nixosTests,
@@ -12,28 +13,28 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-osd";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-osd";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-POjuxrNBajp4IOw7YwF2TS4OfoM8Hxo1fO48nkhKj8U=";
+    hash = "sha256-tsP4dlHmzuf5QgByDWbuigMrpgnJAjuNsYwWDSutCoI=";
  };

-  postPatch = ''
-    substituteInPlace src/components/app.rs \
-      --replace-fail '/usr/share/sounds/freedesktop/stereo/audio-volume-change.oga' '${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga'
-  '';
+  cargoHash = "sha256-YcNvvK+Zf8nSS5YjS5iaoipogstiyBdNY7LhWPsz9xQ=";

-  cargoHash = "sha256-kfExKggQo3MoTXw1JbKWjLu5kwYF0n7DzSQcG6e1+QQ=";
-
-  nativeBuildInputs = [ libcosmicAppHook ];
+  nativeBuildInputs = [
+    libcosmicAppHook
+    rustPlatform.bindgenHook
+  ];

  buildInputs = [
    pulseaudio
    udev
+    libinput
+    pipewire
  ];

  env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1";
@@ -11,17 +11,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-panel";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-panel";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-QcrkfU6HNZ2tWfKsMdcv58HC/PE7b4T14AIep85TWOY=";
+    hash = "sha256-gSTvF6Zcixh5/uYZuUiCIdBlXJj31+lISBwLujTuOfo=";
  };

-  cargoHash = "sha256-qufOJeWPRjj4GgWNJmQfYaGKeYOQbkTeFzrUSi9QNnQ=";
+  cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk=";

  nativeBuildInputs = [
    just
@@ -18,17 +18,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-player";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-player";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-/xf3IOFVpctfgaaNNq2HUzK/qHt7Qikcv0JKoPJboRU=";
+    hash = "sha256-oTTVVQkSkON5NTgO5+eUD2wVpiW5MvW3MZyeyqqc3qk=";
  };

-  cargoHash = "sha256-0RrtErTR2J5mn/Lfppk+5X8UUOC2LN65krAq1uz/O4M=";
+  cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo=";

  postPatch = ''
    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-randr";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-randr";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vCGbWsG/F3WhWVSy8Z3r4ZHpks/X/57/ZZXuw6BFl+c=";
+    hash = "sha256-daP2YZ7B1LXzqh2n0KoSTJbitdK+hlZO+Ydt9behzmQ=";
  };

-  cargoHash = "sha256-lW44Y7RhA1l+cCDwqSq9sbhWi+kONJ0zy1fUu8WPYw0=";
+  cargoHash = "sha256-tkmBthh+nM3Mb9WoSjxMbx3t0NTf6lv91TwEwEANS6U=";

  nativeBuildInputs = [
    just
@@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-screenshot";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-screenshot";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-VvU/9vYdoTvy3yzdeXrhKrtS9tUHMKnaSAeNTEKk5PA=";
+    hash = "sha256-TKR8EDXZwKKC1WSZhlcf5U6tiM4cWCdb24U74vVKTaU=";
  };

-  cargoHash = "sha256-1r0Uwcf4kpHCgWqrUYZELsVXGDzbtbmu/WFeX53fBiQ=";
+  cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";

  nativeBuildInputs = [
    just
@@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-session";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-session";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vozm4vcXV3RB9Pk6om1UNCfGh80vIVJvSwbzwGDQw3Y=";
+    hash = "sha256-P3xXYd80P+DR1vVE0zZC+v4ARsGhRrG9N9LdP2BEfDA=";
  };

-  cargoHash = "sha256-68budhhbt8wPY7sfDqwIs4MWB/NBXsswK6HbC2AnHqE=";
+  cargoHash = "sha256-bo46A7hS1U0cOsa/T4oMTKUTjxVCaGuFdN2qCjVHxhg=";

  postPatch = ''
    substituteInPlace data/start-cosmic \
@@ -7,22 +7,22 @@
  adw-gtk3,
  pkg-config,
  libpulseaudio,
-  geoclue2-with-demo-agent,
  libinput,
  udev,
+  openssl,
  nixosTests,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-settings-daemon";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-settings-daemon";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vdhkE5CmgiGYg5TXxN7lLqxjv7apKEKvIscXFIzZfRc=";
+    hash = "sha256-tHG/VoaP1tcns6AyedkkVUpWFlcOclWijsHYQ3vOIjs=";
  };

  postPatch = ''
@@ -32,17 +32,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3'
  '';

-  cargoHash = "sha256-Dzv1SDeZFIa+LFQQ91lO7RBHldsjDnGf+R12Ln2WZwU=";
+  cargoHash = "sha256-1YQ7eQ6L6OHvVihUUnZCDWXXtVOyaI1pFN7YD/OBcfo=";

  nativeBuildInputs = [ pkg-config ];
+
  buildInputs = [
    libinput
    libpulseaudio
+    openssl
    udev
  ];

-  env.GEOCLUE_AGENT = "${lib.getLib geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent";
-
  makeFlags = [
    "prefix=$(out)"
    "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
@@ -59,12 +59,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
      ;
  };

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/pop-os/cosmic-settings-daemon";
    description = "Settings Daemon for the COSMIC Desktop Environment";
    mainProgram = "cosmic-settings-daemon";
-    license = licenses.gpl3Only;
-    teams = [ teams.cosmic ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    teams = [ lib.teams.cosmic ];
+    platforms = lib.platforms.linux;
  };
 })
@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-settings";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-settings";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-rrPgCXl4uD4Gvstgj9Sdv6rB/0d8wa56CdBjAkTLQG8=";
+    hash = "sha256-Yn5CSp/vsLMbkcQ7mCDw/ErgkSCyEvkwNvWqupVUkZ4=";
  };

-  cargoHash = "sha256-7Aoy/okgFSwDU6jMYzTGtwPbK82yMgL5bnKBfBUD3vA=";
+  cargoHash = "sha256-dHyUTV5txSLWEDE7Blplz8CBvyuUmYNNr1kbifujHKk=";

  nativeBuildInputs = [
    cmake
@@ -15,17 +15,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-store";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-store";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-skNzkpcdGJkve7enlnnZxYxnScHFmyaCAy0xaMEEsE0=";
+    hash = "sha256-KlXFFoUEa0YTQDEJHMrbWOIEsSnXvJNzzaEFYR83t9s=";
  };

-  cargoHash = "sha256-2iWJFPSvNQ6JwQwzowKYbgjog2gsjOUlReai/j0d3Do=";
+  cargoHash = "sha256-xdNYQB/zmndnMAkstwJ6Z2uk0fXli3gIYHchUq/3u6k=";

  nativeBuildInputs = [
    just
@@ -15,24 +15,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-term";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-term";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-leCKdnlevfLiPJkloWCpOjkHaSf7+EYdobZRZ/Jis+4=";
+    hash = "sha256-1kQuPMaLXq+V1fTplXKoXAVOtyuD4Sh8diljHgTDbdI=";
  };

-  cargoHash = "sha256-Re9t25tkwmrvXB9GmPSVG+QDUZmk5rwrrY2ntlB3Tdw=";
-
-  # COSMIC applications now uses vergen for the About page
-  # Update the COMMIT_DATE to match when the commit was made
-  env = {
-    VERGEN_GIT_COMMIT_DATE = "2025-04-20";
-    VERGEN_GIT_SHA = finalAttrs.src.tag;
-  };
+  cargoHash = "sha256-mpuVSHb9YcDZB+eyyD+5ZNzUeEgx8T25IFjsD/Q/quU=";

  nativeBuildInputs = [
    just
@@ -2,13 +2,12 @@
  lib,
  stdenvNoCC,
  fetchFromGitHub,
-  fetchpatch,
  nix-update-script,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "cosmic-wallpapers";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
@@ -20,13 +19,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    hash = "sha256-XtNmV6fxKFlirXQvxxgAYSQveQs8RCTfcFd8SVdEXtE=";
  };

-  patches = [
-    (fetchpatch {
-      url = "https://github.com/pop-os/cosmic-wallpapers/pull/2/commits/4d17ebe69335f8ffa80fd1c48baa7f3d3efa4dbe.patch";
-      hash = "sha256-4QRtX5dbN6C/ZKU3pvV7mTT7EDrMWvRCFB4004RMylM=";
-    })
-  ];
-
  makeFlags = [ "prefix=${placeholder "out"}" ];

  passthru.updateScript = nix-update-script {
@@ -14,17 +14,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-workspaces-epoch";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-d7KYZbq8O/t5V/gU+wwstp06vyfnmt6vRKo+54Dct+o=";
+    hash = "sha256-gcS8Q9SR7Dj1FH2Dtdd6jUMX8u5kHJBMvlgqJGw+rjA=";
  };

-  cargoHash = "sha256-TjgnPuFUIDtxx9kpvN9hKiir3/ZVtCc0z1CE4UHre1Q=";
+  cargoHash = "sha256-BE6s2dmbgXlFXrtd8b9k2LltLnegLzWbIUlaEQvv+5o=";

  separateDebugInfo = true;

@@ -7,14 +7,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "enum4linux-ng";
-  version = "1.3.5";
+  version = "1.3.7";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cddmp";
    repo = "enum4linux-ng";
    tag = "v${version}";
-    hash = "sha256-jwwBYpzMjaVVojMB1udkinNQDiOXPKWbOwIsWHlhWw4=";
+    hash = "sha256-Crd5sc0sYvYufN0bK4Qh7iSy22utQet6X1UlPlS48XI=";
  };

  build-system = with python3.pkgs; [ setuptools ];
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "files-cli";
-  version = "2.15.96";
+  version = "2.15.104";

  src = fetchFromGitHub {
    repo = "files-cli";
    owner = "files-com";
    rev = "v${version}";
-    hash = "sha256-HGdOlLJBnobstH0oCOMY5qSPjI+xUevTsRLQK4ubSEE=";
+    hash = "sha256-7HXLDFTLKHKOhjs01lUPSIW3btvCnffiJZ2VKgHwGiY=";
  };

-  vendorHash = "sha256-6J9Iw8Z5iRU+Kx7rfyG1cALEmiynPxVfnxYC9/SFpPI=";
+  vendorHash = "sha256-I829gWaDUgbMhnp99p5SvtBRePefCZ86iztHqtWEEzs=";

  ldflags = [
    "-s"
@@ -7,7 +7,7 @@
 }:

 let
-  version = "18.4.0";
+  version = "18.4.1";
  package_version = "v${lib.versions.major version}";
  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";

@@ -21,7 +21,7 @@ let
      owner = "gitlab-org";
      repo = "gitaly";
      rev = "v${version}";
-      hash = "sha256-Xg+JRw/W93n6FGjjQRTULuCTRQxvPyyQJKACQNaYyyg=";
+      hash = "sha256-NsPOxnX8BF9J1SqTj6DhPUWSEq7E5+grumPlwHPbA/8=";
    };

    vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
@@ -6,18 +6,18 @@

 buildGo124Module rec {
  pname = "gitlab-container-registry";
-  version = "4.27.0";
-  rev = "v${version}-gitlab-ahmed-master-test";
+  version = "4.28.0";
+  rev = "v${version}-gitlab";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "container-registry";
    inherit rev;
-    hash = "sha256-lcM0HjseQ4N7rndDx95aC6MWb+Ggwz3UIhSvbC8oxus=";
+    hash = "sha256-0v39mQ0wLq2VUYNeDU6E2M8Ny/e/A3VrE8+pmpwJgug=";
  };

-  vendorHash = "sha256-ALPK9h5Isniis7QPz9DXokeBd+hWMDJ7ts9/sGNrFMk=";
+  vendorHash = "sha256-tCOXSZjJOWHTIdWYxdBaH6STKAwqlHsuDfhGd2KPx1Q=";

  checkFlags =
    let
@@ -6,14 +6,14 @@

 buildGoModule rec {
  pname = "gitlab-pages";
-  version = "18.4.0";
+  version = "18.4.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-pages";
    rev = "v${version}";
-    hash = "sha256-yaIqPr5f2GdRtgLn2XQHNBf0n0O97WlOcCdIule53eA=";
+    hash = "sha256-C4zdBsZ+Sz9S5lQ5qivqmrlM6C6jEepq152v3XQvA6E=";
  };

  vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
@@ -1,15 +1,15 @@
 {
-  "version": "18.4.0",
-  "repo_hash": "0vp4wnipbl8v9vm4xjvwqgzgff4i9xn5p690vw4yvngs7gnclv11",
+  "version": "18.4.1",
+  "repo_hash": "0wqk6vcjsnv84qbngzri4klg299kk154cadl98zf9vzypv5l66rz",
  "yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v18.4.0-ee",
+  "rev": "v18.4.1-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "18.4.0",
-    "GITLAB_PAGES_VERSION": "18.4.0",
+    "GITALY_SERVER_VERSION": "18.4.1",
+    "GITLAB_PAGES_VERSION": "18.4.1",
    "GITLAB_SHELL_VERSION": "14.45.2",
    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
-    "GITLAB_WORKHORSE_VERSION": "18.4.0"
+    "GITLAB_WORKHORSE_VERSION": "18.4.1"
  }
 }
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
  pname = "gitlab-workhorse";

-  version = "18.4.0";
+  version = "18.4.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
@@ -27,8 +27,11 @@ PATH
    gitlab-active-context (0.0.1)
      activerecord
      activesupport
+      aws-sdk-core
      connection_pool
      elasticsearch
+      faraday-typhoeus
+      faraday_middleware-aws-sigv4
      opensearch-ruby
      pg
      zeitwerk
@@ -2790,8 +2790,11 @@ src: {
    dependencies = [
      "activerecord"
      "activesupport"
+      "aws-sdk-core"
      "connection_pool"
      "elasticsearch"
+      "faraday-typhoeus"
+      "faraday_middleware-aws-sigv4"
      "opensearch-ruby"
      "pg"
      "zeitwerk"
@@ -1,83 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  wrapGAppsHook4,
-  meson,
-  ninja,
-  pkg-config,
-  glib,
-  glib-networking,
-  desktop-file-utils,
-  gettext,
-  librsvg,
-  blueprint-compiler,
-  python3Packages,
-  sassc,
-  appstream-glib,
-  libadwaita,
-  libportal,
-  libportal-gtk4,
-  libsoup_3,
-  gobject-introspection,
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "gradience";
-  version = "0.4.1";
-
-  src = fetchFromGitHub {
-    owner = "GradienceTeam";
-    repo = "Gradience";
-    # See https://github.com/GradienceTeam/Gradience/releases/tag/0.4.1-patch1
-    rev = "0.4.1-patch1";
-    sha256 = "sha256-5jloFbimJC4jP1C1uS8a9VlqyR5qqDuqcKvUXwr9SjY=";
-  };
-
-  format = "other";
-  dontWrapGApps = true;
-
-  nativeBuildInputs = [
-    appstream-glib
-    blueprint-compiler
-    desktop-file-utils
-    gettext
-    glib
-    gobject-introspection
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook4
-    sassc
-  ];
-
-  buildInputs = [
-    glib-networking
-    libadwaita
-    libportal
-    libportal-gtk4
-    librsvg
-    libsoup_3
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    anyascii
-    jinja2
-    lxml
-    material-color-utilities
-    pygobject3
-    svglib
-    yapsy
-    packaging
-  ];
-
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/GradienceTeam/Gradience";
-    description = "Customize libadwaita and GTK3 apps (with adw-gtk3)";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ foo-dogsquared ];
-  };
-}
@@ -42,11 +42,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "haproxy";
-  version = "3.2.4";
+  version = "3.2.5";

  src = fetchurl {
    url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-XUsu5v5WuAmOu5yRqJnXKPh9ZM176IBNLdzF+TdJjB0=";
+    hash = "sha256-dzFqPhtsOSRbwR71j01trdBjwBTBuuyPDYF5jFGeBys=";
  };

  buildInputs = [
@@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "hours";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "dhth";
    repo = "hours";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-B9M02THTCrr7ylbbflpkpTFMuoIwV2O0PQKOKbyxYPg=";
+    hash = "sha256-z1VHvzUQJoZeSuc1LpTw+z3XCFRJqNU+GIWwlAEXl1o=";
  };

-  vendorHash = "sha256-5lhn0iTLmXUsaedvtyaL3qWLosmQaQVq5StMDl7pXXI=";
+  vendorHash = "sha256-Sim17RybSM92H6OP0Od9gH/wqa+5cd4Lmli6Na8RDJk=";

  doCheck = !stdenv.hostPlatform.isDarwin;

@@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "iina";
-  version = "1.4.0";
+  version = "1.4.1";

  src = fetchurl {
    url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg";
-    hash = "sha256-S5gHyI1dQcqmNfCkCDI649gKMwVHZpisLaRyYTakgbg=";
+    hash = "sha256-F3rUaeoSm+2VqCrFm1+1jQoGw1NC/KejfbohSogh+Eg=";
  };

  nativeBuildInputs = [ undmg ];
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "jna";
-  version = "5.17.0";
+  version = "5.18.0";

  src = fetchFromGitHub {
    owner = "java-native-access";
    repo = "jna";
    rev = finalAttrs.version;
-    hash = "sha256-4i7iQaxH4wS35cIvMfcNf4kUGI+uIoHNpZkQrs4oAyk=";
+    hash = "sha256-7ErF/AQntDfxXdHr9HUCM4JoFBNX3sXhJvKE/kzrZZg=";
  };

  nativeBuildInputs = [
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "just-lsp";
-  version = "0.2.5";
+  version = "0.2.6";

  src = fetchFromGitHub {
    owner = "terror";
    repo = "just-lsp";
    tag = finalAttrs.version;
-    hash = "sha256-cHDkcUsrrz71GqchkKT4yU1h6WzrT/zZPs95MJvb2tU=";
+    hash = "sha256-IcNPtyYXNLWtZDeVPWfLzKeVv6PGHYTb/mvVQ5uAiTE=";
  };

-  cargoHash = "sha256-0CgwovZ9AtQs5AHulKxe1jHxG+EcyrCUyoEpxV/oDxY=";
+  cargoHash = "sha256-epFrVie97VUGGlr4cNKzZCbUpxCgG/kmJPd1JWen6j0=";

  passthru = {
    updateScript = nix-update-script { };
@@ -1,7 +1,7 @@
 { callPackage, ... }:

 callPackage ./generic.nix {
-  version = "5.2.11";
+  version = "5.2.13";
  kde-channel = "stable";
-  hash = "sha256-Gawkagbpb3+De1fy5bGr1R3QnwyUjfcHfgizstNgxQ8=";
+  hash = "sha256-y5CUMMmeK/EGhPHBPXaHZpHuYlctmqpU1wWJMflhVTE=";
 }
@@ -22,13 +22,13 @@

 buildGoModule (finalAttrs: {
  pname = "kubernetes";
-  version = "1.34.0";
+  version = "1.34.1";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = "kubernetes";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-rKy4X01pX+kovJ8b2JHV0KuzHJ7PYZ08eDEO3GeuPoc=";
+    hash = "sha256-18AMfS2OnInTmdr5fLwtuKaeyGQSiAtk29BjuHl6qQA=";
  };

  vendorHash = null;
@@ -39,13 +39,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "linyaps";
-  version = "1.9.12";
+  version = "1.9.13";

  src = fetchFromGitHub {
    owner = "OpenAtom-Linyaps";
    repo = finalAttrs.pname;
    tag = finalAttrs.version;
-    hash = "sha256-BNP/CenPXMuEixEleil9zB08qLn/SZ9Ur/Im4MQy5nE=";
+    hash = "sha256-sAxHDvhRz7okElk8vdISJt/yrNnCdu95hW3ImHOjiyw=";
  };

  patches = [
@@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "lombok";
-  version = "1.18.40";
+  version = "1.18.42";

  src = fetchurl {
    url = "https://projectlombok.org/downloads/lombok-${version}.jar";
-    sha256 = "sha256-Gy1mCf8zLnCC/tOXs6ql0SWBL3vwoHp9hv/qFbccv90=";
+    sha256 = "sha256-NIik6ZlMJllrqs7r7ljK02pQ472uxb5ytYNNPDtWAwY=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -1,32 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 5d7192b6..ce9b1302 100644
--- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3900,8 +3900,9 @@ dependencies = [
- 
- [[package]]
- name = "resolv-conf"
-version = "0.7.4"
-source = "git+https://forgejo.ellis.link/continuwuation/resolv-conf?rev=56251316cc4127bcbf36e68ce5e2093f4d33e227#56251316cc4127bcbf36e68ce5e2093f4d33e227"
-+version = "0.7.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799"
- 
- [[package]]
- name = "rgb"
-diff --git a/Cargo.toml b/Cargo.toml
-index c656e183..2942ad07 100644
--- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -592,9 +592,8 @@ rev = "e4ae7628fe4fcdacef9788c4c8415317a4489941"
- 
- # Allows no-aaaa option in resolv.conf
- # Use 1-indexed line numbers when displaying parse error messages
-[patch.crates-io.resolv-conf]
-git = "https://forgejo.ellis.link/continuwuation/resolv-conf"
-rev = "56251316cc4127bcbf36e68ce5e2093f4d33e227"
-+[workspace.dependencies.resolv-conf]
-+version = "0.7.5"
- 
- #
- # Our crates
@@ -28,13 +28,13 @@ let
    }).overrideAttrs
      (
        final: old: {
-          version = "10.4.2";
+          version = "10.5.1";
          src = fetchFromGitea {
            domain = "forgejo.ellis.link";
            owner = "continuwuation";
            repo = "rocksdb";
-            rev = "10.4.fb";
-            hash = "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY=";
+            rev = "10.5.fb";
+            hash = "sha256-X4ApGLkHF9ceBtBg77dimEpu720I79ffLoyPa8JMHaU=";
          };

          patches = [ ];
@@ -77,22 +77,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "matrix-continuwuity";
-  version = "0.5.0-rc.7";
+  version = "0.5.0-rc.8";

-  # Switch back to fetchFromGitea once archive download errors are fixed
  src = fetchFromGitea {
    domain = "forgejo.ellis.link";
    owner = "continuwuation";
    repo = "continuwuity";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-u1k1r95qBoEizeILR5rrM5lDFz2a2NjUwM9TTi0HNjw=";
+    hash = "sha256-5XjEwEYzWANm2k0GKFuHV3no65ReWPbCq+xMUH13zuI=";
  };

-  # Patch to fix linking issue caused by resolv-conf which needs to be incorporated
-  # into continuwuity upstream.
-  cargoPatches = [ ./cargolock.patch ];
-
-  cargoHash = "sha256-1ECD8RZ918TM1IX3jkTDNhCR5Zye0a3ii0zeIPy8jlI=";
+  cargoHash = "sha256-uMr1DLwiMwIKN5IeALwQfh2xmAGPyQtxvT/uM0gfPvA=";

  nativeBuildInputs = [
    pkg-config
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  nixosTests,
  nix-update-script,
-  version ? "1.20.0",
+  version ? "1.22.1",
 }:

 let
@@ -15,11 +15,11 @@ let
  # the meilisearch module accordingly and to remove the meilisearch_1_11
  # attribute from all-packages.nix at that point too.
  hashes = {
-    "1.20.0" = "sha256-Ap/5iOyC9yn0zwZTyUeljmuTCEIcq7pniPEns6fqwYg=";
+    "1.22.1" = "sha256-RWHu77/GoSMzRU7KyKmu23DFwWn6RD3MUWUc5ICY1d8=";
    "1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U=";
  };
  cargoHashes = {
-    "1.20.0" = "sha256-tQyWpN8lzgLfvXMqz/AExBTp2EoOQVD4hfcJeooUjLQ=";
+    "1.22.1" = "sha256-xKBYumdb1vJS+UQF3yD/p+7FvWRfBKbLjOFiT7DVJ+o=";
    "1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8=";
  };
 in
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "microsoft-edge";
-  version = "140.0.3485.81";
+  version = "140.0.3485.94";

  src = fetchurl {
    url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-8GX70RKXRyhaPVhfg2bB0JDLkmpcwvZDUtlyKusBTN8=";
+    hash = "sha256-UvnAT87X9YMlyF1i9z7bBCWpz3CU2ZWe9hoABgGSXY8=";
  };

  # With strictDeps on, some shebangs were not being patched correctly
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "nzbhydra2";
-  version = "7.16.3";
+  version = "7.19.1";

  src = fetchzip {
    url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
-    hash = "sha256-YQWZjTTgZ0mArAJCqjWYeou+JXxFwAvxM/Z/rpgI4bs=";
+    hash = "sha256-eR+mYtVWRg+2HWAFmyCpb9hNdsS+U3QMBpO1r4LvQVM=";
    stripRoot = false;
  };

@@ -31,13 +31,13 @@

 stdenv.mkDerivation rec {
  pname = "openvas-scanner";
-  version = "23.27.0";
+  version = "23.28.0";

  src = fetchFromGitHub {
    owner = "greenbone";
    repo = "openvas-scanner";
    tag = "v${version}";
-    hash = "sha256-p/SYzrjM37Q67DnT/cfvJkDHxWwrGxBt1NK/hwWgOdM=";
+    hash = "sha256-ggmex/BmAVgdE1JNM3kybEmr/uKqrIl8JdSoBnsg+40=";
  };

  nativeBuildInputs = [
@@ -10,15 +10,15 @@
  libxkbcommon,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "pop-launcher";
-  version = "1.2.4";
+  version = "1.2.6";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "launcher";
-    rev = version;
-    hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs=";
+    tag = finalAttrs.version;
+    hash = "sha256-4wPspv5bpqoG45uUkrtxJTvdbmFkpWv8QBZxsPbGu/M=";
  };

  nativeBuildInputs = [
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
    libxkbcommon
  ];

-  cargoHash = "sha256-Htre2gzAlNfxBkBvMMtjYbUcuwNw+tB4DI18iBA+g34=";
+  cargoHash = "sha256-gc1YhIxHBqmMOE3Gu3T4gmGdAp0t+qiUXDcPYZE6utU=";

  cargoBuildFlags = [
    "--package"
@@ -66,12 +66,13 @@ rustPlatform.buildRustPackage rec {
        --replace-fail '/usr/bin/gnome-terminal' 'gnome-terminal'
  '';

-  meta = with lib; {
+  meta = {
    description = "Modular IPC-based desktop launcher service";
    homepage = "https://github.com/pop-os/launcher";
-    platforms = platforms.linux;
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ samhug ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ samhug ];
    mainProgram = "pop-launcher";
+    teams = [ lib.teams.cosmic ];
  };
-}
+})
@@ -87,9 +87,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
  # versionCheckHook doesn't support multiple arguments yet
  doInstallCheck = true;
  installCheckPhase = ''
-    runHook preInstallCheckPhase
+    runHook preInstallCheck
    $out/bin/rad-tui --version --no-forward | grep -F 'rad-tui ${finalAttrs.version}'
-    runHook postInstallCheckPhase
+    runHook postInstallCheck
  '';

  passthru.updateScript = ./update.sh;
@@ -11,13 +11,13 @@

 stdenv.mkDerivation {
  pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-09-11";
+  version = "2.20220925.4.0a-unstable-2025-09-22";

  src = fetchFromGitHub {
    owner = "re-Isearch";
    repo = "re-Isearch";
-    rev = "26e44f3d66e7f19def909a8179f798f6a4fe0a8a";
-    hash = "sha256-zAYdZrKx2xaNrPYS0BbNNA30TkMqqR8P7pCB/j9VBuY=";
+    rev = "d2e16c1f62aa4951d331668908f8dd17638be351";
+    hash = "sha256-6sBIrmngdNG7hCg6NS3MkghVIf58ZNZFITpTBtfZ5RA=";
  };

  patches = [
@@ -28,13 +28,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shader-slang";
-  version = "2025.17.1";
+  version = "2025.17.2";

  src = fetchFromGitHub {
    owner = "shader-slang";
    repo = "slang";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-0rpjwUCOJedafF6ZKyV+a3fHhnEcflFC6nflTApN4Z0=";
+    hash = "sha256-bviodruPqvw2L9E6qSO0ihg9L/qK33A03bpr1bI+xR8=";
    fetchSubmodules = true;
  };

@@ -25,15 +25,15 @@
  zlib,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "snapper";
-  version = "0.12.2";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "openSUSE";
    repo = "snapper";
-    rev = "v${version}";
-    sha256 = "sha256-SHwF9FMfrrf2IXrGjT/lTI8rDltVkRXkAQ9MpeNVeWw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8rIjfulMuh4HzZv08bX7gveJAo2X2GvswmBD3Ziu0NM=";
  };

  strictDeps = true;
@@ -62,18 +62,14 @@ stdenv.mkDerivation rec {
    zlib
  ];

-  passthru.tests.snapper = nixosTests.snapper;
-
+  # Hard-coded root paths, hard-coded root paths everywhere...
  postPatch = ''
-    # Hard-coded root paths, hard-coded root paths everywhere...
-    for file in {client,client/installation-helper,client/systemd-helper,data,pam,scripts,zypp-plugin}/Makefile.am; do
+    for file in {client/installation-helper,client/systemd-helper,data,scripts,zypp-plugin,scripts/completion}/Makefile.am; do
      substituteInPlace $file \
-        --replace '$(DESTDIR)/usr' "$out" \
-        --replace "DESTDIR" "out" \
-        --replace "/usr" "$out"
+        --replace-warn '$(DESTDIR)/usr' "$out" \
+        --replace-warn "DESTDIR" "out" \
+        --replace-warn "/usr" "$out"
    done
-    substituteInPlace pam/Makefile.am \
-      --replace '/`basename $(libdir)`' "$out/lib"
  '';

  configureFlags = [
@@ -92,10 +88,12 @@ stdenv.mkDerivation rec {
      $out/lib/systemd/system/* \
      $out/share/dbus-1/system-services/* \
    ; do
-      substituteInPlace $file --replace "/usr" "$out"
+      substituteInPlace $file --replace-warn "/usr" "$out"
    done
  '';

+  passthru.tests.snapper = nixosTests.snapper;
+
  meta = {
    description = "Tool for Linux filesystem snapshot management";
    homepage = "http://snapper.io";
@@ -104,4 +102,4 @@ stdenv.mkDerivation rec {
    maintainers = with lib.maintainers; [ markuskowa ];
    platforms = lib.platforms.linux;
  };
-}
+})
@@ -9,16 +9,16 @@

 php84.buildComposerProject2 (finalAttrs: {
  pname = "snipe-it";
-  version = "8.3.0";
+  version = "8.3.2";

  src = fetchFromGitHub {
    owner = "grokability";
    repo = "snipe-it";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-YeedBSpEzdMOPpbwqEFpVtMY4hnnN/Sb/XB1YNDnDNc=";
+    hash = "sha256-ZmOij8oDaMtLKbNEbzufvXy5fmLrGqwiDXzIpDVQ93o=";
  };

-  vendorHash = "sha256-32TbhVhfi8i9jwBQ2gpeb7sLmrtHQXSjlaVVdgFdaxs=";
+  vendorHash = "sha256-13Mw2sjeSk4AmELjuD6Z7SgxLBgIeqzolq+rR992sEs=";

  postInstall = ''
    snipe_it_out="$out/share/php/snipe-it"
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "swiftlint";
-  version = "0.59.0";
+  version = "0.61.0";

  src = fetchurl {
    url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip";
-    hash = "sha256-rsGt9hy2EklZEA7eQ/Tp9eztVLVlVn9LMPTeZz9fQYA=";
+    hash = "sha256-I0LzeEMHoCEX4Y90X801DGrMbKsOUhwMDgHDKlOjsnQ=";
  };

  dontPatch = true;
@@ -0,0 +1,32 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "typr";
+  version = "1.0.1.21";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "DriftingOtter";
+    repo = "Typr";
+    tag = version;
+    hash = "sha256-49e5tnX/vea3xLJP62Sj2gCdjbfsulIU48X/AR/3IBI=";
+  };
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [ rich ];
+
+  doCheck = false; # absent
+
+  meta = {
+    homepage = "https://github.com/DriftingOtter/Typr";
+    description = "Your Personal Typing Tutor";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ artur-sannikov ];
+    mainProgram = "typr";
+  };
+}
@@ -17,22 +17,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-alpha.7";
+  version = "1.0.0-beta.1.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "xdg-desktop-portal-cosmic";
    tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-7yfrjKHuYOWPMMkHdGZ+g0hynh2TtSf4h8zW13tTus4=";
+    hash = "sha256-EkhOa1Tircgyta98Zf4ZaV/tR4zZh4/bU35xjn3xU8c=";
  };

-  env = {
-    VERGEN_GIT_COMMIT_DATE = "2025-04-08";
-    VERGEN_GIT_SHA = finalAttrs.src.tag;
-  };
-
-  cargoHash = "sha256-fOaLeWtrjgBDSShC5OmBZKODNQn4bp/+iPZX5ZMQFqk=";
+  cargoHash = "sha256-uJKwwESkzqweM4JunnMIsDE8xhCyjFFZs1GiJAwnbG8=";

  separateDebugInfo = true;

@@ -66,7 +66,7 @@ stdenv.mkDerivation {
      tests/zorbajsoniq/download.sh
  '';

-  preBuildPhase = ''
+  preBuild = ''
    mkdir -p import/{flre,synapse,pasdblstrutils} rcmdline internettools
    cp -R ${flreSrc}/. import/flre
    cp -R ${pasdblstrutilsSrc}/. import/pasdblstrutils
@@ -80,9 +80,9 @@ stdenv.mkDerivation {
  '';

  buildPhase = ''
-    runHook preBuildPhase
+    runHook preBuild
    ./build.sh
-    runHook postBuildPhase
+    runHook postBuild
  '';

  installPhase = ''
@@ -1,5 +1,185 @@
-import ./common.nix {
-  version = "1.4.x-2021-12-21";
-  rev = "c8bb2a35850be7c6eaec5ad5a2936a77f7913de2";
-  sha256 = "1fwfg1hp1ajqh2b4ra4phi96854q9i8c0gbyi7pr35ljyv848295";
-}
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  zlib,
+  libjpeg,
+  libpng,
+  fontconfig,
+  freetype,
+  libX11,
+  libXext,
+  libXinerama,
+  libXfixes,
+  libXcursor,
+  libXft,
+  libXrender,
+
+  withGL ? true,
+  libGL,
+  libGLU,
+  glew,
+
+  withCairo ? true,
+  cairo,
+
+  withPango ? stdenv.hostPlatform.isLinux,
+  pango,
+
+  withDocs ? true,
+  doxygen,
+  graphviz,
+
+  withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform),
+}:
+
+let
+  onOff = value: if value then "ON" else "OFF";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fltk";
+  version = "1.4.4";
+
+  src = fetchFromGitHub {
+    owner = "fltk";
+    repo = "fltk";
+    rev = "release-${finalAttrs.version}";
+    hash = "sha256-xba9uiiwQhM4a3Rf4PoGshY3mUKZrcsm+Iv7qnE2sEA=";
+  };
+
+  outputs = [ "out" ] ++ lib.optional withExamples "bin" ++ lib.optional withDocs "doc";
+
+  # Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries
+  outputBin = lib.optionalString withExamples "out";
+
+  postPatch = ''
+    patchShebangs documentation/make_*
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withDocs [
+    doxygen
+    graphviz
+  ];
+
+  buildInputs =
+    lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [
+      libGL
+      libGLU
+    ]
+    ++ lib.optionals (withExamples && withGL) [
+      glew
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      fontconfig
+    ];
+
+  propagatedBuildInputs = [
+    zlib
+    libjpeg
+    libpng
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    freetype
+    libX11
+    libXext
+    libXinerama
+    libXfixes
+    libXcursor
+    libXft
+    libXrender
+  ]
+  ++ lib.optionals withCairo [
+    cairo
+  ]
+  ++ lib.optionals withPango [
+    pango
+  ];
+
+  cmakeFlags = [
+    # Common
+    "-DFLTK_BUILD_SHARED_LIBS=${onOff (!stdenv.hostPlatform.isStatic)}"
+    "-DFLTK_USE_SYSTEM_LIBDECOR=ON"
+    "-DFLTK_USE_SYSTEM_LIBJPEG=ON"
+    "-DFLTK_USE_SYSTEM_LIBPNG=ON"
+    "-DFLTK_USE_SYSTEM_ZLIB=ON"
+
+    # X11
+    "-DFLTK_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}"
+    "-DFLTK_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}"
+    "-DFLTK_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}"
+    "-DFLTK_USE_XFT=${onOff stdenv.hostPlatform.isLinux}"
+    "-DFLTK_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}"
+
+    # GL
+    "-DFLTK_BUILD_GL=${onOff withGL}"
+    "-DOpenGL_GL_PREFERENCE=GLVND"
+
+    # Cairo
+    "-DFLTK_OPTION_CAIRO_WINDOW=${onOff withCairo}"
+    "-DFLTK_OPTION_CAIRO_EXT=${onOff withCairo}"
+
+    # Pango
+    "-DFLTK_USE_PANGO=${onOff withPango}"
+
+    # Examples & Tests
+    "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}"
+    "-DFLTK_BUILD_TEST=${onOff withExamples}"
+
+    # Docs
+    "-DFLTK_BUILD_HTML_DOCS=${onOff withDocs}"
+    "-DFLTK_BUILD_PDF_DOCS=OFF"
+    "-DFLTK_INSTALL_HTML_DOCS=${onOff withDocs}"
+    "-DFLTK_INSTALL_PDF_DOCS=OFF"
+    "-DFLTK_INCLUDE_DRIVER_DOCS=${onOff withDocs}"
+
+    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+  ];
+
+  postBuild = lib.optionalString withDocs ''
+    make docs
+  '';
+
+  postInstall =
+    lib.optionalString withExamples ''
+      mkdir -p $bin/bin
+      mv bin/{test,examples}/* $bin/bin/
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      moveAppBundles() {
+        echo "Moving and symlinking $1"
+        appname="$(basename "$1")"
+        binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")"
+        curpath="$(dirname "$1")"
+
+        mkdir -p "$curpath"/../Applications/
+        mv "$1" "$curpath"/../Applications/
+        [ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname"
+        ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname"
+      }
+
+      for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do
+        moveAppBundles "$app"
+      done
+    '';
+
+  postFixup = ''
+    substituteInPlace $out/bin/fltk-config \
+      --replace-fail "/$out/" "/"
+  '';
+
+  meta = {
+    description = "C++ cross-platform lightweight GUI library";
+    homepage = "https://www.fltk.org";
+    platforms = lib.platforms.unix;
+    # LGPL2 with static linking exception
+    # https://www.fltk.org/COPYING.php
+    license = lib.licenses.lgpl2Only;
+  };
+})
@@ -1,204 +0,0 @@
-{
-  version,
-  rev,
-  sha256,
-}:
-
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  zlib,
-  libjpeg,
-  libpng,
-  fontconfig,
-  freetype,
-  libX11,
-  libXext,
-  libXinerama,
-  libXfixes,
-  libXcursor,
-  libXft,
-  libXrender,
-
-  withGL ? true,
-  libGL,
-  libGLU,
-  glew,
-
-  withCairo ? true,
-  cairo,
-
-  withPango ? (lib.strings.versionAtLeast version "1.4" && stdenv.hostPlatform.isLinux),
-  pango,
-
-  withDocs ? true,
-  doxygen,
-  graphviz,
-
-  withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform),
-  withShared ? true,
-}:
-
-let
-  onOff = value: if value then "ON" else "OFF";
-in
-stdenv.mkDerivation {
-  pname = "fltk";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "fltk";
-    repo = "fltk";
-    inherit rev sha256;
-  };
-
-  outputs = [ "out" ] ++ lib.optional withExamples "bin" ++ lib.optional withDocs "doc";
-
-  # Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries
-  outputBin = lib.optionalString withExamples "out";
-
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    ./nsosv.patch
-  ];
-
-  postPatch = ''
-    patchShebangs documentation/make_*
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ]
-  ++ lib.optionals withDocs [
-    doxygen
-    graphviz
-  ];
-
-  buildInputs =
-    lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [
-      libGL
-      libGLU
-    ]
-    ++ lib.optionals (withExamples && withGL) [
-      glew
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      fontconfig
-    ];
-
-  propagatedBuildInputs = [
-    zlib
-    libjpeg
-    libpng
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    freetype
-    libX11
-    libXext
-    libXinerama
-    libXfixes
-    libXcursor
-    libXft
-    libXrender
-  ]
-  ++ lib.optionals withCairo [
-    cairo
-  ]
-  ++ lib.optionals withPango [
-    pango
-  ];
-
-  cmakeFlags = [
-    # Common
-    "-DOPTION_BUILD_SHARED_LIBS=${onOff withShared}"
-    "-DOPTION_USE_SYSTEM_ZLIB=ON"
-    "-DOPTION_USE_SYSTEM_LIBJPEG=ON"
-    "-DOPTION_USE_SYSTEM_LIBPNG=ON"
-
-    # X11
-    "-DOPTION_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}"
-    "-DOPTION_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}"
-    "-DOPTION_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}"
-    "-DOPTION_USE_XFT=${onOff stdenv.hostPlatform.isLinux}"
-    "-DOPTION_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}"
-    "-DOPTION_USE_XDBE=${onOff stdenv.hostPlatform.isLinux}"
-
-    # GL
-    "-DOPTION_USE_GL=${onOff withGL}"
-    "-DOpenGL_GL_PREFERENCE=GLVND"
-
-    # Cairo
-    "-DOPTION_CAIRO=${onOff withCairo}"
-    "-DOPTION_CAIROEXT=${onOff withCairo}"
-
-    # Pango
-    "-DOPTION_USE_PANGO=${onOff withPango}"
-
-    # Examples & Tests
-    "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}"
-    "-DFLTK_BUILD_TEST=${onOff withExamples}"
-
-    # Docs
-    "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
-    "-DOPTION_BUILD_PDF_DOCUMENTATION=OFF"
-    "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
-    "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
-    "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
-
-    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
-    "-DCMAKE_SKIP_BUILD_RPATH=ON"
-  ];
-
-  preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
-    # unresolved symbols in cairo dylib without this: https://github.com/fltk/fltk/issues/250
-    export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
-  '';
-
-  postBuild = lib.optionalString withDocs ''
-    make docs
-  '';
-
-  postInstall =
-    lib.optionalString withExamples ''
-      mkdir -p $bin/bin
-      mv bin/{test,examples}/* $bin/bin/
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Library/Frameworks
-      mv $out{,/Library/Frameworks}/FLTK.framework
-
-      moveAppBundles() {
-        echo "Moving and symlinking $1"
-        appname="$(basename "$1")"
-        binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")"
-        curpath="$(dirname "$1")"
-
-        mkdir -p "$curpath"/../Applications/
-        mv "$1" "$curpath"/../Applications/
-        [ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname"
-        ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname"
-      }
-
-      rm $out/bin/fluid.icns
-      for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do
-        moveAppBundles "$app"
-      done
-    '';
-
-  postFixup = ''
-    substituteInPlace $out/bin/fltk-config \
-      --replace "/$out/" "/"
-  '';
-
-  meta = with lib; {
-    description = "C++ cross-platform lightweight GUI library";
-    homepage = "https://www.fltk.org";
-    platforms = platforms.unix;
-    # LGPL2 with static linking exception
-    # https://www.fltk.org/COPYING.php
-    license = licenses.lgpl2Only;
-  };
-}
@@ -1,5 +1,199 @@
-import ./common.nix rec {
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  zlib,
+  libjpeg,
+  libpng,
+  fontconfig,
+  freetype,
+  libX11,
+  libXext,
+  libXinerama,
+  libXfixes,
+  libXcursor,
+  libXft,
+  libXrender,
+
+  withGL ? true,
+  libGL,
+  libGLU,
+  glew,
+
+  withCairo ? true,
+  cairo,
+
+  withPango ? false,
+  pango,
+
+  withDocs ? true,
+  doxygen,
+  graphviz,
+
+  withExamples ? (stdenv.buildPlatform == stdenv.hostPlatform),
+  withShared ? true,
+}:
+
+let
+  onOff = value: if value then "ON" else "OFF";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fltk";
  version = "1.3.8";
-  rev = "release-${version}";
-  sha256 = "1pw4ndwn9rr1cxw5qiw32r9la2z9zbjphgsqq1hj2yy4blwv419r";
-}
+
+  src = fetchFromGitHub {
+    owner = "fltk";
+    repo = "fltk";
+    rev = "release-${finalAttrs.version}";
+    hash = "sha256-OQWyOV3EeyFhwFg/eOX66QtFUxaDR1x4ZyHnZHmzhN8=";
+  };
+
+  outputs = [ "out" ] ++ lib.optional withExamples "bin" ++ lib.optional withDocs "doc";
+
+  # Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries
+  outputBin = lib.optionalString withExamples "out";
+
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [
+    ./nsosv.patch
+  ];
+
+  postPatch = ''
+    patchShebangs documentation/make_*
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ]
+  ++ lib.optionals withDocs [
+    doxygen
+    graphviz
+  ];
+
+  buildInputs =
+    lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [
+      libGL
+      libGLU
+    ]
+    ++ lib.optionals (withExamples && withGL) [
+      glew
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      fontconfig
+    ];
+
+  propagatedBuildInputs = [
+    zlib
+    libjpeg
+    libpng
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    freetype
+    libX11
+    libXext
+    libXinerama
+    libXfixes
+    libXcursor
+    libXft
+    libXrender
+  ]
+  ++ lib.optionals withCairo [
+    cairo
+  ]
+  ++ lib.optionals withPango [
+    pango
+  ];
+
+  cmakeFlags = [
+    # Common
+    "-DOPTION_BUILD_SHARED_LIBS=${onOff withShared}"
+    "-DOPTION_USE_SYSTEM_ZLIB=ON"
+    "-DOPTION_USE_SYSTEM_LIBJPEG=ON"
+    "-DOPTION_USE_SYSTEM_LIBPNG=ON"
+
+    # X11
+    "-DOPTION_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}"
+    "-DOPTION_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}"
+    "-DOPTION_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}"
+    "-DOPTION_USE_XFT=${onOff stdenv.hostPlatform.isLinux}"
+    "-DOPTION_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}"
+    "-DOPTION_USE_XDBE=${onOff stdenv.hostPlatform.isLinux}"
+
+    # GL
+    "-DOPTION_USE_GL=${onOff withGL}"
+    "-DOpenGL_GL_PREFERENCE=GLVND"
+
+    # Cairo
+    "-DOPTION_CAIRO=${onOff withCairo}"
+    "-DOPTION_CAIROEXT=${onOff withCairo}"
+
+    # Pango
+    "-DOPTION_USE_PANGO=${onOff withPango}"
+
+    # Examples & Tests
+    "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}"
+    "-DFLTK_BUILD_TEST=${onOff withExamples}"
+
+    # Docs
+    "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
+    "-DOPTION_BUILD_PDF_DOCUMENTATION=OFF"
+    "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
+    "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
+    "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
+
+    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
+    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+  ];
+
+  preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
+    # unresolved symbols in cairo dylib without this: https://github.com/fltk/fltk/issues/250
+    export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
+  '';
+
+  postBuild = lib.optionalString withDocs ''
+    make docs
+  '';
+
+  postInstall =
+    lib.optionalString withExamples ''
+      mkdir -p $bin/bin
+      mv bin/{test,examples}/* $bin/bin/
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Library/Frameworks
+      mv $out{,/Library/Frameworks}/FLTK.framework
+
+      moveAppBundles() {
+        echo "Moving and symlinking $1"
+        appname="$(basename "$1")"
+        binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")"
+        curpath="$(dirname "$1")"
+
+        mkdir -p "$curpath"/../Applications/
+        mv "$1" "$curpath"/../Applications/
+        [ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname"
+        ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname"
+      }
+
+      rm $out/bin/fluid.icns
+      for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do
+        moveAppBundles "$app"
+      done
+    '';
+
+  postFixup = ''
+    substituteInPlace $out/bin/fltk-config \
+      --replace "/$out/" "/"
+  '';
+
+  meta = {
+    description = "C++ cross-platform lightweight GUI library";
+    homepage = "https://www.fltk.org";
+    platforms = lib.platforms.unix;
+    # LGPL2 with static linking exception
+    # https://www.fltk.org/COPYING.php
+    license = lib.licenses.lgpl2Only;
+  };
+})
@@ -1,10 +1,11 @@
 {
  lib,
+  stdenv,
  buildDunePackage,
  fetchFromGitHub,
 }:

-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
  pname = "minisat";
  version = "0.6";

@@ -13,14 +14,18 @@ buildDunePackage rec {
  src = fetchFromGitHub {
    owner = "c-cube";
    repo = "ocaml-minisat";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-dH0Ndlyo/DTZ6Ao1S478aBuxoZFSkRBi5HblkTWCPas=";
  };

+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_COMPILE = "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
+  };
+
  meta = {
    homepage = "https://c-cube.github.io/ocaml-minisat/";
    description = "Simple bindings to Minisat-C";
    license = lib.licenses.bsd2;
    maintainers = with lib.maintainers; [ mgttlinger ];
  };
-}
+})
@@ -1,21 +1,19 @@
 {
  lib,
-  fetchFromGitHub,
-  buildOasisPackage,
+  fetchurl,
+  buildDunePackage,
  minisat,
 }:

-buildOasisPackage rec {
+buildDunePackage (finalAttrs: {
  pname = "ocaml-sat-solvers";
-  version = "0.4";
+  version = "0.8";

-  minimumOCamlVersion = "4.03.0";
+  minimalOCamlVersion = "4.05";

-  src = fetchFromGitHub {
-    owner = "tcsprojects";
-    repo = "ocaml-sat-solvers";
-    rev = "v${version}";
-    sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938";
+  src = fetchurl {
+    url = "https://github.com/tcsprojects/ocaml-sat-solvers/releases/download/v${finalAttrs.version}/ocaml-sat-solvers-${finalAttrs.version}.tbz";
+    hash = "sha256-1eXzuY6rrrjdEG/XnkJe4o9zAcUvfTVFO1+ZIzcgpOU=";
  };

  propagatedBuildInputs = [ minisat ];
@@ -26,4 +24,4 @@ buildOasisPackage rec {
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ mgttlinger ];
  };
-}
+})
@@ -1,6 +1,7 @@
 {
  lib,
  fetchFromGitHub,
+  fetchpatch,
  buildOasisPackage,
  ounit,
  tcslib,
@@ -18,6 +19,16 @@ buildOasisPackage rec {
    sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a";
  };

+  # Compatibility with ocaml-sat-solvers 0.8
+  patches = fetchpatch {
+    url = "https://github.com/tcsprojects/pgsolver/commit/e57a4fc5c8050b8d4ada5583a6c65ecf8cd65141.patch";
+    hash = "sha256-QFKxWByptnCl1SfleNASyXmKM2gkh1OE66L8PAZX+TU=";
+    includes = [
+      "src/solvers/*.ml"
+      "src/tools/*.ml"
+    ];
+  };
+
  buildInputs = [ ounit ];
  propagatedBuildInputs = [
    tcslib
@@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "badsecrets";
-  version = "0.12.12";
+  version = "0.13.47";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "blacklanternsecurity";
    repo = "badsecrets";
    tag = "v${version}";
-    hash = "sha256-eZaTH47WYm89JgDrY0eTTrFC5OkbKqV+MY1bHWaiExU=";
+    hash = "sha256-Yvd9AGbVDOfXep8y+XzwYP2EpTvy+rwyz5hRIe7v4oc=";
  };

  build-system = [
@@ -3,38 +3,27 @@
  fetchFromGitHub,
  httpx,
  lib,
-  pdm-pep517,
+  pdm-backend,
  pytest-asyncio,
  pytestCheckHook,
  setuptools,
  starlette,
-  fetchpatch,
 }:

 buildPythonPackage rec {
  pname = "baize";
-  version = "0.22.2";
+  version = "0.23.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "abersheeran";
    repo = "baize";
    tag = "v${version}";
-    hash = "sha256-vsYt1q8QEDmEXjd8dlzHr85Fz3YAjPowS+oBWYGbG1o=";
+    hash = "sha256-TclyTLqJ+r9Spg6VgmsqhhVj/Mp/HqFrkXjZy5f2BR0=";
  };

-  patches = [
-    # Fix tests failing with httpx>=0.28
-    # https://github.com/abersheeran/baize/pull/74
-    # FIXME: Remove in next release
-    (fetchpatch {
-      url = "https://github.com/abersheeran/baize/commit/40dc83bc03b4e5acd5155917be3a481e6494530e.patch";
-      hash = "sha256-z4jb4iwo51WIPAAECiM4kPThpHcrzy3349gm/orgoq8=";
-    })
-  ];
-
  build-system = [
-    pdm-pep517
+    pdm-backend
    setuptools
  ];

@@ -47,13 +36,6 @@ buildPythonPackage rec {
    starlette
  ];

-  disabledTests = [
-    # test relies on last modified date, which is set to 1970-01-01 in the sandbox
-    "test_files"
-    # starlette.testclient.WebSocketDenialResponse
-    "test_request_response"
-  ];
-
  meta = {
    description = "Powerful and exquisite WSGI/ASGI framework/toolkit";
    homepage = "https://github.com/abersheeran/baize";
@@ -62,5 +62,6 @@ buildPythonPackage rec {
    changelog = "https://github.com/gboeing/osmnx/blob/${src.rev}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ psyanticy ];
+    teams = [ lib.teams.geospatial ];
  };
 }
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pysmartthings";
-  version = "3.2.9";
+  version = "3.3.0";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "andrewsayre";
    repo = "pysmartthings";
    tag = "v${version}";
-    hash = "sha256-5buCkZ+VBZFHId616YxTUPNVd1QRh+bO0OBq0JL4dvo=";
+    hash = "sha256-i1whnELYPkaT7K5hLZy+Q4Aub1TBph8aDFZKx78hElY=";
  };

  build-system = [ poetry-core ];
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "resend";
-  version = "2.13.1";
+  version = "2.14.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "resend";
    repo = "resend-python";
    tag = "v${version}";
-    hash = "sha256-TE0sfNg6m71Chl6TPAssEiX+jeeHv0ZYOcv/HOe30OM=";
+    hash = "sha256-rRaW32hKfbYOKuh5lcPWiq6sD35tUzRS8ZCsyAyy4Mo=";
  };

  build-system = [ setuptools ];
@@ -33,12 +33,12 @@

 buildPythonPackage rec {
  pname = "tempest";
-  version = "44.0.0";
+  version = "45.0.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-R9V9NX5Pz4+1yV/OjtbuIOICZQnDt1wjDo6ZZP9ojkc=";
+    hash = "sha256-z+DJ5ODgWaIcYM0orXYA/Ci0hrzfSGkOZt/z7L3DWJs=";
  };

  pythonRelaxDeps = [ "defusedxml" ];
@@ -60,9 +60,9 @@ in
  # Not to be used with buildPgrxExtension, where it should be pinned.
  # When you make an extension use the latest version, *copy* this to a separate pinned attribute.
  cargo-pgrx = generic {
-    version = "0.16.0";
-    hash = "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=";
-    cargoHash = "sha256-3eyBDWDoCzSU0tbab8qbjSnBkkN0oOgd7YbuyHLEHYw=";
+    version = "0.16.1";
+    hash = "sha256-AjoBr+/sEPdzbD0wLUNVm2syCySkGaFOFQ70TST1U9w=";
+    cargoHash = "sha256-95DHq5GLnAqb3bbKwwaeBeKEmkfRh81ZTRaJ7L59DAg=";
  };
 }
 // lib.mapAttrs (_: generic) (import ./pinned.nix)
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
  owner = "AlexxIT";
  domain = "yandex_station";
-  version = "3.20.0";
+  version = "3.20.1";

  src = fetchFromGitHub {
    owner = "AlexxIT";
    repo = "YandexStation";
    tag = "v${version}";
-    hash = "sha256-dGMq/uJBr30K9J4C5rFbX99ykf3WttPMLEHf6674THk=";
+    hash = "sha256-AP0GAJrGZq2z0HlsARfhVZiv7yaeOKg05GjV95ljVdU=";
  };

  dependencies = [
@@ -1057,61 +1057,55 @@ mapAliases {
  glxinfo = mesa-demos; # Added 2024-07-04
  gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
  gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
+  gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17
  gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
-  gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
  gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
  gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
  gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
  gnatboot = gnat-bootstrap; # Added 2023-04-07
+  gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
  gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25
+  gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25
  gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25
  gnatcoll-iconv = gnatPackages.gnatcoll-iconv; # Added 2024-02-25
  gnatcoll-lzma = gnatPackages.gnatcoll-lzma; # Added 2024-02-25
  gnatcoll-omp = gnatPackages.gnatcoll-omp; # Added 2024-02-25
+  gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25
  gnatcoll-python3 = gnatPackages.gnatcoll-python3; # Added 2024-02-25
  gnatcoll-readline = gnatPackages.gnatcoll-readline; # Added 2024-02-25
-  gnatcoll-syslog = gnatPackages.gnatcoll-syslog; # Added 2024-02-25
-  gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25
-  gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25
  gnatcoll-sql = gnatPackages.gnatcoll-sql; # Added 2024-02-25
  gnatcoll-sqlite = gnatPackages.gnatcoll-sqlite; # Added 2024-02-25
+  gnatcoll-syslog = gnatPackages.gnatcoll-syslog; # Added 2024-02-25
  gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25
-  gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25
+  gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25
  gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25
  gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14
  gnome-firmware-updater = gnome-firmware; # added 2022-04-14
  gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
  gnome-passwordsafe = gnome-secrets; # added 2022-01-30
-  gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14
  gnome-resources = resources; # added 2023-12-10
-
-  gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17
-
  gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17
+  gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14
  gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16
  gnufdisk = throw "'gnufdisk' has been removed due to lack of maintenance upstream"; # Added 2024-12-31
-  gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
  gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
  gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
  gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
+  gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
+  gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
+  gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
  gnustep = throw "The gnustep scope has been replaced with top-level packages: gnustep-back, -base, -gui, -libobjc, -make, -systempreferences; gorm, gworkspace, projectcenter."; # Added 2025-01-25
-  gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
-  gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
-  gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
-  gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
-  grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02
-  graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
-  godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
-  godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
-  godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27
  go-thumbnailer = thud; # Added 2023-09-21
  go-upower-notify = upower-notify; # Added 2024-07-21
+  gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
+  godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27
+  godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
+  godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
+  godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
  goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
  googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
  gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
@@ -1120,11 +1114,16 @@ mapAliases {
  gpxsee-qt6 = gpxsee; # added 2025-09-09
  gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; # Added 2024-09-14
  gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25
-  graalvmCEPackages = graalvmPackages; # Added 2024-08-10
  graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
  graalvm-oracle = graalvmPackages.graalvm-oracle; # Added 2024-12-17
+  graalvmCEPackages = graalvmPackages; # Added 2024-08-10
+  gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20
+  gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
+  gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
+  grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02
  grafana_reporter = grafana-reporter; # Added 2024-06-09
  grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23
+  graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
  graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09
  graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
  graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
@@ -1148,7 +1147,6 @@ mapAliases {
  guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
  gutenprintBin = gutenprint-bin; # Added 2025-08-21
  gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
-
  ### H ###

  hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25