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: 4295e225f568
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0402f04b9bba
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 13, 2018

  1. cargo-download: init at 0.1.1

    Cargo.nix was generated from cargo-download 0.1.1 with this patch
    applied, which was necessary to not confuse carnix about the version
    being different between Cargo.toml and Cargo.lock.
    
    See Xion/cargo-download#3.
    
    From 5efd4cf11ff9d5042712303404169016b1e05c33 Mon Sep 17 00:00:00 2001
    From: Alyssa Ross <hi@alyssa.is>
    Date: Thu, 26 Jul 2018 21:19:06 +0200
    Subject: [PATCH] Fix Cargo.lock
    
    Running `cargo build` on a clean checkout produces a diff in Cargo.lock,
    because it wasn't updated after the version number was bumped.
    
    After this commit, `cargo build` should no longer produce a modified
    working tree.
    ---
     Cargo.lock | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    diff --git a/Cargo.lock b/Cargo.lock
    index cc7357c..c384dc1 100644
    --- a/Cargo.lock
    +++ b/Cargo.lock
    @@ -76,7 +76,7 @@ dependencies = [
    
     [[package]]
     name = "cargo-download"
    -version = "0.1.0"
    +version = "0.1.1"
     dependencies = [
      "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
      "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)",
    --
    2.17.1
    alyssais committed Aug 13, 2018
    Copy the full SHA
    0d3b2b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2018

  1. Copy the full SHA
    9f3707d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #44978 from alyssais/cargo-download

    cargo-download: init at 0.1.1
    xeji committed Sep 4, 2018
    Copy the full SHA
    0402f04 View commit details
    Browse the repository at this point in the history