From d675b17cdbeedf73d48b21a16684ff0ca0fe7ae4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Aug 2021 19:28:21 -0500 Subject: [PATCH 1/4] postgresqlPackages.timescaledb: 2.3.1 -> 2.4.0 https://github.com/timescale/timescaledb/releases/tag/2.4.0 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index bebe58676935..f8e3f00b7970 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.3.1"; + version = "2.4.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx"; + sha256 = "0nc6nvngp5skz8rasvb7pyi9nlw642iwk19p17lizmw8swdm5nji"; }; - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] + cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ volth marsam ]; platforms = postgresql.meta.platforms; license = licenses.asl20; + broken = versionOlder postgresql.version "12"; }; } From 9a8850aea97840dca1cc1087447ed89dbfe183dc Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Sat, 21 Aug 2021 19:25:01 -0700 Subject: [PATCH 2/4] dhallToNix: Permit inputs referring to derivations (#134459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes https://github.com/dhall-lang/dhall-haskell/issues/2267 `pkgs.dhallToNix` currently fails when a Dhall package is interpolated into the input source code, like this: ```nix let pkgs = import { }; f = { buildDhallPackage }: buildDhallPackage { name = "not"; code = "λ(x : Bool) → x == False"; source = true; }; not = pkgs.dhallPackages.callPackage f {}; in pkgs.dhallToNix "${not}/source.dhall True" ``` This is because `dhallToNix` was using `builtins.toFile`, which does not permit inputs with interpolated derivations. However, `pkgs.writeText` does not have this limitation, so we can switch to using that instead. --- pkgs/build-support/dhall-to-nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/dhall-to-nix.nix b/pkgs/build-support/dhall-to-nix.nix index 3805656dfa0e..96cc16e16f36 100644 --- a/pkgs/build-support/dhall-to-nix.nix +++ b/pkgs/build-support/dhall-to-nix.nix @@ -15,12 +15,12 @@ Note that this uses "import from derivation", meaning that Nix will perform a build during the evaluation phase if you use this `dhallToNix` utility */ -{ stdenv, dhall-nix }: +{ stdenv, dhall-nix, writeText }: let dhallToNix = code : let - file = builtins.toFile "dhall-expression" code; + file = writeText "dhall-expression" code; drv = stdenv.mkDerivation { name = "dhall-compiled.nix"; From acdc88d158a40504594e7621c3b1e62e86cd172c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 23:18:55 +0000 Subject: [PATCH 3/4] esbuild: 0.12.20 -> 0.12.22 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 1ff54223d08c..ae8579c16a91 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.20"; + version = "0.12.22"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-40r0f+bzzD0M97pbiSoVSJvVvcCizQvw9PPeXhw7U48="; + sha256 = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From a2ce82238290589a2a9ab267bc0ef5030c4bce9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 01:14:07 +0000 Subject: [PATCH 4/4] git-filter-repo: 2.32.0 -> 2.33.0 --- .../git-and-tools/git-filter-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index c67fb1532abf..f5e964d3ca9a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.32.0"; + version = "2.33.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CztFSyeKM9Bmcf0eSrLHH3vHGepd8WXPvcAACT+vFps="; + sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk="; }; buildInputs = [ pythonPackages.python ];