public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-05-24 10:10:06 +02:00
parent 5aad832327 c778596f56
commit d578248611
74 changed files with 1073 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sql/postgresql/ext/pg_partman.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_partman";
version = "4.3.1";
version = "4.4.0";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "pgpartman";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn";
sha256 = "0wr2nivp0b8vk355rnv4bygiashq98q9zhfgdbxzhm7bgxd01rk2";
};
installPhase = ''
pkgs/servers/sql/postgresql/ext/pgrouting.nix
+4 -4
View File
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, gmp, cgal, mpfr }:
{ stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }:
stdenv.mkDerivation rec {
pname = "pgrouting";
version = "2.6.3";
version = "3.0.0";
nativeBuildInputs = [ cmake perl ];
buildInputs = [ postgresql boost gmp cgal mpfr ];
buildInputs = [ postgresql boost ];
src = fetchFromGitHub {
owner = "pgRouting";
repo = pname;
rev = "v${version}";
sha256 = "0jdjb8476vjgc7i26v2drcqjvhdbsk1wx243fddffg169nb664ml";
sha256 = "101lyhhfcv3chrp2h5q04l155hr6wvx427cv1kgd4ryzk88wxx5i";
};
installPhase = ''