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: d9dccbcd3a2a
Choose a base ref
...
head repository: NixOS/ofborg
compare: 65699e555551
Choose a head ref
  • 8 commits
  • 13 files changed
  • 1 contributor

Commits on May 24, 2020

  1. nixpkgs: 2020-02-19 -> 2020-05-19 

    It seems like the latest crate2nix depends on some changes to the rust
infrastructure in nixpkgs.

    error: cannot coerce null to a string, at pkgs/build-support/rust/build-rust-crate/configure-crate.nix:33:4
    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    634e68c View commit details
    Browse the repository at this point in the history

  2. remove workspace workarounds for carnix

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    c7a5d20 View commit details
    Browse the repository at this point in the history

  3. replace update-carnix.sh 

    Crate2nix hasn't been added to nixpkgs yet so it needs to be pulled in
separately.
    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    dcb534e View commit details
    Browse the repository at this point in the history

  4. generate Cargo.nix with cargo2nix

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    0a7e29b View commit details
    Browse the repository at this point in the history

  5. enforce Cargo.lock is up to date instead of building

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    bf41d6c View commit details
    Browse the repository at this point in the history

  6. remove carnix

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    29de5c6 View commit details
    Browse the repository at this point in the history

  7. make update-crates pure 

    This works with --pure now so it doesn't depend on having anything
installed outside of the nix-shell shebang anymore.
    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    bf07e6e View commit details
    Browse the repository at this point in the history

  8. Merge pull request #499 from LnL7/crate2nix 

    use crate2nix
    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    65699e5 View commit details
    Browse the repository at this point in the history