Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support reproducible builds via Nix #1285

Merged
merged 60 commits into from Dec 3, 2015
Merged

Support reproducible builds via Nix #1285

merged 60 commits into from Dec 3, 2015

Commits on Nov 4, 2015

  1. Added config parsing for nix-shell execution environment

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    99f7fa8 View commit details
    Browse the repository at this point in the history

  2. Nix-shell: added option for initial env expr file

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    3dac5d9 View commit details
    Browse the repository at this point in the history

  3. Adding branching in main (docker or nix)

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    2df0c24 View commit details
    Browse the repository at this point in the history

  4. Stack launches a nix-shell

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    162d807 View commit details
    Browse the repository at this point in the history

  5. Some opts of nix-shell were forgotten

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    97b1f9b View commit details
    Browse the repository at this point in the history

  6. Hack: fixing stack version in arg and nix-shell no longer pure

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    cee6f0b View commit details
    Browse the repository at this point in the history

  7. Using ghc from nixpkgs.haskell.packages.lts-X_Y when possible

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    6fbce23 View commit details
    Browse the repository at this point in the history

  8. Cleaning up the NixShell file

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    a36c7f9 View commit details
    Browse the repository at this point in the history

  9. Remove redundant LANGUAGE pragmas.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    bdb32f7 View commit details
    Browse the repository at this point in the history

  10. Remove trailing whitespace.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    ffea96d View commit details
    Browse the repository at this point in the history

  11. Rename ExecEnv to Nix.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    a8e9b7f View commit details
    Browse the repository at this point in the history

  12. Remove dead code.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    9e8a2dc View commit details
    Browse the repository at this point in the history

  13. Remove ExecEnv abstraction. Allow docker + nix simultaneously. 

    Don't dispatch on the ExecEnv type. Using Docker and nix is no longer
mutually exclusive. We run commands in a docker container if configured,
and then fork a nix-shell inside if configured.
    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    2809ff9 View commit details
    Browse the repository at this point in the history

  14. Remove redundant imports and arguments.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    e33a65b View commit details
    Browse the repository at this point in the history

  15. Nix: delegate ctrlc if in terminal.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    68480b3 View commit details
    Browse the repository at this point in the history

  16. twiddle: intercalate rather than concat . intersperse.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    dd5ee9c View commit details
    Browse the repository at this point in the history

  17. Use $logDebug.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    95c24b8 View commit details
    Browse the repository at this point in the history

  18. Remove redundant extra-dep.

    @mboes @YPares
    mboes authored and YPares committed Nov 4, 2015
    Copy the full SHA
    a2930f9 View commit details
    Browse the repository at this point in the history

  19. Nix options (--nix & --no-nix) and help added to command line

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    292bd3d View commit details
    Browse the repository at this point in the history

  20. Added --nix-shell-options to be passed to nix-shell

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    086e9d3 View commit details
    Browse the repository at this point in the history

  21. --nix* option group showing in stack --help output

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    68ef716 View commit details
    Browse the repository at this point in the history

  22. Nix can read a premade shell.nix file

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    210772b View commit details
    Browse the repository at this point in the history

  23. Throwing an exception when trying to use shell file and packages at the 

    same time
    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    2554209 View commit details
    Browse the repository at this point in the history

  24. Sharing reExecArgName with Docker config

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    b4689a4 View commit details
    Browse the repository at this point in the history

  25. Fixing a comment

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    f25fcad View commit details
    Browse the repository at this point in the history

  26. When nix enabled, stack setup downloads ghc and system deps through nix 

    and reports the use of nix-provided GHC
    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    c44aaf9 View commit details
    Browse the repository at this point in the history

  27. Added some tests for nix-shell configuration

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    a2c417c View commit details
    Browse the repository at this point in the history

  28. Using Strings instead of PackageName for nix packages 

    Using PackageNames forbid to use '.' in names, which is required when
you use attributes
    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    b0213f9 View commit details
    Browse the repository at this point in the history

  29. Trying to fix the LD_LIBRARY_PATH problem

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    5ef1584 View commit details
    Browse the repository at this point in the history

  30. Added default dep to glibcLocales when lauching nix-shell

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    c3233ec View commit details
    Browse the repository at this point in the history

  31. Added a comment about the LD_LIBRARY_PATH hack

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    8913e66 View commit details
    Browse the repository at this point in the history

  32. Following the convention RE option names

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    6a51e45 View commit details
    Browse the repository at this point in the history

  33. Added DeriveDataTypeable for Nix exception type derivation

    @YPares
    YPares committed Nov 4, 2015
    Copy the full SHA
    83d8779 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2015

  1. Passing libs and includes zith --extra-*-dirs to stack: beginning

    @YPares
    YPares committed Nov 6, 2015
    Copy the full SHA
    fa2991d View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2015

  1. Building with --extra-lib-dirs

    @YPares
    YPares committed Nov 12, 2015
    Copy the full SHA
    969fa35 View commit details
    Browse the repository at this point in the history

  2. Ok on OSX BUT in a non-pure shell. Investigating...

    @YPares
    YPares committed Nov 12, 2015
    Copy the full SHA
    6f1ed7d View commit details
    Browse the repository at this point in the history

  3. No exception

    @YPares
    YPares committed Nov 12, 2015
    Copy the full SHA
    103f926 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2015

  1. Stack/Nix doesn't need BuildConfig anymore 

    It fixes the bug which prevented stack to launch without a local GHC
