Merge master into staging-next

maintainers/maintainer-list.nix

@@ -17181,6 +17181,12 @@
     githubId = 27586264;
     name = "Tobias Schmidt";
   };
+  totalchaos = {
+    email = "basil.keeler@outlook.com";
+    github = "totalchaos05";
+    githubId = 70387628;
+    name = "Basil Keeler";
+  };
   totoroot = {
     name = "Matthias Thym";
     email = "git@thym.at";
@@ -18569,6 +18575,13 @@
     githubId = 647076;
     name = "Yorick van Pelt";
   };
+  YorikSar = {
+    name = "Yuriy Taraday";
+    email = "yorik.sar@gmail.com";
+    matrix = "@yorik.sar:matrix.org";
+    github = "YorikSar";
+    githubId = 428074;
+  };
   yrashk = {
     email = "yrashk@gmail.com";
     github = "yrashk";

pkgs/applications/audio/feishin/darwin.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
-    hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
+    hash = "sha256-J5LB4uR/NJ6ykiTqBY1VepcLujprgqwpxy7sGD0NtZw=";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];

pkgs/applications/audio/feishin/default.nix

@@ -8,7 +8,7 @@ let
   extraArgs = removeAttrs args [ "callPackage" ];
 
   pname = "feishin";
-  version = "0.2.0";
+  version = "0.3.0";
   appname = "Feishin";
 
   meta = with lib; {

pkgs/applications/audio/feishin/linux.nix

@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz";
-    hash = "sha256-o+fEjdG2iN84FEchyAKWZCpsrqDm1K1k+Q2K+cwYBZE=";
+    hash = "sha256-sl2zM24bb0yBTfCxtNGizp6Yu+L4nj/Uf669zylnPmE=";
   };
 
 

pkgs/applications/misc/waypaper/default.nix

@@ -0,0 +1,51 @@
+{ lib
+, python3
+, fetchFromGitHub
+, gobject-introspection
+, gtk3
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "waypaper";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "anufrievroman";
+    repo = "waypaper";
+    rev = "refs/tags/${version}";
+    hash = "sha256-wD3DtxP4aUwIn+EoM3s1Y9VNEcUGhtyugNBEFHI9eqw=";
+  };
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pygobject3
+  ];
+
+  # has no tests
+  doCheck = false;
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    changelog = "https://github.com/anufrievroman/waypaper/releases/tag/${version}";
+    description = "GUI wallpaper setter for Wayland-based window managers";
+    longDescription = ''
+      GUI wallpaper setter for Wayland-based window managers that works as a frontend for popular backends like swaybg and swww.
+
+      If wallpaper does not change, make sure that swaybg or swww is installed.
+    '';
+    homepage = "https://github.com/anufrievroman/waypaper";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ totalchaos ];
+    platforms = platforms.linux;
+  };
+}

pkgs/applications/networking/cluster/argocd/default.nix

@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.7.10";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    sha256 = "sha256-MHEmbZZjPxKu0PyDOjkS3pIsWJYozERPVhJfhleeqbQ=";
+    sha256 = "sha256-/BMagPR74pANVYcmvdJZmV4tB48cEyAy0FKtBlpoLDE=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-h4TKomZSG6fEUVxIDhsxNHaIO+1Xl40+pFWgJJ2VH4E=";
+  vendorHash = "sha256-xiCgQqP2XF+b2JQTBFqJ3h2klc6GjqyXoNUwatO0Ul8=";
 
   # Set target as ./cmd per cli-local
   # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

pkgs/applications/networking/instant-messengers/discord/default.nix

@@ -3,7 +3,7 @@ let
   versions = if stdenv.isLinux then {
     stable = "0.0.28";
     ptb = "0.0.44";
-    canary = "0.0.162";
+    canary = "0.0.163";
     development = "0.0.217";
   } else {
     stable = "0.0.273";
@@ -24,7 +24,7 @@ let
       };
       canary = fetchurl {
         url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        sha256 = "sha256-eSWcwSw46hKJmDLxHtolBZgKrIS2QnTbVoYe0EI4Njs=";
+        sha256 = "sha256-QLQCv3hlCNZ8Ii/+GWHAZs4enBh+gOUEt+wlrkUP91Q=";
       };
       development = fetchurl {
         url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";

pkgs/applications/virtualization/runc/default.nix

@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "runc";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    hash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
+    hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo=";
   };
 
   vendorHash = null;

pkgs/build-support/trivial-builders/default.nix

