From bccc72930ffc04edc27788a1c8c7cd5d9bfc9caa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 20 Apr 2023 04:20:00 +0000 Subject: [PATCH 01/24] spotifyd: 0.3.4 -> 0.3.5 https://github.com/Spotifyd/spotifyd/releases/tag/v0.3.5 --- pkgs/applications/audio/spotifyd/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 274b054955b7..d0a77ab06497 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -1,4 +1,4 @@ -{ 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 ]; From d8edffa5f76ae2ae9879af8a1e041f41cc6183da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 05:05:40 +0000 Subject: [PATCH 02/24] lego: 4.10.2 -> 4.11.0 --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 8a13936f10e8..f7a5193100d7 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ 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; From c1ee77dc1ecf310e8ece040c4be9cfdf0e78c162 Mon Sep 17 00:00:00 2001 From: revol-xut Date: Wed, 10 May 2023 15:00:25 +0200 Subject: [PATCH 03/24] lingua-franca: 0.3.0 -> 0.4.0 --- pkgs/development/compilers/lingua-franca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix index 5f5de16b44b8..4e2c6e32b554 100644 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -2,11 +2,11 @@ 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 ]; From 7da8045e7ebceb38ed155ab47c7970a1c0b146ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Thu, 11 May 2023 20:45:45 -0300 Subject: [PATCH 04/24] budgiePlugins.budgie-analogue-clock-applet: rename from budgie.budgie-analogue-clock-applet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- nixos/tests/budgie.nix | 2 +- pkgs/desktops/budgie/default.nix | 1 - .../{ => plugins}/budgie-analogue-clock-applet/default.nix | 4 ++-- pkgs/desktops/budgie/plugins/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) rename pkgs/desktops/budgie/{ => plugins}/budgie-analogue-clock-applet/default.nix (95%) create mode 100644 pkgs/desktops/budgie/plugins/default.nix diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index a2599572b3bf..8fe32bb26fbd 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -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 ]; }; }; diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 8c49ac5b0234..afe954610fff 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -1,7 +1,6 @@ { 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 { }; diff --git a/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix similarity index 95% rename from pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix rename to pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 798992886b9b..c443cb72dd49 100644 --- a/pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , vala -, budgie-desktop +, budgie , gtk3 , libpeas }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - budgie-desktop + budgie.budgie-desktop gtk3 libpeas ]; diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix new file mode 100644 index 000000000000..290618e9924d --- /dev/null +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -0,0 +1,3 @@ +{ callPackage }: { + budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbca18144b4e..77a7b19b9402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37021,6 +37021,7 @@ with pkgs; arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); + budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); cdesktopenv = callPackage ../desktops/cdesktopenv { }; From 813b23d9f155a11f37edf006b741b0e837f156c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Thu, 11 May 2023 21:08:03 -0300 Subject: [PATCH 05/24] budgiePlugins.budgie-user-indicator-redux: init at 1.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../budgie-user-indicator-redux/default.nix | 53 +++++++++++++++++++ pkgs/desktops/budgie/plugins/default.nix | 1 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix new file mode 100644 index 000000000000..0d031dbaeb5a --- /dev/null +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -0,0 +1,53 @@ +{ 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 ]; + }; +} diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix index 290618e9924d..e096802b6600 100644 --- a/pkgs/desktops/budgie/plugins/default.nix +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -1,3 +1,4 @@ { callPackage }: { budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; + budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { }; } From 8e01b9d98ce1113b53127db93601334aa0967add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Thu, 11 May 2023 21:35:27 -0300 Subject: [PATCH 06/24] nixos/budgie: Update description for sessionPath, add example for extraPlugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../services/x11/desktop-managers/budgie.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 2eff81750d9e..b7341d4d8b49 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -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 ]"; }; From 550de0a2df0354a4f323f8dd80654475566a8d1a Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Thu, 11 May 2023 21:04:05 -0700 Subject: [PATCH 07/24] vagrant: disable version check Silences messages such as: > A new version of Vagrant is available: 2.3.4 (installed version: 2.2.19)! Documentation: https://developer.hashicorp.com/vagrant/docs/v2.2.19/other/environmental-variables#vagrant_checkpoint_disable --- pkgs/development/tools/vagrant/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 95b18eb72b52..5db4a3d05ef3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -79,7 +79,8 @@ in buildRubyGem rec { in '' wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ - --prefix PATH ':' ${pathAdditions} + --prefix PATH ':' ${pathAdditions} \ + --set VAGRANT_CHECKPOINT_DISABLE '✓' mkdir -p "$out/vagrant-plugins/plugins.d" echo '{}' > "$out/vagrant-plugins/plugins.json" From 119e879d68ba23c36992691ef633cfd516ca2e40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 May 2023 05:39:04 +0000 Subject: [PATCH 08/24] python311Packages.flake8-bugbear: 23.2.13 -> 23.5.9 --- pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 296f6eb30d96..a3bdbab1712f 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.2.13"; + version = "23.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4iOt6KQU8QkNdmGBIyevfwqvbKpylV+BN49GjeX68xE="; + hash = "sha256-qjR6WbgewVdmxubtEK6BdZv6zXgp0B9bQLxana3o+WU="; }; propagatedBuildInputs = [ From 492ebde5e2d670fb62240f10c2365ab3133d8a14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 May 2023 05:46:20 +0000 Subject: [PATCH 09/24] python310Packages.sqlite-utils: 3.30 -> 3.31 --- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 24fdb5b2fa98..bdbf5763a7d1 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.30"; + version = "3.31"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MABcEtXxNEVln3kXZr62qZAMJfRCvqH5gPIdOLdfbjM="; + hash = "sha256-VJifPQntEh+d+Xgx0EFziuSHcdPKhQCJRvG8GIQQmoo="; }; postPatch = '' From 1bd62f43eb66cff8fcbb540e91386cb34703affb Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 12 May 2023 18:55:09 +0200 Subject: [PATCH 10/24] nixos/systemd-repart: add myself as maintainer --- nixos/modules/system/boot/systemd/repart.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index 1f176252dc1e..251c7e236123 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -121,4 +121,6 @@ in ]; }; }; + + meta.maintainers = with lib.maintainers; [ nikstur ]; } From 9e177809688a1bdbe0a42fa35a9912556705608c Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 12 May 2023 19:27:47 -0700 Subject: [PATCH 11/24] vagrant: allow un-disabling of version check Co-authored-by: Nick Cao --- pkgs/development/tools/vagrant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 5db4a3d05ef3..3b03e4426ba6 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -80,7 +80,7 @@ in buildRubyGem rec { wrapProgram "$out/bin/vagrant" \ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \ --prefix PATH ':' ${pathAdditions} \ - --set VAGRANT_CHECKPOINT_DISABLE '✓' + --set-default VAGRANT_CHECKPOINT_DISABLE 1 mkdir -p "$out/vagrant-plugins/plugins.d" echo '{}' > "$out/vagrant-plugins/plugins.json" From 262803bfb1e79533c517dfecd384903f49a0aaef Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 May 2023 03:43:38 +0000 Subject: [PATCH 12/24] mate.libmatekbd: 1.26.0 -> 1.26.1 https://github.com/mate-desktop/libmatekbd/compare/v1.26.0...v1.26.1 --- pkgs/desktops/mate/libmatekbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 17abf388fee8..b05a477f02e5 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -10,11 +10,11 @@ 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 = [ From cd0fc8aeed286e7977a5ddaa6b40a7844cc1d41c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 May 2023 03:43:44 +0000 Subject: [PATCH 13/24] mate.libmateweather: 1.26.0 -> 1.26.1 https://github.com/mate-desktop/libmateweather/compare/v1.26.0...v1.26.1 --- pkgs/desktops/mate/libmateweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 55eacf8d63e3..91223601dc4d 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -11,11 +11,11 @@ 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 = [ From 1141632dd4c05203701faed563b296a19383bac1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 May 2023 03:44:13 +0000 Subject: [PATCH 14/24] mate.mate-notification-daemon: 1.26.0 -> 1.26.1 https://github.com/mate-desktop/mate-notification-daemon/compare/v1.26.0...v1.26.1 --- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 4340c5549aa4..7569a676db11 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -17,11 +17,11 @@ 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 = [ From a9ac128103dbc00b654bbcdcedf2827e28e0ba1a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 May 2023 03:44:29 +0000 Subject: [PATCH 15/24] mate.mate-settings-daemon: 1.26.0 -> 1.26.1 https://github.com/mate-desktop/mate-settings-daemon/compare/v1.26.0...v1.26.1 --- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 3fbc590bd855..6d245add0df3 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -21,11 +21,11 @@ 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 = [ From 01f5a08e44c72437771e3b5e7561666ce6c82291 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 16/24] spotifyd: enable mpris on Linux --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebd308f5abd5..c57fe2eef51a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31169,6 +31169,7 @@ with pkgs; withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; + withMpris = stdenv.isLinux; }; srain = callPackage ../applications/networking/irc/srain { }; From fba4bcd99f94809001f1e7d58c5181df267199c6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 May 2023 13:11:43 +0800 Subject: [PATCH 17/24] mate.libmatekbd: Fix darwin build https://hydra.nixos.org/build/219011673/nixlog/3 --- pkgs/desktops/mate/libmatekbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index b05a477f02e5..901d1c6bfffa 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , gettext -, gtk3 +, gtk3-x11 , libxklavier , mateUpdateScript }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 + gtk3-x11 libxklavier ]; From 507ee7a7cf8439b0da8129b9c5cedd431fac8c5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 May 2023 06:17:38 +0000 Subject: [PATCH 18/24] pretender: 1.1.0 -> 1.1.1 --- pkgs/tools/security/pretender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pretender/default.nix b/pkgs/tools/security/pretender/default.nix index 2f855c183275..9ea3918b3699 100644 --- a/pkgs/tools/security/pretender/default.nix +++ b/pkgs/tools/security/pretender/default.nix @@ -5,13 +5,13 @@ 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="; From 8c46935fcf5328eeeeff8c18e5b230a3bd353f34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:15:12 +0200 Subject: [PATCH 19/24] python311Packages.reolink-aio: 0.5.13 -> 0.5.15 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.13...0.5.15 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.15 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 424ec8aaed51..65b38637cc3a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.13"; + version = "0.5.15"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-jIdKNOYj+ahqfMqTPYwf5fCwHVRn+CLecqlQCXslVG4="; + hash = "sha256-YTBx0tMWSyy6A1OuTBmfEpRnZE4gHLIY5qFH9YL+YEo="; }; postPatch = '' From 57525dc485dddd0fb6b30136312ebe4148ac2f01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:19:33 +0200 Subject: [PATCH 20/24] exploitdb: 2023-05-10 -> 2023-05-12 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-05-10...2023-05-12 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 5deebcfffa16..ffe29fb1d886 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ 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 = [ From 7db633effdfecf51012b609692260b57d0cfbc7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:23:14 +0200 Subject: [PATCH 21/24] python311Packages.bthome-ble: 2.11.0 -> 2.11.2 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v2.11.0...v2.11.2 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v2.11.2/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 9336a83aacec..fcaf93f9f2e6 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.11.0"; + version = "2.11.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VCdXkUdSFX7ARVtgcbsRgh9Kcy490PA+HrT0Eaj8KvI="; + hash = "sha256-U0R4WWgXtfP1vvrGdJl70xO88YhvxwJYDnMiN4B+Waw="; }; nativeBuildInputs = [ From e86627576f25172f664567d3288447428b463d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 May 2023 07:26:18 +0000 Subject: [PATCH 22/24] cargo-udeps: 0.1.38 -> 0.1.39 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 1ae5f39566a8..97d7b81d90a9 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ 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 ]; From 37dc4f571bcfaea0e0cc72a53b540d3b9f3aef6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 09:40:00 +0200 Subject: [PATCH 23/24] python310Packages.sqlite-utils: add changelog to meta - update disabled --- pkgs/development/python-modules/sqlite-utils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index bdbf5763a7d1..29223b635248 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "3.31"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -49,6 +49,7 @@ buildPythonPackage rec { 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 ]; }; From d443f43656fc24521aad3cb9ad68a9b5d7771d4c Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 13 May 2023 14:10:56 +0300 Subject: [PATCH 24/24] Revert "carlito: 20130920 -> 20230309" This reverts commit 8050cacb9e1520ca3ad0298f6fa9961889b619d1. --- pkgs/data/fonts/carlito/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index db62cb0f1483..283eb21a175f 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -1,27 +1,25 @@ -{ 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