Skip to content

Commit a107d52

Browse files
authored
Merge pull request #34 from DavHau/release-2.0.1
version 2.0.1
2 parents 6d7e485 + 12cde63 commit a107d52

10 files changed

+21
-13
lines changed

Changelog.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1+
# 2.0.1 (29 Jun 2020)
2+
Improves build-time closure, build success rate and fixes disable_checks option.
3+
### Fixes:
4+
- fix: `disable_checks` did not work for packages built via the `sdist` provider if the required version matches exactly the version used in nixpkgs.
5+
- fix: some dependencies with markers were ignored completely
6+
- fix: providers `nixpkgs` and `sdist` inherited many unneeded build inputs from nixpkgs leading to bloated build-time closures, increased failure rate and uneffective `disable_checks` option. After this fix, only non-python build-inputs are inherited from nixpkgs.
7+
- mach-nix now sets `pname` + `version` for python packages instead of `name`
8+
19
# 2.0.0
2-
## Features:
10+
### Features:
311
- **Python Wheels**: Wheels are supported for linux including manylinux1, manylinux2010, manylinux2014
412
- **Nixpkgs python packages**: Nixpkgs is now treated as a separate provider. That means packages can be taken directly from there, independent on their availability from pypi.
513
- **Configurable Providers**: The user can now freely decide where packages should be taken from either via a default or on a per package basis. Currently available provider are `nixpkgs`, `sdist`, `wheel`.
@@ -8,7 +16,7 @@
816
- **Python Overrides support**: `mkPython` now accepts new parameter `overrides_pre` and `overrides_post` each allowing to inject a list of python overrides to apply before and after the mach-nix internal overrides. This allows you to fixup packages or add your own modifications to them.
917
- **Extras support**: All providers now fully support python [extras](https://www.python.org/dev/peps/pep-0508/#extras). That means requirements like for example '`requests[security]`' will be correctly resolved.
1018

11-
## Nix Interface changes:
19+
### Nix Interface changes:
1220
- Removed:
1321
- **mkPythonExpr**: removed in favor of `machNixFile` and `machNix`
1422
- Added:

Readme.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ or
1919
You can either install mach-nix via pip or by using nix in case you already have the nix package manager installed.
2020
### Installing via pip
2121
```shell
22-
pip install git+git://github.com/DavHau/mach-nix@2.0.0
22+
pip install git+git://github.com/DavHau/mach-nix@2.0.1
2323
```
2424
### Installing via nix
2525
```shell
26-
nix-env -if https://github.com/DavHau/mach-nix/tarball/2.0.0 -A mach-nix
26+
nix-env -if https://github.com/DavHau/mach-nix/tarball/2.0.1 -A mach-nix
2727
```
2828

2929
## Basic usage
@@ -54,7 +54,7 @@ If you are comfortable with writing nix expressions, you don't need to install t
5454
let
5555
mach-nix = import (builtins.fetchGit {
5656
url = "https://github.com/DavHau/mach-nix/";
57-
ref = "2.0.0";
57+
ref = "2.0.1";
5858
});
5959
in
6060
mach-nix.mkPython {

example/simple-usage-expression.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
let
22
mach-nix = import (builtins.fetchGit {
33
url = "https://github.com/DavHau/mach-nix/";
4-
ref = "2.0.0";
4+
ref = "2.0.1";
55
});
66
in mach-nix.mkPythonExpr {
77
requirements = builtins.readFile ./requirements.txt;

example/simple-usage-shell.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
let
22
mach-nix = import (builtins.fetchGit {
33
url = "https://github.com/DavHau/mach-nix/";
4-
ref = "2.0.0";
4+
ref = "2.0.1";
55
});
66
in mach-nix.mkPythonShell {
77
requirements = builtins.readFile ./requirements.txt;

example/simple-usage.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
let
22
mach-nix = import (builtins.fetchGit {
33
url = "https://github.com/DavHau/mach-nix/";
4-
ref = "2.0.0";
4+
ref = "2.0.1";
55
});
66
in mach-nix.mkPython {
77
requirements = builtins.readFile ./requirements.txt;

mach_nix/VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0
1+
2.0.1

mach_nix/nix/NIXPKGS_COMMIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14dd961b8d5a2d2d3b2cf6526d47cbe5c3e97039
1+
f8248ab6d9e69ea9c07950d73d48807ec595e923

mach_nix/nix/NIXPKGS_SHA256

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
07nc06mff31hwg6d7spnabfbipxjxhg856z1gcwbyr1cx299y996
1+
009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk

mach_nix/nix/PYPI_DEPS_DB_COMMIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c75c0817d61e26427fe3f7b2a82730e3f3edd62f
1+
d8936568152dff29bd51c8bf492609a1f686fc7f

mach_nix/nix/PYPI_DEPS_DB_SHA256

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
101lhfpd4awz1l9mkrccdqfwwm02zdlkzyys52irqdx5piq2qyan
1+
1f9kazr6ny6v68d55qbdcccl34s97370lpd6w43rizpjdznv04hv

0 commit comments

Comments
 (0)