From 2095e319fd6194e031ceccf3282e4ceefb5db5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 00:34:03 -0300 Subject: [PATCH 1/8] budgie: Don't use `with` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 031ec9cd51a0..52f47d00bdeb 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -1,6 +1,8 @@ -{ lib, pkgs }: +{ lib, newScope }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope newScope (self: let + inherit (self) callPackage; +in { budgie-backgrounds = callPackage ./budgie-backgrounds { }; budgie-control-center = callPackage ./budgie-control-center { }; budgie-desktop = callPackage ./budgie-desktop { }; From 51c3335edb0de948fa202d9ff28f8a1e0a201368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 00:35:36 -0300 Subject: [PATCH 2/8] budgie.budgie-backgrounds: Don't use `rec` and `with lib` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../desktops/budgie/budgie-backgrounds/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-backgrounds/default.nix b/pkgs/desktops/budgie/budgie-backgrounds/default.nix index b554cda38aaf..230e4fd97e98 100644 --- a/pkgs/desktops/budgie/budgie-backgrounds/default.nix +++ b/pkgs/desktops/budgie/budgie-backgrounds/default.nix @@ -7,14 +7,14 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-backgrounds"; version = "3.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-backgrounds"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2E6+WDLIAwqiiPMJw+tLDCT3CnpboH4X0cB87zw/hBQ="; }; @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { ninja ]; - meta = with lib; { + meta = { description = "The default background set for the Budgie Desktop"; homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds"; - platforms = platforms.linux; - maintainers = teams.budgie.members; - license = licenses.cc0; + platforms = lib.platforms.linux; + maintainers = lib.teams.budgie.members; + license = lib.licenses.cc0; }; -} +}) From 086334b31250f1947f18b75521ce6cf41826233c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 00:35:52 -0300 Subject: [PATCH 3/8] budgie.budgie-control-center: Don't use `rec` and `with lib` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../budgie/budgie-control-center/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index cc5a0c0b7061..aea55e66256c 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -56,14 +56,14 @@ , enableSshSocket ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-control-center"; version = "1.4.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; - repo = pname; - rev = "v${version}"; + repo = "budgie-control-center"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; }; @@ -167,12 +167,12 @@ stdenv.mkDerivation rec { separateDebugInfo = true; - meta = with lib; { + meta = { description = "A fork of GNOME Control Center for the Budgie 10 Series"; homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center"; mainProgram = "budgie-control-center"; - platforms = platforms.linux; - maintainers = teams.budgie.members; - license = licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.budgie.members; + license = lib.licenses.gpl2Plus; }; -} +}) From 5d0339b577d372e9d9c48e297807826786eab6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 00:36:08 -0300 Subject: [PATCH 4/8] budgie.budgie-screensaver: Don't use `rec` and `with lib` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../budgie/budgie-screensaver/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-screensaver/default.nix b/pkgs/desktops/budgie/budgie-screensaver/default.nix index f4139cbbe2e6..68c253a2a1c6 100644 --- a/pkgs/desktops/budgie/budgie-screensaver/default.nix +++ b/pkgs/desktops/budgie/budgie-screensaver/default.nix @@ -17,14 +17,14 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-screensaver"; version = "5.1.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; - repo = pname; - rev = "v${version}"; + repo = "budgie-screensaver"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-N8x9hdbaMDisTbQPJedNO4UMLnCn+Q2hhm4udJZgQlc="; }; @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; - meta = with lib; { + meta = { description = "A fork of old GNOME Screensaver for purposes of providing an authentication prompt on wake"; homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver"; mainProgram = "budgie-screensaver"; - platforms = platforms.linux; - maintainers = teams.budgie.members; - license = licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = lib.teams.budgie.members; + license = lib.licenses.gpl2Only; }; -} +}) From e4d5a254c8d51e14544be6d083b528c4b7c2d24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 00:36:23 -0300 Subject: [PATCH 5/8] budgie.magpie: Don't use `with lib` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/magpie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 7793fdf4df3d..f900e82a9ce1 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -156,11 +156,11 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Softish fork of Mutter 43.x"; homepage = "https://github.com/BuddiesOfBudgie/magpie"; - license = licenses.gpl2Plus; - maintainers = teams.budgie.members; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = lib.teams.budgie.members; + platforms = lib.platforms.linux; }; }) From 470492ccfb0236199800bceac7c4e49eccf1f54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 00:37:02 -0300 Subject: [PATCH 6/8] budgie.budgie-desktop: Propagate libpeas for plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-desktop/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 26c2231870b0..71e69a5223e4 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -72,13 +72,14 @@ stdenv.mkDerivation (finalAttrs: { gnome.mutter gnome.zenity graphene + gst_all_1.gstreamer + gst_all_1.gst-plugins-base gtk3 ibus libcanberra-gtk3 libgee libGL libnotify - libpeas libpulseaudio libuuid libwnck @@ -88,10 +89,12 @@ stdenv.mkDerivation (finalAttrs: { sassc upower xfce.libxfce4windowing - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); + ]; + + propagatedBuildInputs = [ + # budgie-1.0.pc, budgie-raven-plugin-1.0.pc + libpeas + ]; passthru.providedSessions = [ "budgie-desktop" From 1f41c466dcdf2e13a96602aa504eb62e41775d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 21:05:25 -0300 Subject: [PATCH 7/8] budgiePlugins.budgie-analogue-clock-applet: Don't use `rec` and `with lib` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../budgie-analogue-clock-applet/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix index 4b89b0889c29..3792a19f99e9 100644 --- a/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix @@ -10,14 +10,14 @@ , libpeas }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-analogue-clock-applet"; version = "2.0"; src = fetchFromGitHub { owner = "samlane-ma"; repo = "analogue-clock-applet"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-yId5bbdmELinBmZ5eISa5hQSYkeZCkix2FJ287GdcCs="; }; @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { libpeas ]; - meta = with lib; { + meta = { description = "Analogue Clock Applet for the Budgie desktop"; homepage = "https://github.com/samlane-ma/analogue-clock-applet"; - license = licenses.gpl3Plus; - maintainers = teams.budgie.members; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = lib.teams.budgie.members; + platforms = lib.platforms.linux; }; -} +}) From d01ba0921413ba0a7ce76fe2672d02c9cba27d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 22 Mar 2024 21:06:02 -0300 Subject: [PATCH 8/8] budgiePlugins.budgie-user-indicator-redux: Don't use `lib` and `with lib` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../budgie-user-indicator-redux/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix index efe1a87631df..273f87d51dbd 100644 --- a/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix +++ b/pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix @@ -14,14 +14,14 @@ , vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "budgie-user-indicator-redux"; version = "1.0.2"; src = fetchFromGitHub { owner = "EbonJaeger"; repo = "budgie-user-indicator-redux"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-X9b4H4PnrYGb/T7Sg9iXQeNDLoO1l0VCdbOCGUAgwC4="; }; @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { sassc ]; - meta = with lib; { + meta = { description = "Manage your user session from the Budgie panel"; homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux"; - changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = teams.budgie.members; + changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.budgie.members; }; -} +})