diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
commit | 92124ed660c033aa3caa467876f7bc1c6f514d77 (patch) | |
tree | eaaac3b33ba341b7068ac11e536d56bb647c6480 /pkgs/build-support | |
parent | ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b (diff) | |
parent | 3420bd63b9bbd4eb4e544b898a072c6fbbc9cfa9 (diff) | |
download | nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.tar nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.gz nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.bz2 nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.lz nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.xz nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.zst nixpkgs-92124ed660c033aa3caa467876f7bc1c6f514d77.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/emacs/setup-hook.sh | 24 | ||||
-rw-r--r-- | pkgs/build-support/vm/default.nix | 4 |
2 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index 8f074e0b406..83e995631b3 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -1,15 +1,23 @@ +addToEmacsLoadPath() { + local lispDir="$1" + if [[ -d $lispDir && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then + # It turns out, that the trailing : is actually required + # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html + export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + fi +} + addEmacsVars () { + addToEmacsLoadPath "$1/share/emacs/site-lisp" + + # Add sub paths to the Emacs load path if it is a directory + # containing .el files. This is necessary to build some packages, + # e.g., using trivialBuild. for lispDir in \ - "$1/share/emacs/site-lisp" \ "$1/share/emacs/site-lisp/"* \ "$1/share/emacs/site-lisp/elpa/"*; do - # Add the path to the Emacs load path if it is a directory - # containing .el files and it has not already been added to the - # load path. - if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then - # It turns out, that the trailing : is actually required - # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html - export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" ]] ; then + addToEmacsLoadPath "$lispDir" fi done } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 488c7f2ce2c..487a91145c5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1022,8 +1022,8 @@ rec { name = "debian-9.8-stretch-i386"; fullName = "Debian 9.8 Stretch (i386)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-i386/Packages.xz; - sha256 = "1dr3skl35iyj85qlc33lq4whippbqf327vnbcyfqqrv6h86k68mw"; + url = http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz; + sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; |