Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 95f1a9a03439
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 112436afc3a3
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 25, 2019

  1. libglvnd: fix build on darwin 

    The --version-script flag is only supported by GNU LD
    @marsam
    marsam committed Oct 25, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    efce3c1 View commit details

Commits on Oct 26, 2019

  1. Merge pull request #71959 from marsam/fix-libglvnd-darwin 

    libglvnd: fix build on darwin
    @marsam
    marsam authored Oct 26, 2019
    Copy the full SHA
    3b43c08 View commit details

  2. rocksdb: 6.2.4 -> 6.3.6 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rocksdb/versions
    @r-ryantm
    r-ryantm authored and Jon committed Oct 26, 2019
    Copy the full SHA
    112436a View commit details
Showing with 4 additions and 2 deletions.
  1. +2 −0 pkgs/development/libraries/libglvnd/default.nix
  2. +2 −2 pkgs/development/libraries/rocksdb/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/libraries/libglvnd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
--replace "-Wl,-Bsymbolic " ""
substituteInPlace src/EGL/Makefile.am \
--replace "-Wl,-Bsymbolic " ""
substituteInPlace src/GLdispatch/Makefile.am \
--replace "-Xlinker --version-script=$(VERSION_SCRIPT)" "-Xlinker"
'';

NIX_CFLAGS_COMPILE = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/rocksdb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "rocksdb";
version = "6.2.4";
version = "6.3.6";

src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "08077agbimm7738xrknkw6fjw9f8jv6x3igp8b5pmsj9l954ywma";
sha256 = "0i993z7xxsbs595y7wxfhgm69mg5893lfkpidcbaqnzj8j0kn0ab";
};

nativeBuildInputs = [ cmake ];