version 3.4.0
This commit is contained in:
parent
f0f48efdd6
commit
fe5255e6fd
4 changed files with 94 additions and 64 deletions
30
Changelog.md
30
Changelog.md
|
@ -1,3 +1,33 @@
|
|||
# 3.4.0 (29 Jan 2022)
|
||||
aarch64-darwin, nixpkgs provider improvements, bugfixes
|
||||
|
||||
### Features
|
||||
- support conda packages
|
||||
- support wheels for apple m1 (aarch64-darwin)
|
||||
|
||||
### Changes
|
||||
- remove support for installing mach-nix via pip
|
||||
- updated inputs nixpkgs, pypi-deps-db, conda-channels
|
||||
|
||||
### Improvements
|
||||
- support for PEP600 wheels of format: 'manylinux_${GLIBCMAJOR}_${GLIBCMINOR}'
|
||||
- respect 'python_requires' for sdist packages
|
||||
- PEP440 compatible pre-release version handling
|
||||
- improve handling of python packages from nixpkgs
|
||||
|
||||
### Fixes
|
||||
- fix problem where required dependencies were removed from nixpkgs python modules.
|
||||
- prevent package collisions with dependencies from `packagesExtra`
|
||||
- fix version comparison of versions with arbitrary length
|
||||
- various fixes for MacOS
|
||||
- various fixes for requirements parsing
|
||||
- various other fixes
|
||||
|
||||
### Package Fixes
|
||||
- libwebp-base: remove colliding binaries in conda package
|
||||
- pyqt5: fix missing wrapQtAppsHook
|
||||
|
||||
|
||||
# 3.3.0 (22 May 2021)
|
||||
bugfixes, improvements
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ Table of Contents
|
|||
|
||||
### Installation
|
||||
```shell
|
||||
nix-env -if https://github.com/DavHau/mach-nix/tarball/3.3.0 -A mach-nix
|
||||
nix-env -if https://github.com/DavHau/mach-nix/tarball/3.4.0 -A mach-nix
|
||||
```
|
||||
or, if you prefer `nix-shell`:
|
||||
|
||||
|
@ -70,7 +70,7 @@ or, if you prefer `nix-shell`:
|
|||
+ otherwise:
|
||||
|
||||
```shell
|
||||
nix-shell -p '(callPackage (fetchTarball https://github.com/DavHau/mach-nix/tarball/3.3.0) {}).mach-nix'
|
||||
nix-shell -p '(callPackage (fetchTarball https://github.com/DavHau/mach-nix/tarball/3.4.0) {}).mach-nix'
|
||||
```
|
||||
|
||||
---
|
||||
|
@ -102,7 +102,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.3.0";
|
||||
ref = "refs/tags/3.4.0";
|
||||
}) {};
|
||||
in
|
||||
mach-nix.mkPython {
|
||||
|
|
|
@ -46,7 +46,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.3.0";
|
||||
ref = "refs/tags/3.4.0";
|
||||
}) {
|
||||
# optionally bring your own nixpkgs
|
||||
# pkgs = import <nixpkgs> {};
|
||||
|
@ -69,7 +69,7 @@ in
|
|||
nixpkgs.url = "github:nixos/nixpkgs";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
mach-nix = {
|
||||
url = "github:DavHau/mach-nix?ref=3.3.0";
|
||||
url = "github:DavHau/mach-nix?ref=3.4.0";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
|
@ -313,7 +313,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/heads/3.3.0"; # update this version
|
||||
ref = "refs/heads/3.4.0"; # update this version
|
||||
}) {
|
||||
python = "python37";
|
||||
};
|
||||
|
|
|
@ -1 +1 @@
|
|||
master
|
||||
3.4.0
|
Loading…
Reference in a new issue