Merge staging-next into staging

nixos/modules/system/boot/loader/limine/limine-install.py

@@ -492,12 +492,12 @@ def install_bootloader() -> None:
     config_file += option_from_config('term_margin_gradient', ['style', 'graphicalTerminal', 'marginGradient'])
 
     config_file += textwrap.dedent('''
-        # NixOS boot entries start here
+        # @distroName@ boot entries start here
     ''')
 
     for (profile, gens) in profiles:
         group_name = 'default profile' if profile == 'system' else f"profile '{profile}'"
-        config_file += f'/+NixOS {group_name}\n'
+        config_file += f'/+@distroName@ {group_name}\n'
 
         isFirst = True
 
@@ -506,7 +506,7 @@ def install_bootloader() -> None:
             isFirst = False
 
     config_file_path = os.path.join(limine_install_dir, 'limine.conf')
-    config_file += '\n# NixOS boot entries end here\n\n'
+    config_file += '\n# @distroName@ boot entries end here\n\n'
 
     config_file += str(config('extraEntries'))
 

nixos/modules/system/boot/loader/limine/limine.nix

@@ -432,6 +432,7 @@ in
           replacements = {
             python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]);
             configPath = limineInstallConfig;
+            inherit (config.system.nixos) distroName;
           };
         };
       };

nixos/tests/limine/default.nix

@@ -8,4 +8,5 @@
   secureBoot = runTest ./secure-boot.nix;
   specialisations = runTest ./specialisations.nix;
   uefi = runTest ./uefi.nix;
+  distroName = runTest ./distroName.nix;
 }

nixos/tests/limine/distroName.nix

@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+{
+  name = "distroName";
+  meta = {
+    inherit (pkgs.limine.meta) maintainers;
+  };
+
+  nodes.machine =
+    { ... }:
+    {
+      virtualisation.useBootLoader = true;
+      virtualisation.useEFIBoot = true;
+
+      boot.loader.efi.canTouchEfiVariables = true;
+      boot.loader.limine.enable = true;
+      boot.loader.limine.efiSupport = true;
+      boot.loader.timeout = 0;
+
+      system.nixos.distroName = "BestDistroEver";
+    };
+
+  testScript = /* python */ ''
+    machine.start()
+    with subtest('Machine boots correctly'):
+      machine.wait_for_unit('multi-user.target')
+
+    machine.succeed("grep \"BestDistroEver\" /boot/limine/limine.conf")
+    machine.fail("grep \"NixOS\" /boot/limine/limine.conf")
+  '';
+}

pkgs/by-name/ca/catppuccin/package.nix

@@ -19,6 +19,7 @@ let
     "starship"
     "thunderbird"
     "waybar"
+    "whoogle"
   ];
 in
 {
@@ -208,6 +209,14 @@ let
       rev = "ee8ed32b4f63e9c417249c109818dcc05a2e25da";
       hash = "sha256-za0y6hcN2rvN6Xjf31xLRe4PP0YyHu2i454ZPjr+lWA=";
     };
+
+    whoogle = fetchFromGitHub {
+      name = "whoogle";
+      owner = "catppuccin";
+      repo = "whoogle";
+      rev = "9d961dc6e2ac405fee18ee1da9a14db1f139db39";
+      hash = "sha256-GyJD/xAF481ZMHOEfwW1SrWW6LT8ARRFizbfjl526XE=";
+    };
   };
 in
 lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListOfEnum
@@ -338,6 +347,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO
       mkdir -p "$out/waybar"
       cp "${sources.waybar}/themes/${variant}.css" "$out/waybar"
 
+    ''
+    + lib.optionalString (lib.elem "whoogle" themeList) ''
+      mkdir -p "$out/whoogle"
+      cp "${sources.whoogle}/css/${variant}.css" "$out/whoogle"
+
     ''
     + ''
       runHook postInstall

pkgs/by-name/co/comrak/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "comrak";
-  version = "0.51.0";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Klux0l0onlkpRIeQPHKZZhLhYB5On2R8CivpByGSgEA=";
+    sha256 = "sha256-MMCA6PfVt9kUvdOKlIBFUxTXEJwNETyxgdPhdXcM/os=";
   };
 
-  cargoHash = "sha256-AB4XcGERw9PmYpwMVV1mTjpEJmL4pV7iyZUhn5GWflc=";
+  cargoHash = "sha256-uHJvkFcKnX3gduTSQokhWwz9ABY94KxIQg7Q7fvyMhk=";
 
   meta = {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

pkgs/by-name/do/dotenvx/package.nix

@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.57.4";
+  version = "1.59.1";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-IagswzHoChAHUJKrtN9UDLhp4ZJSwUf9bX0+JN/DCmA=";
+    hash = "sha256-P1k1cd6DfxGom2VKPKkNqhfs0h89QHQW19ZtePlutJk=";
   };
 
