Merge master into staging-next

maintainers/maintainer-list.nix

@@ -15953,6 +15953,12 @@
     githubId = 34967;
     name = "Julius de Bruijn";
   };
+  pinage404 = {
+    email = "[email protected]";
+    github = "pinage404";
+    githubId = 6325757;
+    name = "pinage404";
+  };
   pineapplehunter = {
     email = "[email protected]";
     github = "pineapplehunter";

maintainers/team-list.nix

@@ -749,7 +749,10 @@ with lib.maintainers;
   };
 
   openstack = {
-    members = [ SuperSandro2000 ];
+    members = [
+      SuperSandro2000
+      anthonyroussel
+    ];
     scope = "Maintain the ecosystem around OpenStack";
     shortName = "OpenStack";
   };

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -140,6 +140,8 @@
   Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
   and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
 
+- `tests.overriding` has its `passthru.tests` restructured as an attribute set instead of a list, making individual tests accessible by their names.
+
 - `vaultwarden` lost the capability to bind to privileged ports. If you rely on
    this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in
    your local configuration.

nixos/modules/module-list.nix

@@ -1244,6 +1244,7 @@
   ./services/networking/websockify.nix
   ./services/networking/wg-access-server.nix
   ./services/networking/wg-netmanager.nix
+  ./services/networking/wvdial.nix
   ./services/networking/webhook.nix
   ./services/networking/wg-quick.nix
   ./services/networking/wgautomesh.nix

nixos/modules/services/networking/wvdial.nix

@@ -0,0 +1,47 @@
+# Global configuration for wvdial.
+
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.environment.wvdial;
+in
+{
+  options = {
+    environment.wvdial = {
+      dialerDefaults = lib.mkOption {
+        default = "";
+        type = lib.types.str;
+        example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
+        description = ''
+          Contents of the "Dialer Defaults" section of
+          <filename>/etc/wvdial.conf</filename>.
+        '';
+      };
+      pppDefaults = lib.mkOption {
+        default = ''
+          noipdefault
+          usepeerdns
+          defaultroute
+          persist
+          noauth
+        '';
+        type = lib.types.str;
+        description = "Default ppp settings for wvdial.";
+      };
+    };
+  };
+
+  config = lib.mkIf (cfg.dialerDefaults != "") {
+    environment.etc."wvdial.conf".source = pkgs.writeText "wvdial.conf" ''
+      [Dialer Defaults]
+      PPPD PATH = ${pkgs.ppp}/sbin/pppd
+      ${config.environment.wvdial.dialerDefaults}
+    '';
+    environment.etc."ppp/peers/wvdial".source = pkgs.writeText "wvdial" cfg.pppDefaults;
+  };
+}

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

@@ -21,6 +21,7 @@
 , pulseaudio
 , vulkan-loader
 , wrapGAppsHook3
+, xcb-imdkit
 , xdg-utils
 , xorg
 , zlib
@@ -68,6 +69,7 @@ stdenv.mkDerivation rec {
     pulseaudio
     stdenv.cc.cc.lib
     vulkan-loader
+    xcb-imdkit
     xcbutil
     xcbutilwm
     zlib
@@ -80,6 +82,11 @@ stdenv.mkDerivation rec {
     cp -r opt/bitwig-studio $out/libexec
     ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
     cp -r usr/share $out/share
+
+    # Bitwig includes a copy of libxcb-imdkit.
+    # Removing it will force it to use our version.
+    rm $out/libexec/lib/bitwig-studio/libxcb-imdkit.so.1
+
     substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
       $out/share/applications/com.bitwig.BitwigStudio.desktop \
       --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio

pkgs/applications/audio/lingot/default.nix

@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.nongnu.org/lingot/";
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
   };
 }

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

@@ -4,111 +4,33 @@ self:
 let
   inherit (self) callPackage;
 in
