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/nixpkgs
base: 3d1dee36927f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 35ad024fa413
Choose a head ref
  • 17 commits
  • 16 files changed
  • 8 contributors

Commits on Oct 16, 2017

  1. encrypted devices: don't override default cryptoModules

    @Lassulus
    Lassulus committed Oct 16, 2017
    Copy the full SHA
    f804a8f View commit details
    Browse the repository at this point in the history

  2. encrypted devices: provide working example

    @Lassulus
    Lassulus committed Oct 16, 2017
    Copy the full SHA
    77be4d9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #30477 from Lassulus/encrypted-devices 

    Encrypted devices: don't override crytpoModules, fix example
    @Mic92
    Mic92 committed Oct 16, 2017
    Copy the full SHA
    6838762 View commit details
    Browse the repository at this point in the history

  4. aiger: fix stupid incorrect download link 

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Oct 16, 2017
    Copy the full SHA
    cd52a3d View commit details
    Browse the repository at this point in the history

  5. nixos/tests: unbreak prometheus test 

    Commit 271d3f7 ("prometheus service: globalConfig.labels is obsolete")
removed globalConfig.labels. Update the test config accordingly.
    @bjornfor
    bjornfor committed Oct 16, 2017
    Copy the full SHA
    774d058 View commit details
    Browse the repository at this point in the history

  6. nixos/tests: enable prometheus test 

    As far as I can tell, we've had this test since 2015, but it was never
enabled.
    @bjornfor
    bjornfor committed Oct 16, 2017
    Copy the full SHA
    12d6fed View commit details
    Browse the repository at this point in the history

  7. steam-run-native: init 

    Refactor Steam so that native steam-run can be built as a free package and
expose it so that Hydra builds needed i686 packages.
    @abbradar
    abbradar committed Oct 16, 2017
    Copy the full SHA
    38ffe0e View commit details
    Browse the repository at this point in the history

  8. sc2-headless: init at 3.17 

    This packages up the Starcraft II headless Linux client provided by
Blizzard for machine learning research.
    Dan Haraj committed Oct 16, 2017
    Copy the full SHA
    188a413 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #30481 from obsidiansystems/sc2-headless 

    sc2-headless: init at 3.17
    @Ericson2314
    Ericson2314 committed Oct 16, 2017
    Copy the full SHA
    155b163 View commit details
    Browse the repository at this point in the history

  10. sc2-headless: License is unfree 

    I wrongly assumed that was the default when reviewing the PR.
    @Ericson2314
    Ericson2314 committed Oct 16, 2017
    Copy the full SHA
    6e1f864 View commit details
    Browse the repository at this point in the history

  11. buildFHSEnv: fix NIX_* compiler flags 

    This is needed now after #27672.
    @abbradar
    abbradar committed Oct 16, 2017
    Copy the full SHA
    2a036ca View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. boost165: init at 1.65.1

    @abbradar
    abbradar committed Oct 17, 2017
    Copy the full SHA
    23ea2e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into HEAD

    @abbradar
    abbradar committed Oct 17, 2017
    Copy the full SHA
    c6c67c4 View commit details
    Browse the repository at this point in the history

  3. boost: make 1.65 the default

    @abbradar
    abbradar committed Oct 17, 2017
    Copy the full SHA
    b173651 View commit details
    Browse the repository at this point in the history

  4. rstudio: enable parallel building 

    Also cleanup inputs.
    @abbradar
    abbradar committed Oct 17, 2017
    Copy the full SHA
    e2a7f50 View commit details
    Browse the repository at this point in the history

  5. boost: add numpy support 

    Not built by default.

Also add enablePython flag (enabled by default) and cleanup a bit.
    @abbradar
    abbradar committed Oct 17, 2017
    Copy the full SHA
    b1e4997 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #29814 from abbradar/new-boost 

    Update Boost to 1.65 and make it default
    @abbradar
    abbradar committed Oct 17, 2017
    Copy the full SHA
    35ad024 View commit details
    Browse the repository at this point in the history