From 939211bfafa9c7baf1ba701e259e35d603e6794c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 4 Sep 2020 11:58:12 +0000 Subject: [PATCH 1/2] duckdb: 0.1.8 -> 0.2.1 --- pkgs/development/libraries/duckdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 05961bce89c..dde0806add4 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.1.8"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55"; + sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x"; }; nativeBuildInputs = [ cmake ]; From 48ae44b3a2e1ef160fa9e8dbf8c5ce6195d0d29e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 4 Sep 2020 22:56:43 +0100 Subject: [PATCH 2/2] pythonPackages.duckdb: patch out attempted use of git replace with `false` as its use here is pointless anyway. --- pkgs/development/python-modules/duckdb/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index c839dea3d1a..ea6dfe32fda 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { pname = "duckdb"; inherit (duckdb) version src; + # build attempts to use git to figure out its own version. don't want to add + # the dependency for something pointless. + postPatch = '' + substituteInPlace scripts/package_build.py --replace \ + "'git'" "'false'" + ''; + postConfigure = '' cd tools/pythonpkg export SETUPTOOLS_SCM_PRETEND_VERSION=${version}