nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #317770 from bobby285271/upd/cinnamon

Browse Source 
Cinnamon updates 2024-06-06
This commit is contained in:
Bobby Rong 2024-06-07 21:16:17 +08:00 committed by GitHub
commit 17a565067d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/backup/timeshift/unwrapped.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "timeshift";
version = "24.01.1";
version = "24.06.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "timeshift";
rev = version;
hash = "sha256-vAKUR0VsOuiQmB+1jPOR0KufzfXaxAsf3EOPzdgFt0A=";
hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw=";
};
patches = [

4
pkgs/applications/editors/xed-editor/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "xed-editor";
version = "3.4.5";
version = "3.6.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xed";
rev = version;
sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8=";
sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8=";
};
patches = [

6
pkgs/desktops/cinnamon/pix/default.nix
View File

@ -7,6 +7,7 @@
, exiv2
, libheif
, libjpeg
, libjxl
, libtiff
, gst_all_1
, libraw
@ -30,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "pix";
version = "3.2.2";
version = "3.4.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-tRndJjUw/k5mJPFTBMfW88Mvp2wZtC3RUzyS8bBO1jc=";
sha256 = "sha256-XXt5tq+Zfm6fqorsFAWV3guii6gTK5JRgw26GkNkoos=";
};
nativeBuildInputs = [
@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
lcms2
libheif
libjpeg
libjxl
libraw
librsvg
libsecret

4
pkgs/desktops/cinnamon/xapp/default.nix
View File

@ -22,7 +22,7 @@
stdenv.mkDerivation rec {
pname = "xapp";
version = "2.8.2";
version = "2.8.3";
outputs = [ "out" "dev" ];
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-n600mc8/4+bYUtYaHUnmr90ThVkngcu8Ft02iuSrWWQ=";
hash = "sha256-uWBHCsKcW0vP2HYHQWXPrCSr5NsN2nYWAzBByxJBVrY=";
};
# Recommended by upstream, which enables the build of xapp-debug.

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

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "xreader";
version = "4.0.2";
version = "4.2.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-X5XMkO2JFceLyH7KEp8mnDltdjGpCT4kVGdcpGRpUJI=";
sha256 = "sha256-MWSAyXQcE8cDdzJISFV7UHheHX+7zF1Ula+LGicvUPM=";
};
nativeBuildInputs = [

6
pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
View File

@ -8,19 +8,20 @@
, cinnamon
, glib
, gsettings-desktop-schemas
, gtk3
, mate
, xdg-desktop-portal
}:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-xapp";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xdg-desktop-portal-xapp";
rev = version;
hash = "sha256-Zz44PCociYhUuHTS3HJNxJPCkiIl01FFe4//7jtgDsk=";
hash = "sha256-dQDz5x6rCJ9BprwrVZVL9BgYqgWmC5eZ8xamX9elLD0=";
};
nativeBuildInputs = [
@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
cinnamon.cinnamon-desktop # org.cinnamon.desktop.background
glib
gsettings-desktop-schemas # org.gnome.system.location
gtk3
mate.mate-desktop # org.mate.background
xdg-desktop-portal
];

16
pkgs/development/python-modules/xapp/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "xapp";
version = "2.4.1";
version = "2.4.2";
format = "other";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "linuxmint";
repo = "python-xapp";
rev = version;
hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
hash = "sha256-Gbm4YT9ZyrROOAbKz5xYd9J9YG9cUL2Oo6dDCPciaBs=";
};
nativeBuildInputs = [
@ -42,14 +42,8 @@ buildPythonPackage rec {
];
postPatch = ''
substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec"
'';
postInstall = ''
# This is typically set by pipInstallHook/eggInstallHook,
# so we have to do so manually when using meson.
# https://github.com/NixOS/nixpkgs/issues/175227
export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
substituteInPlace "xapp/os.py" \
--replace-fail "/usr/bin/pkexec" "${polkit}/bin/pkexec"
'';
doCheck = false;
@ -63,7 +57,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/linuxmint/python-xapp";
description = "Cross-desktop libraries and common resources for python";
license = licenses.lgpl2;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = teams.cinnamon.members;
};