Unverified Commit 6899c7fd authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into gcc-6

parents 9bcee105 e207d1f0
Loading
Loading
Loading
Loading

.github/CODEOWNERS

0 → 100644
+23 −0
Original line number Diff line number Diff line
# CODEOWNERS file
#
# This file is used to describe who owns what in this repository. This file does not
# replace `meta.maintainers` but is instead used for other things than derivations
# and modules, like documentation, package sets, and other assets.
#
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
# Mentioned users will get code review requests.

# Python-related code and docs
pkgs/top-level/python-packages.nix	@FRidh
pkgs/development/interpreters/python/*	@FRidh
pkgs/development/python-modules/*	@FRidh
doc/languages-frameworks/python.md	@FRidh

# Boostraping and core infra
pkgs/stdenv/	@Ericson2314
pkgs/build-support/cc-wrapper/	@Ericson2314

# Darwin-related
pkgs/stdenv/darwin/*	@copumpkin @LnL7
pkgs/os-specific/darwin/*	@LnL7
pkgs/os-specific/darwin/apple-source-releases/*	@copumpkin
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@

###### Things done

Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.

- [ ] Tested using sandboxing
  ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,

.mention-bot

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line
{
  "userBlacklist": [
    "civodul",
    "jhasse",
    "shlevy",
    "bbenoist"
  ],
  "alwaysNotifyForPaths": [
    { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
    { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] },
    { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] }
  ],
  "fileBlacklist": ["pkgs/top-level/all-packages.nix"]
}
+4 −4
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@
<para>
  <varname>pkgs.dockerTools</varname> is a set of functions for creating and
  manipulating Docker images according to the
  <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#docker-image-specification-v100">
  Docker Image Specification v1.0.0
  <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
  Docker Image Specification v1.2.0
  </link>. Docker itself is not used to perform any of the operations done by these
  functions.
</para>
@@ -493,8 +493,8 @@
    <varname>config</varname> is used to specify the configuration of the
    containers that will be started off the built image in Docker.
    The available options are listed in the
    <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#container-runconfig-field-descriptions">
      Docker Image Specification v1.0.0
    <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
      Docker Image Specification v1.2.0
    </link>.
    </para>
  </callout>
+0 −27
Original line number Diff line number Diff line
@@ -698,33 +698,6 @@ rm /nix/var/nix/manifests/*
rm /nix/var/nix/channel-cache/*
```

### How to use the Haste Haskell-to-Javascript transpiler

Open a shell with `haste-compiler` and `haste-cabal-install` (you don't actually need
`node`, but it can be useful to test stuff):
```shell
nix-shell \
  -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" \
  -p nodejs
```
You may not need the following step but if `haste-boot` fails to compile all the
packages it needs, this might do the trick
```shell
haste-cabal update
```
`haste-boot` builds a set of core libraries so that they can be used from Javascript
transpiled programs:
```shell
haste-boot
```
Transpile and run a "Hello world" program:
```
$ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs
$ hastec --onexec hello-world.hs
$ node hello-world.js
Hello world
```

### Builds on Darwin fail with `math.h` not found

Users of GHC on Darwin have occasionally reported that builds fail, because the
Loading