From a28a6999b460f671aa0a2ee5eb99de0a07a5fa33 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 24 Nov 2014 13:38:06 +0900 Subject: [PATCH] cran-packages: renamed the files from camelCase to kebab-case --- pkgs/development/r-modules/cran-packages.nix | 12 ++++++------ .../{defaultOverrides.nix => default-overrides.nix} | 0 .../{generate_sources.R => generate-sources.R} | 0 .../{maskedPackages.nix => masked-packages.nix} | 0 ...agesRequireingX.nix => packages-requireing-x.nix} | 0 ...gesToSkipTests.nix => packages-to-skip-tests.nix} | 0 ...uildInputs.nix => packages-with-build-inputs.nix} | 0 ...uts.nix => packages-with-native-build-inputs.nix} | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/r-modules/{defaultOverrides.nix => default-overrides.nix} (100%) rename pkgs/development/r-modules/{generate_sources.R => generate-sources.R} (100%) rename pkgs/development/r-modules/{maskedPackages.nix => masked-packages.nix} (100%) rename pkgs/development/r-modules/{packagesRequireingX.nix => packages-requireing-x.nix} (100%) rename pkgs/development/r-modules/{packagesToSkipTests.nix => packages-to-skip-tests.nix} (100%) rename pkgs/development/r-modules/{packagesWithBuildInputs.nix => packages-with-build-inputs.nix} (100%) rename pkgs/development/r-modules/{packagesWithNativeBuildInputs.nix => packages-with-native-build-inputs.nix} (100%) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 73e2828c6c0..11677e7c6ef 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -132,10 +132,10 @@ let in builtins.listToAttrs nameValuePairs; - packagesWithNativeBuildInputs = import ./packagesWithNativeBuildInputs.nix pkgs; - packagesWithBuildInputs = import ./packagesWithBuildInputs.nix pkgs; - packagesRequireingX = import ./packagesRequireingX.nix; - packagesToSkipTests = import ./packagesToSkipTests.nix; + packagesWithNativeBuildInputs = import ./packages-with-native-build-inputs.nix pkgs; + packagesWithBuildInputs = import ./packages-with-build-inputs.nix pkgs; + packagesRequireingX = import ./packages-requireing-x.nix; + packagesToSkipTests = import ./packages-to-skip-tests.nix; defaultOverrides = old: new: let old0 = old; in @@ -145,7 +145,7 @@ let old3 = old2 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old2); old4 = old3 // (overrideBuildInputs packagesWithBuildInputs old3); old = old4; - in old // (import ./defaultOverrides.nix overrideDerivation pkgs old new); + in old // (import ./default-overrides.nix overrideDerivation pkgs old new); # Recursive override pattern. @@ -154,7 +154,7 @@ let # packages in `_self` may depends on overridden packages. overridden = (defaultOverrides _self self) // overrides; - maskedPackages = import ./maskedPackages.nix; + maskedPackages = import ./masked-packages.nix; masked = removeAttrs overridden maskedPackages; self = masked; diff --git a/pkgs/development/r-modules/defaultOverrides.nix b/pkgs/development/r-modules/default-overrides.nix similarity index 100% rename from pkgs/development/r-modules/defaultOverrides.nix rename to pkgs/development/r-modules/default-overrides.nix diff --git a/pkgs/development/r-modules/generate_sources.R b/pkgs/development/r-modules/generate-sources.R similarity index 100% rename from pkgs/development/r-modules/generate_sources.R rename to pkgs/development/r-modules/generate-sources.R diff --git a/pkgs/development/r-modules/maskedPackages.nix b/pkgs/development/r-modules/masked-packages.nix similarity index 100% rename from pkgs/development/r-modules/maskedPackages.nix rename to pkgs/development/r-modules/masked-packages.nix diff --git a/pkgs/development/r-modules/packagesRequireingX.nix b/pkgs/development/r-modules/packages-requireing-x.nix similarity index 100% rename from pkgs/development/r-modules/packagesRequireingX.nix rename to pkgs/development/r-modules/packages-requireing-x.nix diff --git a/pkgs/development/r-modules/packagesToSkipTests.nix b/pkgs/development/r-modules/packages-to-skip-tests.nix similarity index 100% rename from pkgs/development/r-modules/packagesToSkipTests.nix rename to pkgs/development/r-modules/packages-to-skip-tests.nix diff --git a/pkgs/development/r-modules/packagesWithBuildInputs.nix b/pkgs/development/r-modules/packages-with-build-inputs.nix similarity index 100% rename from pkgs/development/r-modules/packagesWithBuildInputs.nix rename to pkgs/development/r-modules/packages-with-build-inputs.nix diff --git a/pkgs/development/r-modules/packagesWithNativeBuildInputs.nix b/pkgs/development/r-modules/packages-with-native-build-inputs.nix similarity index 100% rename from pkgs/development/r-modules/packagesWithNativeBuildInputs.nix rename to pkgs/development/r-modules/packages-with-native-build-inputs.nix