-{
+lib.packagesFromDirectoryRecursive {
+  inherit callPackage;
+  directory = ./manual-packages;
+}
+// {
   inherit (pkgs) emacspeak;
 
-  acm = callPackage ./manual-packages/acm { };
-
-  acm-terminal = callPackage ./manual-packages/acm-terminal { };
-
-  agda2-mode = callPackage ./manual-packages/agda2-mode { };
-
-  cask = callPackage ./manual-packages/cask { };
-
   codeium = callPackage ./manual-packages/codeium {
     inherit (pkgs) codeium;
   };
 
-  consult-gh = callPackage ./manual-packages/consult-gh { };
-
-  control-lock = callPackage ./manual-packages/control-lock { };
-
-  copilot = callPackage ./manual-packages/copilot { };
-
-  ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
-
-  el-easydraw = callPackage ./manual-packages/el-easydraw { };
-
-  elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
-
-  emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
-
-  evil-markdown = callPackage ./manual-packages/evil-markdown { };
-
-  font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
-
-  git-undo = callPackage ./manual-packages/git-undo { };
-
-  grid = callPackage ./manual-packages/grid { };
-
-  helm-words = callPackage ./manual-packages/helm-words { };
-
-  icicles = callPackage ./manual-packages/icicles { };
-
-  idris2-mode = callPackage ./manual-packages/idris2-mode { };
-
-  isearch-plus = callPackage ./manual-packages/isearch-plus { };
-
-  isearch-prop = callPackage ./manual-packages/isearch-prop { };
-
-  jam-mode = callPackage ./manual-packages/jam-mode { };
-
-  ligo-mode = callPackage ./manual-packages/ligo-mode { };
-
-  llvm-mode = callPackage ./manual-packages/llvm-mode { };
-
   lsp-bridge = callPackage ./manual-packages/lsp-bridge {
     inherit (pkgs) basedpyright git go gopls python3;
   };
 
-  lspce = callPackage ./manual-packages/lspce { };
-
   matrix-client = callPackage ./manual-packages/matrix-client {
     _map = self.map;
   };
 
-  mu4e = callPackage ./manual-packages/mu4e { };
-
-  notdeft = callPackage ./manual-packages/notdeft { };
-
-  ott-mode = callPackage ./manual-packages/ott-mode { };
-
-  pod-mode = callPackage ./manual-packages/pod-mode { };
-
-  prisma-mode = callPackage ./manual-packages/prisma-mode { };
-
   structured-haskell-mode = self.shm;
 
-  sv-kalender = callPackage ./manual-packages/sv-kalender { };
-
   texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
 
   tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };
 
-  treesit-grammars = callPackage ./manual-packages/treesit-grammars { };
-
-  tsc = callPackage ./manual-packages/tsc { };
-
-  urweb-mode = callPackage ./manual-packages/urweb-mode { };
-
-  voicemacs = callPackage ./manual-packages/voicemacs { };
-
-  wat-mode = callPackage ./manual-packages/wat-mode { };
-
-  xapian-lite = callPackage ./manual-packages/xapian-lite { };
-
-  yes-no = callPackage ./manual-packages/yes-no { };
-
-  youtube-dl = callPackage ./manual-packages/youtube-dl { };
-
   # From old emacsPackages (pre emacsPackagesNg)
   cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; };
-  color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { };
-  hsc3-mode = callPackage ./manual-packages/hsc3 { };
-  prolog-mode = callPackage ./manual-packages/prolog { };
-  rect-mark = callPackage ./manual-packages/rect-mark { };
-  session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { };
-  sunrise-commander = callPackage ./manual-packages/sunrise-commander { };
 
   # camelCase aliases for some of the kebab-case expressions above
   colorThemeSolarized = self.color-theme-solarized;

pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix

@@ -3,27 +3,32 @@ let
 
   emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let
 