-  npmDepsHash = "sha256-QrQck7HG0jWohZ8hPIdrfvAX7Wk4r4url6zAtbSriWA=";
+  npmDepsHash = "sha256-OUggLKCzvgH158HSavEJBKtVs2EsddHDs/1q7H/5pPY=";
 
   dontNpmBuild = true;
 

pkgs/by-name/fl/flyctl/package.nix

@@ -12,7 +12,7 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.4.27";
+  version = "0.4.29";
 
   src = fetchFromGitHub {
     owner = "superfly";
@@ -22,7 +22,7 @@ buildGoModule rec {
       cd "$out"
       git rev-parse HEAD > COMMIT
     '';
-    hash = "sha256-C0MlKxkd3fftaBoVsmpnBP+tLw1dTCckKS0BrZGt8/c=";
+    hash = "sha256-mpyxl8Bjk6d0nCmnl+yzp0GtKiugjLykCFlfnf53+K4=";
   };
 
   proxyVendor = true;

pkgs/by-name/fr/fresh-editor/package.nix

@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.2.18";
+  version = "0.2.21";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LSMbG6ROFJv5Mc9TQ4ocZUXjqVlK9mvK3EtxEgEXKyk=";
+    hash = "sha256-du5YCDPqrGsbajT676Zs2oPvJPPAFseTkd3bXNNg64M=";
   };
 
-  cargoHash = "sha256-XMl/1IVtZ15ukmouk7Ktz9W4N1lBuXJA++VzOrr/F2U=";
+  cargoHash = "sha256-UDbW8R8XNbif+beReQsCrCqtpUw8DhDMIAlZBKqUWaQ=";
 
   nativeBuildInputs = [
     gzip

pkgs/by-name/hy/hydralauncher/package.nix

@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "3.9.4";
+  version = "3.9.5";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-CTy7kMRSaMYRtOctbgizA2i4VGSLGS5/kI2lAnTuDC4=";
+    hash = "sha256-FFF5k+eGKg066zYYc9GvRMCsXdu092h9SQGvO6S8rBA=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };

pkgs/by-name/ko/komga/package.nix

@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.24.2";
+  version = "1.24.3";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-6qVWoEo/s8GEq7vOF0qyDGAQztRVFp/Ygx0hXRP895M=";
+    sha256 = "sha256-+MZ2Rr/QYJuKBZdQtuQaq1crRRqBPo3LGRHjkl1Gupo=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mi/mimalloc/package.nix

@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mimalloc";
-  version = "3.1.5";
+  version = "3.1.6";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-fk6nfyBFS1G0sJwUJVgTC1+aKd0We/JjsIYTO+IOfyg=";
+    hash = "sha256-7zG0Sqloanz/b+fkJ4wzO86uBmtf9fdYNAT9ixLouyY=";
   };
 
   doCheck = !stdenv.hostPlatform.isStatic;

pkgs/by-name/mi/minder/package.nix

@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minder";
-  version = "2.0.5";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = "minder";
     tag = finalAttrs.version;
-    hash = "sha256-g1rz7yihbMtSvL3B9XTqtOEjjLP+DczOTCp47Cp9GHs=";
+    hash = "sha256-5W2ff0TJPQnuUAqw4oRjUv/h1x1goVfUsYPyrqDwc9Q=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ne/neovide/package.nix

@@ -30,16 +30,16 @@
 
 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   pname = "neovide";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "neovide";
     repo = "neovide";
     tag = finalAttrs.version;
-    hash = "sha256-i3HEdYZ1fTK8kHRMhGVY80kE6Sp/HhNV4vG2cVroDWo=";
+    hash = "sha256-yiIJEVEjXvFkTm4PIPOVX8gDAI6aA5PzBMlu51POCZU=";
   };
 
-  cargoHash = "sha256-ybPKRgUZ2MRbzSFyevxSDtsNyU4iQwL4b7JIqBpbwk4=";
+  cargoHash = "sha256-bWkK8tmKJrBKmdzJzHDht7BYVBMgpapzG79o8RM+Wuc=";
 
   env = {
     SKIA_SOURCE_DIR =
@@ -136,6 +136,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       ck3d
+      caverav
     ];
     platforms = lib.platforms.unix;
   };

pkgs/by-name/ni/nixpkgs-vet/package.nix