@@ -304,6 +304,7 @@ rec {
       checkPhase = ''
         ${stdenv.shellDryRun} "$target"
       '';
+      meta.mainProgram = name;
     };
 
   /*

pkgs/development/compilers/flutter/engine-artifacts/default.nix

@@ -6,13 +6,43 @@
 , fetchzip
 , autoPatchelfHook
 , gtk3
+, flutterVersion
 , unzip
+, stdenvNoCC
 }:
 
 let
   hashes = (import ./hashes.nix).${engineVersion} or
     (throw "There are no known artifact hashes for Flutter engine version ${engineVersion}.");
+  noticeText = stdenvNoCC.mkDerivation (finalAttrs: {
+    pname = "flutter-notice";
+    version = engineVersion;
+    dontUnpack = true;
+    src = fetchurl {
+      url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE";
+      sha256 = hashes.skyNotice;
+    };
+    flutterNotice = fetchurl {
+      url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE";
+      sha256 = hashes.flutterNotice;
+    };
+    installPhase =
+      ''
+        SRC_TEXT="$(cat $src)"
+        FLUTTER_NOTICE_TEXT="$(cat $flutterNotice)"
+        cat << EOF > $out
+        This artifact is from the Flutter SDK's engine.
+        This file carries third-party notices for its dependencies.
+        See also other files, that have LICENSE in the name, in the artifact directory.
 
+        Appendix 1/2: merged sky_engine LICENSE file (also found at ${finalAttrs.src.url})
+        $SRC_TEXT
+
+        Appendix 2/2: Flutter license (also found at ${finalAttrs.flutterNotice.url})
+        $FLUTTER_NOTICE_TEXT
+        EOF
+      '';
+  });
   artifacts =
     {
       common = {
@@ -165,6 +195,17 @@ let
           destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}";
         in
         ''
+          # ship the notice near all artifacts. if the artifact directory is / multiple directories are nested in $src, link it there. If there isn't a directory, link it in root
+          # this *isn't the same as the subdirectory variable above*
+          DIR_CNT="$(echo */ | wc -w)"
+          if [[ "$DIR_CNT" == 0 ]]; then
+            ln -s ${noticeText} LICENSE.README
+          else
+            for dir in */
+            do
+              ln -s ${noticeText} "$dir/LICENSE.README"
+            done
+          fi
           mkdir -p "${destination}"
           cp -r . "${destination}"
         '';

pkgs/development/compilers/flutter/engine-artifacts/hashes.nix

@@ -1,5 +1,7 @@
 {
   "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
+    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM=";
     };
@@ -113,6 +115,8 @@
     };
   };
   "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = {
+    skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo=";
+    flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA=";
     android-arm = {
       "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU=";
     };

pkgs/development/compilers/flutter/wrapper.nix

@@ -56,7 +56,10 @@
 }:
 
 let
-  engineArtifacts = callPackage ./engine-artifacts { inherit (flutter) engineVersion; };
+  engineArtifacts = callPackage ./engine-artifacts {
+    inherit (flutter) engineVersion;
+    flutterVersion = flutter.version;
+  };
   mkCommonArtifactLinkCommand = { artifact }:
     ''
       mkdir -p $out/artifacts/engine/common

pkgs/development/libraries/catch2/3.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.3.2";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    hash = "sha256-t/4iCrzPeDZNNlgibVqx5rhe+d3lXwm1GmBMDDId0VQ=";
+    hash = "sha256-DqGGfNjKPW9HFJrX9arFHyNYjB61uoL6NabZatTWrr0=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/example-robot-data/default.nix

@@ -33,6 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   doCheck = true;
+  # The package expect to find an `example-robot-data/robots` folder somewhere
+  # either in install prefix or in the sources
+  # where it can find the meshes for unit tests
+  preCheck = "ln -s source ../../${finalAttrs.pname}";
   pythonImportsCheck = [
     "example_robot_data"
   ];

pkgs/development/libraries/pinocchio/default.nix

@@ -4,21 +4,23 @@
 , cmake
 , boost
 , eigen
+, collisionSupport ? !stdenv.isDarwin
+, hpp-fcl
 , urdfdom
 , pythonSupport ? false
 , python3Packages
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pinocchio";
-  version = "2.6.19";
+  version = "2.6.20";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
-    repo = pname;
+    repo = finalAttrs.pname;
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-P7jSAQ6LYcboJHqtpneT4W8Pu5G3fd3/a8Gju9im1e8=";
+    hash = "sha256-Pu/trCpqdue7sQKDbLhyxTfgj/+xRiVcG7Luz6ZQXtM=";
   };
 
   # error: use of undeclared identifier '__sincos'
@@ -38,20 +40,37 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (!pythonSupport) [
     boost
     eigen
+  ] ++ lib.optionals (!pythonSupport && collisionSupport) [
+    hpp-fcl
   ] ++ lib.optionals pythonSupport [
     python3Packages.boost
     python3Packages.eigenpy
+  ] ++ lib.optionals (pythonSupport && collisionSupport) [
+    python3Packages.hpp-fcl
   ];
 
-  cmakeFlags = lib.optionals (!pythonSupport) [
+  cmakeFlags = lib.optionals collisionSupport [
+    "-DBUILD_WITH_COLLISION_SUPPORT=ON"
+  ] ++ lib.optionals pythonSupport [
+    "-DBUILD_WITH_LIBPYTHON=ON"
+  ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [
+    # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.6.20.drv/sou[84 chars].dae'
+    "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'"
+  ] ++ lib.optionals (!pythonSupport) [
     "-DBUILD_PYTHON_INTERFACE=OFF"
   ];
 
+  doCheck = true;
+
+  pythonImportsCheck = lib.optionals (!pythonSupport) [
+    "pinocchio"
+  ];
+
   meta = with lib; {
     description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives";
     homepage = "https://github.com/stack-of-tasks/pinocchio";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ wegank ];
+    maintainers = with maintainers; [ nim65s wegank ];
     platforms = platforms.unix;
   };
-}
+})

