Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -2503,6 +2503,12 @@
     matrix = "@cawilliamson:nixos.dev";
     name = "Christopher A. Williamson";
   };
+  cbleslie = {
+    email = "[email protected]";
+    github = "cbleslie";
+    githubId = 500963;
+    name = "C.B.Leslie";
+  };
   cbley = {
     email = "[email protected]";
     github = "avdv";
@@ -11297,6 +11303,15 @@
     githubId = 111265;
     name = "Ozan Sener";
   };
+  ostrolucky = {
+    email = "[email protected]";
+    github = "ostrolucky";
+    githubId = 496233;
+    name = "Gabriel Ostrolucký";
+    keys = [{
+      fingerprint = "6611 22A7 B778 6E4A E99A  9D6E C79A D015 19EF B134";
+    }];
+  };
   otavio = {
     email = "[email protected]";
     github = "otavio";

nixos/modules/installer/tools/nixos-generate-config.pl

@@ -127,9 +127,6 @@ sub cpuManufacturer {
 push @kernelModules, "kvm-intel" if hasCPUFeature "vmx";
 push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
 
-push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD";
-push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel";
-
 
 # Look at the PCI devices and add necessary modules.  Note that most
 # modules are auto-detected so we don't need to list them here.
@@ -324,11 +321,15 @@ sub usbCheck {
 }
 
 
-# Provide firmware for devices that are not detected by this script,
-# unless we're in a VM/container.
-push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")"
-    if $virt eq "none";
+# Check if we're on bare metal, not in a VM/container.
+if ($virt eq "none") {
+    # Provide firmware for devices that are not detected by this script.
+    push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")";
 
+    # Update the microcode.
+    push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD";
+    push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel";
+}
 
 # For a device name like /dev/sda1, find a more stable path like
 # /dev/disk/by-uuid/X or /dev/disk/by-label/Y.

nixos/modules/programs/atop.nix

@@ -151,6 +151,8 @@ in
                   if ! ${pkgs.diffutils}/bin/cmp -s "$logfile" "$logfile".new
                   then
                     ${pkgs.coreutils}/bin/mv -v -f "$logfile".new "$logfile"
+                  else
+                    ${pkgs.coreutils}/bin/rm -f "$logfile".new
                   fi
                 done
               '';

nixos/modules/services/monitoring/grafana.nix

@@ -1300,7 +1300,7 @@ in {
         SystemCallFilter = [
           "@system-service"
           "~@privileged"
-        ] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ];
+        ] ++ lib.optionals (cfg.settings.server.protocol == "socket") [ "@chown" ];
         UMask = "0027";
       };
       preStart = ''

nixos/modules/services/monitoring/prometheus/default.nix

@@ -31,7 +31,7 @@ let
     if checkConfigEnabled then
       pkgs.runCommandLocal
         "${name}-${replaceStrings [" "] [""] what}-checked"
-        { buildInputs = [ cfg.package ]; } ''
+        { buildInputs = [ cfg.package.cli ]; } ''
         ln -s ${file} $out
         promtool ${what} $out
       '' else file;

nixos/tests/garage/default.nix

@@ -49,5 +49,5 @@ in
   })
   {}
   [
-    "0_8_0"
+    "0_8"
   ]

pkgs/applications/audio/easyeffects/default.nix

@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     rev = "v${version}";
-    sha256 = "sha256-SjhJj5kClPd8DT1vzbSdqJ9AJw0XiX9Q8/R8SDnxGPQ=";
+    sha256 = "sha256-PI29TJSYa/dARlSHe4mO4ejV+muhGFhwVvhA10jziTA=";
   };
 
   nativeBuildInputs = [

pkgs/applications/audio/musikcube/default.nix

@@ -70,17 +70,17 @@ stdenv.mkDerivation rec {
     Cocoa SystemConfiguration
   ] ++ lib.optionals coreaudioSupport [
     CoreAudio
-  ] ++ lib.optional sndioSupport [
+  ] ++ lib.optionals sndioSupport [
     sndio
-  ] ++ lib.optional pipewireSupport [
+  ] ++ lib.optionals pipewireSupport [
     pipewire
   ];
 
   cmakeFlags = [
     "-DDISABLE_STRIP=true"
   ];
 
-  postFixup = lib.optionals stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}
     install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d
   '';

pkgs/applications/editors/l3afpad/default.nix

@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA=";
   };
 
-  nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
-  buildInputs = [ intltool gtk3 ];
+  nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ];
+  buildInputs = [ gtk3 ];
 
   meta = with lib; {
     description = "Simple text editor forked from Leafpad using GTK+ 3.x";

pkgs/applications/editors/vim/plugins/generated.nix

@@ -7475,6 +7475,18 @@ final: prev:
     meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/";
   };
 
