Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6a0dd6350842
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 099ba3782065
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 29, 2017

  1. Do not export ASPELL_CONF 

    This does not belong in Nix. Setting this env var is already done by the aspell derivation found in Nixpkgs.
    @FRidh
    FRidh committed Dec 29, 2017
    Copy the full SHA
    ab8ba71 View commit details

Commits on Jan 2, 2018

  1. Merge pull request #1766 from FRidh/aspell 

    Do not export ASPELL_CONF
    @edolstra
    edolstra authored Jan 2, 2018
    Copy the full SHA
    099ba37 View commit details
Showing with 0 additions and 6 deletions.
  1. +0 −6 scripts/nix-profile.sh.in
6 changes: 0 additions & 6 deletions scripts/nix-profile.sh.in
View file
Original file line number Diff line number Diff line change
@@ -60,12 +60,6 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
# This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix
NIX_PROFILES="@localstatedir@/nix/profiles/default $NIX_USER_PROFILE_DIR"

for i in $NIX_PROFILES; do
if [ -d "$i/lib/aspell" ]; then
export ASPELL_CONF="dict-dir $i/lib/aspell"
fi
done

# Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
if [ -e /etc/ssl/certs/ca-certificates.crt ]; then # NixOS, Ubuntu, Debian, Gentoo, Arch
export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt