Merge master into staging-next

maintainers/maintainer-list.nix

@@ -5829,6 +5829,12 @@
     githubId = 129093;
     name = "Desmond O. Chang";
   };
+  dod-101 = {
+    email = "david.thievon@proton.me";
+    github = "DOD-101";
+    githubId = 131907205;
+    name = "David Thievon";
+  };
   domenkozar = {
     email = "domen@dev.si";
     github = "domenkozar";
@@ -16348,6 +16354,13 @@
     github = "oaksoaj";
     githubId = 103952141;
   };
+  ob7 = {
+    name = "ob7";
+    email = "dev@ob7.us";
+    github = "ob7";
+    githubId = 6877929;
+    keys = [ { fingerprint = "5C1C 0251 FA85 8C62 0E96  7AC5 2766 5625 0571 34E4"; } ];
+  };
   obadz = {
     email = "obadz-nixos@obadz.com";
     github = "obadz";

maintainers/team-list.nix

@@ -134,6 +134,24 @@ with lib.maintainers;
     shortName = "c3d2";
   };
 
+  categorization = {
+    members = [
+      aleksana
+      fgaz
+      getpsyched
+      lyndeno
+      natsukium
+      philiptaron
+      pyrotelekinetic
+      raskin
+      sigmasquadron
+      tomodachi94
+    ];
+    githubTeams = [ "categorization" ];
+    scope = "Maintain the categorization system in Nixpkgs, per RFC 146. This team has authority over all categorization issues in Nixpkgs.";
+    shortName = "Categorization";
+  };
+
   cinnamon = {
     members = [
       bobby285271

pkgs/applications/graphics/inkscape/default.nix

@@ -7,7 +7,7 @@
 , cmake
 , desktopToDarwinBundle
 , fetchurl
-, fetchpatch
+, fd
 , gettext
 , ghostscript
 , glib
@@ -27,7 +27,6 @@
 , librevenge
 , librsvg
 , libsigcxx
-, libsoup_2_4
 , libvisio
 , libwpg
 , libXft
@@ -40,40 +39,43 @@
 , popt
 , potrace
 , python3
+, runCommand
 , substituteAll
 , wrapGAppsHook3
 , libepoxy
 , zlib
+, yq
 }:
 let
   python3Env = python3.withPackages
     (ps: with ps; [
+      # List taken almost verbatim from the output of nix-build -A inkscape.passthru.pythonDependencies
       appdirs
       beautifulsoup4
       cachecontrol
-    ]
-    # CacheControl requires extra runtime dependencies for FileCache
-    # https://gitlab.com/inkscape/extras/extension-manager/-/commit/9a4acde6c1c028725187ff5972e29e0dbfa99b06
-    ++ cachecontrol.optional-dependencies.filecache
-    ++ [
-      numpy
+      cssselect
+      filelock
+      inkex
       lxml
+      numpy
       packaging
       pillow
-      scour
+      pygobject3
       pyparsing
       pyserial
       requests
-      pygobject3
-    ] ++ inkex.propagatedBuildInputs);
+      scour
+      tinycss2
+      zstandard
+    ]);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "inkscape";
-  version = "1.3.2";
+  version = "1.4";
 
   src = fetchurl {
-    url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz";
-    sha256 = "sha256-29GETcRD/l4Q0+mohxROX7ciOFL/8ZHPte963qsOCGs=";
+    url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz";
+    sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U=";
   };
 
   # Inkscape hits the ARGMAX when linking on macOS. It appears to be
@@ -87,29 +89,13 @@ stdenv.mkDerivation rec {
       src = ./fix-python-paths.patch;
       # Python is used at run-time to execute scripts,
       # e.g., those from the "Effects" menu.
-      python3 = "${python3Env}/bin/python";
+      python3 = lib.getExe python3Env;
     })
     (substituteAll {
       # Fix path to ps2pdf binary
       src = ./fix-ps2pdf-path.patch;
       inherit ghostscript;
     })
-
-    # Fix build with libxml2 2.12
-    # https://gitlab.com/inkscape/inkscape/-/merge_requests/6089
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/694d8ae43d06efff21adebf377ce614d660b24cd.patch";
-      hash = "sha256-9IXJzpZbNU5fnt7XKgqCzUDrwr08qxGwo8TqnL+xc6E=";
-    })
-
-    # Improve distribute along path precision
-    # https://gitlab.com/inkscape/extensions/-/issues/580
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch";
-      extraPrefix = "share/extensions/";
-      stripLen = 1;
-      hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8=";
-    })
   ];
 
   postPatch = ''
