cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #235511 from bobby285271/upd/cinnamon-bpo

Browse source 
Cinnamon updates 2023-06-02
This commit is contained in:
Bobby Rong 2023-06-02 21:25:34 +08:00 committed by GitHub
commit 7f96a08418
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View file

@ -70,9 +70,9 @@ in
name = mkDefault "Mint-Y-Aqua"; name = mkDefault "Mint-Y-Aqua";
package = mkDefault pkgs.cinnamon.mint-themes; package = mkDefault pkgs.cinnamon.mint-themes;
}; };
iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) { iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
name = mkDefault "Mint-Y-Aqua"; name = mkDefault "Mint-Y-Aqua";
package = mkDefault pkgs.cinnamon.mint-x-icons; package = mkDefault pkgs.cinnamon.mint-y-icons;
}; };
cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) { cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
name = mkDefault "Bibata-Modern-Classic"; name = mkDefault "Bibata-Modern-Classic";

4
nixos/tests/cinnamon.nix
View file

@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
meta.maintainers = lib.teams.cinnamon.members; meta.maintainers = lib.teams.cinnamon.members;
nodes.machine = { nodes, ... }: { nodes.machine = { ... }: {
imports = [ ./common/user-account.nix ]; imports = [ ./common/user-account.nix ];
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.desktopManager.cinnamon.enable = true; services.xserver.desktopManager.cinnamon.enable = true;
@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
testScript = { nodes, ... }: testScript = { nodes, ... }:
let let
user = nodes.machine.config.users.users.alice; user = nodes.machine.users.users.alice;
uid = toString user.uid; uid = toString user.uid;
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus"; bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
display = "DISPLAY=:0.0"; display = "DISPLAY=:0.0";

9
pkgs/desktops/cinnamon/warpinator/default.nix
View file

@ -33,13 +33,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "warpinator"; pname = "warpinator";
version = "1.6.1"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k="; hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -77,11 +77,6 @@ stdenv.mkDerivation rec {
--replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
--replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
--replace 'GLib.find_program_in_path("bwrap")' "True" --replace 'GLib.find_program_in_path("bwrap")' "True"
# Typo fix that can be removed on next update
# https://github.com/linuxmint/warpinator/pull/174
substituteInPlace src/remote.py \
--replace "receiver.remaining_count" "op.remaining_count"
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {

4
pkgs/development/python-modules/xapp/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xapp"; pname = "xapp";
version = "2.4.0"; version = "2.4.1";
format = "other"; format = "other";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "linuxmint"; owner = "linuxmint";
repo = "python-xapp"; repo = "python-xapp";
rev = version; rev = version;
hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk="; hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [