From 7bd27add2a7bd0401a4091ef61dc3efb5c46d384 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 7 Dec 2020 13:33:31 +0000 Subject: [PATCH 1/2] csvs-to-sqlite: 1.1 -> 1.2 --- pkgs/development/python-modules/csvs-to-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 19d0fa4f7bb..4105d981386 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "csvs-to-sqlite"; - version = "1.1"; + version = "1.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "1xi9d8l1sf9vixzvqpz8lvhl6yqmz9x5659nvpsxinl317qzmc8m"; + sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; }; postPatch = '' From a13d912bdf7758ec8988580492c35916c2c16eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Dec 2020 17:50:12 +0100 Subject: [PATCH 2/2] pythonPackages.pygmt: Mark as broken on darwin --- pkgs/development/python-modules/pygmt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 378419cc835..28e7db2a99e 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub @@ -36,10 +36,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygmt" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A Python interface for the Generic Mapping Tools"; homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; + # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' + broken = stdenv.isDarwin; maintainers = with maintainers; [ sikmir ]; }; }