@@ -119,7 +105,7 @@ stdenv.mkDerivation rec {
 
     # double-conversion is a dependency of 2geom
     substituteInPlace CMakeScripts/DefineDependsandFlags.cmake \
-      --replace 'find_package(DoubleConversion REQUIRED)' ""
+      --replace-fail 'find_package(DoubleConversion REQUIRED)' ""
   '';
 
   nativeBuildInputs = [
@@ -155,7 +141,6 @@ stdenv.mkDerivation rec {
     librevenge
     librsvg # for loading icons
     libsigcxx
-    libsoup_2_4
     libvisio
     libwpg
     libXft
@@ -182,14 +167,34 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { };
+  passthru = {
+    tests = {
+      ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { };
+      inherit (python3.pkgs) inkex;
+    };
 
-  meta = with lib; {
+    pythonDependencies = runCommand "python-dependency-list" {
+      nativeBuildInputs = [
+        fd
+        yq
+      ];
+      inherit (finalAttrs) src;
+    } ''
+      unpackPhase
+      tomlq --slurp 'map(.tool.poetry.dependencies | to_entries | map(.key)) | flatten | map(ascii_downcase) | unique' $(fd pyproject.toml) > "$out"
+    '';
+  };
+
+  meta = {
     description = "Vector graphics editor";
     homepage = "https://www.inkscape.org";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.jtojnar ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      jtojnar
+      x123
+      Luflosi
+    ];
+    platforms = lib.platforms.all;
     mainProgram = "inkscape";
     longDescription = ''
       Inkscape is a feature-rich vector graphics editor that edits
@@ -198,4 +203,4 @@ stdenv.mkDerivation rec {
       If you want to import .eps files install ps2edit.
     '';
   };
-}
+})

pkgs/by-name/au/automatic-timezoned/package.nix

@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "2.0.38";
+  version = "2.0.40";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-yGDMH0MmC+jihbKfKwQ/CEflBo+/q/OPzsi+CiiRqfE=";
+    sha256 = "sha256-q7WEG5Y8YpRUwNgp+SLi2eV9Z/Ork6+QZmPqxpUf60I=";
   };
 
-  cargoHash = "sha256-qUAst/goPhpJO26RLUPw6+q/FYHuGXaiFADOHIYmGZ8=";
+  cargoHash = "sha256-DJAQqPRcscYdrMYP0L09T6TtmDh3wuS89cWCvscyAak=";
 
   meta = with lib; {
     description = "Automatically update system timezone based on location";

pkgs/by-name/bu/buffybox/package.nix

@@ -15,15 +15,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffybox";
-  version = "3.2.0-unstable-2024-11-10";
+  version = "3.2.0-unstable-2024-12-09";
 
   src = fetchFromGitLab {
     domain = "gitlab.postmarketos.org";
     owner = "postmarketOS";
     repo = "buffybox";
     fetchSubmodules = true; # to use its vendored lvgl
-    rev = "07e324c17564cb9aab573259a8e0824a6806a751";
-    hash = "sha256-JY9WqtRjDsQf1UVFnM6oTwyAuhlJvrhcSNJdEZ0zIus=";
+    rev = "32f4837e836fbb0b820d68c74c3278c925369b04";
+    hash = "sha256-d9fa/Zqbm/+WMRmO0hBW83PCTDgaVOAxyRuSTItr9Xs=";
   };
 
   depsBuildBuild = [

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

@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cava";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "karlstav";
     repo = "cava";
     rev = version;
-    hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss=";
+    hash = "sha256-qpQ1WFWqq4FzeN0Yy8ke3mOYtGXmK998yZAy9OTBGq4=";
   };
 
   buildInputs =

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

@@ -44,10 +44,26 @@
 # $ conda install spyder
 let
   version = "24.9.2";
-  src = fetchurl {
-    url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-x86_64.sh";
-    hash = "sha256-jZNrpgAwDgjso9h03uiMYcbzkwNZeytmuu5Ur097QSI=";
-  };
+  selectSystem =
+    attrs:
+    attrs.${stdenv.hostPlatform.system}
+      or (throw "conda: ${stdenv.hostPlatform.system} is not supported");
+  src =
+    let
+      arch = selectSystem {
+        x86_64-linux = "x86_64";
+        aarch64-linux = "aarch64";
+      };
+      hash = selectSystem {
+        x86_64-linux = "sha256-jZNrpgAwDgjso9h03uiMYcbzkwNZeytmuu5Ur097QSI=";
+        aarch64-linux = "sha256-hrjfdIFkbPh+d4c+l4mtt1abWCSNOqYp6y2jXm8uLu0=";
+      };
+    in
+    fetchurl {
+      url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-${arch}.sh";
+      inherit hash;
+    };
+
   conda = (
     let
       libPath = lib.makeLibraryPath [
@@ -99,7 +115,7 @@ buildFHSEnv {
     # Some other required environment variables
     export FONTCONFIG_FILE=/etc/fonts/fonts.conf
     export QTCOMPOSE=${xorg.libX11}/share/X11/locale
-    export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so
+    export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
     # Allows `conda activate` to work properly
     condaSh=${installationPath}/etc/profile.d/conda.sh
     if [ ! -f $condaSh ]; then
@@ -111,11 +127,14 @@ buildFHSEnv {
   runScript = "bash -l";
 
   meta = {
-    description = "Conda is a package manager for Python";
+    description = "Package manager for Python";
     mainProgram = "conda-shell";
-    homepage = "https://conda.io/";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.bsd3;
+    homepage = "https://conda.io";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ jluttine ];
   };
 }

pkgs/by-name/co/config-store/package.nix

@@ -0,0 +1,30 @@
+{
+  rustPlatform,
+  fetchFromGitHub,
+  lib,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "config-store";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "DOD-101";
+    repo = "config-store";
+    tag = "v${version}";
+    hash = "sha256-dmFIB9tVI5/hnI+VKeawFzKi6UJrRis0tpeQE5a5dGU=";
+  };
+
+  cargoHash = "sha256-tEhk6vDan5uaP1vvKanB+juKsGJndrJPP67kudds24s=";
+
+  meta = {
+    description = "Simple key-value store designed to be used from shell scripts written in Rust";
+    homepage = "https://github.com/DOD-101/config-store";
+    mainProgram = "config-store";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ dod-101 ];
+  };
+}

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

@@ -5,22 +5,22 @@
   makeBinaryWrapper,
   makeDesktopItem,
   jdk17,
-  gradle_7,
+  gradle_8,
   which,
 }:
 
 let
   pname = "freeplane";
