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: 1a91d50ff2b6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f0fa6296a52
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 1, 2018

  1. leveldb: 1.18 -> 1.20 (#49587) 

    Changelog:

1.20: https://github.com/google/leveldb/releases/tag/v1.20
1.19: https://github.com/google/leveldb/releases/tag/v1.19
    @xeji
    Daniël de Kok authored and xeji committed Nov 1, 2018
    Copy the full SHA
    3f0fa62 View commit details
Showing with 7 additions and 6 deletions.
  1. +7 −6 pkgs/development/libraries/leveldb/default.nix
13 changes: 7 additions & 6 deletions pkgs/development/libraries/leveldb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,21 +2,21 @@

stdenv.mkDerivation rec {
name = "leveldb-${version}";
version = "1.18";
version = "1.20";

src = fetchFromGitHub {
owner = "google";
repo = "leveldb";
rev = "v${version}";
sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d";
sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
};

buildPhase = ''
make all leveldbutil libmemenv.a
make all
'';

installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
for file in *.dylib*; do
for file in out-shared/*.dylib*; do
install_name_tool -id $out/lib/$file $file
done
'') + # XXX consider removing above after transition to cmake in the next release
@@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/include/leveldb/helpers
cp helpers/memenv/memenv.h $out/include/leveldb/helpers
cp lib* $out/lib
cp out-shared/lib* $out/lib
cp out-static/lib* $out/lib
cp leveldbutil $out/bin
cp out-static/leveldbutil $out/bin
";

meta = with stdenv.lib; {