diff options
author | Vincent Ambo <tazjin@google.com> | 2019-12-20T20·37+0000 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2019-12-20T20·37+0000 |
commit | 8de5d093d8e35b2492c81015dcfcb052d2718614 (patch) | |
tree | f4bb5763a39c7059537fc7877e3c0ac15a4d8f69 /overrides | |
parent | 03bfe08e1dd9faf48b06cb146bfa446575cde88a (diff) |
refactor: Fix a variety of filepaths for repo relayouting r/238
This fixes readTree and the various project builds, as well as (hopefully) most documentation links inside of the projects.
Diffstat (limited to 'overrides')
-rw-r--r-- | overrides/default.nix | 28 | ||||
-rw-r--r-- | overrides/elmPackages/default.nix (renamed from overrides/elmPackages.nix) | 0 | ||||
-rw-r--r-- | overrides/kontemplate/default.nix (renamed from overrides/kontemplate.nix) | 0 | ||||
-rw-r--r-- | overrides/writeElispBin/default.nix (renamed from overrides/writeElispBin.nix) | 0 |
4 files changed, 28 insertions, 0 deletions
diff --git a/overrides/default.nix b/overrides/default.nix new file mode 100644 index 000000000000..2159d45bd0b6 --- /dev/null +++ b/overrides/default.nix @@ -0,0 +1,28 @@ +# This file is used to move things from nested attribute sets to the +# top-level. +{ pkgs, ... }: + +{ + buildGo = pkgs.nix.buildGo; + + # These packages must be exposed at the top-level for compatibility + # with Nixery. + inherit (pkgs.third_party) + bashInteractive + cacert + coreutils + iana-etc + jq + moreutils + nano + openssl + runCommand + symlinkJoin + writeText; + + # These packages must be exposed for compatibility with buildGo. + # + # Despite buildGo being tracked in this tree, I want it to be possible + # for external users to import it with the default nixpkgs layout. + inherit (pkgs.third_party) go ripgrep; +} diff --git a/overrides/elmPackages.nix b/overrides/elmPackages/default.nix index 20026d9180ea..20026d9180ea 100644 --- a/overrides/elmPackages.nix +++ b/overrides/elmPackages/default.nix diff --git a/overrides/kontemplate.nix b/overrides/kontemplate/default.nix index 40f6b68b2962..40f6b68b2962 100644 --- a/overrides/kontemplate.nix +++ b/overrides/kontemplate/default.nix diff --git a/overrides/writeElispBin.nix b/overrides/writeElispBin/default.nix index a1616fb9d464..a1616fb9d464 100644 --- a/overrides/writeElispBin.nix +++ b/overrides/writeElispBin/default.nix |