-  version = "1.11.14";
+  version = "1.12.8";
 
   jdk = jdk17;
-  gradle = gradle_7;
+  gradle = gradle_8;
 
   src = fetchFromGitHub {
     owner = "freeplane";
     repo = "freeplane";
     rev = "release-${version}";
-    hash = "sha256-zEQjB57iiKVQnH8VtynpEGKNAa2e+WpqnGt6fnv5Rjs=";
+    hash = "sha256-yzjzaobXuQH8CHz183ditL2LsCXU5xLh4+3El4Ffu20=";
   };
 
 in

pkgs/by-name/go/gollama/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gollama";
-  version = "1.27.19";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "sammcj";
     repo = "gollama";
     rev = "refs/tags/v${version}";
-    hash = "sha256-W+69Jt0mdwLIBHZ8zg3oK8d2DwwvYHtHj1oQUW3vt6M=";
+    hash = "sha256-nQrd0gpl6fjJ5wzDvDGpI01h7jeGEyB6uuObgoz7Uo8=";
   };
 
-  vendorHash = "sha256-SYu2ITSZIVtDczBfWJ5pFw4l0mkb3b7YvMzIrEcpOa8=";
+  vendorHash = "sha256-vIqDYtdz799qm3vp8w293OLx1IoLNr5YjyNqYcvOkI0=";
 
   doCheck = false;
 

pkgs/by-name/ho/houdini/package.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:
 
 buildFHSEnv rec {
-  name = "houdini-${unwrapped.version}";
+  inherit (unwrapped) pname version;
 
   # houdini spawns hserver (and other license tools) that is supposed to live beyond the lifespan of houdini process
   dieWithParent = false;
@@ -76,7 +76,7 @@ buildFHSEnv rec {
       "houdini/sbin/sesinetd"
     ];
   in ''
-    WRAPPER=$out/bin/${name}
+    WRAPPER=$out/bin/houdini
     EXECUTABLES="${lib.concatStringsSep " " executables}"
     for executable in $EXECUTABLES; do
       mkdir -p $out/$(dirname $executable)
@@ -94,7 +94,7 @@ buildFHSEnv rec {
     "--ro-bind-try /etc/OpenCL/vendors /etc/OpenCL/vendors"  # this is the case of not NixOS
   ];
 
-  runScript = writeScript "${name}-wrapper" ''
+  runScript = writeScript "houdini-wrapper" ''
     # ncurses5 is needed by hfs ocl backend
     # workaround for this issue: https://github.com/NixOS/nixpkgs/issues/89769
     export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH

pkgs/by-name/im/imgpkg/package.nix

@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "imgpkg";
-  version = "0.43.1";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "imgpkg";
     rev = "v${version}";
-    hash = "sha256-RjTVJjuzjNTZrg1VZ4NrDf1SZmS+CGzofYTBQEZNIag=";
+    hash = "sha256-M8OUeB2aigwlvGznByVEsDZnSQb0ggqQA73lXFwbY2c=";
   };
 
   vendorHash = null;

pkgs/by-name/li/lib2geom/package.nix

@@ -1,6 +1,5 @@
 {
   stdenv,
-  fetchpatch,
   fetchFromGitLab,
   cmake,
   ninja,
@@ -16,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lib2geom";
-  version = "1.3";
+  version = "1.4";
 
   outputs = [
     "out"
@@ -27,33 +26,9 @@ stdenv.mkDerivation rec {
     owner = "inkscape";
     repo = "lib2geom";
     rev = "refs/tags/${version}";
-    hash = "sha256-llUpW8VRBD8RKaGfyedzsMbLRb8DIo0ePt6m2T2w7Po=";
+    hash = "sha256-kbcnefzNhUj/ZKZaB9r19bpI68vxUKOLVAwUXSr/zz0=";
   };
 
-  patches = [
-    # Fix compilation with Clang.
-    # https://gitlab.com/inkscape/lib2geom/-/merge_requests/102
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/lib2geom/-/commit/a5b5ac7d992023f8a80535ede60421e73ecd8e20.patch";
-      hash = "sha256-WJYkk3WRYVyPSvyTbKDUrYvUwFgKA9mmTiEWtYQqM4Q=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch";
-      hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA=";
-    })
-
-    # Fix ellipses rendering near page corners.
-    # https://gitlab.com/inkscape/lib2geom/-/issues/66
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/lib2geom/-/commit/039ce8d4af23a0a2a9d48eb970b321d9795dcc08.patch";
-      hash = "sha256-JfgGrqBcYSYKcdl4Bt7vGZ4aTBPSHM6JjZ95IlzxPwI=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/lib2geom/-/commit/cf523857e48c87f9f6a09217bdf935fff457823d.patch";
-      hash = "sha256-BRg8ANHMSgoi6vt9PNbhwG1fRkzEPXb4gPTPO3sY0XE=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     ninja
@@ -91,6 +66,17 @@ stdenv.mkDerivation rec {
           # Fails due to rounding differences
           # https://gitlab.com/inkscape/lib2geom/-/issues/70
           "circle-test"
+        ]
+        ++ lib.optionals (stdenv.hostPlatform.system != "x86_64-linux") [
+          # https://gitlab.com/inkscape/lib2geom/-/issues/69
+          "polynomial-test"
+
+          # https://gitlab.com/inkscape/lib2geom/-/issues/75
+          "line-test"
+
+          # Failure observed on aarch64-darwin
+          "bezier-test"
+          "ellipse-test"
         ];
     in
     ''

pkgs/by-name/ma/mactracker/package.nix

@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  unzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "mactracker";
+  version = "7.13";
+
+  src = fetchurl {
+    url = "https://mactracker.ca/downloads/Mactracker_${finalAttrs.version}.zip";
+    hash = "sha256-GbaGhYF9Pf3EpzoLQd9fkWYxHFwCkYdlRyy33lieUxM=";
+  };
+
+  dontPatch = true;
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true;
+  dontUnpack = true;
+
+  nativeBuildInputs = [ unzip ];
+
+  sourceRoot = "Mactracker.app";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/Applications
+    unzip -d $out/Applications $src -x '__MACOSX/*'
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Mactracker provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made";
+    homepage = "https://mactracker.ca";
+    changelog = "https://mactracker.ca/releasenotes-mac.html";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ DimitarNestorov ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
+  };
+})

