Unverified Commit 98a73a98 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 5e6d7899 4c945008
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@

- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.

- `carla` no longer support `gtk2` override.

- The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.

- `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021.
+0 −6
Original line number Diff line number Diff line
@@ -685,12 +685,6 @@
    githubId = 260983;
    name = "Adrien Lemaire";
  };
  AdsonCicilioti = {
    name = "Adson Cicilioti";
    email = "adson.cicilioti@live.com";
    github = "AdsonCicilioti";
    githubId = 6278398;
  };
  adsr = {
    email = "as@php.net";
    github = "adsr";
+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ let

        hashedPasswordFile = mkOption {
          type = with types; nullOr str;
          default = cfg.users.${name}.passwordFile;
          default = config.passwordFile;
          defaultText = literalExpression "null";
          description = ''
            The full path to a file that contains the hash of the user's
+0 −9
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch2,
  alsa-lib,
  file,
  fluidsynth,
@@ -13,11 +12,9 @@
  pkg-config,
  python3Packages,
  which,
  gtk2 ? null,
  gtk3 ? null,
  qtbase ? null,
  withFrontend ? true,
  withGtk2 ? true,
  withGtk3 ? true,
  withQt ? true,
  wrapQtAppsHook ? null,
@@ -62,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
    libsndfile
  ]
  ++ lib.optional withQt qtbase
  ++ lib.optional withGtk2 gtk2
  ++ lib.optional withGtk3 gtk3;

  propagatedBuildInputs = finalAttrs.pythonPath;
@@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
        filename="$(basename -- "$file")"
        substituteInPlace "$file" --replace-fail '--with-appname="$0"' "--with-appname=\"$filename\""
    done
  ''
  + lib.optionalString withGtk2 ''
    # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
    substituteInPlace source/bridges-ui/Makefile \
        --replace-fail '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
  '';

  dontWrapQtApps = true;
+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-code";
    publisher = "anthropic";
    version = "2.0.17";
    hash = "sha256-8R0BvDfQDJmWD038mywNVIYtmgzyzwSEbqnCHQBpjg8=";
    version = "2.0.22";
    hash = "sha256-ystT5nHh0ivpFLwhHr6Uw5PyubkdY/kWm841wzIfyJ4=";
  };

  meta = {
Loading