@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixpkgs-vet";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "nixpkgs-vet";
     tag = finalAttrs.version;
-    hash = "sha256-TxQkD9jPoONec87qGXOIQNh+lZ7kyFM6q1RtlgxEqy4=";
+    hash = "sha256-Rk1p6qAqAtl5bwg9dNZ0yc4m1yOOxybWvTwfuNcOkFQ=";
   };
 
-  cargoHash = "sha256-Wx8AwgUENVbxv9GgB/DTH5aGIRznAslABjxRu/X0l2s=";
+  cargoHash = "sha256-GaQ2ldsGabsDMx1bHuZwnSvtPp1LgPkj2C07cnEBdDY=";
 
   doCheck = false;
 

pkgs/by-name/ov/overturemaps/package.nix

@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "overturemaps";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y91x+S6YKBldy7OWIXCJQ5HuR3KrFRdfBkfMmkaeXy8=";
+    hash = "sha256-rvc1MpqCdRGuMWS5CSDev9SFgyVX8VczopXU/lWAyxg=";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -22,6 +22,7 @@ python3Packages.buildPythonPackage rec {
     click
     geopandas
     numpy
+    orjson
     pyarrow
     shapely
   ];

pkgs/by-name/pr/premid/package.nix

@@ -1,167 +0,0 @@
-{
-  autoPatchelfHook,
-  makeDesktopItem,
-  lib,
-  stdenv,
-  wrapGAppsHook3,
-  fetchurl,
-  copyDesktopItems,
-  alsa-lib,
-  at-spi2-atk,
-  at-spi2-core,
-  atk,
-  cairo,
-  cups,
-  dbus,
-  expat,
-  fontconfig,
-  freetype,
-  gdk-pixbuf,
-  glib,
-  gtk3,
-  libcxx,
-  libdrm,
-  libnotify,
-  libpulseaudio,
-  libuuid,
-  libx11,
-  libxscrnsaver,
-  libxcomposite,
-  libxcursor,
-  libxdamage,
-  libxext,
-  libxfixes,
-  libxi,
-  libxrandr,
-  libxrender,
-  libxtst,
-  libxcb,
-  libxshmfence,
-  libgbm,
-  nspr,
-  nss,
-  pango,
-  systemd,
-  libappindicator-gtk3,
-  libdbusmenu,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "premid";
-  version = "2.3.4";
-
-  src = fetchurl {
-    url = "https://github.com/premid/Linux/releases/download/v${version}/${pname}.tar.gz";
-    sha256 = "sha256-ime6SCxm+fhMR2wagv1RItqwLjPxvJnVziW3DZafP50=";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    wrapGAppsHook3
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    alsa-lib
-    cups
-    libdrm
-    libuuid
-    libxdamage
-    libx11
-    libxscrnsaver
-    libxtst
-    libxcb
-    libxshmfence
-    libgbm
-    nss
-  ];
-
-  dontWrapGApps = true;
-  dontBuild = true;
-  dontConfigure = true;
-
-  libPath = lib.makeLibraryPath [
-    libcxx
-    systemd
-    libpulseaudio
-    libdrm
-    libgbm
-    stdenv.cc.cc
-    alsa-lib
-    atk
-    at-spi2-atk
-    at-spi2-core
-    cairo
-    cups
-    dbus
-    expat
-    fontconfig
-    freetype
-    gdk-pixbuf
-    glib
-    gtk3
-    libnotify
-    libx11
-    libxcomposite
-    libuuid
-    libxcursor
-    libxdamage
-    libxext
-    libxfixes
-    libxi
-    libxrandr
-    libxrender
-    libxtst
-    nspr
-    nss
-    libxcb
-    pango
-    systemd
-    libxscrnsaver
-    libappindicator-gtk3
-    libdbusmenu
-  ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,opt/PreMiD,share/pixmaps}
-    mv * $out/opt/PreMiD
-
-    chmod +x $out/opt/PreMiD/${pname}
-    patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
-        $out/opt/PreMiD/${pname}
-
-    wrapProgram $out/opt/PreMiD/${pname} \
-        "''${gappsWrapperArgs[@]}" \
-        --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-        --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${pname}
-
-    ln -s $out/opt/PreMiD/${pname} $out/bin/
-  '';
-
-  # This is the icon used by the desktop file
-  postInstall = ''
-    ln -s $out/opt/PreMiD/assets/appIcon.png $out/share/pixmaps/${pname}.png
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = "PreMiD";
-      icon = pname;
-      desktopName = "PreMiD";
-      genericName = meta.description;
-      mimeTypes = [ "x-scheme-handler/premid" ];
-    })
-  ];
-
-  meta = {
-    description = "Simple, configurable utility to show your web activity as playing status on Discord";
-    homepage = "https://premid.app";
-    downloadPage = "https://premid.app/downloads";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ natto1784 ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "premid";
-  };
-}

