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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b82bdcd3c395
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d8ba20e3ae4
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 14, 2020

  1. dqlite: 1.4.1 -> 1.4.4

    @wucke13
    wucke13 committed Jun 14, 2020
    Copy the full SHA
    a0b0199 View commit details

  2. raft-canonical: 0.9.18 -> 0.9.23

    @wucke13
    wucke13 committed Jun 14, 2020
    Copy the full SHA
    ec1fe34 View commit details

Commits on Jul 5, 2020

  1. Merge pull request #90316 from wucke13/dqlite 

    dqlite: 1.4.1 -> 1.4.4, raft-canonical: 0.9.18 -> 0.9.23
    @bhipple
    bhipple authored Jul 5, 2020
    Copy the full SHA
    3d8ba20 View commit details
Showing with 6 additions and 12 deletions.
  1. +3 −3 pkgs/development/libraries/dqlite/default.nix
  2. +3 −9 pkgs/development/libraries/raft-canonical/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/dqlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "dqlite";
version = "1.4.1";
version = "1.4.4";

src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4";
sha256 = "0wm7vkapjg8hdjm6bi48hwsf4w4ppgn3r655gqms5ssjxm50m15d";
};

nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sqlite-replication
];

# tests hang for ever on x86_64-linux
# tests fail
doCheck = false;

outputs = [ "dev" "out" ];
12 changes: 3 additions & 9 deletions pkgs/development/libraries/raft-canonical/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "raft-canonical";
version = "0.9.18";
version = "0.9.23";

src = fetchFromGitHub {
owner = "canonical";
repo = "raft";
rev = "v${version}";
sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k";
sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr";
};

nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@@ -18,13 +18,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /usr/bin/ " "
'';

# test fails
#
#append/finalizeSegment [ ERROR ]
#Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true
#Error: child killed by signal 6 (Aborted)

doCheck = false;
doCheck = true;

outputs = [ "dev" "out" ];