pkgs/by-name/mi/microsoft-edge/update.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian common-updater-scripts
+#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts
 
 import base64
 import textwrap

pkgs/by-name/ne/networkmanager-vpnc/package.nix

@@ -3,7 +3,6 @@
 , fetchurl
 , substituteAll
 , vpnc
-, intltool
 , pkg-config
 , networkmanager
 , libsecret
@@ -20,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "NetworkManager-vpnc";
-  version = "1.2.8";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager-vpnc/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1l4xqlPI/cP95++EpNqpeaYFwj/THO/2R79+qqma+8w=";
+    sha256 = "47KpiIAnWht1FUvDF6eGQ8/fnqfnDfTu2WSPKeolNzA=";
   };
 
   patches = [
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    intltool
     pkg-config
     file
   ];

pkgs/by-name/pa/pandoc/package.nix

@@ -1,13 +1,22 @@
-{ stdenv, lib, haskellPackages, haskell, removeReferencesTo, installShellFiles }:
+{
+  stdenv,
+  lib,
+  haskellPackages,
+  haskell,
+  removeReferencesTo,
+  installShellFiles,
+  selectPandocCLI ? (p: p.pandoc-cli), # The version of pandoc-cli choosen from haskellPackages.
+}:
 
 let
   # Since pandoc 3.0 the pandoc binary resides in the pandoc-cli package.
-  static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc-cli;
+  static = haskell.lib.compose.justStaticExecutables pandoc-cli;
+  pandoc-cli = selectPandocCLI haskellPackages;
 
 in
   (haskell.lib.compose.overrideCabal (drv: {
     configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
-    buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
+    buildDepends = drv.buildDepends or [] ++ [pandoc-cli.scope.file-embed];
     buildTools = (drv.buildTools or []) ++ [
       removeReferencesTo
       installShellFiles
@@ -22,13 +31,13 @@ in
     # For details see: https://github.com/NixOS/nixpkgs/issues/34376
     postInstall = drv.postInstall or "" + ''
       remove-references-to \
-        -t ${haskellPackages.pandoc-types} \
+        -t ${pandoc-cli.scope.pandoc-types} \
         $out/bin/pandoc
       remove-references-to \
-        -t ${haskellPackages.warp} \
+        -t ${pandoc-cli.scope.warp} \
         $out/bin/pandoc
       remove-references-to \
-        -t ${haskellPackages.pandoc} \
+        -t ${pandoc-cli.scope.pandoc} \
         $out/bin/pandoc
     '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
       mkdir -p $out/share/bash-completion/completions
@@ -44,5 +53,5 @@ in
     # lead to a transitive runtime dependency on the whole GHC distribution.
     # This should ideally be fixed in haskellPackages (or even Cabal),
     # but a minimal pandoc is important enough to patch it manually.
-    disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc ];
+    disallowedReferences = [ pandoc-cli.scope.pandoc-types pandoc-cli.scope.warp pandoc-cli.scope.pandoc ];
   })

pkgs/by-name/pa/par2cmdline-turbo/package.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "par2cmdline-turbo";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "animetosho";
     repo = "par2cmdline-turbo";
     rev = "v${version}";
-    hash = "sha256-EJ6gBja5tPrfsfbqYs8pZDEPmJ6mCPfkUYOTTMFaKG8=";
+    hash = "sha256-GFMFqHiKoQByD8ZYgGm36ehfMP4CvC2F+u2Va20RSNI=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/by-name/ro/rockcraft/package.nix

@@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec {
       pytest-mock
       pytest-subprocess
       pytestCheckHook
+      tabulate
     ]
     ++ [ dpkg ];
 

pkgs/by-name/s7/s7/package.nix

@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.2-unstable-2024-11-02";
+  version = "11.2-unstable-2024-12-10";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "6b6651de318c3360aa2711a445659f372ffe894e";
-    hash = "sha256-9x1u60jflESAHgP0gwIDVFwhI5XU5gsAiXaic8zdW2U=";
+    rev = "9228fbb69835a8b414cba028d56ee7ddf4479e14";
+    hash = "sha256-qvkkRc3UivsAAu9b48K+6dpl91MDnTsU/zyN4hfKUCo=";
   };
 
   buildInputs = [

pkgs/by-name/sc/scrcpy/package.nix

@@ -16,12 +16,12 @@
 }:
 
 let
-  version = "3.0.2";
+  version = "3.1";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-4Z/gJL+jNngJSUQHrWyoCab2532slemfhbp1FE4Lo10=";
+    hash = "sha256-lY8JRKYvI7HzOhbp6xSETBoEuILKF1pzjBbSPLIrhsA=";
   };
 in
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6CViFgQuazvKGPHGpityEI/mpgOmIBA6LTEHobWybV0=";
+    hash = "sha256-XxvlwF3vqtkew+P1yuIwBJxYetD+D+v8OKaETU3qVkk=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.

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

