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/ofborg
base: 041d96d890bb
Choose a base ref
...
head repository: NixOS/ofborg
compare: bef27f6ab914
Choose a head ref
  • 5 commits
  • 8 files changed
  • 2 contributors

Commits on Apr 25, 2020

  1. move carnix files to workspace

    @LnL7
    LnL7 committed Apr 25, 2020
    Copy the full SHA
    0139cd5 View commit details
    Browse the repository at this point in the history

  2. work around carnix workspace issue 

    Carnix doesn't properly handle includes for workspace members, this
works around the issue by specifying what should be generated directly
in Cargo.toml.

https://nest.pijul.com/pmeunier/carnix/discussions/46
    @LnL7
    LnL7 committed Apr 25, 2020
    Copy the full SHA
    96639e9 View commit details
    Browse the repository at this point in the history

  3. add build for ofborg-simple-build

    @LnL7
    LnL7 committed Apr 25, 2020
    Copy the full SHA
    40c759e View commit details
    Browse the repository at this point in the history

  4. disable debug build on darwin 

    Currently broken due to the .dSYM folders it generates next to the binaries.

See NixOS/nixpkgs#83488
    @LnL7
    LnL7 committed Apr 25, 2020
    Copy the full SHA
    5669d9b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #471 from LnL7/carnix-workspace 

    carnix workspace
    @grahamc
    grahamc committed Apr 25, 2020
    Copy the full SHA
    bef27f6 View commit details
    Browse the repository at this point in the history