gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #325246 from bobby285271/upd/cinnamon

Browse Source 
Cinnamon updates 2024-07-07
This commit is contained in:
Bobby Rong
2024-07-08 20:51:30 +08:00
committed by GitHub
parent 280c135264 fb63a9b1e8
commit 1c34e6dd02
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@@ -71,13 +71,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "6.2.3";
version = "6.2.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-u5QsUFRXPVsk9T7tVmuOpTaAxdMIJs5yPVcWM1olXz8=";
hash = "sha256-zWSz49ESzuftrE4caTxa+9Zvyz2rdmGgRz2hZO2OWtc=";
};
patches = [

12
pkgs/desktops/cinnamon/nemo/default.nix
View File

@@ -1,5 +1,4 @@
{ fetchFromGitHub
, fetchpatch
, glib
, gobject-introspection
, meson
@@ -25,26 +24,19 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "6.2.2";
version = "6.2.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-afK+iJ/WUtcs8Upid4AkbAZAIs/wimHFlXm717U0LHc=";
sha256 = "sha256-wyz2pzwJGYMFKoKVqrhLnkJqXG8Qg2+BygpOm2yegpM=";
};
patches = [
# Load extensions from NEMO_EXTENSION_DIR environment variable
# https://github.com/NixOS/nixpkgs/issues/78327
./load-extensions-from-env.patch
# Don't tie the interactive search box with the window's lifetime
# https://github.com/linuxmint/nemo/issues/3423
(fetchpatch {
url = "https://github.com/linuxmint/nemo/commit/055b47af0e1a830e556989372f3689bbd36b639d.patch";
hash = "sha256-cMtBz1uLGCV4nnrBITzXAV/SffI0nNcEdeujrHxAzQc=";
})
];
outputs = [ "out" "dev" ];