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

Commits on Jan 27, 2018

  1. Revert "ldb: 1.1.27 -> 1.3.1"

    This reverts commit bc474e2.
    
    Source hash is incorrect:
    
    https://hydra.nixos.org/build/68234054
    
    And even fixing it doesn't make it compile:
    
    Checking for system tdb (>=1.3.15)                                                : not found
    ERROR: System library tdb of version 1.3.15 not found, and bundling disabled
    builder for ‘/nix/store/bxnawxa402vrv4qmcmj2hmp98a0bz7li-ldb-1.3.1.drv’ failed with exit code 1
    error: build of ‘/nix/store/bxnawxa402vrv4qmcmj2hmp98a0bz7li-ldb-1.3.1.drv’ failed
    dezgeg committed Jan 27, 2018
    Copy the full SHA
    eef3601 View commit details
  2. libbsd: 0.8.6 -> 0.8.7

    dezgeg committed Jan 27, 2018
    Copy the full SHA
    5925caf View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/libraries/ldb/default.nix
  2. +2 −2 pkgs/development/libraries/libbsd/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/ldb/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
}:

stdenv.mkDerivation rec {
name = "ldb-1.3.1";
name = "ldb-1.1.27";

src = fetchurl {
url = "mirror://samba/ldb/${name}.tar.gz";
sha256 = "1b1mkggp8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
};

outputs = [ "out" "dev" ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libbsd/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "libbsd-${version}";
version = "0.8.6";
version = "0.8.7";

src = fetchurl {
url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
sha256 = "11wnkzims5grprvhb1ssmq9pc2lcgh2r2rk8gwgz36ply6fvyzs6";
sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
};

# darwin changes configure.ac which means we need to regenerate