pkgs/desktops/mate: prep for dissolving mate scope (#473445)

This commit is contained in:
Bobby Rong
2025-12-24 15:18:42 +00:00
committed by GitHub
40 changed files with 329 additions and 189 deletions
+3 -3
View File
@@ -31,14 +31,14 @@
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "atril";
version = "1.28.2";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "atril";
tag = "v${version}";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-NnWD3Gcxn8ZZKdHzg6iclLiSwj3sBvF+BwpNtcU+dSY=";
};
@@ -96,4 +96,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -10,18 +10,18 @@
gtk3,
python3,
dropbox,
mateUpdateScript,
gitUpdater,
}:
let
dropboxd = "${dropbox}/bin/dropbox";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "caja-dropbox";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-dropbox-${finalAttrs.version}.tar.xz";
sha256 = "t0w4qZQlS9PPfLxxK8LsdRagypQqpleFJs29aqYgGWM=";
};
@@ -57,7 +57,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/caja-dropbox";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Dropbox extension for Caja file manager";
@@ -69,4 +73,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -12,15 +12,15 @@
imagemagick,
mate-desktop,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "caja-extensions";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-extensions-${finalAttrs.version}.tar.xz";
sha256 = "0phsXgdAg1/icc+9WCPu6vAyka8XYyA/RwCruBCeMXU=";
};
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/caja-extensions";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Set of extensions for Caja file manager";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -15,10 +15,10 @@
hicolor-icon-theme,
wayland,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "caja";
version = "1.28.0";
outputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-${finalAttrs.version}.tar.xz";
sha256 = "HjAUzhRVgX7C73TQnv37aDXYo3LtmhbvtZGe97ghlXo=";
};
@@ -62,7 +62,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/caja";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "File manager for the MATE desktop";
@@ -74,4 +78,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -12,18 +12,18 @@
json-glib,
mate-desktop,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
# can be defaulted to true once switch to meson
withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
file,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "engrampa";
version = "1.28.2";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/engrampa-${finalAttrs.version}.tar.xz";
hash = "sha256-Hpl3wjdFv4hDo38xUXHZr5eBSglxrqw9d08BdlCsCe8=";
};
@@ -55,7 +55,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/engrampa";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Archive Manager for MATE";
@@ -69,4 +73,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -18,15 +18,15 @@
mate-desktop,
hicolor-icon-theme,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "eom";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/eom-${finalAttrs.version}.tar.xz";
sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw=";
};
@@ -61,7 +61,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/eom";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Image viewing and cataloging program for the MATE desktop";
@@ -71,4 +75,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+3 -3
View File
@@ -12,14 +12,14 @@
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libmatekbd";
version = "1.28.0";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "libmatekbd";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-6s8JiuXbBWOHxbNSuO8rglzOCRKlQ9fx/GsYYc08GmI=";
};
@@ -57,4 +57,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -12,15 +12,15 @@
pulseaudioSupport ? config.pulseaudio or true,
libpulseaudio,
ossSupport ? false,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libmatemixer";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/libmatemixer-${finalAttrs.version}.tar.xz";
sha256 = "XXO5Ijl/YGiOPJUw61MrzkbDDiYtsbU1L6MsQNhwoMc=";
};
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/libmatemixer";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Mixer library for MATE";
@@ -53,4 +57,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
teams = [ lib.teams.mate ];
};
}
})
@@ -14,16 +14,16 @@
libsoup_3,
tzdata,
mate-common,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libmateweather";
version = "1.28.1";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "libmateweather";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ=";
};
@@ -66,7 +66,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/libmateweather";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Library to access weather information from online services for MATE";
@@ -75,4 +79,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -18,15 +18,15 @@
mate-desktop,
mate-settings-daemon,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "marco";
version = "1.28.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/marco-${finalAttrs.version}.tar.xz";
sha256 = "JJbl5A7pgM1oSUk6w+D4/Q3si4HGdNqNm6GaV38KwuE=";
};
@@ -61,7 +61,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/marco";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE default window manager";
@@ -70,4 +74,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -22,10 +22,10 @@
wirelesstools,
hicolor-icon-theme,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-applets";
version = "1.28.1";
outputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-applets-${finalAttrs.version}.tar.xz";
sha256 = "pZZxQVJ9xbFy0yKmADwjruwlMWD2ULs2QwoG3a76fi4=";
};
@@ -72,7 +72,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-applets";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Applets for use with the MATE panel";
@@ -85,4 +89,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
teams = [ lib.teams.mate ];
};
}
})
@@ -5,15 +5,15 @@
meson,
ninja,
gettext,
mateUpdateScript,
gitUpdater,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mate-backgrounds";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-backgrounds-${finalAttrs.version}.tar.xz";
sha256 = "UNGv0CSGvQesIqWmtu+jAxFI8NSKguSI2QmtVwA6aUM=";
};
@@ -23,7 +23,11 @@ stdenvNoCC.mkDerivation rec {
ninja
];
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-backgrounds";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Background images and data for MATE";
@@ -35,4 +39,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -10,15 +10,15 @@
libxml2,
mpfr,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-calc";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-calc-${finalAttrs.version}.tar.xz";
sha256 = "gEsSXR4oZLHnSvgW2psquLGUcrmvl0Q37nNVraXmKPU=";
};
@@ -41,7 +41,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-calc";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Calculator for the MATE desktop";
@@ -50,4 +54,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -2,21 +2,25 @@
lib,
stdenvNoCC,
fetchurl,
mateUpdateScript,
gitUpdater,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mate-common";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-common-${finalAttrs.version}.tar.xz";
sha256 = "QrfCzuJo9x1+HBrU9pvNoOzWVXipZyIYfGt2N40mugo=";
};
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-common";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Common files for development of MATE packages";
@@ -25,4 +29,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -33,17 +33,17 @@
hicolor-icon-theme,
wrapGAppsHook3,
yelp-tools,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-control-center";
version = "1.28.1";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "mate-control-center";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-rsEu3Ig6GxqPOvAFOXhkEoXM+etyjWpQWHGOsA+myJs=";
};
@@ -100,7 +100,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-control-center";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Utilities to configure the MATE desktop";
@@ -109,4 +113,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -9,10 +9,10 @@
gtk3,
dconf,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-desktop";
version = "1.28.2";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-desktop-${finalAttrs.version}.tar.xz";
sha256 = "MrtLeSAUs5HB4biunBioK01EdlCYS0y6fSjpVWSWSqI=";
};
@@ -45,7 +45,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-desktop";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Library with common API for various MATE modules";
@@ -54,4 +58,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
teams = [ lib.teams.mate ];
};
}
})
@@ -9,12 +9,12 @@
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-icon-theme-faenza";
version = "1.20.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-icon-theme-faenza-${finalAttrs.version}.tar.xz";
sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
};
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = gitUpdater {
url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza";
rev-prefix = "v";
url = "https://github.com/mate-desktop-legacy-archive/${pname}";
};
meta = {
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -8,15 +8,15 @@
librsvg,
gtk3,
hicolor-icon-theme,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-icon-theme";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-icon-theme-${finalAttrs.version}.tar.xz";
sha256 = "lNYHkGDKXfdFQpId5O6ji30C0HVhyRk1bZXeh2+abTo=";
};
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-icon-theme";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Icon themes from MATE";
@@ -53,4 +57,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
teams = [ lib.teams.mate ];
};
}
})
@@ -9,15 +9,15 @@
mate-panel,
hicolor-icon-theme,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-indicator-applet";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-indicator-applet-${finalAttrs.version}.tar.xz";
sha256 = "zrPXA5cKPlWNfNffCxwhceOvdSolSVrO0uIiwemtSc0=";
};
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-indicator-applet";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
homepage = "https://github.com/mate-desktop/mate-indicator-applet";
@@ -67,4 +71,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -14,10 +14,10 @@
mate-panel,
wayland,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-media";
version = "1.28.1";
outputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-media-${finalAttrs.version}.tar.xz";
sha256 = "vNwQLiL2P1XmMWbVxwjpHBE1cOajCodDRaiGCeg6mRI=";
};
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-media";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Media tools for MATE";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ chpatrick ];
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -10,17 +10,17 @@
gobject-introspection,
mate-common,
python3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-menus";
version = "1.28.1";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "mate-menus";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-GAc9DPsXdswmyNKlbY6cyHBWO2OSKCBygtzttNHN/p4=";
};
nativeBuildInputs = [
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-menus";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
broken = stdenv.hostPlatform.isDarwin;
@@ -57,4 +61,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -10,10 +10,10 @@
libXtst,
mate,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-netbook";
version = "1.26.0";
outputs = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-netbook-${finalAttrs.version}.tar.xz";
sha256 = "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3";
};
@@ -42,7 +42,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-netbook";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE utilities for netbooks";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -17,10 +17,10 @@
mate-desktop,
mate-panel,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-notification-daemon";
version = "1.28.5";
outputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "mate-notification-daemon";
tag = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-6N6lD63JL9xAtALn9URjYiCEhMZBC9TfIsrdalyY3YY=";
};
@@ -61,7 +61,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-notification-daemon";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Notification daemon for MATE Desktop";
@@ -74,4 +78,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+3 -3
View File
@@ -29,7 +29,7 @@
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-panel";
version = "1.28.7";
outputs = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "mate-panel";
tag = "v${version}";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-8GS6JY5kS2YKscItAo8dzudgkZeG51JsSBUj0EfLiZQ=";
};
@@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -8,15 +8,15 @@
gobject-introspection,
libayatana-appindicator,
polkit,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-polkit";
version = "1.28.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-polkit-${finalAttrs.version}.tar.xz";
sha256 = "NQod0KjtaiycGDz/KiHzlCmelo/MauLoyTxWXa5gSug=";
};
@@ -34,7 +34,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-polkit";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Integrates polkit authentication for MATE desktop";
@@ -43,4 +47,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -18,10 +18,10 @@
libtool,
polkit,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-power-manager";
version = "1.28.1";
outputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-power-manager-${finalAttrs.version}.tar.xz";
sha256 = "jr3LdLYH6Ggza6moFGze+Pl7zlNcKwyzv2UMWPce7iE=";
};
@@ -60,7 +60,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-power-manager";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE Power Manager";
@@ -73,4 +77,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ chpatrick ];
teams = [ lib.teams.mate ];
};
}
})
@@ -15,15 +15,15 @@
pam,
systemd,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-screensaver";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-screensaver-${finalAttrs.version}.tar.xz";
sha256 = "ag8kqPhKL5XhARSrU+Y/1KymiKVf3FA+1lDgpBDj6nA=";
};
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-screensaver";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Screen saver and locker for the MATE desktop";
@@ -64,4 +68,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -14,15 +14,15 @@
lm_sensors,
mate-panel,
hicolor-icon-theme,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-sensors-applet";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-sensors-applet-${finalAttrs.version}.tar.xz";
sha256 = "1GU2ZoKvj+uGGCg8l4notw22/RfKj6lQrG9xAQIxWoE=";
};
@@ -56,7 +56,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-sensors-applet";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
homepage = "https://github.com/mate-desktop/mate-sensors-applet";
@@ -65,4 +69,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
teams = [ lib.teams.mate ];
};
}
})
@@ -18,15 +18,15 @@
mate-screensaver,
wrapGAppsHook3,
fetchpatch,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-session-manager";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-session-manager-${finalAttrs.version}.tar.xz";
sha256 = "0yzkWVuh2mUpB3cgPyvIK9lzshSjoECAoe9caJkKLXs=";
};
@@ -69,7 +69,11 @@ stdenv.mkDerivation rec {
passthru.providedSessions = [ "mate" ];
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-session-manager";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE Desktop session manager";
@@ -81,4 +85,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -18,11 +18,11 @@
pulseaudioSupport ? stdenv.config.pulseaudio or true,
libpulseaudio,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
udevCheckHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-settings-daemon";
version = "1.28.0";
outputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-settings-daemon-${finalAttrs.version}.tar.xz";
sha256 = "TtfNraqkyZ7//AKCuEEXA7t24HLEHEtXmJ+MW0BhGjo=";
};
@@ -64,7 +64,11 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-settings-daemon";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE settings daemon";
@@ -78,4 +82,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -13,15 +13,15 @@
systemd,
wrapGAppsHook3,
mate-desktop,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-system-monitor";
version = "1.28.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-system-monitor-${finalAttrs.version}.tar.xz";
sha256 = "QtZj1rkPtTYevBP2VHmD1vHirHXcKuTxysbqYymWWiU=";
};
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-system-monitor";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "System monitor for the MATE desktop";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -11,16 +11,16 @@
vte,
pcre2,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
nixosTests,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-terminal";
version = "1.28.1";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-terminal-${finalAttrs.version}.tar.xz";
sha256 = "8TXrGp4q4ieY7LLcGRT9tM/XdOa7ZcAVK+N8xslGnpI=";
};
@@ -43,7 +43,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-terminal";
odd-unstable = true;
rev-prefix = "v";
};
passthru.tests.test = nixosTests.terminal-emulators.mate-terminal;
@@ -54,4 +58,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -11,15 +11,15 @@
gtk-engine-murrine,
gdk-pixbuf,
librsvg,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-themes";
version = "3.22.26";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor finalAttrs.version}/mate-themes-${finalAttrs.version}.tar.xz";
sha256 = "Ik6J02TrO3Pxz3VtBUlKmEIak8v1Q0miyF/GB+t1Xtc=";
};
@@ -49,7 +49,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-themes";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Set of themes from MATE";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -6,15 +6,15 @@
itstool,
libxml2,
yelp,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-user-guide";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-user-guide-${finalAttrs.version}.tar.xz";
sha256 = "U+8IFPUGVEYU7WGre+UiHMjTqfFPfvlpjJD+fkYBS54=";
};
@@ -35,7 +35,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-user-guide";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE User Guide";
@@ -47,4 +51,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -15,18 +15,18 @@
hicolor-icon-theme,
mate,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
let
inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-user-share";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-user-share-${finalAttrs.version}.tar.xz";
sha256 = "iYVgmZkXllE0jkl+8I81C4YIG5expKcwQHfurlc5rjg=";
};
@@ -65,7 +65,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-user-share";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "User level public file sharing for the MATE desktop";
@@ -75,4 +79,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -18,10 +18,10 @@
hicolor-icon-theme,
wayland,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mate-utils";
version = "1.28.0";
outputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-utils-${finalAttrs.version}.tar.xz";
sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM=";
};
@@ -69,7 +69,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mate-utils";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Utilities for the MATE desktop";
@@ -81,4 +85,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
@@ -12,14 +12,14 @@
gitUpdater,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mate-wayland-session";
version = "1.28.4";
src = fetchFromGitHub {
owner = "mate-desktop";
repo = "mate-wayland-session";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-jcYkiJOo1k0bMP/LkBW+QIrSyoj6qi8zZMTxqmuNQd0=";
};
@@ -53,4 +53,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+7 -3
View File
@@ -9,7 +9,7 @@
glib,
wrapGAppsHook3,
gobject-introspection,
mateUpdateScript,
gitUpdater,
}:
python3.pkgs.buildPythonApplication rec {
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/mozo-${version}.tar.xz";
sha256 = "/piYT/1qqMNtBZS879ugPeObQtQeAHJRaAOE8870SSQ=";
};
@@ -43,7 +43,11 @@ python3.pkgs.buildPythonApplication rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/mozo";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "MATE Desktop menu editor";
+9 -5
View File
@@ -15,15 +15,15 @@
libpeas,
mate-desktop,
wrapGAppsHook3,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pluma";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/pluma-${finalAttrs.version}.tar.xz";
sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ=";
};
@@ -66,7 +66,11 @@ stdenv.mkDerivation rec {
patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py
'';
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/pluma";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Powerful text editor for the MATE desktop";
@@ -80,4 +84,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})
+9 -5
View File
@@ -7,15 +7,15 @@
caja,
gtk3,
python3Packages,
mateUpdateScript,
gitUpdater,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "python-caja";
version = "1.28.0";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/python-caja-${finalAttrs.version}.tar.xz";
sha256 = "sFbCOdvf4z7QzIQx+zUAqTj3h7Weh19f+TV4umb2gNY=";
};
@@ -36,7 +36,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.updateScript = mateUpdateScript { inherit pname; };
passthru.updateScript = gitUpdater {
url = "https://git.mate-desktop.org/python-caja";
odd-unstable = true;
rev-prefix = "v";
};
meta = {
description = "Python binding for Caja components";
@@ -45,4 +49,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
teams = [ lib.teams.mate ];
};
}
})