Merge master into staging-next

maintainers/maintainer-list.nix

@@ -15953,6 +15953,12 @@
     githubId = 34967;
     name = "Julius de Bruijn";
   };
+  pinage404 = {
+    email = "pinage404+nixpkgs@gmail.com";
+    github = "pinage404";
+    githubId = 6325757;
+    name = "pinage404";
+  };
   pineapplehunter = {
     email = "peshogo+nixpkgs@gmail.com";
     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;
   };
 }

pkgs/applications/networking/browsers/chromium/common.nix

@@ -388,6 +388,10 @@ let
       find . -type f -perm -0100 -exec sed -i -e '$a\' {} +
 
       patchShebangs .
+    '' + lib.optionalString (ungoogled) ''
+      # Prune binaries (ungoogled only) *before* linking our own binaries:
+      ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
+    '' + ''
       # Link to our own Node.js and Java (required during the build):
       mkdir -p third_party/node/linux/node-linux-x64/bin
       ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
@@ -400,7 +404,6 @@ let
       substituteInPlace build/toolchain/linux/BUILD.gn \
         --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
     '' + lib.optionalString ungoogled ''
-      ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
       ${ungoogler}/utils/patches.py . ${ungoogler}/patches
       ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
     '';

pkgs/applications/networking/browsers/chromium/upstream-info.nix

@@ -21,17 +21,17 @@
   ungoogled-chromium = {
     deps = {
       gn = {
-        hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=";
-        rev = "df98b86690c83b81aedc909ded18857296406159";
+        hash = "sha256-vzZu/Mo4/xATSD9KgKcRuBKVg9CoRZC9i0PEajYr4UM=";
+        rev = "b3a0bff47dd81073bfe67a402971bad92e4f2423";
         url = "https://gn.googlesource.com/gn";
-        version = "2024-05-13";
+        version = "2024-06-06";
       };
       ungoogled-patches = {
-        hash = "sha256-jDWL4gXcWF6GMlFJ/sua4dfVURs9vWYXRMjnYNqESWc=";
-        rev = "126.0.6478.182-1";
+        hash = "sha256-IBdOV+eFJWD+kCxnhSWWjiBgMbP/DxF+gUVIIpWf4rc=";
+        rev = "127.0.6533.72-1";
       };
     };
-    hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4=";
-    version = "126.0.6478.182";
+    hash = "sha256-m99HaGCuIihDdbVnmu6xatnC/QDxgLVby2TWY/L+RHk=";
+    version = "127.0.6533.72";
   };
 }

pkgs/applications/networking/circumflex/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "circumflex";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
     rev = version;
-    hash = "sha256-FzJUmF2X4Iyf83cIEa8b8EFCcWUyYEZBVyvXuhiaaWM=";
+    hash = "sha256-jjtjOT8lFPsk300Q9EtsX/w8Bck0pwrS/GyouoBsZ+0=";
   };
 
-  vendorHash = "sha256-x/NgcodS/hirXJHxBHeUP9MgOBHq1yQWHprMrlpqsas=";
+  vendorHash = "sha256-Nlv8H5YqHrqACW2kEXg+mkc3bCgXVudrSNfyu+xeFBA=";
 
   nativeBuildInputs = [ makeWrapper ];
 

pkgs/applications/networking/cluster/linkerd/edge.nix

@@ -2,7 +2,7 @@
 
 (callPackage ./generic.nix { }) {
   channel = "edge";
-  version = "24.7.2";
-  sha256 = "1kl1ik1w0j3m0qlfbdagzjgd67kabx358xaa2rn0clg8jk43nk3n";
-  vendorHash = "sha256-/dYLPoPg3Oac4W1eLytJJiP7kzK4PTSjh8BRKjJAnU0=";
+  version = "24.7.5";
+  sha256 = "03hsz87vpysw4y45afsbr3amkrqnank1zcclfh6qj0yf98ymxxbn";
+  vendorHash = "sha256-0NKoQICbKM3UA62LNySqu5pS2bPuuEfmOEukxB/6Ges=";
 }

