summary refs log tree commit diff
path: root/doc/languages-frameworks
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-03 11:47:38 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-03 11:47:38 +0100
commitadab4cd58b06896be6436f93a76432811deb897e (patch)
treed4dec437b37d500a136f35ead5290ba15c338ee3 /doc/languages-frameworks
parent787c1add0ba40ba8094b0ed4001de10c7d05c033 (diff)
parent5b759293e09a062373d4b2843c5bad89d5a47165 (diff)
downloadnixlib-adab4cd58b06896be6436f93a76432811deb897e.tar
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.gz
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.bz2
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.lz
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.xz
nixlib-adab4cd58b06896be6436f93a76432811deb897e.tar.zst
nixlib-adab4cd58b06896be6436f93a76432811deb897e.zip
Merge branch 'master' into staging
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r--doc/languages-frameworks/haskell.md8
-rw-r--r--doc/languages-frameworks/python.md2
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 34b53ded3791..6d8984821741 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -195,7 +195,7 @@ its normal core packages:
         mtl-2.2.1
 
 This function allows users to define their own development environment by means
-of an override. After adding the following snippet to `~/.nixpkgs/config.nix`,
+of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`,
 
     {
       packageOverrides = super: let self = super.pkgs; in
@@ -522,7 +522,7 @@ file with `cabal2nix`:
     $ cd ~/src/foo && cabal2nix . >default.nix
     $ cd ~/src/bar && cabal2nix . >default.nix
 
-Then edit your `~/.nixpkgs/config.nix` file to register those builds in the
+Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the
 default Haskell package set:
 
       {
@@ -554,7 +554,7 @@ Every Haskell package set takes a function called `overrides` that you can use
 to manipulate the package as much as you please. One useful application of this
 feature is to replace the default `mkDerivation` function with one that enables
 library profiling for all packages. To accomplish that, add configure the
-following snippet in your `~/.nixpkgs/config.nix` file:
+following snippet in your `~/.config/nixpkgs/config.nix` file:
 
     {
       packageOverrides = super: let self = super.pkgs; in
@@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`:
 
     $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix
 
-Then add the override in `~/.nixpkgs/config.nix`:
+Then add the override in `~/.config/nixpkgs/config.nix`:
 
     {
       packageOverrides = super: let self = super.pkgs; in
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 3f5d500620bb..83d47b6f43a7 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -781,7 +781,7 @@ If you get the following error:
     could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
     Permission denied
 
-This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
+This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools.
 Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
 As workaround install it as an extra `preInstall` step: