Merge master into staging-next

2024-08-22 06:01:15 +00:00
parent 1676e911f5 3a6a2291ba
commit e3b8ab6b2e
62 changed files with 334 additions and 164 deletions
@@ -17238,6 +17238,12 @@
    githubId = 52847440;
    name = "Ryan Burns";
  };
+  rcmlz = {
+    email = "haguga-nixos@yahoo.com";
+    github = "rcmlz";
+    githubId = 19784049;
+    name = "rcmlz";
+  };
  rcoeurjoly = {
    email = "rolandcoeurjoly@gmail.com";
    github = "RCoeurjoly";
@@ -4,6 +4,9 @@ import ./make-test-python.nix ({ pkgs, ...} :

  meta = with pkgs.lib.maintainers; {
    maintainers = [ romildo ];
+    timeout = 600;
+    # OCR tests are flaky
+    broken = true;
  };

  nodes.machine = { ... }:
@@ -23,10 +23,6 @@ lib.packagesFromDirectoryRecursive {
    inherit (pkgs) basedpyright git go gopls python3;
  };

-  matrix-client = callPackage ./manual-packages/matrix-client {
-    _map = self.map;
-  };
-
  structured-haskell-mode = self.shm;

  texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
@@ -48,5 +44,6 @@ lib.packagesFromDirectoryRecursive {
  ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15
  ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17
  haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17
+  matrix-client = throw "emacsPackages.matrix-client is deprecated in favor of emacsPackages.ement."; # Added 2024-08-17
  perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19
 }
@@ -23,6 +23,8 @@ melpaBuild {
    popon
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -15,6 +15,8 @@ melpaBuild {

  files = ''("acm/*.el" "acm/icons")'';

+  ignoreCompilationError = false;
+
  meta = {
    description = "Asynchronous Completion Menu";
    homepage = "https://github.com/manateelazycat/lsp-bridge";
@@ -8,6 +8,8 @@ melpaBuild {

  files = ''("src/data/emacs-mode/*.el")'';

+  ignoreCompilationError = false;
+
  meta = {
    inherit (Agda.meta) homepage license;
    description = "Agda2-mode for Emacs extracted from Agda package";
@@ -25,6 +25,8 @@ melpaBuild {
    })
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = gitUpdater { };

  meta = {
@@ -13,6 +13,8 @@ melpaBuild {
    hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://www.emacswiki.org/emacs/control-lock.el";
    description = "Like caps-lock, but for your control key";
@@ -30,6 +30,8 @@ melpaBuild {

  propagatedUserEnvPkgs = [ nodejs ];

+  ignoreCompilationError = false;
+
  meta = {
    description = "Unofficial copilot plugin for Emacs";
    homepage = "https://github.com/copilot-emacs/copilot.el";
@@ -13,6 +13,8 @@ melpaBuild rec {
    hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/";
    description = "Major modes for Gentoo package files";
@@ -21,6 +21,8 @@ melpaBuild {

  files = ''(:defaults "msg")'';

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };

  meta = {
@@ -27,6 +27,8 @@ melpaBuild {
    make
  '';

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -23,6 +23,8 @@ melpaBuild {
    markdown-mode
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -17,6 +17,8 @@ melpaBuild {
    hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -22,6 +22,8 @@ melpaBuild {
    helm
  ];

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://github.com/emacsmirror/helm-words";
    description = "Helm extension for looking up words in dictionaries and thesauri";
@@ -16,6 +16,8 @@ melpaBuild {

  packageRequires = [ haskell-mode ];

+  ignoreCompilationError = false;
+
  meta = {
    inherit (hsc3.meta) homepage license;
    description = "Emacs mode for hsc3";
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -24,6 +24,8 @@ melpaBuild {
    prop-menu
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = gitUpdater { };

  meta = {
@@ -17,6 +17,8 @@ melpaBuild {
    hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -27,6 +27,8 @@ melpaBuild rec {
    mv tmp.el jam-mode.el
  '';

+  ignoreCompilationError = false;
+
  meta = {
    description = "Emacs major mode for editing Jam files";
    license = lib.licenses.gpl2Plus;
@@ -19,6 +19,8 @@ melpaBuild {

  files = ''("tools/emacs/ligo-mode.el")'';

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -9,6 +9,8 @@ melpaBuild {
     "llvm/utils/emacs/README")
  '';

+  ignoreCompilationError = false;
+
  meta = {
    inherit (llvmPackages.llvm.meta) homepage license;
    description = "Major mode for the LLVM assembler language";
@@ -87,6 +87,8 @@ melpaBuild {

  __darwinAllowLocalNetworking = true;

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -24,6 +24,8 @@ melpaBuild {
  # to compile lspce.el, it needs lspce-module.so
  files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")'';

+  ignoreCompilationError = false;
+
  passthru = {
    inherit lspce-module;
    updateScript = nix-update-script {
@@ -1,65 +0,0 @@
-{
-  lib,
-  melpaBuild,
-  fetchFromGitHub,
-  fetchpatch,
-  # Emacs packages
-  _map,
-  a,
-  anaphora,
-  cl-lib,
-  dash,
-  dash-functional,
-  esxml,
-  f,
-  frame-purpose,
-  ht,
-  ov,
-  rainbow-identifiers,
-  request,
-  s,
-  tracking,
-}:
-
-melpaBuild {
-  pname = "matrix-client";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "alphapapa";
-    repo = "matrix-client.el";
-    rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";
-    hash = "sha256-GLM8oCbm6PdEZPsM0ogMtNJr8mWjCKoX6ed5AUrYjuk=";
-  };
-
-  patches = [
-    # Fix: avatar loading when imagemagick support is not available
-    (fetchpatch {
-      url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
-      hash = "sha256-dXUa/HKDe+UjaXYTvgwPdXDuDcHB2HLPGWHboE+Lex0=";
-    })
-  ];
-
-  packageRequires = [
-    _map
-    a
-    anaphora
-    cl-lib
-    dash
-    dash-functional
-    esxml
-    f
-    frame-purpose
-    ht
-    ov
-    rainbow-identifiers
-    request
-    s
-    tracking
-  ];
-
-  meta = {
-    description = "Chat client and API wrapper for Matrix.org";
-    license = lib.licenses.gpl3Plus;
-  };
-}
@@ -27,6 +27,8 @@ elpaBuild {
    popd
  '';

+  ignoreCompilationError = false;
+
  meta = mu.meta // {
    description = "Full-featured e-mail client";
  };
@@ -59,6 +59,8 @@ melpaBuild {
    install -D --target-directory=$out/bin source/notdeft-xapian
  '';

+  ignoreCompilationError = false;
+
  passthru = {
    updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
  };
@@ -15,6 +15,8 @@ melpaBuild {
    popd
  '';

+  ignoreCompilationError = false;
+
  meta = {
    description = "Emacs ott mode (from ott sources)";
    inherit (ott.meta) homepage license;
@@ -26,6 +26,8 @@ melpaBuild {
    install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README
  '';

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://metacpan.org/dist/pod-mode";
    description = "Major mode for editing .pod-files";
@@ -3,13 +3,17 @@
  fetchFromGitHub,
  melpaBuild,
  js2-mode,
+  lsp-mode,
 }:

 melpaBuild {
  pname = "prisma-mode";
  version = "0-unstable-2021-12-07";

-  packageRequires = [ js2-mode ];
+  packageRequires = [
+    js2-mode
+    lsp-mode
+  ];

  src = fetchFromGitHub {
    owner = "pimeys";
@@ -18,6 +22,8 @@ melpaBuild {
    hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    description = "Major mode for Prisma Schema Language";
    license = lib.licenses.gpl2Only;
@@ -19,6 +19,8 @@ melpaBuild {
      --replace-fail ";; prolog.el ---" ";;; prolog.el ---"
  '';

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/";
    description = "Prolog mode for Emacs";
@@ -19,6 +19,8 @@ melpaBuild {
    hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = gitUpdater { };

  meta = {
@@ -17,6 +17,8 @@ melpaBuild {
    hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -13,6 +13,8 @@ melpaBuild {
    hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://www.emacswiki.org/emacs/sv-kalender.el";
    description = "Swedish calendar for Emacs";
@@ -10,6 +10,8 @@ melpaBuild {

  files = ''("emacs/*.el")'';

+  ignoreCompilationError = false;
+
  meta = {
    inherit (texpresso.meta) homepage license;
    description = "Emacs mode for TeXpresso";
@@ -44,6 +44,8 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: {
          fi
        '') plugins);

+  ignoreCompilationError = false;
+
  passthru = old.passthru or {} // {
    inherit plugins;
    withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; };
@@ -20,6 +20,8 @@ melpaBuild {

  dontConfigure = true;

+  ignoreCompilationError = false;
+
  meta = {
    description = "Major mode for editing Ur/Web";
    inherit (urweb.meta) license homepage;
@@ -15,6 +15,7 @@
  porthole,
  unstableGitUpdater,
  yasnippet,
+  el-patch,
 }:

 melpaBuild {
@@ -45,8 +46,11 @@ melpaBuild {
    nav-flash
    porthole
    yasnippet
+    el-patch
  ];

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

  meta = {
@@ -13,6 +13,8 @@ melpaBuild {
    hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8=";
  };

+  ignoreCompilationError = false;
+
  meta = {
    homepage = "https://www.emacswiki.org/emacs/yes-no.el";
    description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis";
@@ -16,6 +16,8 @@ melpaBuild {
    hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4=";
  };

+  ignoreCompilationError = false;
+
  passthru.updateScript = unstableGitUpdater { };

  meta = {
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "pachyderm";
-  version = "2.10.6";
+  version = "2.11.0";

  src = fetchFromGitHub {
    owner = "pachyderm";
    repo = "pachyderm";
    rev = "v${version}";
-    hash = "sha256-kn2vpc+KcIQXZgSbGf1aAANQ/OW807jhGpVZbfwcFMM=";
+    hash = "sha256-tr/1A3kOYvprybqE2Ma7AUr7gdDWZly1H38qKfPQVTk=";
  };

-  vendorHash = "sha256-NShVyjNyG06cLmt8rd71lFLvkd8KRWQjj6xUCx7NgSk=";
+  vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc=";

  subPackages = [ "src/server/cmd/pachctl" ];

@@ -50,7 +50,9 @@ rustPlatform.buildRustPackage rec {
  dontUseCargoParallelTests = true;

  checkFlags = lib.optionals stdenv.isDarwin [
-    "--skip=test_diff_same_non_empty_file"
+    # This test tries to read /etc/passwd, which fails with the sandbox
+    # enabled on Darwin
+    "--skip=test_diff_real_files"
  ];

  meta = with lib; {
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  perl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "convmv";
+  version = "2.05";
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  src = fetchzip {
+    url = "https://www.j3e.de/linux/convmv/convmv-${finalAttrs.version}.tar.gz";
+    hash = "sha256-ts9xAPRGUoS0XBRTmpb+BlGW1hmGyUs+rQLyUEgiZ54=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ perl ];
+
+  buildInputs = [ perl ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "MANDIR=${placeholder "man"}/share/man"
+  ];
+
+  checkTarget = "test";
+
+  # testsuite.tar contains filenames that aren't valid UTF-8. Extraction of
+  # testsuite.tar will fail as APFS enforces that filenames are valid UTF-8.
+  doCheck = !stdenv.isDarwin;
+
+  prePatch =
+    lib.optionalString finalAttrs.doCheck ''
+      tar -xf testsuite.tar
+    ''
+    + ''
+      patchShebangs --host .
+    '';
+
+  dontPatchShebangs = true;
+
+  meta = with lib; {
+    description = "Converts filenames from one encoding to another";
+    downloadPage = "https://www.j3e.de/linux/convmv/";
+    license = with licenses; [
+      gpl2Only
+      gpl3Only
+    ];
+    maintainers = with maintainers; [ al3xtjames ];
+    mainProgram = "convmv";
+    platforms = platforms.unix;
+  };
+})
@@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "doublecmd";
-  version = "1.1.16";
+  version = "1.1.17";

  src = fetchFromGitHub {
    owner = "doublecmd";
    repo = "doublecmd";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-jVK4CKd4QkJp4bu9OrEo8oHxfVpEJd0saSbgc+aeKxU=";
+    hash = "sha256-TKlhPvfnq62XWTo2twKO8hEjBZW0mWkKruXWhwirtR4=";
  };

  nativeBuildInputs = [
@@ -144,12 +144,12 @@ stdenv.mkDerivation (finalAttrs: {
      tomlplusplus
      wayland
      wayland-protocols
+      xorg.libXcursor
    ]
    ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ]
    ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ]
    ++ lib.optionals enableXWayland [
      xorg.libxcb
-      xorg.libXcursor
      xorg.libXdmcp
      xorg.xcbutil
      xorg.xcbutilerrors
@@ -1,41 +1,46 @@
-{ lib
-, cairo
-, fetchFromGitHub
-, gettext
-, glib
-, libdrm
-, libinput
-, libpng
-, librsvg
-, libxcb
-, libxkbcommon
-, libxml2
-, meson
-, ninja
-, pango
-, pkg-config
-, scdoc
-, stdenv
-, wayland
-, wayland-protocols
-, wayland-scanner
-, wlroots
-, xcbutilwm
-, xwayland
+{
+  lib,
+  cairo,
+  fetchFromGitHub,
+  gettext,
+  glib,
+  libdrm,
+  libinput,
+  libpng,
+  librsvg,
+  libxcb,
+  libxkbcommon,
+  libxml2,
+  meson,
+  ninja,
+  pango,
+  pkg-config,
+  scdoc,
+  stdenv,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  wlroots_0_18,
+  xcbutilwm,
+  xwayland,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "labwc";
-  version = "0.7.4";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc";
-    rev = finalAttrs.version;
-    hash = "sha256-7MH1mMfyMkaTVwEBJWvI1Lt3M6kosXOwkowuBTZej3c=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA=";
  };

-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];

  nativeBuildInputs = [
    gettext
@@ -59,16 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
    pango
    wayland
    wayland-protocols
-    wlroots
+    wlroots_0_18
    xcbutilwm
    xwayland
  ];

-  strictDeps = true;
+  mesonFlags = [ (lib.mesonEnable "xwayland" true) ];

-  mesonFlags = [
-    (lib.mesonEnable "xwayland" true)
-  ];
+  strictDeps = true;

  passthru = {
    providedSessions = [ "labwc" ];
@@ -77,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    homepage = "https://github.com/labwc/labwc";
    description = "Wayland stacking compositor, inspired by Openbox";
-    changelog = "https://github.com/labwc/labwc/blob/${finalAttrs.src.rev}/NEWS.md";
    license = with lib.licenses; [ gpl2Plus ];
    mainProgram = "labwc";
    maintainers = with lib.maintainers; [ AndersonTorres ];
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchFromGitHub,
+  fetchpatch,
  gitUpdater,
  nixosTests,
  boost,
@@ -19,20 +20,30 @@
  nlohmann_json,
  pcre2,
  pkg-config,
+  wayland,
  yaml-cpp,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "miracle-wm";
-  version = "0.3.0";
+  version = "0.3.2";

  src = fetchFromGitHub {
    owner = "mattkae";
    repo = "miracle-wm";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Ss93yI33e+XFjbKedbBjmYHkjPeWUWxEStwNTgTszA4=";
+    hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y=";
  };

+  patches = [
+    # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release
+    (fetchpatch {
+      name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch";
+      url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch";
+      hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU=";
+    })
+  ];
+
  postPatch =
    ''
      substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \
@@ -66,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
    mir
    nlohmann_json
    pcre2
+    wayland
    yaml-cpp
  ];

@@ -0,0 +1,99 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchurl,
+  makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
+  jre,
+}:
+let
+  icon = fetchurl {
+    # In case tigerjython/tjinstall becomes unavailable, use this url - see comment for src in MkDerivation
+    #url = "https://web.archive.org/web/20240623120114/https://raw.githubusercontent.com/tigerjython/tjinstall/master/tjlogo64.png";
+    url = "https://raw.githubusercontent.com/tigerjython/tjinstall/611c56d4e765731883656a5c4b71209d72b5ab74/tjlogo64.png";
+    hash = "sha256-tw3uDWLtcMHYmN6JGsEvVKLgI09v5DF27V2+OF9Z5tA=";
+  };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "tigerjython";
+
+  # UPDATE instructions
+  #
+  # We cache potentially unstable upstream input (.tar.gz file) via https://web.archive.org - this is a common procedure in Nixpkgs.
+  #
+  # - Open https://tigerjython.ch/en/products/download and identify the new version string for "TigerJython IDE for Linux"
+  version = "2.39";
+
+  # - and copy download link (most likely https://tigerjython.ch/user/pages/download/TigerJython.tar.gz) to clipboard.
+  # - Open http://web.archive.org and paste download link from clipboard into "Save Page Now" field and hit the "Save Page" button.
+  # - Unselect "Save Error Pages" and hit "Save Page" again.
+  # - Wait for the archive link to be generated and copy it to the url field - adjust hash accordingly.
+  src = fetchurl {
+    url = "http://web.archive.org/web/20240119124245/https://tigerjython.ch/user/pages/download/TigerJython.tar.gz";
+    hash = "sha256-PdoAOjr19aLmXYrLtMCq/tZ2Fqq7pINTuhFyMMiC0yM=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "TigerJython";
+      desktopName = "TigerJython";
+      comment = "The Python IDE for beginners";
+      type = "Application";
+      categories = [ "Education" ];
+      terminal = false;
+      startupNotify = false;
+      exec = "tigerjython";
+      icon = "tigerjython";
+      mimeTypes = [ "text/x-python" ];
+    })
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    export CUSTOM_LIBS=$out/share/java
+    export JAR=$CUSTOM_LIBS/tigerjython2.jar
+    export EXAMPLES_DIR=$CUSTOM_LIBS/Examples
+
+    install -Dm444 bin/tigerjython2.jar $JAR
+    install -Dm444 bin/Lib/* --target-directory=$CUSTOM_LIBS
+    install -Dm444 bin/TestSamples/* --target-directory=$EXAMPLES_DIR
+
+    makeWrapper ${jre}/bin/java $out/bin/tigerjython \
+      --add-flags "-Duser.dir=$CUSTOM_LIBS/" \
+      --add-flags "-Xmx512M" \
+      --add-flags "-jar $JAR" \
+      --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=lcd'
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    install -Dm444 ${icon} $out/share/icons/hicolor/64x64/apps/tigerjython.png
+  '';
+
+  meta = {
+    homepage = "https://www.tigerjython.ch";
+    downloadPage = "https://tigerjython.ch/en/products/download";
+    description = "Simple development environment for programming in Python";
+    longDescription = ''
+      Designing, coding, and amazing. TigerJython offers everything you need
+      to go from Python programming beginner to professional.
+      You will find a wide variety of tutorials and can get started right away
+      in programming environments specially developed for you.
+    '';
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ rcmlz ];
+    platforms = lib.platforms.all;
+    mainProgram = "tigerjython";
+  };
+})
@@ -59,11 +59,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "uclibc-ng";
-  version = "1.0.49";
+  version = "1.0.50";

  src = fetchurl {
    url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NA+dXdEVnGnDOAZU455WfLswSvzT+d+i6YM/D6E/W74=";
+    hash = "sha256-rthnJR9II6dOpeOjmT06fBIygKvhXjjcIGdww5aPIc8=";
  };

  # 'ftw' needed to build acl, a coreutils dependency
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "libjwt";
-  version = "1.17.1";
+  version = "1.17.2";

  src = fetchFromGitHub {
    owner = "benmcollins";
    repo = "libjwt";
    rev = "v${version}";
-    sha256 = "sha256-yMnk4gfUa5c6Inppz9I1h6it41nuJ4By3eDO0YrdB2Y=";
+    sha256 = "sha256-y7QX6P0EScY9MMdbwc8nDUKCxtNQCqjh9wlbxVuT6lA=";
  };

  buildInputs = [ jansson openssl ];
@@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "huawei-lte-api";
-  version = "1.9.3";
+  version = "1.10";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "Salamek";
    repo = "huawei-lte-api";
    rev = "refs/tags/${version}";
-    hash = "sha256-D3PABCFjy7ZhP4L02rUvmKttejDPUE5whxqQih0MvpU=";
+    hash = "sha256-L6xCX+NHASunB876N1R++xMOx55Z8zc77j5QwKqHsNY=";
  };

  build-system = [ setuptools ];
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "vitess";
-  version = "19.0.4";
+  version = "20.0.1";

  src = fetchFromGitHub {
    owner = "vitessio";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-rP2a/t+5FhGIj9T6CQodMp9YXYf3fL5oBdFpAn7e7hw=";
+    hash = "sha256-OkVBV/Fj2OKxkxjVBdTAyiGETuLw7OvV0KInp533iM8=";
  };

-  vendorHash = "sha256-BlHd5GQJwdntmvVti+Jvfw65LrYM+hjwdvQ0duKk5d8=";
+  vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ=";

  buildInputs = [ sqlite ];

@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "melange";
-  version = "0.10.0";
+  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "chainguard-dev";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-GSYsmXERdxSmd9IPfgkg2dEtFHnYQpAFXnCiZJ8CAM0=";
+    hash = "sha256-OHIpMVXfuX5ezkDGsJIaFgsh5+YolJyap+i9jcUQch0=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
    '';
  };

-  vendorHash = "sha256-czsCvos9C6AwV+PiwkNHePWT6NvE8GhnvfiAbKKXQuU=";
+  vendorHash = "sha256-X4jyLZATJIbTeL4moRrrJQ4B36tlUEfpK6SjBhlJTHQ=";

  subPackages = [ "." ];

@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, perl }:
-
-stdenv.mkDerivation rec {
-  pname = "convmv";
-  version = "2.05";
-
-  src = fetchurl {
-    url = "https://www.j3e.de/linux/convmv/convmv-${version}.tar.gz";
-    sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk";
-  };
-
-  preBuild=''
-    makeFlags="PREFIX=$out"
-  '';
-
-  patchPhase=''
-    tar -xf testsuite.tar
-    patchShebangs .
-  '';
-
-  doCheck = true;
-  checkTarget = "test";
-
-  buildInputs = [ perl ];
-
-  meta = with lib; {
-    description = "Converts filenames from one encoding to another";
-    platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
-    maintainers = [ ];
-    license = licenses.gpl2Plus;
-    mainProgram = "convmv";
-  };
-}
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
  inherit python3;

  installPhase = ''
+    runHook preInstall
+
    find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g"
    substituteInPlace setup.py --replace \
        "fileout.write(('#!/usr/bin/env %s\n' % env).encode('utf-8'))" \
@@ -24,6 +26,8 @@ stdenv.mkDerivation rec {
    python3 setup.py --prefix=$out --freedom=partial install \
        --with-shared-cache=$out/share/ponysay \
        --with-bash
+
+    runHook postInstall
  '';

  meta = with lib; {
@@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
      sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY=";
    })
+  ] ++ [
    (fetchpatch {
      name = "addendum-charset-conversion.patch";
      url = "https://salsa.debian.org/clint/fakeroot/-/commit/b769fb19fd89d696a5e0fd70b974f833f6a0655a.patch";
@@ -6876,8 +6876,6 @@ with pkgs;

  convfont = callPackage ../tools/misc/convfont { };

-  convmv = callPackage ../tools/misc/convmv { };
-
  cpcfs = callPackage ../tools/filesystems/cpcfs { };

  coreutils =  callPackage ../tools/misc/coreutils { };
@@ -31507,10 +31505,6 @@ with pkgs;

  lame = callPackage ../development/libraries/lame { };

-  labwc = callPackage ../by-name/la/labwc/package.nix {
-    wlroots = wlroots_0_17;
-  };
-
  larswm = callPackage ../applications/window-managers/larswm { };

  lash = callPackage ../applications/audio/lash { };