pkgs/by-name/pr/prometheus-node-exporter/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "node_exporter";
-  version = "1.10.2";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "node_exporter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE=";
+    hash = "sha256-cZ7MGh80LIPTrTzgR6W+gl6BUc7ss60mjocwm1BMXC0=";
   };
 
-  vendorHash = "sha256-zQn3Hn40zZT3ZLiYQc/68i9t791eisBSiB6Re24/Ncg=";
+  vendorHash = "sha256-qTuzF4xeF0riOedwaUR4x/U6Jb0j+GIwUfUfstp2Cao=";
 
   # FIXME: tests fail due to read-only nix store
   doCheck = false;

pkgs/by-name/qo/qownnotes/package.nix

@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "26.3.22";
+  version = "26.4.4";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-80JfKVdugyE43FZiqYAb2xEiuoYhkPvqo+OHshrTawg=";
+    hash = "sha256-Sp1ICvsmTlq8cqF3mrkfyAx/tZwLLZIqmQqMQ1gt8uo=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/qu/qutebrowser/package.nix

@@ -26,15 +26,15 @@
 let
   pdfjs =
     let
-      version = "5.4.394";
+      version = "5.6.205";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-KMpSwF5MmoWdNoIUd4ZOwbJZZmjkid8wUoFKw7XjQFA=";
+      hash = "sha256-JMmxoT68PNJ/MmlMwVNYcHerorklLv5YY6C55xjn73w=";
       stripRoot = false;
     };
 
-  version = "3.6.3";
+  version = "3.7.0";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-bb4oieYevWMAOuQLMZ4egfMG6SToMWxnla5IhAIcL68=";
+    hash = "sha256-x/lYhOpeZnXlhAJb6lXP+VDEfXSa/39BX2jaA/zOD5I=";
   };
 
   # Needs tox

pkgs/by-name/si/simplex-chat-desktop/package.nix

@@ -8,7 +8,7 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.4.10";
+  version = "6.4.11";
 
   sources = {
     "aarch64-linux" = fetchurl {
@@ -17,7 +17,7 @@ let
     };
     "x86_64-linux" = fetchurl {
       url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-      hash = "sha256-HueMU1cCOspIsDg4hC9ebMbIvkOtZGiSktB1VSMGgT8=";
+      hash = "sha256-0b88H6eMYO+EgRnWzd9x/MUCr7CE/AHDZnKILQJS1DQ=";
     };
   };
 

pkgs/by-name/sn/snid/package.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "snid";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "AGWA";
+    repo = "snid";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-syKEtG/B1Yy0BAQqlR6o4uIRSwCnFOBsPpV4arqO/I4=";
+  };
+
+  vendorHash = "sha256-cVarG6Tx4yWpZE5BLZsMtLV9LF1lsiFfIXxhYiNjQlY=";
+
+  meta = {
+    description = "Zero config TLS proxy server that uses SNI";
+    homepage = "https://github.com/AGWA/snid";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomfitzhenry ];
+    mainProgram = "snid";
+  };
+})

pkgs/by-name/so/soapysdrplay/cmake.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ca2171..2928008 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ########################################################################
+ # Build Soapy SDR support module for SDRplay (API version 3)
+ ########################################################################
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.10)
+ project(SoapySDRPlay CXX)
+
+ find_package(SoapySDR "0.4.0" NO_MODULE REQUIRED)

pkgs/by-name/so/soapysdrplay/package.nix

@@ -8,17 +8,19 @@
   sdrplay,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soapysdr-sdrplay3";
-  version = "0.4.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "SoapySDRPlay3";
-    rev = "soapy-sdrplay3-${version}";
-    sha256 = "sha256-WMcAw0uR2o2SrQR4mBtdVEZlJ/ZXRqwo6zMJNsB/5U4=";
+    rev = "soapy-sdrplay3-${finalAttrs.version}";
+    hash = "sha256-5XBOUhI/37sMfdVEb19zWU00/j+Nb30wsP5CXjJ+sJY=";
   };
 
+  patches = [ ./cmake.patch ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -38,6 +40,11 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/pothosware/SoapySDRPlay3";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.pmenke ];
-    platforms = lib.platforms.linux;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
-}
+})

pkgs/by-name/sp/spectre-meltdown-checker/package.nix

@@ -5,21 +5,21 @@
   lib,
   makeBinaryWrapper,
   stdenv,