even if Nix GHC was to be used to build
    @YPares
    YPares committed Nov 13, 2015
    Copy the full SHA
    8d3a004 View commit details
    Browse the repository at this point in the history

  2. Removed shell string to export LD_LIBRARY_PATH 

    since we're using --extra-lib-dirs explicitely passed to stack
    @YPares
    YPares committed Nov 13, 2015
    Copy the full SHA
    da3c61e View commit details
    Browse the repository at this point in the history

  3. glibcLocales passed as buildInput only on Linux

    @YPares
    YPares committed Nov 13, 2015
    Copy the full SHA
    9c84315 View commit details
    Browse the repository at this point in the history

  4. darwin.cf-private added as a dep on OSX

    @YPares
    YPares committed Nov 13, 2015
    Copy the full SHA
    7c876f5 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. Merge remote-tracking branch 'fpco.r/master' into nix-merged

    @YPares
    YPares committed Nov 18, 2015
    Copy the full SHA
    3d9e6d3 View commit details
    Browse the repository at this point in the history

  2. Updated Nix test due to change of behaviour 

    GHC is automatically added to Nix deps, because it's necessary at least
on Linux. This is now reflected in the tests.
    @YPares
    YPares committed Nov 18, 2015
    Copy the full SHA
    51498b7 View commit details
    Browse the repository at this point in the history

  3. Fixing warning

    @YPares
    YPares committed Nov 18, 2015
    Copy the full SHA
    1b6b032 View commit details
    Browse the repository at this point in the history

  4. Builds with --pedantic

    @YPares
    YPares committed Nov 18, 2015
    Copy the full SHA
    c7b7e29 View commit details
    Browse the repository at this point in the history

  5. Building with --pedantic with GHC 7.8.4

    @YPares
    YPares committed Nov 18, 2015
    Copy the full SHA
    86d2204 View commit details
    Browse the repository at this point in the history

  6. Removed warning with an import Prelude

    @YPares
    YPares committed Nov 18, 2015
    Copy the full SHA
    44a2241 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2015

  1. Nix integration documentation added to manual 

    Removed a language annotation in doc

Fixed an internal link

Added ref to nixpkgs github
    @YPares
    YPares committed Nov 25, 2015
    Copy the full SHA
    a6e51d0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into nix-merged

    @mboes
    mboes committed Nov 25, 2015
    Copy the full SHA
    1129897 View commit details
    Browse the repository at this point in the history

  3. Edit Nix section of the guide.

    @mboes
    mboes committed Nov 25, 2015
    Copy the full SHA
    dcd10f9 View commit details
    Browse the repository at this point in the history

  4. Mention stack nix standard layout condition in manual.

    @mboes
    mboes committed Nov 25, 2015
    Copy the full SHA
    29135b3 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2015

  1. Simplifying src/Stack/Nix.hs and using the right CL parsing combinators

    @YPares
    YPares committed Nov 27, 2015
    Copy the full SHA
    8acfb7a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'fpco.r/master' into nix-merged

    @YPares
    YPares committed Nov 27, 2015
    Copy the full SHA
    e0f0994 View commit details
    Browse the repository at this point in the history

  3. Changelog updated

    @YPares
    YPares committed Nov 27, 2015
    Copy the full SHA
    ae7e0ff View commit details
    Browse the repository at this point in the history

  4. Stack/Nix: shell subcommand args put between simple quotes

    @YPares
    YPares committed Nov 27, 2015
    Copy the full SHA
    ae9d301 View commit details
    Browse the repository at this point in the history

  5. Fixed OverloadedStrings missing in tests

    @YPares
    YPares committed Nov 27, 2015
    Copy the full SHA
    95051af View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. Merge remote-tracking branch 'fpco.r/master' into nix-merged

    @YPares
    YPares committed Dec 1, 2015
    Copy the full SHA
    d1279e5 View commit details
    Browse the repository at this point in the history

  2. Nix: Escaping quote characters before re-issuing the stack cmd

    @YPares
    YPares committed Dec 1, 2015
    Copy the full SHA
    c2a1135 View commit details
    Browse the repository at this point in the history

  3. nix-shell: section in stack.yaml renamed to nix: for coherence with CLI

    @YPares
    YPares committed Dec 1, 2015
    Copy the full SHA
    6be2541 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2015

  1. Testing validity of nix: config moved to Config/Nix.hs

    @YPares
    YPares committed Dec 2, 2015
    Copy the full SHA
    3554309 View commit details
    Browse the repository at this point in the history