b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #187856 from bobby285271/cinnamon

Browse source
This commit is contained in:
Maciej Krüger 2022-08-22 16:48:33 +02:00 committed by GitHub
parent 47c6a9bf34 957b36c74f
commit 740f9978a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
maintainers/team-list.nix
View file

@ -107,6 +107,7 @@ with lib.maintainers; {
cinnamon = { cinnamon = {
members = [ members = [
bobby285271
mkg20001 mkg20001
]; ];
scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team.";

18
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View file

@ -9,7 +9,6 @@
, cjs , cjs
, clutter , clutter
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, gdk-pixbuf , gdk-pixbuf
, gettext , gettext
, libgnomekbd , libgnomekbd
@ -55,31 +54,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-common"; pname = "cinnamon-common";
version = "5.4.10"; version = "5.4.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = "cinnamon"; repo = "cinnamon";
rev = version; rev = version;
hash = "sha256-yNjFP32+0LXqHfJUxm1A+CTuwny5/IxxT08689f7VlE="; hash = "sha256-3uQ4t+WXauCM3jV44pSz1yqLxXwLBWv7xMvP7ug3AY0=";
}; };
patches = [ patches = [
./use-sane-install-dir.patch ./use-sane-install-dir.patch
./libdir.patch ./libdir.patch
# Re-add libsoup 2.4 as dependency - needed by some applets.
# Can be removed on next update.
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/76224fe409d074f8a44c70e4fd5e1289f92800b9.patch";
sha256 = "sha256-nDt4kkK1kVstxbij63XxTJ2L/TM9Q1P6feok3xlPQOM=";
})
# keybindings.js: Use bindings.get().
# Can be removed on next update.
# https://github.com/linuxmint/cinnamon/issues/11055
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/7724e4146baf8431bc1fb55dce60984e77adef5a.patch";
sha256 = "sha256-idGtkBa13nmoEprtmAr6OssO16wJwBd16r2ZbbhrYDQ=";
})
]; ];
buildInputs = [ buildInputs = [

4
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View file

@ -29,13 +29,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-screensaver"; pname = "cinnamon-screensaver";
version = "5.4.2"; version = "5.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-GRa3ChUCL/AFDg1F01DNwkC4tmrNaOWoOXwFvwpvSck="; hash = "sha256-D+SpAO4i4KGFWJI94LalTMB3j1YPvV63cKb34FDDprk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/desktops/cinnamon/mint-themes/default.nix
View file

@ -8,14 +8,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mint-themes"; pname = "mint-themes";
version = "2.0.4"; version = "2.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
# they don't exactly do tags, it's just a named commit # they don't exactly do tags, it's just a named commit
rev = "73d6cfea807ea84a645f43424c60916cb6214693"; rev = "3a202e401abca98623cd1dbc412221682081244c";
hash = "sha256-WyEabE3K7xuBzXuLqJO0N4nxrc67bKT5YD9yn/bELl0="; hash = "sha256-OgyLNc6gwMn7dG5/T67Toiqsij1rJYV6k6Un2cgr2oQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/cinnamon/muffin/default.nix
View file

@ -35,7 +35,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "muffin"; pname = "muffin";
version = "5.4.5"; version = "5.4.6";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-gtki0MTIMI1JggtVn0dAhkq364hkTuH7Zf7CF32Lc8E="; hash = "sha256-xTpL+o7gFvu8VNbCb8c0Y0Z8ncqb9y2qTiXP3rHAz+M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/desktops/cinnamon/xreader/default.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xreader"; pname = "xreader";
version = "3.4.4"; version = "3.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-uYnQE1GjkUxYlvXSJNmvr6q4OdvAWgv8HqTXk0KkRQM="; sha256 = "sha256-lRtBxqD45/3Wjp0Sq8A0L3Zmg33Pq6iIsA8jeywnDBc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [