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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9dccbcd3a2a
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

  2. remove workspace workarounds for carnix

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    c7a5d20 View commit details

  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

  4. generate Cargo.nix with cargo2nix

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    0a7e29b View commit details

  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

  6. remove carnix

    @LnL7
    LnL7 committed May 24, 2020
    Copy the full SHA
    29de5c6 View commit details

  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

  8. Merge pull request #499 from LnL7/crate2nix 

    use crate2nix
    @LnL7
    LnL7 authored May 24, 2020
    Copy the full SHA
    65699e5 View commit details
Showing with 5,293 additions and 7,724 deletions.
  1. +5,255 −956 Cargo.nix
  2. +2 −2 README.md
  3. +4 −0 crate-hashes.json
  4. +0 −197 crates-io.list
  5. +0 −6,523 crates-io.nix
  6. +19 −18 default.nix
  7. +7 −4 nix/nixpkgs.json
  8. +0 −15 nix/overlay.nix
  9. +0 −6 nix/update-carnix.sh
  10. +6 −0 nix/update-crates.sh
  11. +0 −1 ofborg-simple-build/Cargo.toml
  12. +0 −1 ofborg/Cargo.toml
  13. +0 −1 shell.nix
Loading