alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #219826 from noctarius/master

Browse source 
Fixed TimescaleDB License Information
This commit is contained in:
Mario Rodas 2023-04-01 09:19:04 -05:00 committed by GitHub
parent 0defde4896 4f7f469c82
commit c937feb1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/licenses.nix
View file

@ -909,6 +909,13 @@ in mkLicense lset) ({
url = "https://github.com/thestk/stk/blob/master/LICENSE";
};
tsl = {
shortName = "TSL";
fullName = "Timescale License Agreegment";
url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
unfree = true;
};
tcltk = {
spdxId = "TCL";
fullName = "TCL/TK License";

7
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }:
{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, enableUnfree ? true }:
# # To enable on NixOS:
# config.services.postgresql = let
@ -12,7 +12,7 @@
# }
stdenv.mkDerivation rec {
pname = "timescaledb";
pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
version = "2.10.1";
nativeBuildInputs = [ cmake ];
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
};
cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ]
++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
# Fix the install phase which tries to install into the pgsql extension dir,
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/timescale/timescaledb/raw/${version}/CHANGELOG.md";
maintainers = with maintainers; [ marsam ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;
license = with licenses; if enableUnfree then tsl else asl20;
broken = versionOlder postgresql.version "12";
};
}

1
pkgs/servers/sql/postgresql/packages.nix
View file

@ -55,6 +55,7 @@ self: super: {
temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
timescaledb = super.callPackage ./ext/timescaledb.nix { };
timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
timescaledb_toolkit = super.callPackage ./ext/timescaledb_toolkit.nix { };