mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(third_party): Remove guile 3.0 override

Browse source 
I don't actually use guile at all, this was just for experimentation.
This commit is contained in:
Vincent Ambo 2020-03-01 01:07:48 +00:00
parent 33c2a27d77
commit 1f5d2d424c
4 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ops/nixos/nugget/default.nix
View file

@ -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

2
third_party/default.nix vendored
View file

@ -118,7 +118,7 @@ in exposed // {
# Packages to be overridden
originals = {
inherit (nixpkgs) git guile notmuch;
inherit (nixpkgs) git notmuch;
};
# Make NixOS available

12
third_party/guile/default.nix vendored
View file

@ -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";
};
})

13
third_party/guile/setup-hook-3.0.sh vendored
View file

@ -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