+  searchbox-nvim = buildVimPluginFrom2Nix {
+    pname = "searchbox-nvim";
+    version = "2022-11-01";
+    src = fetchFromGitHub {
+      owner = "VonHeikemen";
+      repo = "searchbox.nvim";
+      rev = "110949af8963185b4e732b45ae57beb731bfcede";
+      hash = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU=";
+    };
+    meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim";
+  };
+
   securemodelines = buildVimPluginFrom2Nix {
     pname = "securemodelines";
     version = "2019-02-09";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -628,6 +628,7 @@ https://github.com/lewis6991/satellite.nvim/,HEAD,
 https://github.com/tiagovla/scope.nvim/,HEAD,
 https://github.com/Xuyuanp/scrollbar.nvim/,,
 https://github.com/cakebaker/scss-syntax.vim/,,
+https://github.com/VonHeikemen/searchbox.nvim/,,
 https://github.com/RobertAudi/securemodelines/,,
 https://github.com/megaannum/self/,,
 https://github.com/jaxbot/semantic-highlight.vim/,,

pkgs/applications/editors/vscode/vscode.nix

@@ -18,17 +18,17 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "00n7mykr8dyn9chiwsp0s8pk53c39by4wl0hyx1inb0zqxaszw25";
-    x86_64-darwin = "1q41x23jbpisbwcxgmx18g0bcdsj5g1w3pbj9m6mxlssvbc2xiw6";
-    aarch64-linux = "1kaj8g50m8imk34whf6sq41a2b1751mjqxvpwnprlx0i7xj2l832";
-    aarch64-darwin = "1h6plmyv3xkkbpwka5rrkc1bdrgj9d8jp0q6qyhch368x8mp781m";
-    armv7l-linux = "0q46nzhn8agsif9s50dbdbx6ds3ll39yp5lrp9n7y9a26m4cwjmv";
+    x86_64-linux = "0dqwjc606z8qizg9hcfjlpq92hmaxh3a09368ffz7irl5sgwp300";
+    x86_64-darwin = "00795gr9dmshz6sfgsp70fii6m76fqdmqskwkdwqwxddl0i07sw5";
+    aarch64-linux = "04ckk6l9ym1igaqk1zfyy4zx05yryi641lc0i1l38k3mbv1k3gvw";
+    aarch64-darwin = "16z96h8s9irgb17gy6ng3r6cbiwrxa7q7qazqamnmgvvahg08kvj";
+    armv7l-linux = "042ihy4bg39y4m2djkqcx099w9710ikprbw3z7gh1gqvj3qyxy6i";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.76.0";
+    version = "1.76.1";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";

pkgs/applications/editors/vscode/vscodium.nix

@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "11w2gzhp0vlpygk93cksxhkimc9y8w862gn9450xkzi1jsps5lj4";
-    x86_64-darwin = "0ya17adx2vbi800ws5sfqq03lrjjk6kbclrfrc2zfij2ha05xl8z";
-    aarch64-linux = "15kzjs1ha5x2hcq28nkbb0rim1v694jj6p9sz226rai3bmq9airg";
-    aarch64-darwin = "1cggppblr42jzpcz3g8052w5y1b9392iizpvg6y7001kw66ndp3n";
-    armv7l-linux = "01qqhhl5ffvba1pk4jj3q7sbahq7cvy81wvmgng1cmaj5b8m8dgp";
+    x86_64-linux = "0q3wp1n67f8w0j35saf4mlnsfd2481f9yl28428vycq32m10q96k";
+    x86_64-darwin = "1820a01a97vvv1d2553czv1g2z7mg3f6l8i8168g63zvvnad0f1c";
+    aarch64-linux = "03gzfp5n6z6dzinsnwpvmmlj0lqa53152a4mylaj1rg540jv2xh7";
+    aarch64-darwin = "0mbwavi3palh353i19an94hr6xs0i5bxqcvkmr5qv3xvpwlaandl";
+    armv7l-linux = "0wpnjd9fqlnv360q6061kmi1z699kd4q9igdczp8gwqyz2x4d3yz";
   }.${system} or throwSystem;
 
   sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.76.0.23062";
+    version = "1.76.1.23069";
     pname = "vscodium";
 
     executableName = "codium";

pkgs/applications/emulators/c64-debugger/default.nix