-  unstableGitUpdater,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spectre-meltdown-checker";
-  version = "0.46-unstable-2024-08-04";
+  version = "26.21.0401891";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
-    rev = "34c6095912d115551f69435a55d6e0445932fdf9";
-    hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cIPM4SFP5NS2eE37fQNb+l6W7mTcmsE1viUEUF+E8SM=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   prePatch = ''
     substituteInPlace spectre-meltdown-checker.sh \
@@ -39,10 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
+    changelog = "https://github.com/speed47/spectre-meltdown-checker/releases/tag/${finalAttrs.src.tag}";
     description = "Spectre & Meltdown vulnerability/mitigation checker for Linux";
     mainProgram = "spectre-meltdown-checker";
     homepage = "https://github.com/speed47/spectre-meltdown-checker";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.dotlambda ];
     platforms = lib.platforms.linux;
   };

pkgs/by-name/vi/vips/package.nix

@@ -58,7 +58,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vips";
-  version = "8.18.1";
+  version = "8.18.2";
 
   outputs = [
     "bin"
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libvips";
     repo = "libvips";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PIaoijkhMKbG8IgK11h8DLemjUR1WNSYB1yfqI4kwdQ=";
+    hash = "sha256-w42igzcvnCBoGHAvyb27Z6IciSuGeHctgSsZY30TtWo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''

pkgs/development/libraries/icu/default.nix

@@ -24,8 +24,8 @@ let
 in
 {
   icu78 = make-icu {
-    version = "78.1";
-    hash = "sha256-Yhf1jKObIxJ2Bc/Gx+DTR1/ksNYxVwETg9cWy0FheIY=";
+    version = "78.2";
+    hash = "sha256-Pploe1xDXUsgljDi0uu3mQbJhGheeGNQeLZy4DyJ3zU=";
   };
   icu77 = make-icu {
     version = "77.1";

pkgs/development/lua-modules/generated-packages.nix

@@ -3221,7 +3221,7 @@ final: prev: {
       knownRockspec =
         (fetchurl {
           url = "mirror://luarocks/lualine.nvim-scm-1.rockspec";
-          sha256 = "06cm86prf92fiqc30r0lsas70fzp7fli2p758gy5sd133ncqxliz";
+          sha256 = "01cqa4nvpq0z4230szwbcwqb0kd8cz2dycrd764r0z5c6vivgfzs";
         }).outPath;
       src = fetchFromGitHub {
         owner = "nvim-lualine";

pkgs/development/python-modules/aioimmich/default.nix

@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "aioimmich";
-  version = "0.12.1";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mib1185";
     repo = "aioimmich";
     tag = "v${version}";
-    hash = "sha256-bmBVIy96qEhLltz8weA1pwr27MlHoETe/YVfM7sLGWw=";
+    hash = "sha256-N7cn/kcyBmiaAhOIxGtLPGxQbPolhhhbSNUzHnpb7QM=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail setuptools==82.0.0 setuptools
+      --replace-fail setuptools==82.0.1 setuptools
   '';
 
   build-system = [ setuptools ];

pkgs/development/python-modules/ctranslate2/default.nix

@@ -67,10 +67,15 @@ buildPythonPackage rec {
     rm -rf ctranslate2
   '';
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # Fatal Python error: Aborted
-    "test_invalid_model_path"
-  ];
+  disabledTests =
+    lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+      # RuntimeError: Failed to initialize cpuinfo!"
+      "test_torch_variables"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Fatal Python error: Aborted
+      "test_invalid_model_path"
+    ];
 
   disabledTestPaths = [
     # TODO: ModuleNotFoundError: No module named 'opennmt'

pkgs/development/python-modules/hass-client/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "hass-client";
-  version = "1.2.0";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "python-hass-client";
     tag = version;
-    hash = "sha256-FA3acaXLWcBMDsabLPxVk6EArSxcTAnmFeO1ixTXB1Q=";
+    hash = "sha256-uCVwxa/KTiOmaexmdeynL2LSqBhDu8Zfre+Nh9Oauiw=";
   };
 
   postPatch = ''

pkgs/development/python-modules/pysilero-vad/default.nix

@@ -48,6 +48,7 @@ buildPythonPackage (finalAttrs: {
   '';
 
   meta = {
+    broken = stdenv.hostPlatform.isDarwin; # ld: unknown option: --disable-new-dtags
     description = "Pre-packaged voice activity detector using silero-vad";
     homepage = "https://github.com/rhasspy/pysilero-vad";
     changelog = "https://github.com/rhasspy/pysilero-vad/blob/${finalAttrs.src.tag}/CHANGELOG.md";

pkgs/development/python-modules/pysnooper/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
@@ -22,6 +23,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # timing-sensitive and often breaks on x86_64-darwin
+    "test_relative_time"
+  ];
+
   pythonImportsCheck = [ "pysnooper" ];
 
   meta = {

pkgs/development/python-modules/sqlalchemy-utc/default.nix

@@ -22,6 +22,8 @@ buildPythonPackage (finalAttrs: {
   patches = [
     # https://github.com/spoqa/sqlalchemy-utc/pull/20
     ./sqlalchemy2-compat.patch
+    # https://github.com/spoqa/sqlalchemy-utc/pull/21\
+    ./python314-compat.patch
   ];
 
   build-system = [

pkgs/development/python-modules/sqlalchemy-utc/python314-compat.patch

@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 2da8f43..1927e60 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,7 +34,7 @@ def get_version():
+             continue
+         target, = node.targets
+         if isinstance(target, ast.Name) and target.id == '__version__':
+-            return node.value.s
++            return node.value.value
+ 
+ 
+ install_requires = ['setuptools', 'SQLAlchemy >= 0.9.0']

pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/missing-hashes.json

@@ -0,0 +1,38 @@
+{
+  "@esbuild/aix-ppc64@npm:0.19.12": "0740fd9160dffa94e55cd58d2f9faf4624a2be68d2696376d5c60cfced508809275eac76315796a1aef8daf3b0975b0df0f2d94de10c14c3f40087b7c6eeb047",
+  "@esbuild/android-arm64@npm:0.19.12": "29d94e32a47af3ae1cc7c0364b00b3145db0b16539bd8d30356bb3a8769499867a7a3f1bc070f10a63cdb33c29752a43f3e4d4594a316e7d179e82bf12edf47c",
+  "@esbuild/android-arm@npm:0.19.12": "f6784506ff94332d1332536cfcabe54dacb6ddc0ce285cdc3d00bb30a71c5dc57b81e3552354c59fe992d6dbc0f66eb8040d18cba76d44ee9cd7b7ed2a3feece",
+  "@esbuild/android-x64@npm:0.19.12": "6253d60665402e38a080c101651c6e1617002b7aa53ed7a81f33d89fd5f99f37f11757bdd534faa3bf115dacf4723412a7cda532abdf0458bb478340772ba8d1",
+  "@esbuild/darwin-arm64@npm:0.19.12": "d934b758e8d6f7c69660f699a627963742a79dd5a917855c878700cc70eda3e629461e1fc69f8bb7242c15ec84f015e40f6877acd599604b784190514de4717f",
+  "@esbuild/darwin-x64@npm:0.19.12": "a436c4b3037a6a68c2b11fe487057c2cd4579363d94562d026a6d1a58eaf019c6ea94ba109e0b0a0597526fb6d2244d261fb7e6a18648f375ec90898b8bc14d6",
+  "@esbuild/freebsd-arm64@npm:0.19.12": "527060fd8bc2c9771d861a9a62935605e190dc17f454408fd87afc7d2fafe2a35cbca5cb171aaeab28cce187a21e5e2bfd607014e229360a8b4fa32438393203",
+  "@esbuild/freebsd-x64@npm:0.19.12": "b4d54892b0eec50f259fa6ab5527a5b4e48e1c68351d2c8febf60835bb5ac957564d2ab2ddf16ee66335b58a69ec367f48b125fb9646f8a39a11e1248c579501",
+  "@esbuild/linux-arm64@npm:0.19.12": "23dd17cd5b3f3d64726baa5632bd8079059ebf8419e3f9e82d900f8c781a7788980f6e6d1a604c1d84bd539f555227559f4916d52e2447a30f5886bbf1ed486c",
+  "@esbuild/linux-arm@npm:0.19.12": "76b9b411ba41320d57632347d1a09db7e745aec425db2cffe1c6467928c8d67bc122b544aa7fcbdca74a32262bfe0d48aa479931f6943bd84434389fada189a0",
+  "@esbuild/linux-ia32@npm:0.19.12": "be7a5294d9387fe09e154c5c771761291ce2278c2e04d36396f737736d185ab4a23d97830afaec67bb593549745ba9e240ac86b0ad4c0e0044e553c408105aed",
+  "@esbuild/linux-loong64@npm:0.19.12": "964386dd94bdd05383e6a8223a6af222a113bef78e4c8f7a77684c9c2e56c30d876c502ce4d28b4d91d21c402cdd491eb1e62bb72448c7077276c4714b299263",
+  "@esbuild/linux-mips64el@npm:0.19.12": "5608d554f1db3311315eb29780e312e66d106d41ad53fb3458e201fbbddda198836fc4ca04314f7ae4e61462214c92494928804abab0759a384adff773da40d0",
+  "@esbuild/linux-ppc64@npm:0.19.12": "7523a8c6b4b46324698b6aecfc661b369326099ebf72a36562ce69d8a6e2158cbe1d9af6d2588f130000c49875b719910df4b426885fcbac1065af590c1cd985",
+  "@esbuild/linux-riscv64@npm:0.19.12": "da7aedccce7377c1991a3bfce3767a41c2bd688a361ff5df9a16b56874d1bd198c4fa70ca15bd7234497ea5ff9a44ddbbece95733a1dbd9f43918b4bf27fb76c",
+  "@esbuild/linux-s390x@npm:0.19.12": "5f55ca2284c1cd1034a0bdf1ded7d38f43539f028fd58ec157f36fd89701f5fd0d0d45514b82c4199e3bd16049635a3a16c96a694f5a8d9c8a40429ad3e2172e",
+  "@esbuild/linux-x64@npm:0.19.12": "401ff8f1d6d5ae6ebdd0d8e24cef86ba1c3adc4fac2014033c8e690331495cb57922e31cdaa96619e2b190a5bfc88ae8b90b1cd3a59952969a29da418bda58b1",
+  "@esbuild/netbsd-x64@npm:0.19.12": "0e4b3ae706cb82356e20862ec0066e9eb61bc7f7bf3cc09da27a72fa5790a59f5256f4e2cd255aac6023a37036c8ad805d51498dbd56fe7d913711858d3c8ebc",
+  "@esbuild/openbsd-x64@npm:0.19.12": "f55049053a978c178bf1d7f4857af395afa9b7708410707eef8149f42adc3ed6d72088419cc17f75f1b7be4991ad28007fe298be84f95ca4e02d28bac1b518c7",
+  "@esbuild/sunos-x64@npm:0.19.12": "da944741c1d6c8d814633445f068b27cdff337f309513982125f633d7365154ba6073719ba4389e471479886841d0152f37426f5bd890b7a8c33b89b7f775c82",
+  "@esbuild/win32-arm64@npm:0.19.12": "c9e6922908588569a8cf396ab0c5230cd1634db77039cb635d83eb825eba64a4ac3e19f28917185495d9d7b043161bfbd4cd49eb7d3592b88cf4594d9d628d08",
+  "@esbuild/win32-ia32@npm:0.19.12": "71487cca9ac6cce6bf214be36e5c6aa1eaac49a2bcd538fafb6168fecbbe2624edf2a057be531b5393c4e2672b24bd316a872cc081df1d9c06e3a12704662675",
+  "@esbuild/win32-x64@npm:0.19.12": "33341d6ae7d0682fb679170c91efa3933fc58dfe3d2f95c19b9856db55af6c8af4785f3669f3de34907ab222b2a6a201a8557213bd37dcc8406593e9eddbaa3c",
+  "@rollup/rollup-android-arm-eabi@npm:4.12.0": "640cc66cd5a2183210340084ee32cf117e44b63f58ee50ca2717f240b2b6f83849f3c175c375e85950c7192ec6ab18e837804e86a83cc30bfc4d873c9acc8626",
+  "@rollup/rollup-android-arm64@npm:4.12.0": "ada400a44ac5f868528d5e9cbaf3e9aa1c9081edc329c025984a81974b4b60126bca6095a0a04c79017732276b56a21e77ebda6467978df2b947538ad153b7bc",
+  "@rollup/rollup-darwin-arm64@npm:4.12.0": "07b2bc6d30f1eaecf1e57671614860455034c9e36cd4b4ff0bbaf1f29fca53533853c377033d0571b6fb112221aae965c57dc5f956ba159289a94fcae092520c",
+  "@rollup/rollup-darwin-x64@npm:4.12.0": "6cd7429f62d198d5c340b1020acc6da116e724a2d8f320ea42a4ce46f705874e083c7941a149479ef42d6ca7d5f6ff1a4ac814b3526aa5c8816261ce2553ad71",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.12.0": "8230ef8bf5fe6fbc5becb3ca7f063bda37c6f2e06946888f25bbb8e7fcdb035982d584b858fd5ce17d8e2fa45b134ee9af10e50bd669a10a87abf65f7cb12505",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.12.0": "8b7cef65fa45f60ab341832c1739aa8d2c928f6fdbdcceb9c815a6260ae5b00f736d3fe9ad435885cc3a13a429a3226d602e319eb6f3bdc9c32cdbf2a48d9649",
+  "@rollup/rollup-linux-arm64-musl@npm:4.12.0": "5dd334993ff942c864acd4a9e3fc4f9720b94c2dda2b3aba1f57078142de7787d278d6efb8f6d334e97a8abf2d691c642513672faa78a0861b3cdde435e7b705",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.12.0": "6fb56fc75f5df2c9dfde59a4e1aa5744f31b265af1c283bc7d17a61c30e6527ba91fd09d0e77de8247b8ef93a21f5021af2835ba37f13acfda7815ca216dad96",
+  "@rollup/rollup-linux-x64-gnu@npm:4.12.0": "53519406cf62f02b65d2b7783675d7797ef13a9f2b1a15c9fecaccf654ebca374a6ab82051952a9efed64c7a704d908c1e5e6eb045351fd20c2ff05281f3d126",
+  "@rollup/rollup-linux-x64-musl@npm:4.12.0": "a5b79ae17930fc37b875e869ee5dd4db20b318da177e51e32cb31d0f11a365e350750fa35997de84123de4d4a27a6fa3f3f95ee2021161762ade51b673c702c5",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.12.0": "b9b0498a30a31e598b1342d5fa25d2540e695fb9b275bcdeef85add12b625166004afa575dfe8679f913e622d57f51f65b900159ce6eca5031adc2c25cbd625d",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.12.0": "f8e3d0e5c24b0390509b900fd4a082f04cf97143398a81a69c8d8db5ad1db138b8cad6491fad2f095256f526153a0ac4320f8aad8aa988d73c4c6a85637f4f41",
+  "@rollup/rollup-win32-x64-msvc@npm:4.12.0": "c881e1441f3e76db0c1fc0172150155559a08714a3342c1bbee3db3aab12f081dfb3d2ae05490e45bf296069d0165c25bd121d032da57b6f588da6e8bb19a079"
+}

pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix

@@ -1,35 +1,57 @@
 {
   lib,
   stdenv,
-  fetchzip,
+  fetchFromGitHub,
+  gitMinimal,
+  yarn-berry_4,
+  nodejs,
+  npmHooks,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "advanced-camera-card";
   version = "7.27.4";
 
-  src = fetchzip {
-    url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-lBdJBn/TLU3ezZnUJLt4eH87n1pOizS68RfLHYyRUq0=";
+  src = fetchFromGitHub {
+    owner = "dermotduffy";
+    repo = "advanced-camera-card";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GHSyDdKGgPPMbcPIqlQbRA0V8gPd1YsId8gqPF0VgTs=";
+    leaveDotGit = true; # gitInfo plugin
   };
 
-  # TODO: build from source once yarn berry support lands in nixpkgs
-  dontBuild = true;
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    name = "${finalAttrs.pname}-yarn-deps";
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-N5GL9//CS33ntGu8v6i9+S38BDsXDD7HvOask1JflJ8=";
+  };
+
+  nativeBuildInputs = [
+    gitMinimal
+    nodejs
+    npmHooks.npmBuildHook
+    yarn-berry_4
+    yarn-berry_4.yarnBerryConfigHook
+  ];
+
+  npmBuildScript = "build";
 
   installPhase = ''
     runHook preInstall
 
-    install -d $out
-    install -m0644 *.js $out/
+    mkdir $out
+    cp -rv dist/* $out/
 
     runHook postInstall
   '';
 
   meta = {
-    changelog = "https://github.com/dermotduffy/advanced-camera-card/releases/tag/v${version}";
+    changelog = "https://github.com/dermotduffy/advanced-camera-card/releases/tag/${finalAttrs.src.tag}";
     description = "Comprehensive camera card for Home Assistant";
     homepage = "https://github.com/dermotduffy/advanced-camera-card";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hexa ];
   };
-}
+})

pkgs/test/check-by-name/pinned-version.txt

@@ -1 +0,0 @@
-0.1.2

pkgs/top-level/aliases.nix

@@ -1644,6 +1644,7 @@ mapAliases {
   powwow = throw "'powwow' has been removed, since it's unmaintained since 2021 and doesn't build with glibc 2.42"; # Added 2025-09-28
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
   preload = throw "'preload' has been removed due to lack of usage and being broken since its introduction into nixpkgs"; # Added 2025-11-29
+  premid = throw "'premid' has been removed, as it has been archived upstream since July 2024. Consider using the browser extension instead."; # Added 2026-04-04
   presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2025-06-19
   preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   primusLib = warnAlias "'primusLib' has been renamed to 'primus-lib'" primus-lib; # Added 2026-02-12