From 8de5d093d8e35b2492c81015dcfcb052d2718614 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 20 Dec 2019 20:37:02 +0000
Subject: refactor: Fix a variety of filepaths for repo relayouting

This fixes readTree and the various project builds, as well
as (hopefully) most documentation links inside of the projects.
---
 overrides/default.nix               | 28 ++++++++++++++++++++++++++++
 overrides/elmPackages.nix           | 10 ----------
 overrides/elmPackages/default.nix   | 10 ++++++++++
 overrides/kontemplate.nix           | 14 --------------
 overrides/kontemplate/default.nix   | 14 ++++++++++++++
 overrides/writeElispBin.nix         | 23 -----------------------
 overrides/writeElispBin/default.nix | 23 +++++++++++++++++++++++
 7 files changed, 75 insertions(+), 47 deletions(-)
 create mode 100644 overrides/default.nix
 delete mode 100644 overrides/elmPackages.nix
 create mode 100644 overrides/elmPackages/default.nix
 delete mode 100644 overrides/kontemplate.nix
 create mode 100644 overrides/kontemplate/default.nix
 delete mode 100644 overrides/writeElispBin.nix
 create mode 100644 overrides/writeElispBin/default.nix

(limited to 'overrides')

diff --git a/overrides/default.nix b/overrides/default.nix
new file mode 100644
index 0000000000..2159d45bd0
--- /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.nix
deleted file mode 100644
index 20026d9180..0000000000
--- a/overrides/elmPackages.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Gemma needs an older version of Elm to be built. Updating it to
-# the newer version is a lot of effort.
-{ pkgs, ... }:
-
-(import (pkgs.third_party.fetchFromGitHub {
-  owner = "NixOS";
-  repo = "nixpkgs";
-  rev = "14f9ee66e63077539252f8b4550049381a082518";
-  sha256 = "1wn7nmb1cqfk2j91l3rwc6yhimfkzxprb8wknw5wi57yhq9m6lv1";
-}) {}).elmPackages
diff --git a/overrides/elmPackages/default.nix b/overrides/elmPackages/default.nix
new file mode 100644
index 0000000000..20026d9180
--- /dev/null
+++ b/overrides/elmPackages/default.nix
@@ -0,0 +1,10 @@
+# Gemma needs an older version of Elm to be built. Updating it to
+# the newer version is a lot of effort.
+{ pkgs, ... }:
+
+(import (pkgs.third_party.fetchFromGitHub {
+  owner = "NixOS";
+  repo = "nixpkgs";
+  rev = "14f9ee66e63077539252f8b4550049381a082518";
+  sha256 = "1wn7nmb1cqfk2j91l3rwc6yhimfkzxprb8wknw5wi57yhq9m6lv1";
+}) {}).elmPackages
diff --git a/overrides/kontemplate.nix b/overrides/kontemplate.nix
deleted file mode 100644
index 40f6b68b29..0000000000
--- a/overrides/kontemplate.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-let master = pkgs.third_party.kontemplate.overrideAttrs(_: {
-  src = pkgs.third_party.fetchFromGitHub {
-    owner = "tazjin";
-    repo = "kontemplate";
-    rev = "v1.8.0";
-    sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1";
-  };
-});
-in pkgs.third_party.writeShellScriptBin "kontemplate" ''
-  export PATH="${pkgs.tools.kms_pass}/bin:$PATH"
-  exec ${master}/bin/kontemplate $@
-''
diff --git a/overrides/kontemplate/default.nix b/overrides/kontemplate/default.nix
new file mode 100644
index 0000000000..40f6b68b29
--- /dev/null
+++ b/overrides/kontemplate/default.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+
+let master = pkgs.third_party.kontemplate.overrideAttrs(_: {
+  src = pkgs.third_party.fetchFromGitHub {
+    owner = "tazjin";
+    repo = "kontemplate";
+    rev = "v1.8.0";
+    sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1";
+  };
+});
+in pkgs.third_party.writeShellScriptBin "kontemplate" ''
+  export PATH="${pkgs.tools.kms_pass}/bin:$PATH"
+  exec ${master}/bin/kontemplate $@
+''
diff --git a/overrides/writeElispBin.nix b/overrides/writeElispBin.nix
deleted file mode 100644
index a1616fb9d4..0000000000
--- a/overrides/writeElispBin.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-
-{ name, src, deps ? (_: []), emacs ? pkgs.third_party.emacs26-nox }:
-
-let
-  inherit (pkgs.third_party) emacsPackagesNg emacsPackagesNgGen writeTextFile;
-  inherit (builtins) isString toFile;
-
-  finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps;
-
-  srcFile = if isString src
-    then toFile "${name}.el" src
-    else src;
-in writeTextFile {
-  inherit name;
-  executable = true;
-  destination = "/bin/${name}";
-
-  text = ''
-    #!/bin/sh
-    ${finalEmacs}/bin/emacs --batch --no-site-file --script ${srcFile} $@
-  '';
-}
diff --git a/overrides/writeElispBin/default.nix b/overrides/writeElispBin/default.nix
new file mode 100644
index 0000000000..a1616fb9d4
--- /dev/null
+++ b/overrides/writeElispBin/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{ name, src, deps ? (_: []), emacs ? pkgs.third_party.emacs26-nox }:
+
+let
+  inherit (pkgs.third_party) emacsPackagesNg emacsPackagesNgGen writeTextFile;
+  inherit (builtins) isString toFile;
+
+  finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps;
+
+  srcFile = if isString src
+    then toFile "${name}.el" src
+    else src;
+in writeTextFile {
+  inherit name;
+  executable = true;
+  destination = "/bin/${name}";
+
+  text = ''
+    #!/bin/sh
+    ${finalEmacs}/bin/emacs --batch --no-site-file --script ${srcFile} $@
+  '';
+}
-- 
cgit 1.4.1