@@ -7,11 +7,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.1.1";
+  version = "6.2.0";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-FHkZqbbJTQz+gIOgpMiak9u4ZOY/7r+1+if74LHLw/c=";
+    hash = "sha256-2Ng77oggjdePDNeB0NdC8vkRY4duwzUdde22Hp6dXyM=";
   };
 
   appimageContents = appimageTools.extract {

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

@@ -82,7 +82,7 @@ python3Packages.buildPythonApplication rec {
     craft-platforms
     craft-providers
     craft-store
-    debian
+    python-debian
     docutils
     jsonschema
     launchpadlib

pkgs/by-name/sp/spotdl/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "spotdl";
-  version = "4.2.8";
+  version = "4.2.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1NPYMyiYWWpiGlr80IcILcC1nI8zkmf7+aA+mqwSAU0=";
+    hash = "sha256-F97g5AhyXXYEICb/0RcfVPype8PVfFAKFEX0Xyg1QoI=";
   };
 
   build-system = with python3.pkgs; [ poetry-core ];
@@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec {
     spotipy
     syncedlyrics
     uvicorn
+    websockets
     yt-dlp
     ytmusicapi
   ] ++ python-slugify.optional-dependencies.unidecode;

pkgs/by-name/sy/syshud/package.nix

@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "syshud";
-  version = "0-unstable-2024-11-12";
+  version = "0-unstable-2024-11-25";
 
   src = fetchFromGitHub {
     owner = "System64fumo";
     repo = "syshud";
-    rev = "734d632ca0665a288d1308f883d974462fa2d349";
-    hash = "sha256-Rk0q/veBEJh8BHZZoFcGZ+Beh8mWGGi2OiuGlM0NEgs=";
+    rev = "922d3fbc811644cb14d0f11cff91f8e8f97eca56";
+    hash = "sha256-ubsmkC/mjDe/6AH/2Y6e9CmhBX3CxtOW2xOhvPJiAqg=";
   };
 
   postPatch = ''

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

@@ -0,0 +1,26 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "tenere";
+  version = "0.11.2-unstable-2024-12-05";
+  src = fetchFromGitHub {
+    owner = "pythops";
+    repo = "tenere";
+    rev = "0f3181ab23066aa69aa4fec387a7e16578078179";
+    hash = "sha256-HKPCX0bmXkB3LwvgE1li3dlWTgpW5CXuWZNq3mFY6FY=";
+  };
+  cargoHash = "sha256-u6QCs3RaLeRoVfhRzUG7wwx7kd0O3KyiC5vhZ3mE7UM=";
+
+  requiredSystemFeatures = [ "big-parallel" ]; # for fat LTO from upstream
+
+  meta = {
+    description = "Terminal interface for large language models (LLMs)";
+    homepage = "https://github.com/pythops/tenere";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ob7 ];
+    mainProgram = "tenere";
+  };
+}

pkgs/by-name/vm/vmware-workstation/package.nix

@@ -47,7 +47,8 @@ let
   };
 
   vmware-unpack-env = buildFHSEnv rec {
-    name = "vmware-unpack-env";
+    pname = "vmware-unpack-env";
+    inherit version;
     targetPkgs = pkgs: [ zlib ];
   };
 

pkgs/data/icons/kora-icon-theme/default.nix

@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec  {
   pname = "kora-icon-theme";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub  {
     owner = "bikass";
     repo = "kora";
     rev = "v${version}";
-    sha256 = "sha256-cWfQiJeyH/bkvASoe2nl4efHQdMpYFh587d5yycs31k=";
+    sha256 = "sha256-FBUOmiw3Ak1QVUrpj0+pfFqG/oKNnEXMRNlVKVNzK2I=";
   };
 
   nativeBuildInputs = [

pkgs/development/compilers/dotnet/build-dotnet.nix

@@ -98,7 +98,7 @@ let
 
 in
 mkWrapper type (
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation (finalAttrs: {
     inherit pname version;
 
     # Some of these dependencies are `dlopen()`ed.
@@ -194,19 +194,29 @@ mkWrapper type (
       {
         inherit icu hasILCompiler;
       }
-      // lib.optionalAttrs (type == "sdk") {
-        packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid};
-        inherit targetPackages runtime aspnetcore;
+      // lib.optionalAttrs (type == "sdk") (
+        let
+          # force evaluation of the SDK package to ensure evaluation failures
+          # (e.g. due to vulnerabilities) propagate to the nuget packages
+          forceSDKEval = builtins.seq finalAttrs.finalPackage.drvPath;
+        in
+        {
+          packages = map forceSDKEval (
+            commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}
+          );
+          targetPackages = lib.mapAttrs (_: map forceSDKEval) targetPackages;
+          inherit runtime aspnetcore;
 
-        updateScript =
-          let
-            majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
-          in
-          [
-            ./update.sh
-            majorVersion
-          ];
-      };
+          updateScript =
+            let
+              majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version));
+            in
+            [
+              ./update.sh
+              majorVersion
+            ];
+        }
+      );
 
     meta = with lib; {
       description = builtins.getAttr type descriptions;
@@ -239,5 +249,5 @@ mkWrapper type (
             "Dotnet SDK ${version} is EOL, please use 8.0 (LTS) or 9.0 (Current)"
           ];
     };
