diff options
author | taku0 <mxxouy6x3m_github@tatapa.org> | 2014-11-24 13:38:06 +0900 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-12-03 16:28:28 +0100 |
commit | a28a6999b460f671aa0a2ee5eb99de0a07a5fa33 (patch) | |
tree | 1dcdda743ed517fbc0ffdf2e499ed03c6e9894b0 /pkgs/development/r-modules | |
parent | 2a1d9ddbf28799831f3a4e531c4dca974b3d7fd3 (diff) | |
download | nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.tar nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.tar.gz nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.tar.bz2 nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.tar.lz nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.tar.xz nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.tar.zst nixlib-a28a6999b460f671aa0a2ee5eb99de0a07a5fa33.zip |
cran-packages: renamed the files from camelCase to kebab-case
Diffstat (limited to 'pkgs/development/r-modules')
-rw-r--r-- | pkgs/development/r-modules/cran-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/development/r-modules/default-overrides.nix (renamed from pkgs/development/r-modules/defaultOverrides.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/r-modules/generate-sources.R (renamed from pkgs/development/r-modules/generate_sources.R) | 0 | ||||
-rw-r--r-- | pkgs/development/r-modules/masked-packages.nix (renamed from pkgs/development/r-modules/maskedPackages.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/r-modules/packages-requireing-x.nix (renamed from pkgs/development/r-modules/packagesRequireingX.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/r-modules/packages-to-skip-tests.nix (renamed from pkgs/development/r-modules/packagesToSkipTests.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/r-modules/packages-with-build-inputs.nix (renamed from pkgs/development/r-modules/packagesWithBuildInputs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/r-modules/packages-with-native-build-inputs.nix (renamed from pkgs/development/r-modules/packagesWithNativeBuildInputs.nix) | 0 |
8 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 73e2828c6c09..11677e7c6ef1 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 index bca7846b39b1..bca7846b39b1 100644 --- a/pkgs/development/r-modules/defaultOverrides.nix +++ b/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 index 903be06f7d05..903be06f7d05 100644 --- a/pkgs/development/r-modules/generate_sources.R +++ b/pkgs/development/r-modules/generate-sources.R diff --git a/pkgs/development/r-modules/maskedPackages.nix b/pkgs/development/r-modules/masked-packages.nix index 68f3a5c809f1..68f3a5c809f1 100644 --- a/pkgs/development/r-modules/maskedPackages.nix +++ b/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 index d31b800ab534..d31b800ab534 100644 --- a/pkgs/development/r-modules/packagesRequireingX.nix +++ b/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 index b52b7518b1f4..b52b7518b1f4 100644 --- a/pkgs/development/r-modules/packagesToSkipTests.nix +++ b/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 index 4ddb33bea504..4ddb33bea504 100644 --- a/pkgs/development/r-modules/packagesWithBuildInputs.nix +++ b/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 index edf25fa8e0f4..edf25fa8e0f4 100644 --- a/pkgs/development/r-modules/packagesWithNativeBuildInputs.nix +++ b/pkgs/development/r-modules/packages-with-native-build-inputs.nix |