Merge master into staging-next

2024-07-21 06:01:25 +00:00 · 2024-07-21 06:01:25 +00:00 · 6ff8a10a87
commit 6ff8a10a87
parent be3262bae8 cef77e159d
13 changed files with 116 additions and 56 deletions
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@ -54,7 +54,7 @@ in
  llvm-mode = callPackage ./manual-packages/llvm-mode { };

  lsp-bridge = callPackage ./manual-packages/lsp-bridge {
-    inherit (pkgs) python3 git go gopls pyright;
+    inherit (pkgs) basedpyright git go gopls python3;
  };

  lspce = callPackage ./manual-packages/lspce { };
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix
@ -1,21 +1,23 @@
-{ lib, trivialBuild, fetchurl, haskell-mode }:
+{
+  melpaBuild,
+  haskell-mode,
+  haskellPackages,
+}:

-trivialBuild rec {
+let
+  inherit (haskellPackages) hsc3;
+in
+melpaBuild {
  pname = "hsc3-mode";
-  version = "0.15";
+  ename = "hsc3";
+  inherit (hsc3) src version;

-  src = fetchurl {
-    url = "mirror://hackage/hsc3-${version}/hsc3-${version}.tar.gz";
-    sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";
-  };
+  files = ''("emacs/*.el")'';

  packageRequires = [ haskell-mode ];

-  sourceRoot = "hsc3-${version}/emacs";
-
  meta = {
-    homepage = "http://rd.slavepianos.org/?t=hsc3";
-    description = "hsc3 mode package for Emacs";
-    platforms = lib.platforms.unix;
+    inherit (hsc3.meta) homepage license;
+    description = "Emacs mode for hsc3";
  };
 }
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix
@ -1,9 +1,10 @@
-{ lib
-, trivialBuild
-, fetchurl
+{
+  lib,
+  melpaBuild,
+  fetchurl,
 }:

-trivialBuild rec {
+melpaBuild rec {
  pname = "jam-mode";
  version = "0.3";

@ -20,10 +21,15 @@ trivialBuild rec {
    runHook postUnpack
  '';

-  meta = with lib; {
+  postPatch = ''
+    echo ";;; jam-mode.el ---" > tmp.el
+    cat jam-mode.el >> tmp.el
+    mv tmp.el jam-mode.el
+  '';
+
+  meta = {
    description = "Emacs major mode for editing Jam files";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ qyliss ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ qyliss ];
  };
 }
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@ -6,11 +6,10 @@
  substituteAll,
  acm,
  markdown-mode,
+  basedpyright,
  git,
  go,
  gopls,
-  pyright,
-  ruff,
  tempel,
  unstableGitUpdater,
 }:
@ -30,13 +29,13 @@ let
 in
 melpaBuild {
  pname = "lsp-bridge";
-  version = "0-unstable-2024-06-29";
+  version = "0-unstable-2024-07-14";

  src = fetchFromGitHub {
    owner = "manateelazycat";
    repo = "lsp-bridge";
-    rev = "9e88e660d717ba597d9fe9366cf4278674734410";
-    hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA=";
+    rev = "023924926ae6adfbcf5458c350b90dea7c05d51b";
+    hash = "sha256-59bl4YbKS3HgrGJlUfM3LPabxKuuE+dT7CnVUJIl05k=";
  };

  patches = [
@ -54,13 +53,15 @@ melpaBuild {
  ];

  checkInputs = [
+    # Emacs packages
+    tempel
+
+    # Executables
+    basedpyright
    git
    go
    gopls
-    pyright
    python
-    ruff
-    tempel
  ];

  files = ''
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@ -62,14 +62,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop";
-  version = "5.2.2";
+  version = "5.2.3";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI=";
+    hash = "sha256-VSMSlR3rIUTYQ4GLQrVMZNrSAFfh3aJo6p92xgXMrvo=";
  };

  patches = [
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@ -3,7 +3,7 @@
 , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
 , openssh, pcre2, bash
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
-, libxslt, tcl, tk, makeWrapper, libiconv
+, libxslt, tcl, tk, makeWrapper, libiconv, libiconvReal
 , svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs
 , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform
 , nlsSupport ? true
@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ]
    ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
         docbook_xsl docbook_xml_dtd_45 libxslt ];
-  buildInputs = [ curl openssl zlib expat cpio libiconv bash ]
+  buildInputs = [ curl openssl zlib expat cpio (if stdenv.isFreeBSD then libiconvReal else libiconv) bash ]
    ++ lib.optionals perlSupport [ perlPackages.perl ]
    ++ lib.optionals guiSupport [tcl tk]
    ++ lib.optionals withpcre2 [ pcre2 ]
@ -302,7 +302,7 @@ stdenv.mkDerivation (finalAttrs: {
    "PERL_PATH=${buildPackages.perl}/bin/perl"
  ];

-  nativeInstallCheckInputs = lib.optional stdenv.isDarwin sysctl;
+  nativeInstallCheckInputs = lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) sysctl;

  preInstallCheck = ''
    installCheckFlagsArray+=(
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@ -13,13 +13,13 @@
 , makeWrapper }:

 let
-  version = "2024.6.0";
+  version = "2024.6.1";

  src = fetchFromGitHub {
    owner = "goauthentik";
    repo = "authentik";
    rev = "version/${version}";
-    hash = "sha256-eYxabUUQVeURrVAaF/Ecohzw9LJj0LZyCSM43gNvajY=";
+    hash = "sha256-SMupiJGJbkBn33JP4WLF3IsBdt3SN3JvZg/EYlz443g=";
  };

  meta = with lib; {
@ -28,7 +28,7 @@ let
    homepage = "https://goauthentik.io/";
    license = licenses.mit;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ jvanbruegge ];
+    maintainers = with maintainers; [ jvanbruegge risson ];
  };

  website = buildNpmPackage {
@ -86,7 +86,7 @@ let
      ln -s ${src}/website $out/
      ln -s ${clientapi} $out/web/node_modules/@goauthentik/api
    '';
-    npmDepsHash = "sha256-LAy2o/gs9lwbZT4NqD2GSsx7PCipnkthwnX9ICVpAWU=";
+    npmDepsHash = "sha256-v9oD8qV5UDJeZn4GZDEPlVM/jGVSeTqdIUDJl6tYXZw=";

    postPatch = ''
      cd web
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@ -1,19 +1,66 @@
-{ lib
-, clash-verge
-, fetchurl
+{
+  lib,
+  autoPatchelfHook,
+  clash-meta,
+  dpkg,
+  fetchurl,
+  libayatana-appindicator,
+  nix-update-script,
+  openssl,
+  stdenv,
+  udev,
+  webkitgtk,
+  wrapGAppsHook3,
 }:

-clash-verge.overrideAttrs (old: rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "clash-verge-rev";
-  version = "1.6.6";
+  version = "1.7.5";

  src = fetchurl {
-    url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb";
-    hash = "sha256-x+Xkasg6Yzft5CLg2YFCRkgpDeiVvvdmcLjrg+oIOT8=";
+    url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${finalAttrs.version}/clash-verge_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-pVEP+A4W6xLShFXuXPA6P+HZT8Hqkj/HRW2LaOOBI6U=";
  };

-  meta = old.meta // (with lib; {
+  nativeBuildInputs = [
+    dpkg
+    wrapGAppsHook3
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    openssl
+    webkitgtk
+  ];
+
+  runtimeDependencies = [
+    (lib.getLib udev)
+    libayatana-appindicator
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mv usr/* $out
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    rm -f $out/bin/verge-mihomo
+    ln -sf ${lib.getExe clash-meta} $out/bin/verge-mihomo
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Clash GUI based on tauri";
    homepage = "https://github.com/clash-verge-rev/clash-verge-rev";
-    maintainers = with maintainers; [ Guanran928 ];
-  });
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "clash-verge";
+    maintainers = with lib.maintainers; [ Guanran928 ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
 })
--- a/pkgs/by-name/li/lime3ds/package.nix
+++ b/pkgs/by-name/li/lime3ds/package.nix
@ -48,11 +48,11 @@
  };
 in stdenv.mkDerivation (finalAttrs: {
  pname = "lime3ds";
-  version = "2115";
+  version = "2116";

  src = fetchzip {
    url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
-    hash = "sha256-sYdYuMl+22vZRU+qX7E/TZO2sTJELkqKS56RoU/6oME=";
+    hash = "sha256-ff4An+ZdxlY4H90Yep4lpKROOMEkDijb3dVFIgSPvWQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "nixseparatedebuginfod";
-  version = "0.3.4";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "symphorien";
    repo = "nixseparatedebuginfod";
    rev = "v${version}";
-    hash = "sha256-lbYU9gveZ4SkIpMMN8KRJItA3PZSDWcJAJs4WDoivBg=";
+    hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k=";
  };

-  cargoHash = "sha256-iKmAOPxxuhIYRKQfOuqHrF+u3wtjOk7RJ9gzPFHGGqw=";
+  cargoHash = "sha256-abHczsRzWDST6ji7yi/Iox1o8QHGjt5T7/KDwsYGYMk=";

  # tests need a working nix install with access to the internet
  doCheck = false;
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@ -3,6 +3,7 @@
  stdenv,
  buildPythonPackage,
  pythonOlder,
+  pythonAtLeast,
  fetchFromGitHub,
  substituteAll,
  gdb,
@ -92,6 +93,9 @@ buildPythonPackage rec {
        }
      )'';

+  # Disable tests for unmaintained versions of python
+  doCheck = pythonAtLeast "3.11";
+
  nativeCheckInputs = [
    ## Used to run the tests:
    pytestCheckHook
--- a/pkgs/development/tools/rye/Cargo.lock
+++ b/pkgs/development/tools/rye/Cargo.lock
@ -1799,7 +1799,7 @@ dependencies = [

 [[package]]
 name = "rye"
-version = "0.36.0"
+version = "0.37.0"
 dependencies = [
 "age",
 "anyhow",
--- a/pkgs/development/tools/rye/default.nix
+++ b/pkgs/development/tools/rye/default.nix
@ -15,13 +15,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "rye";
-  version = "0.36.0";
+  version = "0.37.0";

  src = fetchFromGitHub {
    owner = "mitsuhiko";
    repo = "rye";
    rev = "refs/tags/${version}";
-    hash = "sha256-dQgiEvnf5LreHCNV5ZXXehONG2Btj1MbGL0dBABZIXE=";
+    hash = "sha256-jrtqH5Ur7yXFwYORSkS839s5Q3BtllAJBJC78vOddZ8=";
  };

  cargoLock = {