Merge remote-tracking branch 'upstream/master' into love2d-darwin-clean

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

@@ -16,17 +16,17 @@
 
 buildGoModule rec {
   inherit pname;
-  version = "2.11.5";
+  version = "2.12.0";
   tags = lib.optionals enableGateway [ "gateway" ];
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     tag = version;
-    hash = "sha256-gNojkBMdTbBLnN5Xpbpm7chLfCT+7S8mJTilEABuVis=";
+    hash = "sha256-5syQFcYBY/xKipIsAJdjVrXYXt7NNjjCeXiDVNO9NTo=";
   };
 
-  vendorHash = "sha256-Sy67XRPob++DH+pKFY5lZOfc3f1MaP3nI1znnvjYB+M=";
+  vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";
 
   # no test files
   doCheck = false;

pkgs/by-name/README.md

@@ -62,16 +62,12 @@ The above expression is called using these arguments by default:
 ```
 
 But the package might need `pkgs.libbar_2` instead.
-While the function could be changed to take `libbar_2` directly as an argument,
-this would change the `.override` interface, breaking code like `.override { libbar = ...; }`.
-So instead it is preferable to use the same generic parameter name `libbar`
-and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-packages.nix):
+While the `libbar` argument could explicitly be overridden in `all-packages.nix` with `libbar_2`, this would hide important information about this package from its interface.
+The fact that the package requires a certain version of `libbar` to work should not be hidden in a separate place.
+It is preferable to use `libbar_2` as a argument name instead.
 
-```nix
-{
-  libfoo = callPackage ../by-name/so/some-package/package.nix { libbar = libbar_2; };
-}
-```
+This approach also has the benefit that, if the expectation of the package changes to require a different version of `libbar`, a downstream user with an override of this argument will receive an error.
+This is comparable to a merge conflict in git: It's much better to be forced to explicitly address the conflict instead of silently keeping the override - which might lead to a different problem that is likely much harder to debug.
 
 ## Manual migration guidelines
 

pkgs/by-name/an/anydesk/package.nix

@@ -34,14 +34,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "anydesk";
-  version = "7.0.2";
+  version = "7.1.0";
 
   src = fetchurl {
     urls = [
       "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
       "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"
     ];
-    hash = "sha256-qE49rV/QPYkbyAppDML/n6brzmiA93w47bDOwiKDuUo=";
+    hash = "sha256-CplmZZrlnMjmnpOvzFMiSGMnnSNXnXiUtleXi0X52lo=";
   };
 
   buildInputs = [

pkgs/by-name/bt/btop/package.nix

@@ -8,19 +8,20 @@
   autoAddDriverRunpath,
   apple-sdk_15,
   versionCheckHook,
+  nix-update-script,
   rocmPackages,
   cudaSupport ? config.cudaSupport,
   rocmSupport ? config.rocmSupport,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "btop";
   version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = "btop";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0=";
   };
 
@@ -55,10 +56,12 @@ stdenv.mkDerivation rec {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Monitor of resources";
     homepage = "https://github.com/aristocratos/btop";
-    changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/aristocratos/btop/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
@@ -68,4 +71,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "btop";
   };
-}
+})

pkgs/by-name/la/lazysql/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-M6G0Bp9s1XhgZL9BZDzbJmUmE+UHidpsGIaNt1i7CGw=";
+    hash = "sha256-6tPSr28Ja7LuwWrcqSYLxxQj8e9XCgTWxzudjXOriBg=";
   };
 
   vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";

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

@@ -13,11 +13,11 @@
 }:
 let
   pname = "maptool";
-  version = "1.17.1";
+  version = "1.18.5";
   repoBase = "https://github.com/RPTools/maptool";
   src = fetchurl {
     url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
-    hash = "sha256-yPuZUPRP0O+5Grj53xteZovowuFxOo4q6qL3mnjgIu0=";
+    hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
   };
 
   meta = with lib; {
@@ -124,7 +124,7 @@ stdenvNoCC.mkDerivation {
 
     dest=$out/bin
     install -dm755 "$dest"
-    makeWrapper ${jre}/bin/java "$dest"/${binName} \
+    makeWrapper ${lib.getExe jre} "$dest"/${binName} \
       "''${gappsWrapperArgs[@]}" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \
       --add-flags "${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions"

pkgs/by-name/ot/oterm/package.nix

@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.14.3";
+  version = "0.14.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-zCxuAhgbUpsVoCquFp8MsDYgJ7yANPtWlHhpdGuxOPY=";
+    hash = "sha256-zTRCAg5BjwdP2s1LZrOjLctqYe/jX4Mc3gK+IwVoLR4=";
   };
 
   pythonRelaxDeps = [

pkgs/by-name/pi/pick-colour-picker/package.nix

@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  nix-update-script,
   python3Packages,
   glib,
   gtk3,
@@ -10,7 +11,7 @@
 
 python3Packages.buildPythonPackage {
   pname = "pick-colour-picker";
-  version = "unstable-2022-05-08";
+  version = "1.5.0-unstable-2022-05-08";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -45,6 +46,10 @@ python3Packages.buildPythonPackage {
 
   pythonImportsCheck = [ "pick" ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = with lib; {
     homepage = "https://kryogenix.org/code/pick/";
     license = licenses.mit;

pkgs/by-name/po/powerview/package.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "powerview";
+  version = "2025.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aniqfakhrul";
+    repo = "powerview.py";
+    tag = version;
+    hash = "sha256-kA7vb3YwUlolEnSJRFi+YZoq4yZsdMG+Snk7zsyOCmQ=";
+  };
+
+  pythonRemoveDeps = [
+    "argparse"
+    "future"
+    "flask-basicauth"
+  ];
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    chardet
+    dnspython
+    dsinternals
+    flask
+    gnureadline
+    impacket
+    ldap3-bleeding-edge
+    mcp
+    pycryptodome
+    python-dateutil
+    requests-ntlm
+    tabulate
+    validators
+  ];
+
+  optional-dependencies = with python3.pkgs; {
+    mcp = [
+      mcp
+    ];
+  };
+
+  pythonImportsCheck = [ "powerview" ];
+
+  meta = {
+    description = "Alternative PowerView.ps1 script in Python";
+    homepage = "https://github.com/aniqfakhrul/powerview.py";
+    changelog = "https://github.com/aniqfakhrul/powerview.py/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "powerview";
+  };
+}

pkgs/by-name/ur/uradvd/package.nix

@@ -2,19 +2,27 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  gitMinimal,
+  uradvd,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation {
   pname = "uradvd";
-  version = "0-unstable-2025-08-16";
+  version = "r26-1e64364d";
 
   src = fetchFromGitHub {
     owner = "freifunk-gluon";
     repo = "uradvd";
-    rev = "b37524dfb0292c425fd61f5bffb3101fb1979264";
-    hash = "sha256-PyOAt9dTFdHHF7OlHi9BBTjCN2Hmk8BsHkD2rV94ZDM=";
+    rev = "1e64364d323acb8c71285a6fb85d384334e7007d";
+    deepClone = true;
+    hash = "sha256-+MDhBuCPJ/dcKw4/z4PnXXGoNomIz/0QI32XfLR6fK0=";
   };
 
+  nativeBuildInputs = [
+    gitMinimal
+  ];
+
   installPhase = ''
     runHook preInstall
 
@@ -23,6 +31,12 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Tiny IPv6 Router Advertisement Daemon";
     homepage = "https://github.com/freifunk-gluon/uradvd";

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

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiopvapi";
-  version = "3.1.1";
+  version = "3.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "sander76";
     repo = "aio-powerview-api";
     tag = "v${version}";
-    hash = "sha256-WtTqtVr1oL86dpsAIK55pbXWU4X/cajVLlggd6hfM4c=";
+    hash = "sha256-DBpu1vjK0uYwXF1fbbdoeqCd3a6VdeClhsTGkbf8o7U=";
   };
 
   build-system = [ setuptools ];

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

@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "checkdmarc";
-  version = "5.10.8";
+  version = "5.10.12";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "domainaware";
     repo = "checkdmarc";
     tag = version;
-    hash = "sha256-+vRHuTUKO0O/B6d9+p79wSkwAngG+h7p4P7DAR+bCKA=";
+    hash = "sha256-XbBdBef3+kt26XP5GDH5rgHYGh8xIjHUUVOcdeVICLs=";
   };
 
   pythonRelaxDeps = [ "xmltodict" ];

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

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "fastbencode";
-  version = "0.3.5";
+  version = "0.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "breezy-team";
     repo = "fastbencode";
     tag = "v${version}";
-    hash = "sha256-E02MASmHsXWIqVQuFVwXK0MRocrA7LSga7o42au1gGE=";
+    hash = "sha256-Vn9NcJQaSF+k2TyRTAA9yMWiV+kYrfw6RIbIe99CCsg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

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

@@ -47,7 +47,7 @@ buildPythonPackage rec {
     repo = "Scipp";
     # https://github.com/scipp/scipp/pull/3722
     tag = version;
-    hash = "sha256-s3whsNYqS7hsqvWX73E8KbDMUZTGWLgeqmN08tXPkwE=";
+    hash = "sha256-nLccJlFnnVTpamph2oIaMxRD5ljrw6GlCnnTx7LfrO0=";
   };
   env = {
     SKIP_CONAN = "true";

pkgs/servers/authelia/sources.nix

@@ -1,14 +1,14 @@
 { fetchFromGitHub }:
 rec {
   pname = "authelia";
-  version = "4.39.8";
+  version = "4.39.10";
 
   src = fetchFromGitHub {
     owner = "authelia";
     repo = "authelia";
     rev = "v${version}";
-    hash = "sha256-FDEIou7XGxNUyryhRK9WwGYxwMFgq5d5GhRBLJhQLSk=";
+    hash = "sha256-v6KxDfl/dG4FEC/6V2io5jYlS6FY/WemnZJ7tpikpyM=";
   };
-  vendorHash = "sha256-92U7ih6tIF5Qm/Fio8MHdcWHHxndWf0Y4sxNTc69VZY=";
-  pnpmDepsHash = "sha256-XxOgAkByTHmJ4+0aKFgGGfc7g68Xa+fHvdzVGDSJ3go=";
+  vendorHash = "sha256-Gvk5AX0kyIYyFmgvb/TGCIEycTjtdxNLHk9sbrU5Ybw=";
+  pnpmDepsHash = "sha256-0evGB5UYphBCrVN3/hJfNXJvDGSz77Cm/s7XW7JNU/o=";
 }

pkgs/top-level/all-packages.nix

@@ -13858,14 +13858,6 @@ with pkgs;
 
   liquidwar5 = callPackage ../games/liquidwar/5.nix { };
 
-  maptool = callPackage ../games/maptool {
-    # MapTool is fussy about which JRE it uses; OpenJDK will leave it hanging
-    # at launch in a class initialization deadlock. MapTool ships Temurin with
-    # their pre-built releases so we might as well use it too.
-    jre = temurin-bin-21;
-    openjfx = openjfx21;
-  };
-
   mindustry-wayland = callPackage ../by-name/mi/mindustry/package.nix {
     enableWayland = true;
   };