@@ -26,13 +26,13 @@ stdenv.mkDerivation {
     gtk3
     libGL
     libGLU
-    pkg-config
     libX11
     xcbutil
   ];
 
   nativeBuildInputs = [
     upx
+    pkg-config
   ];
 
   postPatch = ''

pkgs/applications/emulators/wine/base.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, pkgArches, callPackage, makeSetupHook,
   pname, version, src, mingwGccs, monos, geckos, platforms,
   bison, flex, fontforge, makeWrapper, pkg-config,
-  autoconf, hexdump, perl, nixosTests,
+  nixosTests,
   supportFlags,
   patches,
   moltenvk,
@@ -54,11 +54,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
     fontforge
     makeWrapper
     pkg-config
-
-    # Required by staging
-    autoconf
-    hexdump
-    perl
   ]
   ++ lib.optionals supportFlags.mingwSupport (mingwGccs
     ++ lib.optional stdenv.isDarwin setupHookDarwin);

pkgs/applications/emulators/wine/sources.nix

@@ -73,9 +73,9 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "8.1";
+    version = "8.3";
     url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz";
-    hash = "sha256-QSDuaz8pTZeq8scwNM8cLL8ToZXJTFx0pkaoH5JBJZg=";
+    hash = "sha256-QQJpAAKSw7+t0lYf3eBtm8sryVi0mwPpY/FBd6J2MfA=";
     inherit (stable) gecko32 gecko64 patches;
 
     mono = fetchurl rec {
@@ -105,15 +105,15 @@ in rec {
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    hash = "sha256-5AzXXaRGyvfYxd3yXtAlZREv1wp6UqWdDRdnwmKVaUg=";
+    hash = "sha256-b49WFyiEbkJFUp1n9rz+A1c6iseSfV+5DrpA6AwKa+4=";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
 
     disabledPatchsets = [ ];
   };
 
-  wayland = fetchFromGitLab rec {
+  wayland = fetchFromGitLab {
     # https://gitlab.collabora.com/alf/wine/-/tree/wayland
     version = "8.0";
     hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk=";

pkgs/applications/emulators/wine/staging.nix

@@ -1,4 +1,4 @@
-{ lib, callPackage, wineUnstable }:
+{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
 
 with callPackage ./util.nix {};
 
@@ -9,17 +9,16 @@ in assert lib.getVersion wineUnstable == patch.version;
 
 (lib.overrideDerivation wineUnstable (self: {
   buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
+  nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
 
   name = "${self.name}-staging";
 
   prePatch = self.prePatch or "" + ''
     patchShebangs tools
-    cp -r ${patch}/patches .
+    cp -r ${patch}/patches ${patch}/staging .
     chmod +w patches
-    cd patches
-    patchShebangs gitapply.sh
-    ./patchinstall.sh DESTDIR="$PWD/.." --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
-    cd ..
+    patchShebangs ./patches/gitapply.sh
+    python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
   '';
 })) // {
   meta = wineUnstable.meta // {

pkgs/applications/file-managers/lf/ctpv.nix

@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = with pkgs; [
     ffmpegthumbnailer ffmpeg
-  ] ++ lib.optional waylandSupport [ chafa ]
-    ++ lib.optional x11Support [ ueberzug ];
+  ] ++ lib.optionals waylandSupport [ chafa ]
+    ++ lib.optionals x11Support [ ueberzug ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 

pkgs/applications/misc/citations/default.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview5
     libadwaita
     poppler
-  ] ++ lib.optional stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Foundation
   ];
 

pkgs/applications/misc/confy/default.nix

@@ -0,0 +1,57 @@
+{ appstream-glib
+, desktop-file-utils
+, fetchurl
+, gobject-introspection
+, gtk3
+, lib
+, libnotify
+, libhandy
+, meson
+, ninja
+, pkg-config
+, python3
+, stdenv
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "confy";
+  version = "0.6.4";
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~fabrixxm/confy/archive/${version}.tar.gz";
+    sha256 = "0v74pdyihj7r9gb3k2rkvbphan27ajlvycscd8xzrnsv74lcmbpm";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gobject-introspection
+    gtk3
+    libhandy
+    libnotify
+    (python3.withPackages (ps: with ps; [
+      icalendar
+      pygobject3
+    ]))
+  ];
+
+  postPatch = ''
+    # Remove executable bits so that meson runs the script with our Python interpreter
+    chmod -x build-aux/meson/postinstall.py
+  '';
+
+  meta = with lib; {
+    description = "Conferences schedule viewer";
+    homepage = "https://confy.kirgroup.net/";
+    changelog = "https://git.sr.ht/~fabrixxm/confy/refs/${version}";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ michaelgrahamevans ];
+  };
+}