Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: c0aada1e1fc8ae2f7e0fe51f7e4938a03a055d52
https://github.com/NixOS/nixpkgs/commit/c0aada1e1fc8ae2f7e0fe51f7e4938a03a055d52
Author: Tuomas Tynkkynen <[email protected]>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M pkgs/tools/package-management/rpm/default.nix
Log Message:
-----------
rpm: Hack fix finding libpython when compiling for Python 3
Currently, building RPM with `python = python3` causes this:
checking for a Python interpreter with version >= 2.6... python3
checking for python3...
/nix/store/dykqxnrwiz9drlcv2wy8lpvl3xvklx0g-python3-3.4.3/bin/python3
checking for python3 version... 3.4
checking for Python.h... yes
checking for library containing Py_Main... no
configure: error: missing python library
That comes from this snippet in configure.ac:
AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[
WITH_PYTHON_LIB="$ac_res"
],[AC_MSG_ERROR([missing python library])
])
So it's looking for (e.g) `libpython3.4.so` wheras we have `libpython3.4m.so`.
Patching the configure script to match seems to make that work (although
I don't really understand what the heck is this 'm' business about).
Commit: f5b6ced7ec77303acadc85dbe3f112dec665c4ea
https://github.com/NixOS/nixpkgs/commit/f5b6ced7ec77303acadc85dbe3f112dec665c4ea
Author: Tuomas Tynkkynen <[email protected]>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M pkgs/top-level/python-packages.nix
Log Message:
-----------
pythonPackages.tlsh: init at 3.4.1
This C extension is a bit funky since it needs cmake to be run to
generate some header file before it can be built.
Commit: 7e85fdc6df8bd280bb01a50285ae35e3afa9bc85
https://github.com/NixOS/nixpkgs/commit/7e85fdc6df8bd280bb01a50285ae35e3afa9bc85
Author: Tuomas Tynkkynen <[email protected]>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M pkgs/tools/misc/diffoscope/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
diffoscope: 29 -> 44
Relevant changes:
- Python version switched to Python 3
- ssdeep library got replaced with tlsh
- the 'magic' Python package got replaced with a different one
- Minor build system improvements == less work for us
Commit: eae60d2f40cc561c83fe30da221fa7964aa9969f
https://github.com/NixOS/nixpkgs/commit/eae60d2f40cc561c83fe30da221fa7964aa9969f
Author: Tuomas Tynkkynen <[email protected]>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M pkgs/tools/misc/diffoscope/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
diffoscope: Add more tools to the runtime path
Commit: 688ff0c0dcabcdea39b0f8e75cbeb66e368918ec
https://github.com/NixOS/nixpkgs/commit/688ff0c0dcabcdea39b0f8e75cbeb66e368918ec
Author: Domen Kožar <[email protected]>
Date: 2015-12-28 (Mon, 28 Dec 2015)
Changed paths:
M pkgs/tools/misc/diffoscope/default.nix
M pkgs/tools/package-management/rpm/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Merge pull request #11992 from dezgeg/pr-update-diffoscope
diffoscope: 29 -> 44
Compare: https://github.com/NixOS/nixpkgs/compare/7195e6e14f40...688ff0c0dcab_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
