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: 3f93b59e6ad7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e54f6b1fde7a
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 2, 2020

  1. cmake: Tighten deps 

     - OpenSSL is evidentally an optional dep. I guess pkg-config found it
   before because it was a transitive dep?

 - `zstd` and cross-built CMake can get by with a `cmakeMinimal that we
   use during bootstrapping, so let's restrict to that.
    @Ericson2314
    Ericson2314 committed Oct 2, 2020
    Copy the full SHA
    e6294cf View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. Merge remote-tracking branch 'obsidian/cmake-nativeBuildInputs' into … 

    …cmake-optional-openssl
    @Ericson2314
    Ericson2314 committed Oct 13, 2020
    Copy the full SHA
    5235a1e View commit details
    Browse the repository at this point in the history

  2. darwin bootstrapping: Dedup code a bit

    @Ericson2314
    Ericson2314 committed Oct 13, 2020
    Copy the full SHA
    e75f863 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. Merge pull request #99401 from Ericson2314/cmake-optional-openssl 

    cmake: Tighten deps
    @Ericson2314
    Ericson2314 committed Oct 14, 2020
    Copy the full SHA
    e54f6b1 View commit details
    Browse the repository at this point in the history