(* HUGE *) Use nixpkgs overlays

99 files changed, 22 insertions, 40 deletions

diff --git a/README.md b/README.md
index 7ae75e5..5c13562 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ and package set (extending and overriding it).
 Features
 ========
 
+
 Plug & Play
 -----------
 
@@ -31,11 +32,16 @@ or packages and put them into your project with your modifications without
 maintaning a fork of Nixsap.  When taking modules you have to change the
 `nixsap` namespace to something different to avoid conflicts.
 
-It is also possible to build and install packages that are overridden
-by Nixsap, for example:
+
+Package Overlay
+---------------
+
+Nixsap modules use a package overlay located in [./pkgs/default.nix](./pkgs/default.nix).
+It is also possible to build and install packages from this overlay independently,
+for example:
 
 ```
-nix-env [-I nixpkgs=/path/to/vanila/nixpkgs] -f /path/to/nixsap/pkgs -i nodejs-sass
+nix-build -E '(import <nixpkgs> { overlays = [ (import ./pkgs/default.nix) ]; })' -A icinga2
 ```
 
 
diff --git a/modules/overlay.nix b/modules/overlay.nix
new file mode 100644
index 0000000..372da27
--- /dev/null
+++ b/modules/overlay.nix
@@ -0,0 +1,3 @@
+{
+  nixpkgs.overlays = [ (import ../pkgs) ];
+}
diff --git a/modules/pkgs/default.nix b/modules/pkgs/default.nix
deleted file mode 100644
index d66f7ba..0000000
--- a/modules/pkgs/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, ... }:
-
-let
-  all = lib.attrNames (
-    lib.filterAttrs
-    ( n: _: n != "default.nix" && ! lib.hasPrefix "." n )
-    (builtins.readDir ./.)
-  );
-
-  localPackages = super: lib.listToAttrs (map (f:
-    { name = lib.removeSuffix ".nix" f;
-      value = super.callPackage (./. + "/${f}") {}; }
-  ) all);
-
-in {
-  nixpkgs.config.packageOverrides = localPackages;
-}
-
diff --git a/modules/pkgs/cassandra3/default.nix b/pkgs/cassandra3/default.nix
index 467f665..467f665 100644
--- a/modules/pkgs/cassandra3/default.nix
+++ b/pkgs/cassandra3/default.nix
diff --git a/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb b/pkgs/check_aws_ec2_elb/check_aws_ec2_elb
index 7b53cc9..7b53cc9 100755
--- a/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb
+++ b/pkgs/check_aws_ec2_elb/check_aws_ec2_elb
diff --git a/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf b/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf
index 9718e3c..9718e3c 100644
--- a/modules/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf
+++ b/pkgs/check_aws_ec2_elb/check_aws_ec2_elb.conf
diff --git a/modules/pkgs/check_aws_ec2_elb/default.nix b/pkgs/check_aws_ec2_elb/default.nix
index 9e785cf..9e785cf 100644
--- a/modules/pkgs/check_aws_ec2_elb/default.nix
+++ b/pkgs/check_aws_ec2_elb/default.nix
diff --git a/modules/pkgs/check_aws_rds/check_aws_rds b/pkgs/check_aws_rds/check_aws_rds
index d4fd965..d4fd965 100644
--- a/modules/pkgs/check_aws_rds/check_aws_rds
+++ b/pkgs/check_aws_rds/check_aws_rds
diff --git a/modules/pkgs/check_aws_rds/check_aws_rds.conf b/pkgs/check_aws_rds/check_aws_rds.conf
index 2f6a84e..2f6a84e 100644
--- a/modules/pkgs/check_aws_rds/check_aws_rds.conf
+++ b/pkgs/check_aws_rds/check_aws_rds.conf
diff --git a/modules/pkgs/check_aws_rds/default.nix b/pkgs/check_aws_rds/default.nix
index 916cdf6..916cdf6 100644
--- a/modules/pkgs/check_aws_rds/default.nix
+++ b/pkgs/check_aws_rds/default.nix
diff --git a/modules/pkgs/check_aws_s3_file/check_aws_s3_file b/pkgs/check_aws_s3_file/check_aws_s3_file
index 82c8745..82c8745 100755
--- a/modules/pkgs/check_aws_s3_file/check_aws_s3_file
+++ b/pkgs/check_aws_s3_file/check_aws_s3_file
diff --git a/modules/pkgs/check_aws_s3_file/check_aws_s3_file.conf b/pkgs/check_aws_s3_file/check_aws_s3_file.conf
index e2ec2b5..e2ec2b5 100644
--- a/modules/pkgs/check_aws_s3_file/check_aws_s3_file.conf
+++ b/pkgs/check_aws_s3_file/check_aws_s3_file.conf
diff --git a/modules/pkgs/check_aws_s3_file/default.nix b/pkgs/check_aws_s3_file/default.nix
index df84c79..df84c79 100644
--- a/modules/pkgs/check_aws_s3_file/default.nix
+++ b/pkgs/check_aws_s3_file/default.nix
diff --git a/modules/pkgs/check_mdstat/check_mdstat b/pkgs/check_mdstat/check_mdstat
index 32fc168..32fc168 100755
--- a/modules/pkgs/check_mdstat/check_mdstat
+++ b/pkgs/check_mdstat/check_mdstat
diff --git a/modules/pkgs/check_mdstat/default.nix b/pkgs/check_mdstat/default.nix
index 5e645fd..5e645fd 100644
--- a/modules/pkgs/check_mdstat/default.nix
+++ b/pkgs/check_mdstat/default.nix
diff --git a/modules/pkgs/check_solr/cabal2nix.nix b/pkgs/check_solr/cabal2nix.nix
index 138062f..138062f 100644
--- a/modules/pkgs/check_solr/cabal2nix.nix
+++ b/pkgs/check_solr/cabal2nix.nix
diff --git a/modules/pkgs/check_solr/default.nix b/pkgs/check_solr/default.nix
index 27aecce..27aecce 100644
--- a/modules/pkgs/check_solr/default.nix
+++ b/pkgs/check_solr/default.nix
diff --git a/modules/pkgs/check_systemd/check_systemd b/pkgs/check_systemd/check_systemd
index e668331..e668331 100755
--- a/modules/pkgs/check_systemd/check_systemd
+++ b/pkgs/check_systemd/check_systemd
diff --git a/modules/pkgs/check_systemd/default.nix b/pkgs/check_systemd/default.nix
index da92a64..da92a64 100644
--- a/modules/pkgs/check_systemd/default.nix
+++ b/pkgs/check_systemd/default.nix
diff --git a/pkgs/default.nix b/pkgs/default.nix
index cb8c91a..6122987 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,21 +1,12 @@
-{ nixpkgs ? <nixpkgs>
-, system ? builtins.currentSystem
-}:
-
+self: super:
 let