-    promise = epkgs.trivialBuild {
+    promise = epkgs.melpaBuild {
       pname = "promise";
-      version = "1";
+      version = "0-unstable-2019-06-07";
+
       src = pkgs.fetchFromGitHub {
         owner = "bendlas";
         repo = "emacs-promise";
         rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022";
-        sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy";
+        hash = "sha256-XsvPsA/lUzPWyJAdJg9XtD/vLDtk7guG7p+8ZOQ8Nno=";
       };
+
+      packageRequires = [ epkgs.async ];
     };
 
-    semaphore = epkgs.trivialBuild {
+    semaphore = epkgs.melpaBuild {
       pname = "semaphore";
-      version = "1";
-      packageRequires = [ promise ];
+      version = "0-unstable-2019-06-07";
+
       src = pkgs.fetchFromGitHub {
         owner = "webnf";
         repo = "semaphore.el";
         rev = "93802cb093073bc6a6ccd797328dafffcef248e0";
-        sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853";
+        hash = "sha256-o6B5oaGGxwQOCoTIXrQre4veT6Mwqw7I2LqMesT17iY=";
       };
+
+      packageRequires = [ promise ];
     };
 
   in [ promise semaphore ]);

pkgs/applications/editors/vscode/extensions/default.nix

@@ -1782,8 +1782,8 @@ let
         mktplcRef = {
           name = "dependi";
           publisher = "fill-labs";
-          version = "0.7.4";
-          hash = "sha256-6nU0bVAe/vwq43ECLwypIkMAG/q5+P2bE1RPAjeTCX4=";
+          version = "0.7.5";
+          hash = "sha256-troydfNj88c8A24ZtaCToE231VWzcCiQVLTSdVPM/XE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog";

pkgs/applications/graphics/comical/default.nix

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "Viewer of CBR and CBZ files, often used to store scanned comics";
     homepage = "https://comical.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric wegank ];
+    maintainers = with lib.maintainers; [ wegank ];
     platforms = with lib.platforms; unix;
     mainProgram = "comical";
   };

pkgs/applications/graphics/feh/default.nix

@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     # released under a variant of the MIT license
     # https://spdx.org/licenses/MIT-feh.html
     license = licenses.mit-feh;
-    maintainers = with maintainers; [ gepbird globin viric willibutz ];
+    maintainers = with maintainers; [ gepbird globin willibutz ];
     platforms = platforms.unix;
     mainProgram = "feh";
   };

pkgs/applications/graphics/meshlab/default.nix

@@ -95,7 +95,7 @@ mkDerivation rec {
     mainProgram = "meshlab";
     homepage = "https://www.meshlab.net/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/graphics/minidjvu/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://djvu.sourceforge.net/djview4.html";
     description = "Black-and-white djvu page encoder and decoder that use interpage information";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "minidjvu";
   };

pkgs/applications/graphics/tesseract/tesseract3.nix

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "OCR engine";
     homepage = "https://github.com/tesseract-ocr/tesseract";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ viric erikarvstedt ];
+    maintainers = with lib.maintainers; [ erikarvstedt ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "tesseract";
   };

pkgs/applications/graphics/tesseract/tesseract4.nix

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "OCR engine";
     homepage = "https://github.com/tesseract-ocr/tesseract";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ viric erikarvstedt ];
+    maintainers = with lib.maintainers; [ erikarvstedt ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "tesseract";
   };

pkgs/applications/graphics/wings/default.nix

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.wings3d.com/";
     description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
     license = lib.licenses.tcltk;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "wings";
   };

pkgs/applications/misc/librecad/default.nix

@@ -72,7 +72,7 @@ mkDerivation rec {
     description = "2D CAD package based on Qt";
     homepage = "https://librecad.org";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/misc/tuckr/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tuckr";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
     rev = version;
-    hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA=";
+    hash = "sha256-cIyqka/+CrO9RuKr7tI79QvpPA0mDL/YzWWWrcwin8E=";
   };
 
-  cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y=";
+  cargoHash = "sha256-5Z7UpkLlNMW8prtdJO+Xr45fpacjhDBoD/RFv/H44t0=";
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 

pkgs/applications/misc/xfontsel/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Allows testing the fonts available in an X server";
     mainProgram = "xfontsel";
     license = with licenses; [ x11 smlnj mit ];
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }