Merge master into staging-next

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix

···
 
 melpaBuild rec {
   pname = "ebuild-mode";
-  version = "1.76";
+  version = "1.77";
 
   src = fetchzip {
     url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
-    hash = "sha256-o964/Sk33PzyNm2+yoz7oAhw1M0gYwggaYSukuo9ALg=";
+    hash = "sha256-nEqdM/ZQoBDeGzPH/OisCv7ErXHyEBS+J20oIublIQM=";
   };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix

···
 in
 melpaBuild {
   pname = "lsp-bridge";
-  version = "0-unstable-2024-12-16";
+  version = "0-unstable-2024-12-20";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "b73717e6bdd39366ec734c3018578c06f9bc69ad";
-    hash = "sha256-FjcI60XyzKVvdhXzPj3wugkDMx6yKCKWk6yItzCuPy8=";
+    rev = "acebc35d9fed200bfb8237087074a50fcb0d71d2";
+    hash = "sha256-PwielZ2uTW+snP2D0p1pwSCTRQ83EO1sU90lMrd0pvE=";
   };
 
   patches = [

pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix

···
 in
 rustPlatform.buildRustPackage {
   pname = "lspce-module";
-  version = "1.1.0-unstable-2024-10-07";
+  version = "1.1.0-unstable-2024-12-15";
 
   src = fetchFromGitHub {
     owner = "zbelial";
     repo = "lspce";
-    rev = "2a06232033478757dc5770dc7ba658848073de42";
-    hash = "sha256-iCge/m1z4Tl3dDvbN4FGsINWE5GEtLxTlvBBu8Zxhzs=";
+    rev = "45f84ce102bb34e44c39e5f437107ba786973d6f";
+    hash = "sha256-DiqC7z1AQbXsSXc77AGRilWi3HfEg0YoHrXu54O3Clo=";
   };
 
-  cargoHash = "sha256-I3NxV0uIwQ/Vg9Txfx+ouA6FXOYyLQ2kKdhnAdkNfdE=";
+  cargoHash = "sha256-ZRWzkojcNlgdjXUvmdR/vjJx9k3xRvV0Yz7+8TN+8qc=";
 
   checkFlags = [
     # flaky test

pkgs/applications/editors/emacs/sources.nix

···
 
   emacs30 = import ./make-emacs.nix (mkArgs {
     pname = "emacs";
-    version = "30.0.92";
+    version = "30.0.93";
     variant = "mainline";
-    rev = "30.0.92";
-    hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o=";
+    rev = "30.0.93";
+    hash = "sha256-lcpB4lKD3tjvCn646hUyAskxWNCQwEJ0RX/ZddRBRRU=";
   });
 
   emacs28-macport = import ./make-emacs.nix (mkArgs {

pkgs/applications/editors/vscode/vscodium.nix

···
 
   sha256 =
     {
-      x86_64-linux = "1wacrg97dkjhcg11nzhs1v7fcgbf3mvi2n6h840cqafq50qv3qyv";
-      x86_64-darwin = "0i7skffr3zm709iwvndfsckv00y9zkp19zb2byij1zmqp4nmwl2h";
-      aarch64-linux = "1rrpi0ixgr6brp7hik31f5kjhx423zfkbckbxcqh5h8nfz2av380";
-      aarch64-darwin = "05av2yd5dj7r3pyi6k4v4lh3vrngxnzmkh3y4f9x3rrbmbpfhrfy";
-      armv7l-linux = "0dkib4chdxd01g84bk44ida12axvbri976qi5nind5dmn47lp0p8";
+      x86_64-linux = "04q9jm91idlbqsyfjr194i3xayyind67hyk59x4wrmg25sdqa0km";
+      x86_64-darwin = "0a31fjsdx671crd9hs1c9vpqbnskgh57pq4j810v722rmfawn7g0";
+      aarch64-linux = "0i3kx0xsb920f2xnf1xxhf4415xnyljfmah222ikhf6q1lp8dkqd";
+      aarch64-darwin = "068h94fxdafgm7l0z9dvhlmmixp7w8nmll4rzm06i8s3243fzb84";
+      armv7l-linux = "1bqnrgd1ykn67gvscsbkv82bydpmfjq1pn0951iiv2sy4m1g9flr";
     }
     .${system} or throwSystem;
 
···
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.96.0.24352";
+  version = "1.96.2.24355";
   pname = "vscodium";
 
   executableName = "codium";

pkgs/by-name/am/amqpcat/package.nix

···
     package = amqpcat;
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool for publishing to and consuming from AMQP servers";
     mainProgram = "amqpcat";
     homepage = "https://github.com/cloudamqp/amqpcat";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aaronjheng ];
   };
 }

pkgs/by-name/at/atlas/package.nix

···
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Modern tool for managing database schemas";
     homepage = "https://atlasgo.io/";
     changelog = "https://github.com/ariga/atlas/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "atlas";
   };
 }

pkgs/by-name/bi/bingo/package.nix

···
 
   ldflags = [ "-s" "-w" ];
 
-  meta = with lib; {
+  meta = {
     description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules";
     mainProgram = "bingo";
     homepage = "https://github.com/bwplotka/bingo";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
   };
 }

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

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bufbuild/bufisk";
     description = "User-friendly launcher for Buf";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "bufisk";
   };
 }

pkgs/by-name/ds/dsp/package.nix

···
     libpulseaudio
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bmc0/dsp";
     description = "Audio processing program with an interactive mode";
-    license = licenses.isc;
-    maintainers = with maintainers; [ aaronjheng ];
-    platforms = platforms.linux;
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    platforms = lib.platforms.linux;
     mainProgram = "dsp";
   };
 })

pkgs/by-name/du/dust/package.nix

···
     installShellCompletion completions/dust.{bash,fish} --zsh completions/_dust
   '';
 
-  meta = with lib; {
+  meta = {
     description = "du + rust = dust. Like du but more intuitive";
     homepage = "https://github.com/bootandy/dust";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "dust";
   };
 }

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

···
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of Jsonnet in pure Go";
     homepage = "https://github.com/google/go-jsonnet";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       nshalman
       aaronjheng
     ];

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

···
     package = gojq;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Pure Go implementation of jq";
     homepage = "https://github.com/itchyny/gojq";
     changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "gojq";
   };
 }

pkgs/by-name/ki/kitex/package.nix

···
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "A high-performance and strong-extensibility Golang RPC framework";
     homepage = "https://github.com/cloudwego/kitex";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "kitex";
   };
 }

pkgs/by-name/lx/lxcfs/package.nix

···
 
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "6.0.2";
+  version = "6.0.3";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = "v${version}";
-    hash = "sha256-5r1X/yUXTMC/2dNhpI+BVYeClIydefg2lurCGt7iA8Y=";
+    hash = "sha256-+Xlx1E6ggB/Vx3yOJGgh4UfEvaVyT7uOttaxelDA7Iw=";
   };
 
   patches = [

pkgs/by-name/me/mesos-dns/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://m3scluster.github.io/mesos-dns/";
     changelog = "https://github.com/m3scluster/mesos-dns/releases/tag/v${version}";
     description = "DNS-based service discovery for Mesos";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "mesos-dns";
   };
 }

pkgs/by-name/no/notation/package.nix

···
     command = "notation version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to sign and verify OCI artifacts and container images";
     homepage = "https://notaryproject.dev/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "notation";
   };
 }

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

···
     command = "pb version";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/parseablehq/pb";
     changelog = "https://github.com/parseablehq/pb/releases/tag/v${version}";
     description = "CLI client for Parseable server";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "pb";
   };
 }

pkgs/by-name/po/podman-tui/package.nix

···
     version = "v${version}";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/containers/podman-tui";
     description = "Podman Terminal UI";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "podman-tui";
   };
 }

pkgs/by-name/pr/protoscope/package.nix

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple, human-editable language for representing and emitting the Protobuf wire format";
     mainProgram = "protoscope";
     homepage = "https://github.com/protocolbuffers/protoscope";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
   };
 }

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

···
     "-w"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cashapp/spirit";
     description = "Online schema change tool for MySQL";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "spirit";
   };
 }

pkgs/by-name/wi/wingpanel-indicator-namarupa/fix-meson-build.patch