pkgs/development/libraries/qgnomeplatform/default.nix

@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
       src = ./hardcode-gsettings.patch;
       gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
     })
+
+    # Backport cursor fix for Qt6 apps
+    # Ajusted from https://github.com/FedoraQt/QGnomePlatform/pull/138
+    ./qt6-cursor-fix.patch
   ];
 
   nativeBuildInputs = [

pkgs/development/libraries/qgnomeplatform/qt6-cursor-fix.patch

@@ -0,0 +1,53 @@
+diff --git a/src/common/gnomesettings.cpp b/src/common/gnomesettings.cpp
+index 961f75d..d947eb2 100644
+--- a/src/common/gnomesettings.cpp
++++ b/src/common/gnomesettings.cpp
+@@ -210,7 +210,7 @@ GnomeSettingsPrivate::GnomeSettingsPrivate(QObject *parent)
+                                               QStringLiteral("SettingChanged"), this, SLOT(portalSettingChanged(QString,QString,QDBusVariant)));
+     }
+ 
+-    if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++    if (true) {
+         cursorSizeChanged();
+         cursorThemeChanged();
+     }
+@@ -347,11 +347,11 @@ void GnomeSettingsPrivate::gsettingPropertyChanged(GSettings *settings, gchar *k
+     } else if (changedProperty == QStringLiteral("monospace-font-name")) {
+         gnomeSettings->fontChanged();
+     } else if (changedProperty == QStringLiteral("cursor-size")) {
+-        if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        if (true) {
+             gnomeSettings->cursorSizeChanged();
+         }
+     } else if (changedProperty == QStringLiteral("cursor-theme")) {
+-        if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        if (true) {
+             gnomeSettings->cursorThemeChanged();
+         }
+     // Org.gnome.wm.preferences
+@@ -393,13 +393,23 @@ void GnomeSettingsPrivate::cursorBlinkTimeChanged()
+ void GnomeSettingsPrivate::cursorSizeChanged()
+ {
+     int cursorSize = getSettingsProperty<int>(QStringLiteral("cursor-size"));
+-    qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
++    if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
++    }
++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++    m_hints[QPlatformTheme::MouseCursorSize] = QSize(cursorSize, cursorSize);
++#endif
+ }
+ 
+ void GnomeSettingsPrivate::cursorThemeChanged()
+ {
+     const QString cursorTheme = getSettingsProperty<QString>(QStringLiteral("cursor-theme"));
+-    qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
++    if (QGuiApplication::platformName() != QStringLiteral("xcb")) {
++        qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
++    }
++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++    m_hints[QPlatformTheme::MouseCursorTheme] = cursorTheme;
++#endif
+ }
+ 
+ void GnomeSettingsPrivate::fontChanged()

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

@@ -17,16 +17,16 @@
 
 buildPythonPackage rec {
   pname = "acquire";
-  version = "3.7";
+  version = "3.8";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "acquire";
     rev = "refs/tags/${version}";
-    hash = "sha256-wGoMah3Pj7hS5+k/l5pEaDaM25RzdWRIG9Hrf3oWkR8=";
+    hash = "sha256-JfZ0sc7hFj71XxGWTTZ50uGWuKoWKY4vYm0v+zS2YiQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "15.1.15";
+  version = "16.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-qNljw3V0rfMb6GDtTd+jy/hHBaM3kc9y+RCEoNTKHFM=";
+    hash = "sha256-ATfAI8srh5G1ejkp/2wl2Soowatjprq9e8h8tSAAXGs=";
   };
 
   propagatedBuildInputs = [

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

@@ -1,27 +1,49 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, numpy, cython, zlib, six
+{ lib
-, python-lzo, nose }:
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, numpy
+, cython
+, zlib
+, python-lzo
+, nose
+}:
 
 buildPythonPackage rec {
   pname = "bx-python";
-  version = "0.9.0";
+  version = "0.10.0";
-  disabled = pythonOlder "3.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "bxlab";
     repo = "bx-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Pi4hV3FatCXoXY3nNgqm5UfWYIrpP/v5PzzCi3gmIbE=";
+    hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw=";
   };
 
