Skip to content

Commit

Permalink
Merge pull request #34 from DavHau/release-2.0.1
Browse files Browse the repository at this point in the history
version 2.0.1
  • Loading branch information
DavHau authored Jun 29, 2020
2 parents 6d7e485 + 12cde63 commit a107d52
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 13 deletions.
12 changes: 10 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# 2.0.1 (29 Jun 2020)
Improves build-time closure, build success rate and fixes disable_checks option.
### Fixes:
- fix: `disable_checks` did not work for packages built via the `sdist` provider if the required version matches exactly the version used in nixpkgs.
- fix: some dependencies with markers were ignored completely
- 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.
- mach-nix now sets `pname` + `version` for python packages instead of `name`

# 2.0.0
## Features:
### Features:
- **Python Wheels**: Wheels are supported for linux including manylinux1, manylinux2010, manylinux2014
- **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.
- **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`.
Expand All @@ -8,7 +16,7 @@
- **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.
- **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.

## Nix Interface changes:
### Nix Interface changes:
- Removed:
- **mkPythonExpr**: removed in favor of `machNixFile` and `machNix`
- Added:
Expand Down
6 changes: 3 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ or
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@2.0.0
pip install git+git://github.com/DavHau/mach-nix@2.0.1
```
### Installing via nix
```shell
nix-env -if https://github.com/DavHau/mach-nix/tarball/2.0.0 -A mach-nix
nix-env -if https://github.com/DavHau/mach-nix/tarball/2.0.1 -A mach-nix
```

## Basic usage
Expand Down Expand Up @@ -54,7 +54,7 @@ If you are comfortable with writing nix expressions, you don't need to install t
let
mach-nix = import (builtins.fetchGit {
url = "https://github.com/DavHau/mach-nix/";
ref = "2.0.0";
ref = "2.0.1";
});
in
mach-nix.mkPython {
Expand Down
2 changes: 1 addition & 1 deletion example/simple-usage-expression.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
mach-nix = import (builtins.fetchGit {
url = "https://github.com/DavHau/mach-nix/";
ref = "2.0.0";
ref = "2.0.1";
});
in mach-nix.mkPythonExpr {
requirements = builtins.readFile ./requirements.txt;
Expand Down
2 changes: 1 addition & 1 deletion example/simple-usage-shell.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
mach-nix = import (builtins.fetchGit {
url = "https://github.com/DavHau/mach-nix/";
ref = "2.0.0";
ref = "2.0.1";
});
in mach-nix.mkPythonShell {
requirements = builtins.readFile ./requirements.txt;
Expand Down
2 changes: 1 addition & 1 deletion example/simple-usage.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
mach-nix = import (builtins.fetchGit {
url = "https://github.com/DavHau/mach-nix/";
ref = "2.0.0";
ref = "2.0.1";
});
in mach-nix.mkPython {
requirements = builtins.readFile ./requirements.txt;
Expand Down
2 changes: 1 addition & 1 deletion mach_nix/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.1
2 changes: 1 addition & 1 deletion mach_nix/nix/NIXPKGS_COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14dd961b8d5a2d2d3b2cf6526d47cbe5c3e97039
f8248ab6d9e69ea9c07950d73d48807ec595e923
2 changes: 1 addition & 1 deletion mach_nix/nix/NIXPKGS_SHA256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
07nc06mff31hwg6d7spnabfbipxjxhg856z1gcwbyr1cx299y996
009i9j6mbq6i481088jllblgdnci105b2q4mscprdawg3knlyahk
2 changes: 1 addition & 1 deletion mach_nix/nix/PYPI_DEPS_DB_COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c75c0817d61e26427fe3f7b2a82730e3f3edd62f
d8936568152dff29bd51c8bf492609a1f686fc7f
2 changes: 1 addition & 1 deletion mach_nix/nix/PYPI_DEPS_DB_SHA256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
101lhfpd4awz1l9mkrccdqfwwm02zdlkzyys52irqdx5piq2qyan
1f9kazr6ny6v68d55qbdcccl34s97370lpd6w43rizpjdznv04hv

0 comments on commit a107d52

Please sign in to comment.