Unverified Commit c937feb1 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #219826 from noctarius/master 

Fixed TimescaleDB License Information
parents 0defde48 4f7f469c

lib/licenses.nix

+7 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/servers/sql/postgresql/ext/timescaledb.nix

+4 −3
Original line number Diff line number Diff line 
{ 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";

  };

}

pkgs/servers/sql/postgresql/packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -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 { };