Update timescale derivation to disallow non-apache configs (#1232)

* update timescale derivation to disallow non-apache configs * remove enableUnfree flag
supabase · Sep 24, 2024 · 2dda773 · 2dda773
1 parent 9b5146e
commit 2dda773
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/nix/ext/timescaledb.nix b/nix/ext/timescaledb.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, enableUnfree ? true }:
+{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
+  pname = "timescaledb-apache";
   version = "2.16.1";
 
   nativeBuildInputs = [ cmake ];
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-sLxWdBmih9mgiO51zLLxn9uwJVYc5JVHJjSWoADoJ+w=";
   };
 
-  cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ]
-    ++ lib.optionals (!enableUnfree) [ "-DAPACHE_ONLY=ON" ]
+  cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" "-DAPACHE_ONLY=1" ]
     ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ];
 
   # Fix the install phase which tries to install into the pgsql extension dir,
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md";
     maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
-    license = with licenses; if enableUnfree then tsl else asl20;
+    license = licenses.asl20;
     broken = versionOlder postgresql.version "13";
   };
 }
diff --git a/nix/tests/expected/timescale.out b/nix/tests/expected/timescale.out
@@ -1,3 +1,10 @@
+-- Confirm we're running the apache version
+show timescaledb.license;
+ timescaledb.license 
+---------------------
+ apache
+(1 row)
+
 -- Create schema v
 create schema v;
 -- Create a table in the v schema

diff --git a/nix/tests/sql/timescale.sql b/nix/tests/sql/timescale.sql
@@ -1,3 +1,6 @@
+-- Confirm we're running the apache version
+show timescaledb.license;
+
 -- Create schema v
 create schema v;