From 6600922a21be0b3630439d2718294e4f4489ba9d Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Wed, 25 Mar 2020 22:22:55 -0600 Subject: overlays: ignore collisions Signed-off-by: Kenny Ballou --- overlays/00-fonts.nix | 1 + overlays/00-lang.nix | 1 + overlays/00-linux.nix | 1 + overlays/10-emacs.nix | 1 + overlays/10-git.nix | 1 + overlays/10-virtualization.nix | 1 + overlays/20-aws.nix | 2 ++ overlays/20-beam.nix | 1 + overlays/20-clang.nix | 1 + overlays/20-cpp.nix | 1 + overlays/20-elm.nix | 1 + overlays/20-go.nix | 1 + overlays/20-js.nix | 1 + overlays/20-jvm.nix | 3 ++- overlays/20-ml.nix | 1 + overlays/20-nix.nix | 1 + overlays/20-php.nix | 1 + overlays/20-python.nix | 1 + overlays/20-rust.nix | 1 + overlays/20-scheme.nix | 1 + overlays/20-tex.nix | 1 + overlays/30-data-analysis.nix | 1 + overlays/40-pidgin.nix | 1 + 23 files changed, 25 insertions(+), 1 deletion(-) (limited to 'overlays') diff --git a/overlays/00-fonts.nix b/overlays/00-fonts.nix index 0bd7c75..895649e 100644 --- a/overlays/00-fonts.nix +++ b/overlays/00-fonts.nix @@ -2,6 +2,7 @@ self: super: { fontsOverlay = super.buildEnv { name = "fontsOverlay"; + ignoreCollisions = true; paths = [ self.carlito self.dejavu_fonts diff --git a/overlays/00-lang.nix b/overlays/00-lang.nix index 9fad29e..2a2cb28 100644 --- a/overlays/00-lang.nix +++ b/overlays/00-lang.nix @@ -2,6 +2,7 @@ self: super: { langOverlay = self.buildEnv { name = "langOverlay"; + ignoreCollisions = true; paths = [ self.autoconf self.autogen diff --git a/overlays/00-linux.nix b/overlays/00-linux.nix index 11225b0..709689b 100644 --- a/overlays/00-linux.nix +++ b/overlays/00-linux.nix @@ -2,6 +2,7 @@ self: super: { linux-overlay = self.buildEnv { name = "linux-overlay"; + ignoreCollisions = true; paths = [ self.linuxPackages.perf ]; diff --git a/overlays/10-emacs.nix b/overlays/10-emacs.nix index d5024c6..626cd12 100644 --- a/overlays/10-emacs.nix +++ b/overlays/10-emacs.nix @@ -15,6 +15,7 @@ let emacsOverlay = super.buildEnv { name = "emacsTools"; + ignoreCollisions = true; paths = [ emacsWithPkgs self.mu diff --git a/overlays/10-git.nix b/overlays/10-git.nix index a00ea50..b85dfbf 100644 --- a/overlays/10-git.nix +++ b/overlays/10-git.nix @@ -2,6 +2,7 @@ self: super: { gitOverlay = super.buildEnv { name = "gitOverlay"; + ignoreCollisions = true; paths = [ self.gitFull self.gitAndTools.git-crypt diff --git a/overlays/10-virtualization.nix b/overlays/10-virtualization.nix index f56c64a..63ad2cd 100644 --- a/overlays/10-virtualization.nix +++ b/overlays/10-virtualization.nix @@ -2,6 +2,7 @@ self: super: { virtualizationOverlay = super.buildEnv { name = "virtualizationOverlay"; + ignoreCollisions = true; paths = [ self.docker self.docker-compose diff --git a/overlays/20-aws.nix b/overlays/20-aws.nix index 98a7298..aedc98a 100644 --- a/overlays/20-aws.nix +++ b/overlays/20-aws.nix @@ -2,9 +2,11 @@ self: super: { aws-overlay = super.buildEnv { name = "aws-overlay"; + ignoreCollisions = true; paths = [ self.awscli self.python37Packages.boto3 + self.python37Packages.botocore ]; }; } diff --git a/overlays/20-beam.nix b/overlays/20-beam.nix index 53422c3..ae4958c 100644 --- a/overlays/20-beam.nix +++ b/overlays/20-beam.nix @@ -2,6 +2,7 @@ self: super: { beam-overlay = super.buildEnv { name = "beam-overlay"; + ignoreCollisions = true; paths = [ self.elixir self.erlang diff --git a/overlays/20-clang.nix b/overlays/20-clang.nix index b5dc06a..599c231 100644 --- a/overlays/20-clang.nix +++ b/overlays/20-clang.nix @@ -2,6 +2,7 @@ self: super: { clang-overlay = super.buildEnv { name = "clang-overlang"; + ignoreCollisions = true; paths = [ self.clang self.clang-tools diff --git a/overlays/20-cpp.nix b/overlays/20-cpp.nix index d755401..c09dde0 100644 --- a/overlays/20-cpp.nix +++ b/overlays/20-cpp.nix @@ -2,6 +2,7 @@ self: super: { cppOverlay = super.buildEnv { name = "cppOverlay"; + ignoreCollisions = true; paths = [ self.boost self.cmake diff --git a/overlays/20-elm.nix b/overlays/20-elm.nix index a378df8..c632081 100644 --- a/overlays/20-elm.nix +++ b/overlays/20-elm.nix @@ -2,6 +2,7 @@ self: super: { elmOverlay = self.buildEnv { name = "elmOverlay"; + ignoreCollisions = true; paths = [ self.elmPackages.elm self.elmPackages.elm-format diff --git a/overlays/20-go.nix b/overlays/20-go.nix index e14a022..eccbe37 100644 --- a/overlays/20-go.nix +++ b/overlays/20-go.nix @@ -2,6 +2,7 @@ self: super: { goOverlay = super.buildEnv { name = "goOverlay"; + ignoreCollisions = true; paths = [ self.delve self.glide diff --git a/overlays/20-js.nix b/overlays/20-js.nix index 450c192..660cbd3 100644 --- a/overlays/20-js.nix +++ b/overlays/20-js.nix @@ -2,6 +2,7 @@ self: super: { jsOverlay = super.buildEnv { name = "jsOverlay"; + ignoreCollisions = true; paths = [ self.nodePackages.csslint self.nodePackages.eslint diff --git a/overlays/20-jvm.nix b/overlays/20-jvm.nix index 9653270..ef6722d 100644 --- a/overlays/20-jvm.nix +++ b/overlays/20-jvm.nix @@ -2,6 +2,7 @@ self: super: { jvmOverlay = super.buildEnv { name = "jvmOverlay"; + ignoreCollisions = true; paths = [ self.ammonite self.ant @@ -9,7 +10,7 @@ self: super: self.maven self.gradle self.jmeter - self.openjdk + self.jdk11 self.sbt self.scala self.scalafmt diff --git a/overlays/20-ml.nix b/overlays/20-ml.nix index bf1fef1..9cdab74 100644 --- a/overlays/20-ml.nix +++ b/overlays/20-ml.nix @@ -2,6 +2,7 @@ self: super: { ml-overlay = super.buildEnv { name = "ml-overlay"; + ignoreCollisions = true; paths = [ self.ocaml ]; diff --git a/overlays/20-nix.nix b/overlays/20-nix.nix index cd47dab..8938911 100644 --- a/overlays/20-nix.nix +++ b/overlays/20-nix.nix @@ -2,6 +2,7 @@ self: super: { nixOverlay = super.buildEnv { name = "nixOverlay"; + ignoreCollisions = true; paths = [ self.nix-bash-completions self.nix-delegate diff --git a/overlays/20-php.nix b/overlays/20-php.nix index ff9e7fb..d83cd4c 100644 --- a/overlays/20-php.nix +++ b/overlays/20-php.nix @@ -2,6 +2,7 @@ self: super: { phpOverlay = super.buildEnv { name = "phpOverlay"; + ignoreCollisions = true; paths = [ self.php self.phpPackages.apcu diff --git a/overlays/20-python.nix b/overlays/20-python.nix index e843ea1..8d5db2a 100644 --- a/overlays/20-python.nix +++ b/overlays/20-python.nix @@ -2,6 +2,7 @@ self: super: { pythonOverlay = super.buildEnv { name = "pythonOverlay"; + ignoreCollisions = true; paths = [ self.python3 self.python37Packages.gprof2dot diff --git a/overlays/20-rust.nix b/overlays/20-rust.nix index 5c0317f..19aa3dd 100644 --- a/overlays/20-rust.nix +++ b/overlays/20-rust.nix @@ -2,6 +2,7 @@ self: super: { rustOverlay = super.buildEnv { name = "rustOverlay"; + ignoreCollisions = true; paths = [ self.cargo self.cargo-tree diff --git a/overlays/20-scheme.nix b/overlays/20-scheme.nix index 7c82a18..0667548 100644 --- a/overlays/20-scheme.nix +++ b/overlays/20-scheme.nix @@ -2,6 +2,7 @@ self: super: { scheme-overlay = super.buildEnv { name = "scheme-overlay"; + ignoreCollisions = true; paths = [ self.guile self.guile-lint diff --git a/overlays/20-tex.nix b/overlays/20-tex.nix index 8dcbc81..4b73144 100644 --- a/overlays/20-tex.nix +++ b/overlays/20-tex.nix @@ -2,6 +2,7 @@ self: super: { tex-overlay = super.buildEnv { name = "tex-overlay"; + ignoreCollisions = true; paths = [ self.pygmentex self.texlive.combined.scheme-full diff --git a/overlays/30-data-analysis.nix b/overlays/30-data-analysis.nix index 830bdbc..b8d64b0 100644 --- a/overlays/30-data-analysis.nix +++ b/overlays/30-data-analysis.nix @@ -2,6 +2,7 @@ self: super: { data-analysis-overlay = super.buildEnv { name = "data-analysis"; + ignoreCollisions = true; paths = [ self.python3 self.python37Packages.ipdb diff --git a/overlays/40-pidgin.nix b/overlays/40-pidgin.nix index 325ee04..713a690 100644 --- a/overlays/40-pidgin.nix +++ b/overlays/40-pidgin.nix @@ -2,6 +2,7 @@ self: super: { pidgin-overlay = super.buildEnv { name = "pidgin-overlay"; + ignoreCollisions = true; paths = [ self.pidgin self.pidgin-carbons -- cgit v1.2.1