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

Commits on Sep 1, 2019

  1. dgraph: 0.8.2 -> 1.0.17

    @sigma
    sigma committed Sep 1, 2019
    Copy the full SHA
    65b9a73 View commit details

  2. Merge pull request #67863 from sigma/pr/dgraph-1.0.17 

    dgraph: 0.8.2 -> 1.0.17
    @mmahut
    mmahut authored Sep 1, 2019
    Copy the full SHA
    f7a856e View commit details
Showing with 910 additions and 88 deletions.
  1. +8 −14 pkgs/servers/dgraph/default.nix
  2. +902 −74 pkgs/servers/dgraph/deps.nix
22 changes: 8 additions & 14 deletions pkgs/servers/dgraph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,40 +2,34 @@

buildGoPackage rec {
pname = "dgraph";
version = "0.8.2";
version = "1.0.17";

goPackagePath = "github.com/dgraph-io/dgraph";

src = fetchFromGitHub {
owner = "dgraph-io";
repo = "dgraph";
rev = "v${version}";
sha256 = "0zc5bda8m2srjbk0gy1nnm0bya8if0kmk1szqr1qv3xifdzmi4nf";
sha256 = "05z1xwbd76q49zyqahh9krvq78dgkzr22qc6srr4djds0l7y6x5i";
};

extraOutputsToInstall = [ "dashboard" ];
# see licensing
buildFlags = [ "-tags oss" ];

goDeps = ./deps.nix;
subPackages = [ "cmd/dgraph" "cmd/dgraphloader" "cmd/bulkloader"];

# let's move the dashboard to a different output, to prevent $bin from
# depending on $out
# TODO: provide a proper npm application for the dashboard.
postPatch = ''
mv dashboard/* $dashboard
'';
subPackages = [ "dgraph"];

preBuild = ''
export buildFlagsArray="-ldflags=\
-X github.com/dgraph-io/dgraph/x.dgraphVersion=${version} \
-X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/"
-X github.com/dgraph-io/dgraph/x.dgraphVersion=${version}"
'';

meta = {
homepage = "https://dgraph.io/";
description = "Fast, Distributed Graph DB";
maintainers = with stdenv.lib.maintainers; [ sigma ];
license = stdenv.lib.licenses.agpl3;
# Apache 2.0 because we use only build tag "oss"
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
};
}
Loading