+  all = super.lib.attrNames (
+    super.lib.filterAttrs
+    ( n: _: n != "default.nix" && ! super.lib.hasPrefix "." n )
+    (builtins.readDir ./.)
+  );
+in super.lib.listToAttrs (map (f:
+  { name = super.lib.removeSuffix ".nix" f;
+    value = super.callPackage (./. + "/${f}") {}; }
+) all)
 
-  lib = import (nixpkgs + "/lib");
-  inherit (lib) evalModules;
-
-
-  evaluated = evalModules {
-    modules = [
-      { nixpkgs.system = system; }
-      (import (nixpkgs + "/nixos/modules/misc/nixpkgs.nix"))
-      (import ../modules/pkgs)
-    ];
-  };
-
-  inherit (evaluated.config._module.args) pkgs;
-
-in pkgs
diff --git a/modules/pkgs/fakeSSL/cert.pem b/pkgs/fakeSSL/cert.pem
index a4fe610..a4fe610 100644
--- a/modules/pkgs/fakeSSL/cert.pem
+++ b/pkgs/fakeSSL/cert.pem
diff --git a/modules/pkgs/fakeSSL/default.nix b/pkgs/fakeSSL/default.nix
index ec62e79..ec62e79 100644
--- a/modules/pkgs/fakeSSL/default.nix
+++ b/pkgs/fakeSSL/default.nix
diff --git a/modules/pkgs/fakeSSL/key.pem b/pkgs/fakeSSL/key.pem
index 8f3e4b2..8f3e4b2 100644
--- a/modules/pkgs/fakeSSL/key.pem
+++ b/pkgs/fakeSSL/key.pem
diff --git a/modules/pkgs/gpg.nix b/pkgs/gpg.nix
index e3aa8f6..e3aa8f6 100644
--- a/modules/pkgs/gpg.nix
+++ b/pkgs/gpg.nix
diff --git a/modules/pkgs/hoogle/default.nix b/pkgs/hoogle/default.nix
index 4ff5095..4ff5095 100644
--- a/modules/pkgs/hoogle/default.nix
+++ b/pkgs/hoogle/default.nix
diff --git a/modules/pkgs/hoogle/main.nix b/pkgs/hoogle/main.nix
index 9c9a682..9c9a682 100644
--- a/modules/pkgs/hoogle/main.nix
+++ b/pkgs/hoogle/main.nix
diff --git a/modules/pkgs/hyperic-sigar/default.nix b/pkgs/hyperic-sigar/default.nix
index 1251244..1251244 100644
--- a/modules/pkgs/hyperic-sigar/default.nix
+++ b/pkgs/hyperic-sigar/default.nix
diff --git a/modules/pkgs/icinga2/check_mysql_slave.patch b/pkgs/icinga2/check_mysql_slave.patch
index 0658a8a..0658a8a 100644
--- a/modules/pkgs/icinga2/check_mysql_slave.patch
+++ b/pkgs/icinga2/check_mysql_slave.patch
diff --git a/modules/pkgs/icinga2/default.nix b/pkgs/icinga2/default.nix
index 9805ca4..9805ca4 100644
--- a/modules/pkgs/icinga2/default.nix
+++ b/pkgs/icinga2/default.nix
diff --git a/modules/pkgs/icingaweb2/default.nix b/pkgs/icingaweb2/default.nix
index 40aebb0..40aebb0 100644
--- a/modules/pkgs/icingaweb2/default.nix
+++ b/pkgs/icingaweb2/default.nix
diff --git a/modules/pkgs/icingaweb2/sproxy.patch b/pkgs/icingaweb2/sproxy.patch
index 234bee7..234bee7 100644
--- a/modules/pkgs/icingaweb2/sproxy.patch
+++ b/pkgs/icingaweb2/sproxy.patch
diff --git a/modules/pkgs/jenkins.nix b/pkgs/jenkins.nix
index 502d7f9..502d7f9 100644
--- a/modules/pkgs/jenkins.nix
+++ b/pkgs/jenkins.nix
diff --git a/modules/pkgs/jenkinsUpdateCenter/default.nix b/pkgs/jenkinsUpdateCenter/default.nix
index f72dca1..f72dca1 100644
--- a/modules/pkgs/jenkinsUpdateCenter/default.nix
+++ b/pkgs/jenkinsUpdateCenter/default.nix
diff --git a/modules/pkgs/jenkinsUpdateCenter/update-center.actual.json b/pkgs/jenkinsUpdateCenter/update-center.actual.json
index f90c17d..f90c17d 100644
--- a/modules/pkgs/jenkinsUpdateCenter/update-center.actual.json
+++ b/pkgs/jenkinsUpdateCenter/update-center.actual.json
diff --git a/modules/pkgs/jenkinsWithPlugins/default.nix b/pkgs/jenkinsWithPlugins/default.nix
index ebc12db..ebc12db 100644
--- a/modules/pkgs/jenkinsWithPlugins/default.nix
+++ b/pkgs/jenkinsWithPlugins/default.nix
diff --git a/modules/pkgs/jenkinsWithPlugins/fromBase64.nix b/pkgs/jenkinsWithPlugins/fromBase64.nix
index 3130f9c..3130f9c 100644
--- a/modules/pkgs/jenkinsWithPlugins/fromBase64.nix
+++ b/pkgs/jenkinsWithPlugins/fromBase64.nix
diff --git a/modules/pkgs/juandelacosa/default.nix b/pkgs/juandelacosa/default.nix
index 673ac17..673ac17 100644
--- a/modules/pkgs/juandelacosa/default.nix
+++ b/pkgs/juandelacosa/default.nix
diff --git a/modules/pkgs/juandelacosa/main.nix b/pkgs/juandelacosa/main.nix
index 913e057..913e057 100644
--- a/modules/pkgs/juandelacosa/main.nix
+++ b/pkgs/juandelacosa/main.nix
diff --git a/modules/pkgs/kibana5/default.nix b/pkgs/kibana5/default.nix
index 519dafd..519dafd 100644
--- a/modules/pkgs/kibana5/default.nix
+++ b/pkgs/kibana5/default.nix
diff --git a/modules/pkgs/ldapply/default.nix b/pkgs/ldapply/default.nix
index 6bd1219..6bd1219 100644
--- a/modules/pkgs/ldapply/default.nix
+++ b/pkgs/ldapply/default.nix
diff --git a/modules/pkgs/ldapply/ldap.nix b/pkgs/ldapply/ldap.nix
index 03a5fd3..03a5fd3 100644
--- a/modules/pkgs/ldapply/ldap.nix
+++ b/pkgs/ldapply/ldap.nix
diff --git a/modules/pkgs/ldapply/main.nix b/pkgs/ldapply/main.nix
index 3a69576..3a69576 100644
--- a/modules/pkgs/ldapply/main.nix
+++ b/pkgs/ldapply/main.nix
diff --git a/modules/pkgs/mariadb_10_1/default.nix b/pkgs/mariadb_10_1/default.nix
index e4c595a..e4c595a 100644
--- a/modules/pkgs/mariadb_10_1/default.nix
+++ b/pkgs/mariadb_10_1/default.nix
diff --git a/modules/pkgs/mathJax.nix b/pkgs/mathJax.nix
index 04b596f..04b596f 100644
--- a/modules/pkgs/mathJax.nix
+++ b/pkgs/mathJax.nix
diff --git a/modules/pkgs/mediawiki/T122487.patch b/pkgs/mediawiki/T122487.patch
index 7b868a8..7b868a8 100644
--- a/modules/pkgs/mediawiki/T122487.patch
+++ b/pkgs/mediawiki/T122487.patch
diff --git a/modules/pkgs/mediawiki/default.nix b/pkgs/mediawiki/default.nix
index e5a5910..e5a5910 100644
--- a/modules/pkgs/mediawiki/default.nix
+++ b/pkgs/mediawiki/default.nix
diff --git a/modules/pkgs/mediawiki/file-backend-default-mode.patch b/pkgs/mediawiki/file-backend-default-mode.patch
index 2bd303c..2bd303c 100644
--- a/modules/pkgs/mediawiki/file-backend-default-mode.patch
+++ b/pkgs/mediawiki/file-backend-default-mode.patch
diff --git a/modules/pkgs/mediawikiExtensions/Sproxy/Sproxy.php b/pkgs/mediawikiExtensions/Sproxy/Sproxy.php
index c16ac9e..c16ac9e 100644
--- a/modules/pkgs/mediawikiExtensions/Sproxy/Sproxy.php
+++ b/pkgs/mediawikiExtensions/Sproxy/Sproxy.php
diff --git a/modules/pkgs/mediawikiExtensions/default.nix b/pkgs/mediawikiExtensions/default.nix
index ddab0c4..ddab0c4 100644
--- a/modules/pkgs/mediawikiExtensions/default.nix
+++ b/pkgs/mediawikiExtensions/default.nix
diff --git a/modules/pkgs/monitoringPlugins/check_mysql_MYSQL_PORT.patch b/pkgs/monitoringPlugins/check_mysql_MYSQL_PORT.patch
index 5284ec8..5284ec8 100644
--- a/modules/pkgs/monitoringPlugins/check_mysql_MYSQL_PORT.patch
+++ b/pkgs/monitoringPlugins/check_mysql_MYSQL_PORT.patch
diff --git a/modules/pkgs/monitoringPlugins/default.nix b/pkgs/monitoringPlugins/default.nix
index 92a82ba..92a82ba 100644
--- a/modules/pkgs/monitoringPlugins/default.nix
+++ b/pkgs/monitoringPlugins/default.nix
diff --git a/modules/pkgs/monitoringPlugins/mysql_check_slave.patch b/pkgs/monitoringPlugins/mysql_check_slave.patch
index 09098f6..09098f6 100644
--- a/modules/pkgs/monitoringPlugins/mysql_check_slave.patch
+++ b/pkgs/monitoringPlugins/mysql_check_slave.patch
diff --git a/modules/pkgs/monitoringPlugins/test-str-format.patch b/pkgs/monitoringPlugins/test-str-format.patch
index 3311db7..3311db7 100644
--- a/modules/pkgs/monitoringPlugins/test-str-format.patch
+++ b/pkgs/monitoringPlugins/test-str-format.patch
diff --git a/modules/pkgs/mydumper.nix b/pkgs/mydumper.nix
index 20b128c..20b128c 100644
--- a/modules/pkgs/mydumper.nix
+++ b/pkgs/mydumper.nix
diff --git a/modules/pkgs/mywatch/default.nix b/pkgs/mywatch/default.nix
index 673ac17..673ac17 100644
--- a/modules/pkgs/mywatch/default.nix
+++ b/pkgs/mywatch/default.nix
diff --git a/modules/pkgs/mywatch/main.nix b/pkgs/mywatch/main.nix
index 8d78483..8d78483 100644
--- a/modules/pkgs/mywatch/main.nix
+++ b/pkgs/mywatch/main.nix
diff --git a/modules/pkgs/nagios-plugins-rabbitmq/default.nix b/pkgs/nagios-plugins-rabbitmq/default.nix
index 6ecb2e4..6ecb2e4 100644
--- a/modules/pkgs/nagios-plugins-rabbitmq/default.nix
+++ b/pkgs/nagios-plugins-rabbitmq/default.nix
diff --git a/modules/pkgs/nix-serve/default.nix b/pkgs/nix-serve/default.nix
index e5188f0..e5188f0 100644
--- a/modules/pkgs/nix-serve/default.nix
+++ b/pkgs/nix-serve/default.nix
diff --git a/modules/pkgs/nix-serve/nix-serve.psgi b/pkgs/nix-serve/nix-serve.psgi
index e368531..e368531 100644
--- a/modules/pkgs/nix-serve/nix-serve.psgi
+++ b/pkgs/nix-serve/nix-serve.psgi
diff --git a/modules/pkgs/nodejs-sass/default.nix b/pkgs/nodejs-sass/default.nix
index 67e230b..67e230b 100644
--- a/modules/pkgs/nodejs-sass/default.nix
+++ b/pkgs/nodejs-sass/default.nix
diff --git a/modules/pkgs/nodejs-sass/generate.sh b/pkgs/nodejs-sass/generate.sh
index 16d4673..16d4673 100755
--- a/modules/pkgs/nodejs-sass/generate.sh
+++ b/pkgs/nodejs-sass/generate.sh
diff --git a/modules/pkgs/nodejs-sass/main.json b/pkgs/nodejs-sass/main.json
index 393ec56..393ec56 100644
--- a/modules/pkgs/nodejs-sass/main.json
+++ b/pkgs/nodejs-sass/main.json
diff --git a/modules/pkgs/nodejs-sass/main.nix b/pkgs/nodejs-sass/main.nix
index fa82945..fa82945 100644
--- a/modules/pkgs/nodejs-sass/main.nix
+++ b/pkgs/nodejs-sass/main.nix
diff --git a/modules/pkgs/nodejs-sass/node-env.nix b/pkgs/nodejs-sass/node-env.nix
index fc118a7..fc118a7 100644
--- a/modules/pkgs/nodejs-sass/node-env.nix
+++ b/pkgs/nodejs-sass/node-env.nix
diff --git a/modules/pkgs/nodejs-sass/node-packages.nix b/pkgs/nodejs-sass/node-packages.nix
index 1694324..1694324 100644
--- a/modules/pkgs/nodejs-sass/node-packages.nix
+++ b/pkgs/nodejs-sass/node-packages.nix
diff --git a/modules/pkgs/openldap-modular.nix b/pkgs/openldap-modular.nix
index a97d932..a97d932 100644
--- a/modules/pkgs/openldap-modular.nix
+++ b/pkgs/openldap-modular.nix
diff --git a/modules/pkgs/postcss-cli/default.nix b/pkgs/postcss-cli/default.nix
index bdf9271..bdf9271 100644
--- a/modules/pkgs/postcss-cli/default.nix
+++ b/pkgs/postcss-cli/default.nix
diff --git a/modules/pkgs/postcss-cli/generate.sh b/pkgs/postcss-cli/generate.sh
index 16d4673..16d4673 100755
--- a/modules/pkgs/postcss-cli/generate.sh
+++ b/pkgs/postcss-cli/generate.sh
diff --git a/modules/pkgs/postcss-cli/main.json b/pkgs/postcss-cli/main.json
index 7f67d5e..7f67d5e 100644
--- a/modules/pkgs/postcss-cli/main.json
+++ b/pkgs/postcss-cli/main.json
diff --git a/modules/pkgs/postcss-cli/main.nix b/pkgs/postcss-cli/main.nix
index fa82945..fa82945 100644
--- a/modules/pkgs/postcss-cli/main.nix
+++ b/pkgs/postcss-cli/main.nix
diff --git a/modules/pkgs/postcss-cli/node-env.nix b/pkgs/postcss-cli/node-env.nix
index fc118a7..fc118a7 100644
--- a/modules/pkgs/postcss-cli/node-env.nix
+++ b/pkgs/postcss-cli/node-env.nix
diff --git a/modules/pkgs/postcss-cli/node-packages.nix b/pkgs/postcss-cli/node-packages.nix
index 25630a5..25630a5 100644
--- a/modules/pkgs/postcss-cli/node-packages.nix
+++ b/pkgs/postcss-cli/node-packages.nix
diff --git a/modules/pkgs/postcss-plugins/default.nix b/pkgs/postcss-plugins/default.nix
index fbc7d41..fbc7d41 100644
--- a/modules/pkgs/postcss-plugins/default.nix
+++ b/pkgs/postcss-plugins/default.nix
diff --git a/modules/pkgs/postcss-plugins/find.sh b/pkgs/postcss-plugins/find.sh
index 732fca1..732fca1 100755
--- a/modules/pkgs/postcss-plugins/find.sh
+++ b/pkgs/postcss-plugins/find.sh
diff --git a/modules/pkgs/postcss-plugins/generate.sh b/pkgs/postcss-plugins/generate.sh
index af4f22a..af4f22a 100755
--- a/modules/pkgs/postcss-plugins/generate.sh
+++ b/pkgs/postcss-plugins/generate.sh
diff --git a/modules/pkgs/postcss-plugins/node-env.nix b/pkgs/postcss-plugins/node-env.nix
index fc118a7..fc118a7 100644
--- a/modules/pkgs/postcss-plugins/node-env.nix
+++ b/pkgs/postcss-plugins/node-env.nix
diff --git a/modules/pkgs/postcss-plugins/node-packages.nix b/pkgs/postcss-plugins/node-packages.nix
index 90d0956..90d0956 100644
--- a/modules/pkgs/postcss-plugins/node-packages.nix
+++ b/pkgs/postcss-plugins/node-packages.nix
diff --git a/modules/pkgs/postcss-plugins/plugins.json b/pkgs/postcss-plugins/plugins.json
index b2fe64e..b2fe64e 100644
--- a/modules/pkgs/postcss-plugins/plugins.json
+++ b/pkgs/postcss-plugins/plugins.json
diff --git a/modules/pkgs/postcss-plugins/plugins.nix b/pkgs/postcss-plugins/plugins.nix
index fa82945..fa82945 100644
--- a/modules/pkgs/postcss-plugins/plugins.nix
+++ b/pkgs/postcss-plugins/plugins.nix
diff --git a/modules/pkgs/probes.nix b/pkgs/probes.nix
index 650c996..650c996 100644
--- a/modules/pkgs/probes.nix
+++ b/pkgs/probes.nix
diff --git a/modules/pkgs/rdsdump/default.nix b/pkgs/rdsdump/default.nix
index 5d9b024..5d9b024 100644
--- a/modules/pkgs/rdsdump/default.nix
+++ b/pkgs/rdsdump/default.nix
diff --git a/modules/pkgs/rdsdump/rdsdump.bash b/pkgs/rdsdump/rdsdump.bash
index 6b8cbf1..6b8cbf1 100644
--- a/modules/pkgs/rdsdump/rdsdump.bash
+++ b/pkgs/rdsdump/rdsdump.bash
diff --git a/modules/pkgs/sass-lint/default.nix b/pkgs/sass-lint/default.nix
index ed87802..ed87802 100644
--- a/modules/pkgs/sass-lint/default.nix
+++ b/pkgs/sass-lint/default.nix
diff --git a/modules/pkgs/sass-lint/generate.sh b/pkgs/sass-lint/generate.sh
index 16d4673..16d4673 100755
--- a/modules/pkgs/sass-lint/generate.sh
+++ b/pkgs/sass-lint/generate.sh
diff --git a/modules/pkgs/sass-lint/main.json b/pkgs/sass-lint/main.json
index 349b64e..349b64e 100644
--- a/modules/pkgs/sass-lint/main.json
+++ b/pkgs/sass-lint/main.json
diff --git a/modules/pkgs/sass-lint/main.nix b/pkgs/sass-lint/main.nix
index fa82945..fa82945 100644
--- a/modules/pkgs/sass-lint/main.nix
+++ b/pkgs/sass-lint/main.nix
diff --git a/modules/pkgs/sass-lint/node-env.nix b/pkgs/sass-lint/node-env.nix
index fc118a7..fc118a7 100644
--- a/modules/pkgs/sass-lint/node-env.nix
+++ b/pkgs/sass-lint/node-env.nix
diff --git a/modules/pkgs/sass-lint/node-packages.nix b/pkgs/sass-lint/node-packages.nix
index 08fe9f0..08fe9f0 100644
--- a/modules/pkgs/sass-lint/node-packages.nix
+++ b/pkgs/sass-lint/node-packages.nix
diff --git a/modules/pkgs/sproxy-web/cabal2nix.nix b/pkgs/sproxy-web/cabal2nix.nix
index 0583964..0583964 100644
--- a/modules/pkgs/sproxy-web/cabal2nix.nix
+++ b/pkgs/sproxy-web/cabal2nix.nix
diff --git a/modules/pkgs/sproxy-web/default.nix b/pkgs/sproxy-web/default.nix
index 4afc645..4afc645 100644
--- a/modules/pkgs/sproxy-web/default.nix
+++ b/pkgs/sproxy-web/default.nix
diff --git a/modules/pkgs/sproxy2/default.nix b/pkgs/sproxy2/default.nix
index cd66324..cd66324 100644
--- a/modules/pkgs/sproxy2/default.nix
+++ b/pkgs/sproxy2/default.nix
diff --git a/modules/pkgs/sproxy2/main.nix b/pkgs/sproxy2/main.nix
index d02fba7..d02fba7 100644
--- a/modules/pkgs/sproxy2/main.nix
+++ b/pkgs/sproxy2/main.nix
diff --git a/modules/pkgs/writeBashScript.nix b/pkgs/writeBashScript.nix
index b193122..b193122 100644
--- a/modules/pkgs/writeBashScript.nix
+++ b/pkgs/writeBashScript.nix
diff --git a/modules/pkgs/writeBashScriptBin.nix b/pkgs/writeBashScriptBin.nix
index 33b9bf6..33b9bf6 100644
--- a/modules/pkgs/writeBashScriptBin.nix
+++ b/pkgs/writeBashScriptBin.nix
diff --git a/modules/pkgs/writePHPFile.nix b/pkgs/writePHPFile.nix
index 495083f..495083f 100644
--- a/modules/pkgs/writePHPFile.nix
+++ b/pkgs/writePHPFile.nix
diff --git a/modules/pkgs/writeXML.nix b/pkgs/writeXML.nix
index 9ad3826..9ad3826 100644
--- a/modules/pkgs/writeXML.nix
+++ b/pkgs/writeXML.nix
diff --git a/modules/pkgs/writeYAML.nix b/pkgs/writeYAML.nix
index 064ff39..064ff39 100644
--- a/modules/pkgs/writeYAML.nix
+++ b/pkgs/writeYAML.nix
diff --git a/modules/pkgs/xinclude2nix/default.nix b/pkgs/xinclude2nix/default.nix
index 09a9ab3..09a9ab3 100644
--- a/modules/pkgs/xinclude2nix/default.nix
+++ b/pkgs/xinclude2nix/default.nix
diff --git a/modules/pkgs/xinclude2nix/xinclude2nix.hs b/pkgs/xinclude2nix/xinclude2nix.hs
index 369f103..369f103 100644
--- a/modules/pkgs/xinclude2nix/xinclude2nix.hs
+++ b/pkgs/xinclude2nix/xinclude2nix.hs