From ac62255e8112e547432ca0f09bfe8f4d1920fbb8 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Fri, 12 Mar 2021 12:47:01 +0700
Subject: [PATCH] version 3.2.0

---
 Changelog.md     | 19 ++++++++++++++++++-
 Readme.md        |  6 +++---
 examples.md      |  4 ++--
 mach_nix/VERSION |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 96c7432..00575c6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,20 @@
+# 3.2.0 (11 Mar 2021)
+bugfixes, ignoreCollisions
+
+### Features
+ - add argument `ignoreCollisions` to all `mk*` functions
+ - add passthru attribute `expr` to the result of `mkPython`, which is a string containing the internally generated nix expression.
+ - add flake output `sdist` to build pip compatible sdist distribution of mach-nix
+
+### Fixes
+ - Sometimes wrong package versions were inherited when using the `nixpkgs` provider, leading to collision errors or unexpected package versions. Now, python depenencies of `nixpkgs` candidates are automatically replaced recursively.
+ - When cross building, mach-nix attempted to generate the nix expression using the target platform's python interpreter, resulting in failure
+
+### Package Fixes
+ - cartopy: add missing build inputs (geos)
+ - google-auth: add missing dependency `six` when provider is `nixpkgs`
+
+
 # 3.1.1 (27 Nov 2020)
 fix cli
 
@@ -100,7 +117,7 @@ in
  
  - Non-python packages can be passed via `packagesExtra` to include them into the environment.
  
- 
+  the target platform's python interpreter was used to generate the nix expression, resulting in a failing build
 ### Improvements
  - rework the logic for inheriting dependencies from nixpkgs
  - fixes.nix: allow alternative mod function signature with more arguments:  
diff --git a/Readme.md b/Readme.md
index 72fc8eb..cbcf2c0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -63,11 +63,11 @@ Table of Contents
 You can either install mach-nix via pip or by using nix in case you already have the nix package manager installed.
 #### Installing via pip
 ```shell
-pip install git+git://github.com/DavHau/mach-nix@3.1.1
+pip install git+git://github.com/DavHau/mach-nix@3.2.0
 ```
 #### Installing via nix
 ```shell
-nix-env -if https://github.com/DavHau/mach-nix/tarball/3.1.1 -A mach-nix
+nix-env -if https://github.com/DavHau/mach-nix/tarball/3.2.0 -A mach-nix
 ```
 
 ---
@@ -99,7 +99,7 @@ You can call mach-nix directly from a nix expression
 let
   mach-nix = import (builtins.fetchGit {
     url = "https://github.com/DavHau/mach-nix/";
-    ref = "refs/tags/3.1.1";
+    ref = "refs/tags/3.2.0";
   }) {};
 in
 mach-nix.mkPython {
diff --git a/examples.md b/examples.md
index 78f4dcd..e2ae483 100644
--- a/examples.md
+++ b/examples.md
@@ -41,7 +41,7 @@ every mach-nix expression should begin like this:
 let
   mach-nix = import (builtins.fetchGit {
     url = "https://github.com/DavHau/mach-nix/";
-    ref = "refs/tags/3.1.1";
+    ref = "refs/tags/3.2.0";
   }) {
     # optionally bring your own nixpkgs
     # pkgs = import <nixpkgs> {};
@@ -277,7 +277,7 @@ In this example, mach-nix is used to resolve our python dependencies and provide
 let
   mach-nix = import (builtins.fetchGit {
     url = "https://github.com/DavHau/mach-nix/";
-    ref = "refs/tags/3.1.1";  # update this version
+    ref = "refs/tags/3.2.0";  # update this version
   }) {
     python = "python37";
   };
diff --git a/mach_nix/VERSION b/mach_nix/VERSION
index 8b25206..a4f52a5 100644
--- a/mach_nix/VERSION
+++ b/mach_nix/VERSION
@@ -1 +1 @@
-master
\ No newline at end of file
+3.2.0
\ No newline at end of file