pkgs/applications/networking/instant-messengers/silc-client/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Secure Internet Live Conferencing server";
     mainProgram = "silc";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/networking/irc/irssi/fish/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/falsovsky/FiSH-irssi";
     license = licenses.mit;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }

pkgs/applications/networking/offrss/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss";
     description = "Offline RSS/Atom reader";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "offrss";
   };

pkgs/applications/networking/siproxd/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "http://siproxd.sourceforge.net/";
     description = "Masquerading SIP Proxy Server";
     mainProgram = "siproxd";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     license = lib.licenses.gpl2Plus;
   };

pkgs/applications/office/mmex/default.nix

@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     description = "Easy-to-use personal finance software";
     homepage = "https://www.moneymanagerex.org/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
     mainProgram = "mmex";
   };

pkgs/applications/science/electronics/caneda/default.nix

@@ -19,7 +19,7 @@ mkDerivation rec {
     mainProgram = "caneda";
     homepage = "http://caneda.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/science/electronics/xoscope/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     mainProgram = "xoscope";
     homepage = "https://xoscope.sourceforge.net";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/science/math/yacas/default.nix

@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
     homepage = "http://www.yacas.org/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }

pkgs/applications/search/doodle/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = "https://grothoff.org/christian/doodle/";
     description = "Tool to quickly index and search documents on a computer";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "doodle";
   };

pkgs/applications/version-management/fossil/default.nix

@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://www.fossil-scm.org/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ maggesi viric ];
+    maintainers = with maintainers; [ maggesi ];
     platforms = platforms.all;
     mainProgram = "fossil";
   };

pkgs/applications/version-management/rapidsvn/default.nix

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Multi-platform GUI front-end for the Subversion revision system";
     homepage = "http://rapidsvn.tigris.org/";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "rapidsvn";
   };

pkgs/applications/window-managers/dwm/default.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       tags.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ viric neonfuz ];
+    maintainers = with maintainers; [ neonfuz ];
     platforms = platforms.all;
     mainProgram = "dwm";
   };

pkgs/by-name/an/ananicy-cpp/package.nix

@@ -1,27 +1,29 @@
-{ lib
-, clangStdenv
-, fetchFromGitLab
-, fetchpatch
-, cmake
-, pkg-config
-, spdlog
-, nlohmann_json
-, systemd
-, libbpf
-, elfutils
-, bpftools
-, pcre2
-, zlib
+{
+  lib,
+  clangStdenv,
+  fetchFromGitLab,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  spdlog,
+  nlohmann_json,
+  systemd,
+  libbpf,
+  elfutils,
+  bpftools,
+  pcre2,
+  zlib,
+  withBpf ? true,
 }:
 
-clangStdenv.mkDerivation rec {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "ananicy-cpp";
   version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ananicy-cpp";
     repo = "ananicy-cpp";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
   };
@@ -41,6 +43,7 @@ clangStdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+  ] ++ lib.optionals withBpf [
     bpftools
   ];
 
@@ -49,23 +52,29 @@ clangStdenv.mkDerivation rec {
     spdlog
     nlohmann_json
     systemd
+    zlib
+  ] ++ lib.optionals withBpf [
     libbpf
     elfutils
-    zlib
   ];
 
   # BPF A call to built-in function '__stack_chk_fail' is not supported.
-  hardeningDisable = [ "stackprotector" "zerocallusedregs" ];
+  hardeningDisable = [
+    "stackprotector"
+    "zerocallusedregs"
+  ];
 
   cmakeFlags = [
-    "-DUSE_EXTERNAL_JSON=ON"
-    "-DUSE_EXTERNAL_SPDLOG=ON"
-    "-DUSE_EXTERNAL_FMTLIB=ON"
-    "-DUSE_BPF_PROC_IMPL=ON"
-    "-DBPF_BUILD_LIBBPF=OFF"
-    "-DENABLE_SYSTEMD=ON"
-    "-DENABLE_REGEX_SUPPORT=ON"
-    "-DVERSION=${version}"
+    (lib.mapAttrsToList lib.cmakeBool {
+      "USE_EXTERNAL_JSON" = true;
+      "USE_EXTERNAL_SPDLOG" = true;
+      "USE_EXTERNAL_FMTLIB" = true;
+      "USE_BPF_PROC_IMPL" = withBpf;
+      "BPF_BUILD_LIBBPF" = false;
+      "ENABLE_SYSTEMD" = true;
+      "ENABLE_REGEX_SUPPORT" = true;
+    })
+    (lib.cmakeFeature "VERSION" finalAttrs.version)
   ];
 
   postInstall = ''
