diff options
Diffstat (limited to 'pkgs/applications')
13 files changed, 9 insertions, 39 deletions
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/graphics/gocr/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix deleted file mode 100644 index 2fd30577441..00000000000 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - realPath=y: (__toPath ((toString ./JustNothing/.. )+"/"+y.version+".nix")); - dispatch=(x: ((import (realPath x)) x)); -in -args : -with args; -with builderDefs {src="";} null; -let eater=(lib.sumArgs dispatch args); in -eater diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/default.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/default.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/default.nix b/pkgs/applications/window-managers/compiz-fusion/compiz-manager/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/compiz-manager/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/default.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/default.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/config-backend/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix index 156d3d281d7..589b77d0f23 100644 --- a/pkgs/applications/window-managers/compiz-fusion/default.nix +++ b/pkgs/applications/window-managers/compiz-fusion/default.nix @@ -1,13 +1,14 @@ args : with args; rec { - bcop = import ./bcop args; - libcompizconfig = import ./libcompizconfig (args // {inherit bcop;}); - configBackendGConf = import ./config-backend (args // {inherit bcop libcompizconfig;}); - compizConfigPython = import ./compizconfig-python (args // {inherit libcompizconfig + selectVersion = dir: import (dir + "/${args.version}.nix"); + bcop = selectVersion ./bcop args; + libcompizconfig = selectVersion ./libcompizconfig (args // {inherit bcop;}); + configBackendGConf = selectVersion ./config-backend (args // {inherit bcop libcompizconfig;}); + compizConfigPython = selectVersion ./compizconfig-python (args // {inherit libcompizconfig bcop pyrex configBackendGConf;}); - ccsm = import ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); - pluginsMain = import ./main (args //{inherit bcop ;}); - pluginsExtra = import ./extra (args //{inherit bcop pluginsMain;}); - compizManager = import ./compiz-manager (args // {inherit bcop ccsm;}); + ccsm = selectVersion ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;}); + pluginsMain = selectVersion ./main (args //{inherit bcop ;}); + pluginsExtra = selectVersion ./extra (args //{inherit bcop pluginsMain;}); + compizManager = selectVersion ./compiz-manager (args // {inherit bcop ccsm;}); } diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/default.nix b/pkgs/applications/window-managers/compiz-fusion/extra/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/extra/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/default.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz-fusion/main/default.nix b/pkgs/applications/window-managers/compiz-fusion/main/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz-fusion/main/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/compiz/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix deleted file mode 100644 index c8e4bcf9545..00000000000 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -args : -(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args |