-  nativeBuildInputs = [ cython ];
+  nativeBuildInputs = [
-  buildInputs = [ zlib ];
+    cython
-  propagatedBuildInputs = [ numpy six python-lzo ];
+  ];
-  nativeCheckInputs = [ nose ];
+
+  buildInputs = [
+    zlib
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+    python-lzo
+  ];
+
+  nativeCheckInputs = [
+    nose
+  ];
 
   postInstall = ''
     cp -r scripts/* $out/bin
 
-    # This is a small hack; the test suit uses the scripts which need to
+    # This is a small hack; the test suite uses the scripts which need to
     # be patched. Linking the patched scripts in $out back to the
     # working directory allows the tests to run
     rm -rf scripts
@@ -29,11 +51,11 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
+    description = "Tools for manipulating biological data, particularly multiple sequence alignments";
     homepage = "https://github.com/bxlab/bx-python";
-    description =
+    changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}";
-      "Tools for manipulating biological data, particularly multiple sequence alignments";
     license = licenses.mit;
-    maintainers = [ maintainers.jbedo ];
+    maintainers = with maintainers; [ jbedo ];
     platforms = [ "x86_64-linux" ];
   };
 }

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

@@ -1,15 +1,36 @@
-{ lib, buildPythonPackage, fetchPypi, d2to1 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "colour";
   version = "0.1.5";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "af20120fefd2afede8b001fbef2ea9da70ad7d49fafdb6489025dae8745c3aee";
+    hash = "sha256-ryASD+/Sr+3osAH77y6p2nCtfUn6/bZIkCXa6HRcOu4=";
   };
 
-  buildInputs = [ d2to1 ];
+  patches = [
+    # https://github.com/vaab/colour/pull/66 (but does not merge cleanly)
+    ./remove-unmaintained-d2to1.diff
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "--doctest-glob=\"*.rst\""
+    "--doctest-modules"
+  ];
+
+  pythonImportsCheck = [
+    "colour"
+  ];
 
   meta = with lib; {
     description = "Converts and manipulates common color representation (RGB, HSV, web, ...)";

pkgs/development/python-modules/colour/remove-unmaintained-d2to1.diff

@@ -0,0 +1,65 @@
+diff --git a/setup.cfg b/setup.cfg
+index 41de928..1c18182 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,18 +1,14 @@
+ [metadata]
+ name = colour
+ version = 0.1.5
+-summary = converts and manipulates various color representation (HSL, RVB, web, X11, ...)
+-description-file = 
+-	README.rst
+-	CHANGELOG.rst
+-	TODO.rst
+-license_file = LICENSE
+-requires-dist = 
++description = converts and manipulates various color representation (HSL, RVB, web, X11, ...)
++long_description = file: README.rst, CHANGELOG.rst, TODO.rst
++license_files = LICENSE
+ author = Valentin LAB
+ author_email = valentin.lab@kalysto.org
+-home_page = http://github.com/vaab/colour
++url = http://github.com/vaab/colour
+ license = BSD 3-Clause License
+-classifier = 
++classifiers = 
+ 	Programming Language :: Python
+ 	Topic :: Software Development :: Libraries :: Python Modules
+ 	Development Status :: 3 - Alpha
+@@ -26,16 +22,8 @@ classifier =
+ 	Programming Language :: Python :: 3.5
+ 	Programming Language :: Python :: 3.6
+ 
+-[files]
+-modules = colour
+-extra_files = 
+-	README.rst
+-	CHANGELOG.rst
+-	TODO.rst
+-	setup.py
+-
+-[backwards_compat]
+-zip-safe = False
++[options]
++zip_safe = False
+ 
+ [bdist_wheel]
+ universal = 1
+diff --git a/setup.py b/setup.py
+index 47038f9..11a8d3a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -54,12 +54,4 @@ if "%%short-version%%".startswith("%%"):
+     sys.exit(errlvl)
+ 
+ 
+-##
+-## Normal d2to1 setup
+-##
+-
+-setup(
+-    setup_requires=['d2to1'],
+-    extras_require={'test': ['nose', ]},
+-    d2to1=True
+-)
++setup(extras_require={'test': ['nose', ]})

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

@@ -1,25 +0,0 @@
-{ buildPythonPackage
-, lib
-, fetchFromGitHub
-, nose
-}:
-buildPythonPackage rec {
-  pname = "d2to1";
-  version = "0.2.12.post1";
-
-  nativeCheckInputs = [ nose ];
-
-  src = fetchFromGitHub {
-    owner = "embray";
-    repo = pname;
-    rev = version;
-    sha256 = "1hzq51qbzsc27yy8swp08kf42mamag7qcabbrigzj4m6ivb5chi2";
-  };
-
-  meta = with lib;{
-    description = "Support for distutils2-like setup.cfg files as package metadata";
-    homepage = "https://github.com/embray/d2to1";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ makefu ];
-  };
-}

pkgs/development/python-modules/dissect-cstruct/default.nix

@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-cstruct";
-  version = "3.8";
+  version = "3.9";
   format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.cstruct";
     rev = "refs/tags/${version}";
-    hash = "sha256-ART7m0OR0KjkZYHXDoNGJDX0v7h+FgctAaWXNFohGV8=";
+    hash = "sha256-v0giDdH6bYCSrotd9WGSlIMzylTz7FHeCE/JkCw7frY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/dissect-etl/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-etl";
-  version = "3.6";
+  version = "3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.etl";
     rev = "refs/tags/${version}";
-    hash = "sha256-Z6IdSLHXwZULqV6aTZlXjRo5Xq/rRNw7b/nOhuKOth4=";
+    hash = "sha256-z6P7XpA+j9JIJJsp/Z4uewFw9OAPSZV+57eJu7rd17I=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/dissect-ntfs/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-ntfs";
-  version = "3.6";
+  version = "3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.ntfs";
     rev = "refs/tags/${version}";
-    hash = "sha256-kGvy1+MSjJ6IQjffmsT02toBNaSbBZXeYmC9AqwbfFk=";
+    hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/dissect-regf/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-regf";
-  version = "3.6";
+  version = "3.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.regf";
     rev = "refs/tags/${version}";
-    hash = "sha256-doyyBmkRPH2wRZA44/7ldkUdNLX1lulo/XcSVFxaIfM=";
+    hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/dissect-target/default.nix

@@ -39,16 +39,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-target";
-  version = "3.10";
+  version = "3.11";
   format = "pyproject";
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.target";
     rev = "refs/tags/${version}";
-    hash = "sha256-zAcNkRwCnU/53h8/WsaGjCpgPovPb+5VOu/6SHXu31g=";
+    hash = "sha256-WnF0Z/1jIUKSDAToQzKpiYQgn58KvQJfxk6r8oXANvU=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/dissect-util/default.nix

@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "dissect-util";
-  version = "3.9";
+  version = "3.10";
   format = "pyproject";
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect.util";
     rev = "refs/tags/${version}";
-    hash = "sha256-u8FPGSG9bZi+bxqI5zABwHcqwmM24hURvHcHTKz8dYw=";
+    hash = "sha256-H89lPX//AlTEJLuZFzzn9wUc4lZC1TGd98t4+TYlbWs=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@@ -32,16 +32,16 @@
 
 buildPythonPackage rec {
   pname = "dissect";
-  version = "3.7";
+  version = "3.8";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "dissect";
     rev = "refs/tags/${version}";
-    hash = "sha256-noo7yDRTPPSIrSt8Hewb9mZsMuPgDmL3aIxI/bknsGc=";
+    hash = "sha256-TEzIKEGAp+1QHJtnPp5JhopuVVBNo9/Cwj0z3YcBCcg=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/flow-record/default.nix

@@ -15,16 +15,16 @@
 
 buildPythonPackage rec {
   pname = "flow-record";
-  version = "3.10";
+  version = "3.11";
   format = "pyproject";
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "fox-it";
     repo = "flow.record";
     rev = "refs/tags/${version}";
-    hash = "sha256-pOEK53+rIwzTxDEla1xoWo/xgy+eN0nxR0MeW7VQFds=";
+    hash = "sha256-/mrsm7WoqnTIaGOHuIZk1eMXAMi38eVpctgi6+RQ3WQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/md-toc/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "md-toc";
-  version = "8.1.9";
+  version = "8.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "frnmst";
     repo = pname;
     rev = version;
-    hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw=";
+    hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/mkdocs-autorefs/default.nix

@@ -4,26 +4,31 @@
 , markdown
 , mkdocs
 , pytestCheckHook
-, pdm-pep517
+, pdm-backend
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "mkdocs-autorefs";
-  version = "0.4.1";
+  version = "0.5.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "autorefs";
-    rev = version;
+    rev = "refs/tags/${version}";
-    hash = "sha256-kiHb/XSFw6yaUbLJHBvHaQAOVUM6UfyFeomgniDZqgU=";
+    hash = "sha256-GZKQlOXhQIQhS/z4cbmS6fhAKYgnVhSXh5a8Od7+TWc=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
   nativeBuildInputs = [
-    pdm-pep517
+    pdm-backend
   ];
 
   propagatedBuildInputs = [
@@ -35,11 +40,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
-  '';
-
   pythonImportsCheck = [
     "mkdocs_autorefs"
   ];
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Automatically link across pages in MkDocs";
     homepage = "https://github.com/mkdocstrings/autorefs/";
+    changelog = "https://github.com/mkdocstrings/autorefs/blob/${version}/CHANGELOG.md";
     license = licenses.isc;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "msgspec";
-  version = "0.17.0";
+  version = "0.18.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jcrist";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-IDu+Yu9BKk4/ITkNY6YLVmJ5zNR6F4LF1vj8QIEW108=";
+    hash = "sha256-FZq8SEtn/p7x43Je2d0gIGDi8S4uz4cdV0KkQecCFT4=";
   };
 
   # Requires libasan to be accessible

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

@@ -1,8 +1,9 @@
-{ stdenv
+{ lib
-, lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , jinja2
+, napalm
 , poetry-core
 , pytestCheckHook
 , pythonOlder
@@ -12,22 +13,26 @@
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.4.1";
+  version = "1.5.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8=";
+    hash = "sha256-uUw48EBUpEUw+A8wxw3qXrnqmFWQzg/zb+8qAGRSlUw=";
   };
 
   nativeBuildInputs = [
     poetry-core
   ];
 
+  propagatedBuildInputs = [
+    napalm
+  ];
+
   nativeCheckInputs = [
     jinja2
     pytestCheckHook
@@ -49,6 +54,9 @@ buildPythonPackage rec {
     # OSError: [Errno 22] Invalid argument
     "test_compare_type5"
     "test_encrypt_type5"
+    "test_compare_cisco_type5"
+    "test_get_napalm_getters_napalm_installed_default"
+    "test_encrypt_cisco_type5"
   ];
 
   meta = with lib; {

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "0.10.0.20230806";
+  version = "0.10.0.20230811";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jDDqegAZOG0UTKPbh1H3V+5GrMGU6m2WGesXUEFJHJY=";
+    hash = "sha256-C6IKX6e5/lxtx4fZeMa+IS5TyWKhpBeipZSMnSikxUk=";
   };
 
   passthru.optional-dependencies = {

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pynws";
-  version = "1.5.0";
+  version = "1.5.1";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "MatthewFlamm";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-UGwK7HasDAPw3edQUdrzWOmrbbM9l5R1BVw3M+FNm1s=";
+    hash = "sha256-Mq8kYS4p53gdSGF83AkSPecVizoEBbeKvyk7nCsRYdM=";
   };
 
   propagatedBuildInputs = [

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

@@ -11,24 +11,29 @@
 , prompt-toolkit
 , pygments
 , rchitect
-, six
 , R
 , rPackages
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "radian";
-  version = "0.6.5";
+  version = "0.6.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "iuD4EkGZ1GwNxR8Gpg9ANe3lMHJYZ/Q/RyuN6vZZWME=";
+    hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace '"pytest-runner"' ""
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' "" \
+      --replace '0.3.39,<0.4.0' '0.3.39'
   '';
 
   nativeBuildInputs = [
@@ -40,7 +45,6 @@ buildPythonPackage rec {
     prompt-toolkit
     pygments
     rchitect
-    six
   ] ++ (with rPackages; [
     reticulate
     askpass
@@ -65,6 +69,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A 21 century R console";
     homepage = "https://github.com/randy3k/radian";
+    changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ savyajha ];
   };

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

@@ -2,25 +2,31 @@
 , buildPythonPackage
 , fetchFromGitHub
 , cffi
-, six
 , pytestCheckHook
 , pytest-mock
+, pythonOlder
 , R
-, rPackages }:
+, rPackages
+, six
+}:
 
 buildPythonPackage rec {
   pname = "rchitect";
-  version = "0.3.40";
+  version = "0.4.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
-    sha256 = "yJMiPmusZ62dd6+5VkA2uSjq57a0C3arG8CgiUUHKpk=";
+    hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace '"pytest-runner"' ""
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' ""
   '';
 
   propagatedBuildInputs = [
@@ -46,6 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Interoperate R with Python";
     homepage = "https://github.com/randy3k/rchitect";
+    changelog = "https://github.com/randy3k/rchitect/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ savyajha ];
   };

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

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "sqlobject";
-  version = "3.10.1";
+  version = "3.10.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "SQLObject";
     inherit version;
-    hash = "sha256-/PPqJ/ha8GRQpY/uQOLIF0v90p9tZKrHTCMkusiIuEQ=";
+    hash = "sha256-dW9IsIdOSnCG3thWhYwIsz0Oa5runnXD84S5ITPH3ww=";
   };
 
   propagatedBuildInputs = [
@@ -45,6 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Object Relational Manager for providing an object interface to your database";
     homepage = "http://www.sqlobject.org/";
+    changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst";
     license = licenses.lgpl21Only;
     maintainers = with maintainers; [ ];
   };

pkgs/development/python-modules/todoist-api-python/default.nix

@@ -1,5 +1,4 @@
 { lib
-, attrs
 , buildPythonPackage
 , fetchFromGitHub
 , fetchpatch
@@ -13,16 +12,16 @@
 
 buildPythonPackage rec {
   pname = "todoist-api-python";
-  version = "2.0.2";
+  version = "2.1.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "Doist";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-CKOsUb35+7WjSNf4Xo0SK5loIqWJbEnHdmhw9QXWFAI=";
+    hash = "sha256-mBQCC1beBAB+vDV/TrQHQB7cTjjoCDZlqpiYP8IphUA=";
   };
 
   patches = [
@@ -39,7 +38,6 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    attrs
     requests
   ];
 

pkgs/development/tools/analysis/checkov/default.nix

@@ -22,14 +22,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.3.360";
+  version = "2.3.361";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-3EyaJiApKm2Kaj1nAfadMyn/qnrx3on2rYQAXc6jG8E=";
+    hash = "sha256-k357VjGB+mKsKsd+l0S2lMh1f5za5Htlm4AWEVisQss=";
   };
 
   patches = [

pkgs/development/tools/ceedling/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'ceedling'

pkgs/development/tools/ceedling/Gemfile.lock

@@ -0,0 +1,21 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ceedling (0.31.1)
+      constructor (~> 2)
+      deep_merge (~> 1.2)
+      rake (>= 12, < 14)
+      thor (~> 0.14)
+    constructor (2.0.0)
+    deep_merge (1.2.2)
+    rake (13.0.6)
+    thor (0.20.3)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  ceedling
+
+BUNDLED WITH
+   2.4.17

pkgs/development/tools/ceedling/default.nix

@@ -0,0 +1,16 @@
+{ lib
+, bundlerApp
+}:
+
+bundlerApp {
+  pname = "ceedling";
+  gemdir = ./.;
+  exes = [ "ceedling" ];
+
+  meta = with lib; {
+    description = "A build system for C projects that is something of an extension around Ruby's Rake";
+    homepage    = "http://www.throwtheswitch.org/ceedling";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+  };
+}

pkgs/development/tools/ceedling/gemset.nix

@@ -0,0 +1,53 @@
+{
+  ceedling = {
+    dependencies = ["constructor" "deep_merge" "rake" "thor"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jjvz14dg85v8c4raxvk618rq7f6kyna5148901xciz2zjpm3bri";
+      type = "gem";
+    };
+    version = "0.31.1";
+  };
+  constructor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02qmp08kcvi5dkz3lxm5yck9msfwfx1msvrrz9d6z4klc14q889y";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  deep_merge = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      type = "gem";
+    };
+    version = "13.0.6";
+  };
+  thor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      type = "gem";
+    };
+    version = "0.20.3";
+  };
+}

pkgs/development/tools/ocaml/camlp5/default.nix

@@ -1,31 +1,57 @@
-{ lib, stdenv, fetchFromGitHub, ocaml, perl }:
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper
+, rresult, bos, ocaml_pcre, re, camlp-streams
+}:
 
 if lib.versionOlder ocaml.version "4.02"
-|| lib.versionOlder "4.13" ocaml.version
 then throw "camlp5 is not available for OCaml ${ocaml.version}"
 else
 
-stdenv.mkDerivation rec {
+let params =
+  if lib.versionAtLeast ocaml.version "4.12"
+  then rec {
+    version = "8.00.05";
 
-  pname = "camlp5";
+    src = fetchFromGitHub {
-  version = "7.14";
+      owner = "camlp5";
+      repo = "camlp5";
+      rev = version;
+      hash = "sha256-Havr3RB6iUP7QzV+LUGwMHtGzmRdS5RqYsqJ0N5w6gE=";
+    };
 
-  src = fetchFromGitHub {
+    nativeBuildInputs = [ makeWrapper ocaml findlib perl ];
-    owner = "camlp5";
+    buildInputs = [ bos ocaml_pcre re rresult ];
-    repo = "camlp5";
+    propagatedBuildInputs = [ camlp-streams ];
-    rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
+
-    sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
+    postFixup = ''
-  };
+      for p in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
+      do
+        wrapProgram $out/bin/$p \
+        --suffix CAML_LD_LIBRARY_PATH : ${ocaml_pcre}/lib/ocaml/${ocaml.version}/site-lib/stublibs
+      done
+    '';
+  } else rec {
+    version = "7.14";
+    src = fetchFromGitHub {
+      owner = "camlp5";
+      repo = "camlp5";
+      rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
+      sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
+    };
+    nativeBuildInputs = [ ocaml perl ];
+  }
+; in
+
+stdenv.mkDerivation (params // {
+
+  pname = "ocaml${ocaml.version}-camlp5";
 
   strictDeps = true;
 
-  nativeBuildInputs = [ ocaml perl ];
-
   prefixKey = "-prefix ";
 
   preConfigure = ''
     configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
-    patchShebangs ./config/find_stuffversion.pl
+    patchShebangs ./config/find_stuffversion.pl etc/META.pl
   '';
 
   buildFlags = [ "world.opt" ];
@@ -45,4 +71,4 @@ stdenv.mkDerivation rec {
       maggesi vbgl
     ];
   };
-}
+})

pkgs/os-specific/darwin/dark-mode-notify/default.nix

@@ -0,0 +1,40 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, swift
+, swiftpm
+, darwin
+}:
+
+stdenv.mkDerivation (final: {
+  pname = "dark-mode-notify";
+  version = "unstable-2022-07-18";
+
+  src = fetchFromGitHub {
+    owner = "bouk";
+    repo = "dark-mode-notify";
+    rev = "4d7fe211f81c5b67402fad4bed44995344a260d1";
+    hash = "sha256-LsAQ5v5jgJw7KsJnQ3Mh6+LNj1EMHICMoD5WzF3hRmU=";
+  };
+
+  nativeBuildInputs = [
+    swift
+    swiftpm
+  ];
+
+  buildInputs = with darwin.apple_sdk.frameworks; [
+    Foundation
+    Cocoa
+  ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = {
+    description = "Run a script whenever dark mode changes in macOS";
+    homepage = "https://github.com/bouk/dark-mode-notify";
+    # Doesn't build on x86_64 because of some CoreGraphics issue, even with SDK 11.0
+    platforms = [ "aarch64-darwin" ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ YorikSar ];
+  };
+})

pkgs/os-specific/linux/kernel/linux-5.15.nix

@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.125";
+  version = "5.15.126";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1izyv1ibiy4dapwb8745dshfbb9b6xqyz77l6mhkmlkcnx33h3qm";
+    sha256 = "0vzdncrvwqxzjkpgf3gjxvl8iwz92szfyzc33cayx28ghjwsmx5d";
   };
 } // (args.argsOverride or { }))

pkgs/tools/misc/clipbuzz/default.nix

@@ -1,23 +1,21 @@
 { lib
 , stdenv
-, fetchFromSourcehut
+, fetchzip
 , libX11
 , libXfixes
-, zig_0_10
+, zig_0_11
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clipbuzz";
-  version = "2.0.0";
+  version = "2.0.1";
 
-  src = fetchFromSourcehut {
+  src = fetchzip {
-    owner = "~cnx";
+    url = "https://trong.loang.net/~cnx/clipbuzz/snapshot/clipbuzz-${finalAttrs.version}.tar.gz";
-    repo = "clipbuzz";
+    hash = "sha256-2//IwthAjGyVSZaXjgpM1pUJGYWZVkrJ6JyrVbzOtr8=";
-    rev = finalAttrs.version;
-    hash = "sha256-V5bAZHoScTzFZBPUhPd7xc/c32SXPLAJp+vsc/lCyeI=";
   };
 
-  nativeBuildInputs = [ zig_0_10.hook ];
+  nativeBuildInputs = [ zig_0_11.hook ];
 
   buildInputs = [
     libX11
@@ -26,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta =  {
     description = "Buzz on new X11 clipboard events";
-    homepage = "https://git.sr.ht/~cnx/clipbuzz";
+    homepage = "https://trong.loang.net/~cnx/clipbuzz";
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.McSinyx ];
   };

pkgs/tools/networking/netbird/default.nix

@@ -30,13 +30,13 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.22.2";
+  version = "0.22.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-NLi6FJoSYwe1tr3z2F9m3INTfQiltvyq/VfoMwAhxZQ=";
+    sha256 = "sha256-1LUHS3G46EnDz0FgAXXOqluGD+fTRaALypZKNgXtCf0=";
   };
 
   vendorHash = "sha256-Fj80sYoNXt/rHUC8IEevbNbSIvWHPaKd90UQQTkd/7w=";

pkgs/tools/security/exploitdb/default.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2023-08-09";
+  version = "2023-08-11";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-o6rLIp6bOJK+JB0zd+aHbcWUBlEj9Y8FUdTYdnBp8wg=";
+    hash = "sha256-Fv5vGPo9KZCNTllQhVHlGh496vdwpdTx1V0StaS9Flk=";
   };
 
   nativeBuildInputs = [

pkgs/tools/security/tlsx/default.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "tlsx";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-sYyIZKhn2VJxNxoVb58WQj8a+sYHzuu4SjgPHyLsJK4=";
+    hash = "sha256-dCtMfrkN43zJqztCobT3RSkn4crGigqzI6NSP8wrCf0=";
   };
 
-  vendorHash = "sha256-hutHe0n3IAeCP+Lw7dZLfRLyvaOwrWFIrA6chsn+BEw=";
+  vendorHash = "sha256-33eVwWV9PnrP2MSPXTAcYe9ruJc5lauASc4uubBd9S4=";
 
   # Tests require network access
   doCheck = false;

pkgs/top-level/all-packages.nix

@@ -3596,6 +3596,8 @@ with pkgs;
 
   dcap = callPackage ../tools/networking/dcap { };
 
+  dark-mode-notify = callPackage ../os-specific/darwin/dark-mode-notify { };
+
   deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };
 
   delayarchitect = callPackage ../applications/audio/delayarchitect { };
@@ -10146,7 +10148,7 @@ with pkgs;
   lact = callPackage ../tools/system/lact { };
 
   ledit = callPackage ../tools/misc/ledit {
-    inherit (ocaml-ng.ocamlPackages_4_12) ocaml camlp5;
+    inherit (ocaml-ng.ocamlPackages_4_11) ocaml camlp5;
   };
 
   ledmon = callPackage ../tools/system/ledmon { };
@@ -20632,6 +20634,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
+  ceedling = callPackage ../development/tools/ceedling { };
+
   celt = callPackage ../development/libraries/celt { };
   celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { };
   celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };
@@ -36123,6 +36127,8 @@ with pkgs;
 
   watershot = callPackage ../applications/misc/watershot { };
 
+  waypaper = callPackage ../applications/misc/waypaper { };
+
   w3m = callPackage ../applications/networking/browsers/w3m { };
 
   # Should always be the version with the most features
@@ -39274,7 +39280,7 @@ with pkgs;
 
   hol = callPackage ../applications/science/logic/hol { };
 
-  inherit (ocaml-ng.ocamlPackages_4_12) hol_light;
+  inherit (ocamlPackages) hol_light;
 
   hologram = callPackage ../tools/security/hologram { };
 

pkgs/top-level/python-aliases.nix

@@ -80,6 +80,7 @@ mapAliases ({
   cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
   cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
   cx_Freeze = cx-freeze; # added 2023-08-02
+  d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
   dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
   dateutil = python-dateutil; # added 2021-07-03
   demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18

pkgs/top-level/python-packages.nix

@@ -2365,8 +2365,6 @@ self: super: with self; {
 
   cytoolz = callPackage ../development/python-modules/cytoolz { };
 
-  d2to1 = callPackage ../development/python-modules/d2to1 { };
-
   dacite = callPackage ../development/python-modules/dacite { };
 
   daemonize = callPackage ../development/python-modules/daemonize { };