@@ -85,4 +94,4 @@ clangStdenv.mkDerivation rec {
     ];
     mainProgram = "ananicy-cpp";
   };
-}
+})

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

@@ -0,0 +1,133 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  glibc,
+  SDL2,
+  libjpeg_turbo,
+  alsa-lib,
+  libspnav,
+  desktop-file-utils,
+  gobject-introspection,
+  wrapGAppsHook3,
+  wrapGAppsHook4,
+  cameractrls-gtk3,
+  cameractrls-gtk4,
+  withGtk ? null,
+}:
+
+assert lib.assertOneOf "'withGtk' in cameractrls" withGtk [
+  3
+  4
+  null
+];
+
+let
+  mainExecutable =
+    "cameractrls" + lib.optionalString (withGtk != null) "gtk" + lib.optionalString (withGtk == 4) "4";
+
+  modulePath = "${placeholder "out"}/${python3Packages.python.sitePackages}/CameraCtrls";
+
+  installExecutables = [
+    "cameractrls"
+    "cameractrlsd"
+    "cameraptzgame"
+    "cameraptzmidi"
+    "cameraptzspnav"
+    "cameraview"
+  ] ++ lib.optionals (withGtk != null) [ mainExecutable ];
+in
+python3Packages.buildPythonApplication rec {
+  pname = "cameractrls";
+  version = "0.6.6";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "soyersoyer";
+    repo = "cameractrls";
+    rev = "v${version}";
+    hash = "sha256-QjjLd5L+8Slxc3ywurhsWp1pZ2E1Y7NOdnCV2ZYBlqU=";
+  };
+
+  postPatch = ''
+    substituteInPlace cameractrlsd.py \
+      --replace-fail "ctypes.util.find_library('c')" '"${lib.getLib glibc}/lib/libc.so.6"'
+    substituteInPlace cameraptzgame.py cameraview.py \
+      --replace-fail "ctypes.util.find_library('SDL2-2.0')" '"${lib.getLib SDL2}/lib/libSDL2-2.0.so.0"'
+    substituteInPlace cameraview.py \
+      --replace-fail "ctypes.util.find_library('turbojpeg')" '"${lib.getLib libjpeg_turbo}/lib/libturbojpeg.so"'
+    substituteInPlace cameraptzmidi.py \
+      --replace-fail "ctypes.util.find_library('asound')" '"${lib.getLib alsa-lib}/lib/libasound.so"'
+    substituteInPlace cameraptzspnav.py \
+      --replace-fail "ctypes.util.find_library('spnav')" '"${lib.getLib libspnav}/lib/libspnav.so"'
+  '';
+
+  nativeBuildInputs =
+    lib.optionals (withGtk != null) [
+      desktop-file-utils
+      gobject-introspection
+    ]
+    ++ lib.optionals (withGtk == 3) [ wrapGAppsHook3 ]
+    ++ lib.optionals (withGtk == 4) [ wrapGAppsHook4 ];
+
+  # Only used when withGtk != null
+  dependencies = with python3Packages; [ pygobject3 ];
+
+  installPhase =
+    ''
+      runHook preInstall
+
+      mkdir -p $out/bin
+
+      for file in ${lib.concatStringsSep " " installExecutables}; do
+        install -Dm755 $file.py -t ${modulePath}
+        ln -s ${modulePath}/$file.py $out/bin/$file
+      done
+    ''
+    + lib.optionalString (withGtk != null) ''
+      install -Dm644 pkg/hu.irl.cameractrls.svg -t $out/share/icons/hicolor/scalable/apps
+      install -Dm644 pkg/hu.irl.cameractrls.metainfo.xml -t $out/share/metainfo
+      mkdir -p $out/share/applications
+      desktop-file-install \
+        --dir="$out/share/applications" \
+        --set-key=Exec --set-value="${mainExecutable}" \
+        pkg/hu.irl.cameractrls.desktop
+    ''
+    + ''
+      runHook postInstall
+    '';
+
+  dontWrapGApps = true;
+  dontWrapPythonPrograms = true;
+
+  postFixup = lib.optionalString (withGtk != null) ''
+    wrapPythonPrograms
+    patchPythonScript ${modulePath}/${mainExecutable}.py
+    wrapProgram $out/bin/${mainExecutable} ''${makeWrapperArgs[@]} ''${gappsWrapperArgs[@]}
+  '';
+
+  passthru.tests = {
+    # Also build these packages in ofBorg (defined in top-level/all-packages.nix)
+    inherit cameractrls-gtk3 cameractrls-gtk4;
+  };
+
+  meta = {
+    description = "Camera controls for Linux";
+    longDescription = ''
+      It's a standalone Python CLI and GUI (GTK3, GTK4) and
+      camera Viewer (SDL) to set the camera controls in Linux.
+      It can set the V4L2 controls and it is extendable with
+      the non standard controls. Currently it has a Logitech
+      extension (LED mode, LED frequency, BRIO FoV, Relative
+      Pan/Tilt, PTZ presets), Kiyo Pro extension (HDR, HDR
+      mode, FoV, AF mode, Save), Preset extension (Save and
+      restore controls), Control Restore Daemon (to restore
+      presets at device connection).
+    '';
+    homepage = "https://github.com/soyersoyer/cameractrls";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = mainExecutable;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/em/emulationstation/package.nix

@@ -1,31 +1,33 @@
-{ lib
-, SDL2
-, alsa-lib
-, boost
-, cmake
-, curl
-, fetchFromGitHub
-, freeimage
-, freetype
-, libGL
-, libGLU
-, libvlc
-, pkg-config
-, rapidjson
-, stdenv
+{
+  lib,
+  SDL2,
+  alsa-lib,
+  boost,
+  callPackage,
+  cmake,
+  curl,
+  freeimage,
+  freetype,
+  libGL,
+  libGLU,
+  libvlc,
+  pkg-config,
+  rapidjson,
+  stdenv,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "emulationstation";
-  version = "2.11.2";
+let
+  sources = callPackage ./sources.nix { };
+in
+stdenv.mkDerivation {
+  inherit (sources.emulationstation) pname version src;
 
-  src = fetchFromGitHub {
-    owner = "RetroPie";
-    repo = "EmulationStation";
-    rev = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ=";
-  };
+  postUnpack = ''
+    pushd $sourceRoot/external/pugixml
+    cp --verbose --archive ${sources.pugixml.src}/* .
+    chmod --recursive 744 .
+    popd
+  '';
 
   nativeBuildInputs = [
     SDL2
@@ -46,11 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
   ];
 
-  strictDeps = true;
+  cmakeFlags = [ (lib.cmakeBool "GL" true) ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "GL" true)
-  ];
+  strictDeps = true;
 
   installPhase = ''
     runHook preInstall
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/share/emulationstation/
     cp -r ../resources $out/share/emulationstation/
 
-    runHook preInstall
+    runHook postInstall
   '';
 
   # es-core/src/resources/ResourceManager.cpp: resources are searched at the
@@ -70,12 +70,19 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
+  passthru = {
+    inherit sources;
+  };
+
   meta = {
     homepage = "https://github.com/RetroPie/EmulationStation";
     description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)";
     license = with lib.licenses; [ mit ];
     mainProgram = "emulationstation";
-    maintainers = with lib.maintainers; [ AndersonTorres edwtjo ];
+    maintainers = with lib.maintainers; [
+      AndersonTorres
+      edwtjo
+    ];
     platforms = lib.platforms.linux;
   };
-})
+}

pkgs/by-name/em/emulationstation/sources.nix

@@ -0,0 +1,35 @@
+{ fetchFromGitHub }:
+
+{
+  emulationstation =
+    let
+      self = {
+        pname = "emulationstation";
+        version = "2.11.2";
+
+        src = fetchFromGitHub {
+          owner = "RetroPie";
+          repo = "EmulationStation";
+          rev = "v${self.version}";
+          hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE=";
+        };
+      };
+    in
+    self;
+
+  pugixml =
+    let
+      self = {
+        pname = "pugixml";
+        version = "1.8.1";
+
+        src = fetchFromGitHub {
+          owner = "zeux";
+          repo = "pugixml";
+          rev = "v${self.version}";
+          hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4=";
+        };
+      };
+    in
+    self;
+}

pkgs/by-name/fr/freecad/package.nix

@@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: {
       right at home with FreeCAD.
     '';
     license = lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ viric gebner AndersonTorres ];
+    maintainers = with lib.maintainers; [ gebner AndersonTorres ];
     platforms = lib.platforms.linux;
   };
 })

pkgs/by-name/gi/git-igitt/package.nix

@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libgit2,
+  oniguruma,
+  zlib,
+}:
+
+let
+  pname = "git-igitt";
+  version = "0.1.18";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "mlange-42";
+    repo = pname;
+    rev = version;
+    hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ=";
+  };
+
+  cargoHash = "sha256-5UgcgM/WuyApNFCd8YBodx9crJP3+Bygu9nSBJqPCaQ=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libgit2
+    oniguruma
+    zlib
+  ];
+
+  env = {
+    RUSTONIG_SYSTEM_LIBONIG = true;
+  };
+
+  meta = {
+    description = "Interactive, cross-platform Git terminal application with clear git graphs arranged for your branching model";
+    homepage = "https://github.com/mlange-42/git-igitt";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pinage404 ];
+    mainProgram = "git-igitt";
+  };
+}

pkgs/by-name/ht/httm/package.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.40.1";
+  version = "0.40.4";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    hash = "sha256-iJs151HdwcSNlgbbSX/CKBOeGvfEJes8Q8nm/HDfssg=";
+    hash = "sha256-dWL27Fe8bU8/ikNSh0T3/67XBvFkxd71uvArbJRbqKA=";
   };
 
-  cargoHash = "sha256-n/UKM+/rXuf4vbc+1TGUTZzmRyYjLNMttmYnUs7HZPw=";
+  cargoHash = "sha256-BAOFPsHjd5EaWhtzzUxzKvsBtO/kOB5mUo3nUlf7mlY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/md/md-tui/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "md-tui";
-  version = "0.8.1";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "henriklovhaug";
     repo = "md-tui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AwJvB1xLsJCr+r0RJi8jH50QlPq7mbUibvmvYZJi9XE=";
+    hash = "sha256-21h1r6rhjFTOhebMS9PO3/OLKKEeFPVpWThFdgxKhh4=";
   };
 
-  cargoHash = "sha256-QapogSDuAiQWbCFFwPiaSpvLHn0oRLwBEBuB44MN/t0=";
+  cargoHash = "sha256-wONvublKzJnVVUjf1z9V4RwSkHg+HSoTGYvnMdslAYg=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/mi/misconfig-mapper/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QxZDxEt0IHuJh0BBGHFRofXm1nY+Owkyc3GDhDpQSAU=";
+    hash = "sha256-rHEtjbvb907G8RJWLnvrw2xscdWPHQOYSBgYk4yk6ng=";
   };
 
   vendorHash = "sha256-rpDzsUGtYIIUKf8P8Qkd16fuMbwKhKQMATYPVeNhstk=";

pkgs/by-name/nw/nwg-panel/package.nix

@@ -16,13 +16,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.34";
+  version = "0.9.36";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Mn3HXm6hPKxvf98do177dCN+RJgRc02AQ1ILjkZwBVc=";
+    hash = "sha256-MDQht1qqz7dm3Q6INpJEDZqAwvAa7uUp7mCDW/to3+E=";
   };
 
   # No tests

pkgs/by-name/of/offat/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "offat";
-  version = "0.18.0";
+  version = "0.19.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "OFFAT";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AROfhVVV9MN+yRGWrzC2y9lfErT4C3Mg8qPz8lSODFM=";
+    hash = "sha256-USSvUtY5THzsWlJtVYxrCquRJWfAoD7b7NHP7pB27sg=";
   };
 
   sourceRoot = "${src.name}/src";

pkgs/by-name/pl/plasma-panel-colorizer/package.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  kdePackages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "plasma-panel-colorizer";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "luisbocanegra";
+    repo = "plasma-panel-colorizer";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-+JweNB+zjbXh6Htyvu2vgogAr5Fl5wDPCpm6GV18NJ0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    kdePackages.extra-cmake-modules
+    kdePackages.plasma-desktop
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Fully-featured widget to bring Latte-Dock and WM status bar customization features to the default KDE Plasma panel";
+    homepage = "https://github.com/luisbocanegra/plasma-panel-colorizer";
+    changelog = "https://github.com/luisbocanegra/plasma-panel-colorizer/blob/main/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ HeitorAugustoLN ];
+    inherit (kdePackages.kwindowsystem.meta) platforms;
+  };
+})

pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix

@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "plasma-plugin-blurredwallpaper";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "bouteillerAlan";
+    repo = "blurredwallpaper";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-+MjnVsGHqitQytxiAH39Kx9SXuTEFfIC14Ayzu4yE4I=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/plasma/wallpapers/a2n.blur{,.plasma5}
+    cp -r a2n.blur{,.plasma5} $out/share/plasma/wallpapers/
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Plasma 6 wallpaper plugin to blur the wallpaper of active window";
+    homepage = "https://github.com/bouteillerAlan/blurredwallpaper";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
+      dr460nf1r3
+      johnrtitor
+    ];
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/sr/srb2kart/package.nix

@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://mb.srb2.org/threads/srb2kart.25868/";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric donovanglover ];
+    maintainers = with maintainers; [ donovanglover ];
     mainProgram = "srb2kart";
   };
 })

pkgs/by-name/st/stats/package.nix

@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.1";
+  version = "2.11.4";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-/6QFchDpWrJZEKuIsQi6FcGprVOa8J8THJ9Kt3ESrwY=";
+    hash = "sha256-Cm5gu+rL3eerAOnNcNUL2MlXsxV2jMiJLwgGtskIVP4=";
   };
 
   sourceRoot = ".";

pkgs/by-name/te/tenv/package.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "2.6.1";
+  version = "2.7.9";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-qGb7Wj0qH9yh/C0H9Yd0NppoqtjCxnbaTYpv6T8KoL4=";
+    hash = "sha256-oeMbpnYCkJ5GjfgOlNyQpwy80DbrupXIFS2dx4W2xo4=";
   };
 
   vendorHash = "sha256-/4RiOF9YU4GEZlJcx2S2bLhJ1Q6F+8To3XiyWzGGHUU=";

pkgs/by-name/tr/tribler/package.nix

@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [
       xvapx
-      viric
+
       mkg20001
     ];
     platforms = lib.platforms.linux;

pkgs/by-name/un/unison/package.nix

@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
     description = "Bidirectional file synchronizer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ viric nevivurn ];
+    maintainers = with maintainers; [ nevivurn ];
     platforms = platforms.unix;
     broken = stdenv.isDarwin && enableX11; # unison-gui and uimac are broken on darwin
     mainProgram = if enableX11 then "unison-gui" else "unison";

pkgs/by-name/wv/wvdial/package.nix

@@ -0,0 +1,44 @@
+{
+  stdenv,
+  fetchFromGitea,
+  fetchpatch,
+  wvstreams,
+  pkg-config,
+  lib,
+}:
+
+stdenv.mkDerivation {
+  pname = "wvdial";
+  version = "unstable-2016-06-15";
+
+  src = fetchFromGitea {
+    domain = "gitea.osmocom.org";
+    owner = "retronetworking";
+    repo = "wvdial";
+    rev = "42d084173cc939586c1963b8835cb00ec56b2823";
+    hash = "sha256-q7pFvpJvv+ZvbN4xxolI9ZRULr+N5sqO9BOXUqSG5v4=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://git.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch?h=73a68490efe05cdbec540ec6f17782816632a24d";
+      hash = "sha256-fsneoB5GeKH/nxwW0z8Mk6892PtnZ3J77wP4BGo3Tj8=";
+    })
+  ];
+
+  buildInputs = [ wvstreams ];
+  nativeBuildInputs = [ pkg-config ];
+
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+    "PPPDIR=${placeholder "out"}/etc/ppp/peers"
+  ];
+
+  meta = {
+    description = "A dialer that automatically recognises the modem";
+    homepage = "https://gitea.osmocom.org/retronetworking/wvdial";
+    license = lib.licenses.lgpl2;
+    maintainers = with lib.maintainers; [ flokli ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/wv/wvstreams/package.nix

@@ -0,0 +1,110 @@
+{
+  stdenv,
+  fetchpatch,
+  fetchurl,
+  dbus,
+  zlib,
+  openssl,
+  readline,
+  lib,
+  perl,
+}:
+
+stdenv.mkDerivation {
+  pname = "wvstreams";
+  version = "4.6.1";
+
+  # See https://layers.openembedded.org/layerindex/recipe/190863/
+  src = fetchurl {
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-4.6.1.tar.gz";
+    hash = "sha256-hAP1+/g6qawMbOFdl/2FYHSIFSqoTgB7fQYhuOvAdjM=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-zlPiME+KYjesmKt3a+JoE087qE1MbnlVPjC75qQoIks=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-Twqk0J8E05kAvhHjAoAuYEpS445t3mb/BvuxTmaaGoM=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-JMPNUdfAJ/gq+am/F1DE2q3+35ItiLAve1+LLl8+Oe4=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-N3HmuBakD5VHoToOqU6EmTHlgFG6A7x84Gbf2P2u+s8=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-fXhBUKaHD27mspwrKNY5G7F6UHqq/dmnPlf9cIvM7hM=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-55vWFfd/SDa9dE+GmSHDMU2kTrn+tNUW2clPknSdi7g=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-XRJCZMnygcQie9sUc1iCe9HVE9lEFCed4JRDtd/C/84=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-v0WAFyWwQ70dpq1BEXQjkOrdUUk4tBFJVKeHffs4FmA=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-1UZziDaE0BCM/YmYjBgFA2Q8zfnWpQcal08a0qcClmo=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-4Ad10pijea/qusrdCJAEjpc1/qfQNE32t/M2YMk5jNg=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-zWREskvLoAH2sYn6kbemTC1V5KrF9jX0B0d+ASExQBA=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-ACiuwqwg5nUbzqoJR5h9GENXmN3ELzkBjujZivBoM4g=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-pMHopuBEge7Llq1Syb8sZJArhUOWBNmcOvVcNtFgnbA=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Forward-port-to-OpenSSL-1.1.x.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-R5pfYxefEvvxB1k+gZzRQgsbmkgpK9cBqZxCXHQnQlM=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Fix-narrowing-conversion-error.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-esCD7jMVxD1sC2C4jx+pnnIWHpXAVGF/CGXvwHc9rhU=";
+    })
+  ];
+
+  outputs = [
+    "bin"
+    "dev"
+    "lib"
+    "out"
+  ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    dbus
+    zlib
+    openssl
+    readline
+    perl
+  ];
+
+  meta = {
+    description = "Network programming library in C++";
+    homepage = "http://alumnit.ca/wiki/index.php?page=WvStreams";
+    license = lib.licenses.lgpl2;
+    maintainers = [ lib.maintainers.flokli ];
+    platforms = lib.platforms.linux;
+  };
+}