-  }
+  })
 )

pkgs/development/compilers/dotnet/combine-packages.nix

@@ -56,5 +56,14 @@ mkWrapper "sdk" (buildEnv {
     );
   };
 
-  inherit (cli) meta;
+  meta = {
+    description = "${cli.meta.description or "dotnet"} (combined)";
+    inherit (cli.meta)
+      homepage
+      license
+      mainProgram
+      maintainers
+      platforms
+      ;
+  };
 })

pkgs/development/compilers/dotnet/wrapper.nix

@@ -22,7 +22,18 @@
 type: unwrapped:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "${unwrapped.pname}-wrapped";
-  inherit (unwrapped) version meta;
+  inherit (unwrapped) version;
+
+  meta = {
+    description = "${unwrapped.meta.description or "dotnet"} (wrapper)";
+    mainProgram = "dotnet";
+    inherit (unwrapped.meta)
+      homepage
+      license
+      maintainers
+      platforms
+      ;
+  };
 
   src = unwrapped;
   dontUnpack = true;

pkgs/development/haskell-modules/configuration-common.nix

@@ -1964,6 +1964,24 @@ self: super: {
       )
     ];
 
+  # Pandoc 3.5 improves the quality of PDF rendering in Quarto >=1.6.30.
+  # https://github.com/NixOS/nixpkgs/pull/349683
+  pandoc-cli_3_5 = super.pandoc-cli_3_5.overrideScope (
+    self: super: {
+      doclayout = self.doclayout_0_5;
+      hslua-module-doclayout = self.hslua-module-doclayout_1_2_0;
+      lpeg = self.lpeg_1_1_0;
+      pandoc = self.pandoc_3_5;
+      pandoc-lua-engine = self.pandoc-lua-engine_0_3_3;
+      pandoc-server = self.pandoc-server_0_1_0_9;
+      texmath = self.texmath_0_12_8_11;
+      tls = self.tls_2_0_6;
+      toml-parser = self.toml-parser_2_0_1_0;
+      typst = self.typst_0_6;
+      typst-symbols = self.typst-symbols_0_1_6;
+    }
+  );
+
   # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
   pandoc-include-code = doJailbreak super.pandoc-include-code;
 

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -109,6 +109,7 @@ extra-packages:
   - tls < 2.1.0                         # 2024-07-19: requested by darcs == 2.18.3
   - extensions == 0.1.0.2               # 2024-10-20: for GHC 9.10/Cabal 3.12
   - network-run == 0.4.0                # 2024-10-20: for GHC 9.10/network == 3.1.*
+  - typst-symbols >=0.1.6 && <0.1.7     # 2024-11-20: for pandoc 3.5 and quarto
 
 package-maintainers:
   abbradar:

pkgs/development/haskell-modules/hackage-packages.nix

@@ -319314,6 +319314,18 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "typst-symbols_0_1_6" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "typst-symbols";
+       version = "0.1.6";
+       sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl";
+       libraryHaskellDepends = [ base text ];
+       description = "Symbol and emoji lookup for typst language";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "typst-symbols_0_1_7" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {

pkgs/development/libraries/ngtcp2/default.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ngtcp2";
-  version = "1.8.1";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-wNHaoZ6N9sJhsjlZEQ4iRHA3wvVxQE4cg8W2XeRx0LQ=";
+    hash = "sha256-NdqmmYAqCYCm1QAqf8K22HdMd0zO3zYds2cEbJutwPA=";
     fetchSubmodules = true;
   };
 

pkgs/development/libraries/quarto/default.nix

@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, pandoc
+, pandoc_3_5
 , typst
 , esbuild
 , deno
@@ -16,7 +16,6 @@
 , extraPythonPackages ? ps: []
 , sysctl
 }:
-
 stdenv.mkDerivation (final: {
   pname = "quarto";
   version = "1.6.37";
@@ -39,7 +38,7 @@ stdenv.mkDerivation (final: {
   preFixup = ''
     wrapProgram $out/bin/quarto \
       --prefix QUARTO_DENO : ${lib.getExe deno} \
-      --prefix QUARTO_PANDOC : ${lib.getExe pandoc} \
+      --prefix QUARTO_PANDOC : ${lib.getExe pandoc_3_5} \
       --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \
       --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \
       --prefix QUARTO_TYPST : ${lib.getExe typst} \

pkgs/development/python-modules/craft-archives/default.nix

@@ -5,11 +5,12 @@
   nix-update-script,
   launchpadlib,
   lazr-restfulclient,
+  lazr-uri,
   overrides,
   pydantic,
-  setuptools,
+  python-debian,
+  distro,
   setuptools-scm,
-  tabulate,
   pytest-check,
   pytest-mock,
   pytestCheckHook,
@@ -17,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "craft-archives";
-  version = "2.0.0";
+  version = "2.0.2";
 
   pyproject = true;
 
@@ -25,7 +26,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-archives";
     rev = "refs/tags/${version}";
-    hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I=";
+    hash = "sha256-1HEz4d1WLQDDHga7X+V/37n8E7JK/k0z+UDeNEiLOHs=";
   };
 
   postPatch = ''
@@ -39,11 +40,13 @@ buildPythonPackage rec {
   build-system = [ setuptools-scm ];
 
   dependencies = [
+    distro
     launchpadlib
     lazr-restfulclient
+    lazr-uri
     overrides
     pydantic
-    tabulate
+    python-debian
   ];
 
   pythonImportsCheck = [ "craft_archives" ];

pkgs/development/python-modules/craft-parts/default.nix

@@ -9,7 +9,6 @@
   pyyaml,
   requests,
   requests-unixsocket,
-  urllib3,
   pytestCheckHook,
   pytest-check,
   pytest-mock,
@@ -25,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "craft-parts";
-  version = "2.1.3";
+  version = "2.1.4";
 
   pyproject = true;
 
@@ -33,7 +32,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-parts";
     rev = "refs/tags/${version}";
-    hash = "sha256-ouvl4mIDIWHWp84E1I41g/XnP22kCV55CqsVLit5yb4=";
+    hash = "sha256-z0Om1/0Y6fDFHXB0GKFelmYwNwTH7loTtRjXtmjsjkY=";
   };
 
   patches = [ ./bash-path.patch ];
@@ -53,7 +52,6 @@ buildPythonPackage rec {
     pyyaml
     requests
     requests-unixsocket
-    urllib3
   ];
 
   pythonImportsCheck = [ "craft_parts" ];

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

@@ -28,15 +28,15 @@
 }:
 buildPythonPackage rec {
   pname = "cynthion";
-  version = "0.1.7";
+  version = "0.1.8";
   pyproject = true;
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "cynthion";
-    rev = "refs/tags/${version}";
-    hash = "sha256-2nVfODAg4t5hoSKUEP4IN23R+JGe3lw/rpfjW/UIsYw=";
+    tag = version;
+    hash = "sha256-twkCv47Goob2cO7FeHegvab3asf8fqbY9qg97Vw4ZCo=";
   };
 
   sourceRoot = "${src.name}/cynthion/python";

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

@@ -2,9 +2,8 @@
   lib,
   buildPythonPackage,
   pythonOlder,
-  fetchPypi,
-  fetchpatch2,
-  setuptools,
+  fetchFromGitHub,
+  hatchling,
   packaging,
   tomli,
   pyyaml,
@@ -13,27 +12,21 @@
 
 buildPythonPackage rec {
   pname = "dparse";
-  version = "0.6.3";
+  version = "0.6.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg=";
+  src = fetchFromGitHub {
+    owner = "pyupio";
+    repo = "dparse";
+    tag = version;
+    hash = "sha256-LnsmJtWLjV3xoSjacfR9sUwPlOjQTRBWirJVtIJSE8A=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "fix-configparser-deprecation-warning.patch";
-      url = "https://github.com/pyupio/dparse/pull/69.patch";
-      hash = "sha256-RolD6xDJpI8/UHgAdcsXoyxOGLok7AogLMOTl1ZPKvw=";
-    })
-  ];
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+  dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   optional-dependencies = {
     # FIXME pipenv = [ pipenv ];

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

@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   inkscape,
-  fetchpatch,
   poetry-core,
   cssselect,
   lxml,
@@ -14,6 +13,7 @@
   pyparsing,
   pyserial,
   scour,
+  tinycss2,
   gobject-introspection,
   pytestCheckHook,
   gtk3,
@@ -27,17 +27,6 @@ buildPythonPackage {
 
   inherit (inkscape) src;
 
-  patches = [
-    # Fix “distribute along path” test with Python 3.12.
-    # https://gitlab.com/inkscape/extensions/-/issues/580
-    (fetchpatch {
-      url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch";
-      extraPrefix = "share/extensions/";
-      stripLen = 1;
-      hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8=";
-    })
-  ];
-
   nativeBuildInputs = [ poetry-core ];
 
   pythonRelaxDeps = [ "numpy" ];
@@ -48,6 +37,7 @@ buildPythonPackage {
     numpy
     pygobject3
     pyserial
+    tinycss2
   ];
 
   pythonImportsCheck = [ "inkex" ];
@@ -89,8 +79,7 @@ buildPythonPackage {
     cd share/extensions
 
     substituteInPlace pyproject.toml \
-      --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"' \
-      --replace-fail 'lxml = "^4.5.0"' 'lxml = "^4.5.0 || ^5.0.0"'
+      --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"'
   '';
 
   meta = {

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

@@ -14,7 +14,7 @@
   binaryornot,
   boolean-py,
   click,
-  debian,
+  python-debian,
   jinja2,
   license-expression,
   tomlkit,
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     binaryornot
     boolean-py
     click
-    debian
+    python-debian
     jinja2
     license-expression
     tomlkit

pkgs/development/python-modules/safety-schemas/default.nix

@@ -12,19 +12,17 @@
 
 buildPythonPackage rec {
   pname = "safety-schemas";
-  version = "0.0.5";
+  version = "0.0.10";
   pyproject = true;
 
   src = fetchPypi {
     pname = "safety_schemas";
     inherit version;
-    hash = "sha256-DeX8mlPUQjZEqM6aF6LkdHFKon5X81BhRulaQXEP8QQ=";
+    hash = "sha256-Xsg7sZ4XADdI0qSxHkPh8rRHHJQ0Mp6aDYDRBplmuWw=";
   };
 
   build-system = [ hatchling ];
 
-  pythonRelaxDeps = [ "dparse" ];
-
   dependencies = [
     dparse
     packaging

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

@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.2.9";
+  version = "3.2.11";
 
   disabled = pythonOlder "3.7";
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "pyupio";
     repo = "safety";
     rev = "refs/tags/${version}";
-    hash = "sha256-etA/S/i87w4ihsqQo5JJjt6hWC7Jt9/q8vhqyo+DTek=";
+    hash = "sha256-ekJ0o+KWS8Fih1M/scboGEjETX0/2Uh6h/zne4h+3wI=";
   };
 
   postPatch = ''
@@ -54,7 +54,6 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   pythonRelaxDeps = [
-    "dparse"
     "filelock"
   ];
 

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

@@ -50,5 +50,6 @@ buildPythonPackage rec {
       dotlambda
       gal_bolle
     ];
+    broken = true;
   };
 }

pkgs/development/tools/click/default.nix

@@ -3,7 +3,7 @@
   fetchFromGitLab,
   buildPythonApplication,
   autoreconfHook,
-  debian,
+  python-debian,
   perl,
   vala,
   pkg-config,
@@ -78,7 +78,7 @@ buildPythonApplication {
   ];
 
   propagatedBuildInputs = [
-    debian
+    python-debian
     pygobject3
     setuptools
   ];

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

@@ -6,14 +6,14 @@
 buildDunePackage rec {
   pname = "utop";
 
-  version = "2.14.0";
+  version = "2.15.0";
   propagatedBuildInputs = [ findlib lambda-term xdg zed logs ];
 
   minimalOCamlVersion = "4.11";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
-    sha256 = "sha256-D9WpvFtFhSSnFGOh/gzRb5t74TZzrjAxGLchbg0nO6k=";
+    url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tar.gz";
+    hash = "sha256-dlneoKf3pbFuMAJO5oFEUXn4wPh2MOXNrlVCgNrNb6w=";
   };
 
   nativeBuildInputs = [ makeWrapper cppo ];

pkgs/misc/tmux-plugins/default.nix

@@ -601,12 +601,12 @@ in rec {
   session-wizard = mkTmuxPlugin rec {
     pluginName = "session-wizard";
     rtpFilePath = "session-wizard.tmux";
-    version = "1.3.1";
+    version = "1.4.0";
     src = pkgs.fetchFromGitHub {
       owner = "27medkamal";
       repo = "tmux-session-wizard";
       rev = "V${version}";
-      sha256 = "sha256-nJaC5aX+cR/+ks3I/lW/tUnVG0CrEYfsIjPDisgMrTE=";
+      sha256 = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw=";
     };
     meta = with lib; {
       homepage = "https://github.com/27medkamal/tmux-session-wizard";

pkgs/tools/misc/diffoscope/default.nix

@@ -190,7 +190,7 @@ python.pkgs.buildPythonApplication rec {
     ]
     ++ (with python.pkgs; [
       argcomplete
-      debian
+      python-debian
       defusedxml
       jsbeautifier
       jsondiff

pkgs/tools/misc/opentelemetry-collector/builder.nix

@@ -7,17 +7,17 @@ buildGoModule rec {
   pname = "ocb";
   # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
   # whenever that version changes.
-  version = "0.114.0";
+  version = "0.115.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "cmd/builder/v${version}";
-    hash = "sha256-zy+TWjh7janUhpxO9fOC8C9vz/tI0mbAyEsCo9zZ1j4=";
+    hash = "sha256-wl0ThYbDTVLuN9FkrsHF1prydrPMIaiK/9s2Ipeqfik=";
   };
 
   sourceRoot = "${src.name}/cmd/builder";
-  vendorHash = "sha256-dLNs9Vgn6f10hl5XuPzzE4eFNfvELWSKGsd7FbSiHkU=";
+  vendorHash = "sha256-8g/92NOCj/mH1szrKR04R+Yy9GBYNnQFMi9KhqGKelU=";
 
   CGO_ENABLED = 0;
   ldflags = [

pkgs/top-level/all-packages.nix

@@ -4741,6 +4741,8 @@ with pkgs;
 
   pakcs = callPackage ../development/compilers/pakcs { };
 
+  pandoc_3_5 = callPackage ../by-name/pa/pandoc/package.nix { selectPandocCLI = (p: p.pandoc-cli_3_5); };
+
   paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
 
   parallel = callPackage ../tools/misc/parallel { };
@@ -9602,10 +9604,6 @@ with pkgs;
 
   lcms = lcms2;
 
-  lib2geom = callPackage ../development/libraries/lib2geom {
-    stdenv = if stdenv.cc.isClang then llvmPackages_13.stdenv else stdenv;
-  };
-
   libacr38u = callPackage ../tools/security/libacr38u {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
@@ -12525,7 +12523,13 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pam = if stdenv.hostPlatform.isLinux then linux-pam else openpam;
+  pam =
+    if stdenv.hostPlatform.isLinux then
+      linux-pam
+    else if stdenv.hostPlatform.isFreeBSD then
+      freebsd.libpam
+    else
+      openpam;
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
 

pkgs/top-level/python-aliases.nix

@@ -137,6 +137,7 @@ mapAliases ({
   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
+  debian = python-debian; # added 2024-12-10
   deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09
   demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   descartes = throw "descartes has been removed, since it is abandoned and broken"; # added 2023-06-21

pkgs/top-level/python-packages.nix

@@ -3058,8 +3058,6 @@ self: super: with self; {
 
   deap = callPackage ../development/python-modules/deap { };
 
-  debian = callPackage ../development/python-modules/debian { };
-
   debianbts = callPackage ../development/python-modules/debianbts { };
 
   debian-inspector = callPackage ../development/python-modules/debian-inspector { };
@@ -9364,6 +9362,8 @@ self: super: with self; {
 
   python-bugzilla = callPackage ../development/python-modules/python-bugzilla { };
 
+  python-debian = callPackage ../development/python-modules/python-debian { };
+
   python-hcl2 = callPackage ../development/python-modules/python-hcl2 { };
 
   python-lorem = callPackage ../development/python-modules/python-lorem { };