Unverified Commit 51e24f45 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 62aa23a0 c56f8047

nixos/modules/services/x11/desktop-managers/budgie.nix

+12 −6
Original line number Diff line number Diff line
@@ -45,10 +45,15 @@ in { 
      enable = mkEnableOption (mdDoc "the Budgie desktop");



      sessionPath = mkOption {

        description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";

        type = with types; listOf package;

        example = literalExpression "[ pkgs.budgie.budgie-desktop-view ]";

        description = lib.mdDoc ''

          Additional list of packages to be added to the session search path.

          Useful for GSettings-conditional autostart.



          Note that this should be a last resort; patching the package is preferred (see GPaste).

        '';

        type = types.listOf types.package;

        default = [];

        example = literalExpression "[ pkgs.gnome.gpaste ]";

      };



      extraGSettingsOverrides = mkOption {
@@ -59,20 +64,21 @@ in { 


      extraGSettingsOverridePackages = mkOption {

        description = mdDoc "List of packages for which GSettings are overridden.";

        type = with types; listOf path;

        type = types.listOf types.path;

        default = [];

      };



      extraPlugins = mkOption {

        description = mdDoc "Extra plugins for the Budgie desktop";

        type = with types; listOf package;

        type = types.listOf types.package;

        default = [];

        example = literalExpression "[ pkgs.budgiePlugins.budgie-analogue-clock-applet ]";

      };

    };



    environment.budgie.excludePackages = mkOption {

      description = mdDoc "Which packages Budgie should exclude from the default environment.";

      type = with types; listOf package;

      type = types.listOf types.package;

      default = [];

      example = literalExpression "[ pkgs.mate-terminal ]";

    };

nixos/modules/system/boot/systemd/repart.nix

+2 −0
Original line number Diff line number Diff line
@@ -121,4 +121,6 @@ in 
      ];

    };

  };



  meta.maintainers = with lib.maintainers; [ nikstur ];

}

nixos/tests/budgie.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 
    services.xserver.desktopManager.budgie = {

      enable = true;

      extraPlugins = [

        pkgs.budgie.budgie-analogue-clock-applet

        pkgs.budgiePlugins.budgie-analogue-clock-applet

      ];

    };

  };

pkgs/applications/audio/spotifyd/default.nix

+6 −6
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl

{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl

, withALSA ? true, alsa-lib

, withPulseAudio ? false, libpulseaudio

, withPortAudio ? false, portaudio
@@ -9,20 +9,20 @@ 


rustPackages.rustPlatform.buildRustPackage rec {

  pname = "spotifyd";

  version = "0.3.4";

  version = "0.3.5";



  src = fetchFromGitHub {

    owner = "Spotifyd";

    repo = "spotifyd";

    rev = "v${version}";

    sha256 = "sha256-9zwHBDrdvE2R/cdrWgjsfHlm3wEZ9SB2VNcqezB/Op0=";

    hash = "sha256-+P85FWJIsfAv8/DnQFxfoWvNY8NpbZ2xUidfwN8tiA8=";

  };



  cargoSha256 = "sha256-fQm7imXpm5AcKdg0cU/Rf2mAeg2ebZKRisJZSnG0REI=";

  cargoHash = "sha256-j+2yEtn3D+vNRcY4+NnqSX4xRQIE5Sq7bentxTh6kMI=";



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [ openssl ]

  buildInputs = lib.optionals stdenv.isLinux [ openssl ]

    ++ lib.optional withALSA alsa-lib

    ++ lib.optional withPulseAudio libpulseaudio

    ++ lib.optional withPortAudio portaudio
@@ -39,7 +39,7 @@ rustPackages.rustPlatform.buildRustPackage rec { 


  meta = with lib; {

    description = "An open source Spotify client running as a UNIX daemon";

    homepage = "https://github.com/Spotifyd/spotifyd";

    homepage = "https://spotifyd.rs/";

    changelog = "https://github.com/Spotifyd/spotifyd/raw/v${version}/CHANGELOG.md";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ];

pkgs/data/fonts/carlito/default.nix

+8 −10
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, stdenvNoCC }:

{ lib, fetchurl, stdenvNoCC }:



stdenvNoCC.mkDerivation rec {

  pname = "carlito-unstable";

  version = "20230309";

  pname = "carlito";

  version = "20130920";



  src = fetchFromGitHub {

    owner = "googlefonts";

    repo = "carlito";

    rev = "3a810cab78ebd6e2e4eed42af9e8453c4f9b850a";

    hash = "sha256-U4TvZZ7n7dr1/14oZkF1Eo96ZcdWIDWron70um77w+E=";

  src = fetchurl {

    url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";

    sha256 = "sha256-S9ErbLwyHBzxbaduLFhcklzpVqCAZ65vbGTv9sz9r1o=";

  };



  installPhase = ''

    mkdir -p $out/etc/fonts/conf.d

    mkdir -p $out/share/fonts/truetype

    cp -v fonts/ttf/*.ttf $out/share/fonts/truetype

    cp -v *.ttf $out/share/fonts/truetype

    cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf

  '';



  meta = with lib; {

    # This font doesn't appear to have any official web site but this

    # one provides some good information and samples.

    homepage = "https://github.com/googlefonts/carlito";

    homepage = "http://openfontlibrary.org/en/font/carlito";

    description = "A sans-serif font metric-compatible with Microsoft Calibri";

    longDescription = ''

      Carlito is a free font that is metric-compatible with the