about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-03-01T01·07+0000
committerVincent Ambo <tazjin@google.com>2020-03-01T01·07+0000
commit1f5d2d424c94e5c993b47232aff7472fb50d36cb (patch)
tree3c71316191fe2aa6316df216f4a925fcb3581359
parent33c2a27d775ab63e9ad239f9058bc8097fbfd445 (diff)
chore(third_party): Remove guile 3.0 override r/588
I don't actually use guile at all, this was just for experimentation.
-rw-r--r--ops/nixos/nugget/default.nix2
-rw-r--r--third_party/default.nix2
-rw-r--r--third_party/guile/default.nix12
-rw-r--r--third_party/guile/setup-hook-3.0.sh13
4 files changed, 2 insertions, 27 deletions
diff --git a/ops/nixos/nugget/default.nix b/ops/nixos/nugget/default.nix
index eac89821621c..a129a484852d 100644
--- a/ops/nixos/nugget/default.nix
+++ b/ops/nixos/nugget/default.nix
@@ -94,7 +94,6 @@ in depot.lib.fix(self: {
       lieer
       ops.kontemplate
       third_party.git
-      third_party.guile
       third_party.tailscale
       tools.emacs
     ]) ++
@@ -114,6 +113,7 @@ in depot.lib.fix(self: {
       go
       google-chrome
       google-cloud-sdk
+      guile
       htop
       i3lock
       imagemagick
diff --git a/third_party/default.nix b/third_party/default.nix
index cb0233c9e60f..6ac0e2595660 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -118,7 +118,7 @@ in exposed // {
 
   # Packages to be overridden
   originals = {
-    inherit (nixpkgs) git guile notmuch;
+    inherit (nixpkgs) git notmuch;
   };
 
   # Make NixOS available
diff --git a/third_party/guile/default.nix b/third_party/guile/default.nix
deleted file mode 100644
index 1fd853547862..000000000000
--- a/third_party/guile/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Override Guile to version 3.0.0
-{ depot, ... }:
-
-depot.third_party.originals.guile.overrideAttrs(old: rec {
-  name = "guile-${version}";
-  version = "3.0.0";
-
-  src = depot.third_party.fetchurl {
-    url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9";
-  };
-})
diff --git a/third_party/guile/setup-hook-3.0.sh b/third_party/guile/setup-hook-3.0.sh
deleted file mode 100644
index 61d0af988c99..000000000000
--- a/third_party/guile/setup-hook-3.0.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-addGuileLibPath () {
-    if test -d "$1/share/guile/site/3.0"
-    then
-        export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0"
-        export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0"
-    elif test -d "$1/share/guile/site"
-    then
-        export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
-        export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
-    fi
-}
-
-addEnvHooks "$hostOffset" addGuileLibPath