···
+diff --git a/meson.build b/meson.build
+index 47a0da6..7aa49f4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -8,6 +8,9 @@ project(
+ gettext_name = meson.project_name() + '-indicator'
+ i18n = import('i18n')
+ 
++prefix = get_option('prefix')
++libdir = prefix / get_option('libdir')
++
+ add_global_arguments(
+     '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
+     language:'c'
+@@ -25,7 +28,7 @@ add_project_arguments(
+ config_data = configuration_data()
+ config_data.set_quoted('GETTEXT_PACKAGE', gettext_name)
+ config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
+-config_data.set_quoted('AYATANAINDICATORDIR', dependency('indicator3-0.4').get_variable('indicatordir'))
++config_data.set_quoted('AYATANAINDICATORDIR', '@indicator_application@/lib/indicators3/7/')
+ 
+ shared_module(
+     meson.project_name(),
+@@ -44,7 +47,7 @@ shared_module(
+         dependency('indicator3-0.4')
+     ],
+     install: true,
+-    install_dir : dependency('wingpanel').get_variable('indicatorsdir')
++    install_dir : dependency('wingpanel').get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir])
+ )
+ 
+ subdir('po')

pkgs/by-name/wi/wingpanel-indicator-namarupa/package.nix

···
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  replaceVars,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  gtk3,
+  libgee,
+  libindicator-gtk3,
+  pantheon,
+  indicator-application-gtk3,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wingpanel-indicator-namarupa";
+  version = "0.0.0-unstable-2024-12-17";
+
+  src = fetchFromGitHub {
+    owner = "lenemter";
+    repo = pname;
+    rev = "d9fc4e47d58c72e0cf08aa11246910ce84fcef50";
+    sha256 = "sha256-8jzhrCMkP5ui964JRZUs+tl2ShxeB8q60fBUI4okrpg=";
+  };
+
+  patches = [
+    # Tells the indicator the path for libapplication.so
+    (replaceVars ./fix-meson-build.patch {
+      indicator_application = indicator-application-gtk3;
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    gtk3
+    libgee
+    libindicator-gtk3
+    pantheon.granite
+    pantheon.wingpanel
+  ];
+
+  passthru = {
+    updateScript = unstableGitUpdater {
+      url = "https://github.com/lenemter/wingpanel-indicator-namarupa.git";
+    };
+  };
+
+  meta = with lib; {
+    description = "Wingpanel Namarupa Indicator (Ayatana support)";
+    homepage = "https://github.com/lenemter/wingpanel-indicator-namarupa";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = teams.pantheon.members;
+  };
+}

pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-security-privacy";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-cL0kjG7IOlMOvqZj1Yx8E3xHWATnuDm08onpz091wmo=";
+    sha256 = "sha256-k6dSiiBqqbhH7rmhpBu83LX8at/qJ4gkrg4Xc+VbkIE=";
   };
 
   nativeBuildInputs = [

pkgs/development/hare-third-party/hare-ev/default.nix

···
 
 stdenv.mkDerivation {
   pname = "hare-ev";
-  version = "0-unstable-2024-08-06";
+  version = "0-unstable-2024-12-13";
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
     repo = "hare-ev";
-    rev = "7de2b827e5e680e315697b97be142aebe71ec58f";
-    hash = "sha256-0RJqtYy3zGzy32WbR1pxsc3/B1VjUzJcVydqLxwmYSE=";
+    rev = "7f80dcbeb09f4dd743cdccfb2cfed10bfdeb07ab";
+    hash = "sha256-cwBmkwQUeOBjTbDor44ZNowZkJ0ifrbr+ST5j5dUJm8=";
   };
 
   nativeCheckInputs = [ hareHook ];

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

···
     uv = [ uv ];
   };
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+  nativeCheckInputs = [ pytestCheckHook ];
 
   preCheck = ''
     export HOME=$(mktemp -d)

pkgs/development/tools/mysql-shell/8.nix

···
     wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor finalAttrs.version}/en/";
     description = "New command line scriptable shell for MySQL";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "mysqlsh";
   };
 })

pkgs/development/tools/mysql-shell/innovation.nix

···
     wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor finalAttrs.version}/en/";
     description = "New command line scriptable shell for MySQL";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "mysqlsh";
   };
 })