Merge master into staging-next

Changed files
+125 -59
nixos
modules
services
x11
desktop-managers
system
boot
systemd
tests
pkgs
applications
audio
spotifyd
data
fonts
carlito
desktops
budgie
plugins
budgie-analogue-clock-applet
budgie-user-indicator-redux
mate
libmatekbd
libmateweather
mate-notification-daemon
mate-settings-daemon
development
compilers
lingua-franca
python-modules
bthome-ble
flake8-bugbear
reolink-aio
sqlite-utils
tools
rust
cargo-udeps
vagrant
tools
admin
security
exploitdb
pretender
top-level
+12 -6
nixos/modules/services/x11/desktop-managers/budgie.nix
···
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 {
···
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 ]";
};
+2
nixos/modules/system/boot/systemd/repart.nix
···
];
};
};
+
+
meta.maintainers = with lib.maintainers; [ nikstur ];
}
+1 -1
nixos/tests/budgie.nix
···
services.xserver.desktopManager.budgie = {
enable = true;
extraPlugins = [
-
pkgs.budgie.budgie-analogue-clock-applet
+
pkgs.budgiePlugins.budgie-analogue-clock-applet
];
};
};
+6 -6
pkgs/applications/audio/spotifyd/default.nix
···
-
{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
+
{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl
, withALSA ? true, alsa-lib
, withPulseAudio ? false, libpulseaudio
, withPortAudio ? false, portaudio
···
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
···
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 ];
+8 -10
pkgs/data/fonts/carlito/default.nix
···
-
{ 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
+2 -2
pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix
···
, ninja
, pkg-config
, vala
-
, budgie-desktop
+
, budgie
, gtk3
, libpeas
}:
···
];
buildInputs = [
-
budgie-desktop
+
budgie.budgie-desktop
gtk3
libpeas
];
-1
pkgs/desktops/budgie/default.nix
···
{ lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; {
-
budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
budgie-backgrounds = callPackage ./budgie-backgrounds { };
budgie-control-center = callPackage ./budgie-control-center { };
budgie-desktop = callPackage ./budgie-desktop { };
+53
pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix
···
+
{ lib
+
, stdenv
+
, fetchFromGitHub
+
, accountsservice
+
, budgie
+
, gtk3
+
, intltool
+
, libgee
+
, libpeas
+
, meson
+
, ninja
+
, pkg-config
+
, sassc
+
, vala
+
}:
+
+
stdenv.mkDerivation rec {
+
pname = "budgie-user-indicator-redux";
+
version = "1.0.1";
+
+
src = fetchFromGitHub {
+
owner = "EbonJaeger";
+
repo = "budgie-user-indicator-redux";
+
rev = "v${version}";
+
hash = "sha256-HGfcNlkIQD9nNzHm97LpNz3smYwDhxu4EArPo6msahI=";
+
};
+
+
nativeBuildInputs = [
+
intltool
+
meson
+
ninja
+
pkg-config
+
vala
+
];
+
+
buildInputs = [
+
accountsservice
+
budgie.budgie-desktop
+
gtk3
+
libgee
+
libpeas
+
sassc
+
];
+
+
meta = with lib; {
+
description = "Manage your user session from the Budgie panel";
+
homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux";
+
changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md";
+
license = licenses.gpl2Plus;
+
platforms = platforms.linux;
+
maintainers = [ maintainers.federicoschonborn ];
+
};
+
}
+4
pkgs/desktops/budgie/plugins/default.nix
···
+
{ callPackage }: {
+
budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
+
budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };
+
}
+4 -4
pkgs/desktops/mate/libmatekbd/default.nix
···
, fetchurl
, pkg-config
, gettext
-
, gtk3
+
, gtk3-x11
, libxklavier
, mateUpdateScript
}:
stdenv.mkDerivation rec {
pname = "libmatekbd";
-
version = "1.26.0";
+
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2";
+
sha256 = "Y5ONkSUpRe7qiP2DdNEjG9g9As2WXGu6F8GF7bOXvO0=";
};
nativeBuildInputs = [
···
];
buildInputs = [
-
gtk3
+
gtk3-x11
libxklavier
];
+2 -2
pkgs/desktops/mate/libmateweather/default.nix
···
stdenv.mkDerivation rec {
pname = "libmateweather";
-
version = "1.26.0";
+
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7";
+
sha256 = "wgCZD0uOnU0OLG99MaWHY3TD0qNsa4y1kEQAQ6hg7zo=";
};
nativeBuildInputs = [
+2 -2
pkgs/desktops/mate/mate-notification-daemon/default.nix
···
stdenv.mkDerivation rec {
pname = "mate-notification-daemon";
-
version = "1.26.0";
+
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "1fmr6hlcy2invp2yxqfqgpdx1dp4qa8xskjq2rm6v4gmz20nag5j";
+
sha256 = "Dq6SlsSKPHH9VvGTGWH5LSnkWgRf5fGgX4PHQAwxmSQ=";
};
nativeBuildInputs = [
+2 -2
pkgs/desktops/mate/mate-settings-daemon/default.nix
···
stdenv.mkDerivation rec {
pname = "mate-settings-daemon";
-
version = "1.26.0";
+
version = "1.26.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "0hbdwqagxh1mdpxfdqr1ps3yqvk0v0c5zm0bwk56y6l1zwbs0ymp";
+
sha256 = "aX6mW1QpIcK3ZhRSktJo0wCcwtqDFtKnhphpBV5LGFk=";
};
nativeBuildInputs = [
+3 -3
pkgs/development/compilers/lingua-franca/default.nix
···
stdenv.mkDerivation rec {
pname = "lfc";
-
version = "0.3.0";
+
version = "0.4.0";
src = fetchzip {
-
url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lfc_${version}.zip";
-
sha256 = "sha256-jSINlwHfSOPbti3LJTXpSk6lcUtwKfz7CMLtq2OuNns=";
+
url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lf-cli-${version}.zip";
+
sha256 = "sha256-LrAm77iPUlqVfRdYy2bZ4mim7DHIr5JxPdbrgxokGvc=";
};
buildInputs = [ jdk17_headless ];
+2 -2
pkgs/development/python-modules/bthome-ble/default.nix
···
buildPythonPackage rec {
pname = "bthome-ble";
-
version = "2.11.0";
+
version = "2.11.2";
format = "pyproject";
disabled = pythonOlder "3.9";
···
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-VCdXkUdSFX7ARVtgcbsRgh9Kcy490PA+HrT0Eaj8KvI=";
+
hash = "sha256-U0R4WWgXtfP1vvrGdJl70xO88YhvxwJYDnMiN4B+Waw=";
};
nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/flake8-bugbear/default.nix
···
buildPythonPackage rec {
pname = "flake8-bugbear";
-
version = "23.2.13";
+
version = "23.5.9";
format = "setuptools";
disabled = pythonOlder "3.7";
···
owner = "PyCQA";
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-4iOt6KQU8QkNdmGBIyevfwqvbKpylV+BN49GjeX68xE=";
+
hash = "sha256-qjR6WbgewVdmxubtEK6BdZv6zXgp0B9bQLxana3o+WU=";
};
propagatedBuildInputs = [
+4 -3
pkgs/development/python-modules/sqlite-utils/default.nix
···
buildPythonPackage rec {
pname = "sqlite-utils";
-
version = "3.30";
+
version = "3.31";
format = "setuptools";
-
disabled = pythonOlder "3.6";
+
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-MABcEtXxNEVln3kXZr62qZAMJfRCvqH5gPIdOLdfbjM=";
+
hash = "sha256-VJifPQntEh+d+Xgx0EFziuSHcdPKhQCJRvG8GIQQmoo=";
};
postPatch = ''
···
meta = with lib; {
description = "Python CLI utility and library for manipulating SQLite databases";
homepage = "https://github.com/simonw/sqlite-utils";
+
changelog = "https://github.com/simonw/sqlite-utils/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ meatcar techknowlogick ];
};
+3 -3
pkgs/development/tools/rust/cargo-udeps/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
-
version = "0.1.38";
+
version = "0.1.39";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-UQ6JrzL9yGllhPYN7Dod6UYqu2FJLjInmpE6IUmjZno=";
+
sha256 = "sha256-/TAgAwP4y3MBIvcgCi2SiMfQ61BrFYuUY2LTg8mJn7U=";
};
-
cargoHash = "sha256-jzBOdMtv47wDOOcPg0B5BYQtYSnDnOnms0SDrW2lFbs=";
+
cargoHash = "sha256-RGIqFTi0CFiPLMI3K7hsWMJXDrjVNbGnS7ZfTeBTPn0=";
nativeBuildInputs = [ pkg-config ];
+2 -1
pkgs/development/tools/vagrant/default.nix
···
in ''
wrapProgram "$out/bin/vagrant" \
--set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \
-
--prefix PATH ':' ${pathAdditions}
+
--prefix PATH ':' ${pathAdditions} \
+
--set-default VAGRANT_CHECKPOINT_DISABLE 1
mkdir -p "$out/vagrant-plugins/plugins.d"
echo '{}' > "$out/vagrant-plugins/plugins.json"
+3 -3
pkgs/tools/admin/lego/default.nix
···
buildGoModule rec {
pname = "lego";
-
version = "4.10.2";
+
version = "4.11.0";
src = fetchFromGitHub {
owner = "go-acme";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-+bMxZ/ga3LLlZmjfysP/FXiLFokAyagkmds/js3HCzs=";
+
sha256 = "sha256-RotsWr/wUPAAzW9PrUH3DGx2J5beyD+s/PpAUH12gNI=";
};
-
vendorHash = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ=";
+
vendorHash = "sha256-6dfwAsCxEYksZXqSWYurAD44YfH4h5p5P1aYZENjHSs=";
doCheck = false;
+2 -2
pkgs/tools/security/exploitdb/default.nix
···
stdenv.mkDerivation rec {
pname = "exploitdb";
-
version = "2023-05-10";
+
version = "2023-05-12";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-09Z4RKLwJGcM11sD5gGBRRJ6ccSJuzDqoPYcr3I4Plg=";
+
hash = "sha256-G7ig1MtdAWz8eCxNhGjP1ekSp61aIyncbtAexBoOCXY=";
};
nativeBuildInputs = [
+2 -2
pkgs/tools/security/pretender/default.nix
···
buildGoModule rec {
pname = "pretender";
-
version = "1.1.0";
+
version = "1.1.1";
src = fetchFromGitHub {
owner = "RedTeamPentesting";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-iWAejgI/q1lh8daybPItzQA91Ayg3ZgddGFXWm3cuww=";
+
hash = "sha256-3i7zNzwURSNSleiW+KBkxdqBv9yshtBu1hLKtjWe9OE=";
};
vendorHash = "sha256-uw3mpf27OH5uNKmvCFcTw+YFoxVEqT4Fz/CSl9Wjbv0=";
+2
pkgs/top-level/all-packages.nix
···
withALSA = stdenv.isLinux;
withPulseAudio = config.pulseaudio or stdenv.isLinux;
withPortAudio = stdenv.isDarwin;
+
withMpris = stdenv.isLinux;
srain = callPackage ../applications/networking/irc/srain { };
···
arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { });
budgie = recurseIntoAttrs (callPackage ../desktops/budgie { });
+
budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });
cdesktopenv = callPackage ../desktops/cdesktopenv { };