From 81dd022471943861f11a0907661af57fbdb7a8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:21:16 -0300 Subject: [PATCH 1/6] enlightenment.efl: move to pkgs/desktops/enlightenment/efl/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../{ => efl}/0002-efreet-more-stat-info-changes.patch | 0 pkgs/desktops/enlightenment/{efl.nix => efl/default.nix} | 0 pkgs/desktops/enlightenment/{ => efl}/efl-elua.patch | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{ => efl}/0002-efreet-more-stat-info-changes.patch (100%) rename pkgs/desktops/enlightenment/{efl.nix => efl/default.nix} (100%) rename pkgs/desktops/enlightenment/{ => efl}/efl-elua.patch (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index dcaf6260f0c4..bdb56e9172d1 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,7 +1,7 @@ { callPackage, pkgs }: { #### CORE EFL - efl = callPackage ./efl.nix { }; + efl = callPackage ./efl { }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; diff --git a/pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch b/pkgs/desktops/enlightenment/efl/0002-efreet-more-stat-info-changes.patch similarity index 100% rename from pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch rename to pkgs/desktops/enlightenment/efl/0002-efreet-more-stat-info-changes.patch diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/efl.nix rename to pkgs/desktops/enlightenment/efl/default.nix diff --git a/pkgs/desktops/enlightenment/efl-elua.patch b/pkgs/desktops/enlightenment/efl/efl-elua.patch similarity index 100% rename from pkgs/desktops/enlightenment/efl-elua.patch rename to pkgs/desktops/enlightenment/efl/efl-elua.patch From f9d16d59f6351bcc24d2791a325798471f2b3d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:25:54 -0300 Subject: [PATCH 2/6] enlightenment.enlightenment: move to pkgs/desktops/enlightenment/enlightenment/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../{ => enlightenment}/0001-wrapped-setuid-executables.patch | 0 .../{ => enlightenment}/0003-setuid-missing-path.patch | 0 .../{enlightenment.nix => enlightenment/default.nix} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{ => enlightenment}/0001-wrapped-setuid-executables.patch (100%) rename pkgs/desktops/enlightenment/{ => enlightenment}/0003-setuid-missing-path.patch (100%) rename pkgs/desktops/enlightenment/{enlightenment.nix => enlightenment/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index bdb56e9172d1..2dd19ce146b2 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -4,7 +4,7 @@ efl = callPackage ./efl { }; #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; + enlightenment = callPackage ./enlightenment { }; #### APPLICATIONS econnman = callPackage ./econnman.nix { }; diff --git a/pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch b/pkgs/desktops/enlightenment/enlightenment/0001-wrapped-setuid-executables.patch similarity index 100% rename from pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch rename to pkgs/desktops/enlightenment/enlightenment/0001-wrapped-setuid-executables.patch diff --git a/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch b/pkgs/desktops/enlightenment/enlightenment/0003-setuid-missing-path.patch similarity index 100% rename from pkgs/desktops/enlightenment/0003-setuid-missing-path.patch rename to pkgs/desktops/enlightenment/enlightenment/0003-setuid-missing-path.patch diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/enlightenment.nix rename to pkgs/desktops/enlightenment/enlightenment/default.nix From 0f2bbb850dfc89018e4c4d51d2aea1efea268844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:32:01 -0300 Subject: [PATCH 3/6] enlightenment.econnman: move to pkgs/desktops/enlightenment/econnman/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../enlightenment/{econnman.nix => econnman/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{econnman.nix => econnman/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 2dd19ce146b2..36b53c3c9a09 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -7,7 +7,7 @@ enlightenment = callPackage ./enlightenment { }; #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; + econnman = callPackage ./econnman { }; terminology = callPackage ./terminology.nix { }; rage = callPackage ./rage.nix { }; ephoto = callPackage ./ephoto.nix { }; diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/econnman.nix rename to pkgs/desktops/enlightenment/econnman/default.nix From 5eea1c16db7bd8aed35b596d75c7487ca0e69465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:33:41 -0300 Subject: [PATCH 4/6] enlightenment.terminology: move to pkgs/desktops/enlightenment/terminology/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../enlightenment/{terminology.nix => terminology/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{terminology.nix => terminology/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 36b53c3c9a09..f95d75a25e1b 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -8,7 +8,7 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; - terminology = callPackage ./terminology.nix { }; + terminology = callPackage ./terminology { }; rage = callPackage ./rage.nix { }; ephoto = callPackage ./ephoto.nix { }; } diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/terminology.nix rename to pkgs/desktops/enlightenment/terminology/default.nix From 435a50be50d86183488833d4042efe5bcc05fcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:35:20 -0300 Subject: [PATCH 5/6] enlightenment.rage: move to pkgs/desktops/enlightenment/rage/ --- pkgs/desktops/enlightenment/default.nix | 2 +- pkgs/desktops/enlightenment/{rage.nix => rage/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{rage.nix => rage/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index f95d75a25e1b..2c68a9841ea5 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -9,6 +9,6 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; terminology = callPackage ./terminology { }; - rage = callPackage ./rage.nix { }; + rage = callPackage ./rage { }; ephoto = callPackage ./ephoto.nix { }; } diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/rage.nix rename to pkgs/desktops/enlightenment/rage/default.nix From 57986d0a4a324fe6d86e7dd5eca15e089db5ef06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:37:14 -0300 Subject: [PATCH 6/6] enlightenment.ephoto: move to pkgs/desktops/enlightenment/ephoto/ --- pkgs/desktops/enlightenment/default.nix | 2 +- pkgs/desktops/enlightenment/{ephoto.nix => ephoto/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{ephoto.nix => ephoto/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 2c68a9841ea5..5c6a64b1f33d 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -10,5 +10,5 @@ econnman = callPackage ./econnman { }; terminology = callPackage ./terminology { }; rage = callPackage ./rage { }; - ephoto = callPackage ./ephoto.nix { }; + ephoto = callPackage ./ephoto { }; } diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/ephoto.nix rename to pkgs/desktops/enlightenment/ephoto/default.nix