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/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6064dd19b89
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e01ecd112dc
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on May 29, 2017

  1. Fix typo

    @edolstra
    edolstra committed May 29, 2017
    Copy the full SHA
    63145be View commit details

  2. Fix build failure on Debian/Ubuntu 

    http://hydra.nixos.org/build/53537463
    @edolstra
    edolstra committed May 29, 2017
    Copy the full SHA
    588dad4 View commit details

  3. Fix nix-copy-closure test 

    Fixes

  client# error: size mismatch importing path ‘/nix/store/ywf5fihjlxwijm6ygh6s0a353b5yvq4d-libidn2-0.16’; expected 0, got 120264

This is mostly an artifact of the NixOS VM test environment, where the
Nix database doesn't contain hashes/sizes.

http://hydra.nixos.org/build/53537471
    @edolstra
    edolstra committed May 29, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6e01ecd View commit details
Showing with 4 additions and 3 deletions.
  1. +1 −1 src/libstore/local-store.cc
  2. +1 −0 src/libstore/store-api.cc
  3. +1 −1 src/libutil/logging.cc
  4. +0 −1 src/libutil/logging.hh
  5. +1 −0 src/nix/progress-bar.cc
2 changes: 1 addition & 1 deletion src/libstore/local-store.cc
View file
Original file line number Diff line number Diff line change
@@ -923,7 +923,7 @@ void LocalStore::addToStore(const ValidPathInfo & info, const ref<std::string> &
info.path, info.narHash.to_string(), h.to_string());

if (nar->size() != info.narSize)
throw Error("szie mismatch importing path ‘%s’; expected %s, got %s",
throw Error("size mismatch importing path ‘%s’; expected %s, got %s",
info.path, info.narSize, nar->size());

if (requireSigs && !dontCheckSigs && !info.checkSignatures(*this, publicKeys))
1 change: 1 addition & 0 deletions src/libstore/store-api.cc
View file
Original file line number Diff line number Diff line change
@@ -547,6 +547,7 @@ void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
if (!info->narHash && dontCheckSigs) {
auto info2 = make_ref<ValidPathInfo>(*info);
info2->narHash = hashString(htSHA256, *sink.s);
if (!info->narSize) info2->narSize = sink.s->size();
info = info2;
}

2 changes: 1 addition & 1 deletion src/libutil/logging.cc
View file
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ Logger * makeDefaultLogger()
return new SimpleLogger();
}

std::atomic<uint64_t> Activity::nextId{(uint64_t) getpid() << 32};
std::atomic<uint64_t> nextId{(uint64_t) getpid() << 32};

Activity::Activity() : id(nextId++) { };

1 change: 0 additions & 1 deletion src/libutil/logging.hh
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ typedef enum {

class Activity
{
static std::atomic<uint64_t> nextId;
public:
typedef uint64_t t;
const t id;
1 change: 1 addition & 0 deletions src/nix/progress-bar.cc
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@ class ProgressBar : public Logger
std::string uri;
uint64_t current = 0;
uint64_t expected = 0;
DownloadInfo(const std::string & uri) : uri(uri) { }
};

struct State