Commit graph

217124 commits

Author SHA1 Message Date
Vladimír Čunát 4e6a21dbec
Merge #82510: gcc: fix building cross on 32-bit host
... into staging
2020-03-22 08:44:40 +01:00
Matthew Bauer 46f8756aee
Merge pull request #79593 from thefloweringash/wafhook-phases
wafHook: allow overriding phases and disabling of cross flags
2020-03-22 01:59:41 -04:00
Michael Weiss b67aafe8b8
python3Packages.httplib2: 0.15 -> 0.17 (#82355) 2020-03-21 21:42:23 +01:00
Peter Hoeg 438f094334
Merge pull request #82944 from peterhoeg/f/libusb
libusb-compat: fix up the .so so it can find libusb1
2020-03-21 12:50:54 +08:00
Peter Hoeg 59281f742a libusb-compat: fix up the .so so it can find libusb1 2020-03-21 12:49:48 +08:00
Matthew Bauer bd0fef954a
Merge pull request #83046 from khumba/patch-shebangs-error-message-fix
patch-shebangs.sh: fix error messages to go to stderr, not '0' file
2020-03-20 22:13:14 -04:00
Bryan Gardiner bc21c247fc
patch-shebangs.sh: Fix error messages to go to stderr, not '0' file. 2020-03-20 17:08:10 -07:00
R. RyanTM 8c514e9e7b bluez: 5.53 -> 5.54 2020-03-18 22:04:03 -07:00
Jonathan Ringer cf0f90b85e pythonPackages.azure*: use pythonNamespaces 2020-03-18 12:20:51 -07:00
Jonathan Ringer 9c8565f731 azure-cli: use pythonNamespaces 2020-03-18 12:20:51 -07:00
Jonathan Ringer a9c994ad0b python: add pythonNamespacesHook 2020-03-18 12:20:51 -07:00
Niklas Hambüchen 16516cec82
Merge pull request #82552 from danderson/bug-57159-libvorbis
libvorbis: document that patch for CVE-2017-14160 also fixes CVE-2018-10393.
2020-03-18 02:50:23 +01:00
Jörg Thalheim 97c40baa9c
popt: set src to working mirror
rpm5.org no longer exists as a domain
2020-03-17 14:37:52 +00:00
David Anderson b5f90159af libvorbis: document that patch for CVE-2017-14160 also fixes CVE-2018-10393.
Fixes #57159.

Signed-off-by: David Anderson <dave@natulte.net>
2020-03-17 01:11:24 -07:00
Matthew Bauer 655e29d049
Merge pull request #81858 from matthewbauer/mb-cross-fixes-march-2020
Cross compilation fixes (march 2020)
2020-03-16 18:51:51 -04:00
Matthew Bauer 67b0ddf3f3 Merge remote-tracking branch 'origin/staging' into mb-cross-fixes-march-2020 2020-03-16 14:34:03 -04:00
Matthew Bauer e9c2957c14
treewide: add comments on where native inputs are needed
makes it more clear why this happens

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2020-03-16 14:27:23 -04:00
Matthew Bauer c6b320a679
bubblewrap: put docbook_xsl, libxslt in nativeBuildInputs
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
2020-03-16 14:24:09 -04:00
Jörg Thalheim b8cff61c33
Merge pull request #82488 from r-ryantm/auto-update/libuv
libuv: 1.34.2 -> 1.35.0
2020-03-16 15:33:15 +00:00
Jörg Thalheim f6e3f896c3
Merge pull request #82511 from alyssais/rust
rust_1_38, rust_1_42: drop patch version from attr
2020-03-15 18:43:45 +00:00
Vladimír Čunát c82d181120
Merge #82566: gcc: 9.2.0 -> 9.3.0 (into staging) 2020-03-15 16:07:25 +01:00
Vladimír Čunát 855bbb53e4
Merge #82324: mesa: 19.3.3 -> 20.0.1 (into staging) 2020-03-15 11:13:45 +01:00
Michiel Leenaars 2410dbb3c7 Unbound: 1.9.5 -> 1.10.0 2020-03-14 23:32:04 +00:00
adisbladis 2ed1477d86
Merge pull request #82453 from adisbladis/nix-pythonprefix
Python: introduce NIX_PYTHONPREFIX in order to set site.PREFIXES
2020-03-14 21:42:01 +00:00
Frederik Rietdijk 7447fff95a
Fix sys.prefix in case of a Nix env
The prefix will now be correct in case of Nix env.

Note, however, that creating a venv from a Nix env still does not function. This does not seem to be possible
with the current approach either, because venv will copy or symlink our Python wrapper. In case it symlinks
(the default) it won't see a pyvenv.cfg. If it is copied I think it should function but it does not...
2020-03-14 21:39:32 +00:00
adisbladis 753122388d
Python: Add integration test verifying NIX_PYTHONPATH with Mypy 2020-03-14 21:39:32 +00:00
adisbladis 05571d3059
Python Add test for NIX_PYTHONPREFIX 2020-03-14 21:39:31 +00:00
adisbladis d88a7735d2
Python: introduce NIX_PYTHONPREFIX in order to set site.PREFIXES
This is needed in case of `python.buildEnv` to make sure site.PREFIXES
does not only point to the unwrapped executable prefix.

--------------------------------------------------------------------------------

This PR is a story where your valiant hero sets out on a very simple adventure but ends up having to slay dragons, starts questioning his own sanity and finally manages to gain enough knowledge to slay the evil dragon and finally win the proverbial price.

It all started out on sunny spring day with trying to tackle the Nixops plugin infrastructure and make that nice enough to work with.

Our story begins in the shanty town of [NixOps-AWS](https://github.com/nixos/nixops-aws) where [mypy](http://mypy-lang.org/) type checking has not yet been seen.

As our deuteragonist (@grahamc) has made great strides in the capital city of [NixOps](https://github.com/nixos/nixops) our hero wanted to bring this out into the land and let the people rejoice in reliability and a wonderful development experience.

The plugin work itself was straight forward and our hero quickly slayed the first small dragon, at this point things felt good and our hero thought he was going to reach the town of NixOps-AWS very quickly.

But alas! Mypy did not want to go, it said:
`Cannot find implementation or library stub for module named 'nixops'`

Our hero felt a small sliver of life escape from his body. Things were not going to be so easy.

After some frustration our hero discovered there was a [rule of the land of Python](https://www.python.org/dev/peps/pep-0561/) that governed the import of types into the kingdom, more specificaly a very special document (file) called `py.typed`.
Things were looking good.

But no, what the law said did not seem to match reality. How could things be so?

After some frustrating debugging our valiant hero thought to himself "Hmm, I wonder if this is simply a Nix idiosyncrasy", and it turns out indeed it was.
Things that were working in the blessed way of the land of Python (inside a `virtualenv`) were not working the way they were from his home town of Nix (`nix-shell` + `python.withPackages`).

After even more frustrating attempts at reading the mypy documentation and trying to understand how things were supposed to work our hero started questioning his sanity.
This is where things started to get truly interesting.

Our hero started to use a number of powerful weapons, both forged in the land of Python (pdb) & by the mages of UNIX (printf-style-debugging & strace).

After first trying to slay the dragon simply by `strace` and a keen eye our hero did not spot any weak points.
Time to break out a more powerful sword (`pdb`) which also did not divulge any secrets about what was wrong.

Our hero went back to the `strace` output and after a fair bit of thought and analysis a pattern started to emerge. Mypy was looking in the wrong place (i.e. not in in the environment created by `python.withPackages` but in the interpreter store path) and our princess was in another castle!

Our hero went to the pub full of old grumpy men giving out the inner workings of the open source universe (Github) and acquired a copy of Mypy.
He littered the code with print statements & break points.
After a fierce battle full of blood, sweat & tears he ended up in 20f7f2dd71/mypy/sitepkgs.py and realised that everything came down to the Python `site` module and more specifically https://docs.python.org/3.7/library/site.html#site.getsitepackages which in turn relies on https://docs.python.org/3.7/library/site.html#site.PREFIXES .

Our hero created a copy of the environment created by `python.withPackages` and manually modified it to confirm his findings, and it turned out it was indeed the case.
Our hero had damaged the dragon and it was time for a celebration.

He went out and acquired some mead which he ingested while he typed up his story and waited for the dragon to finally die (the commit caused a mass-rebuild, I had to wait for my repro).

In the end all was good in [NixOps-AWS](https://github.com/nixos/nixops-aws)-town and type checks could run. (PR for that incoming tomorrow).
2020-03-14 21:39:31 +00:00
Ryan Mulligan 3be1ae971d
Merge pull request #82554 from r-ryantm/auto-update/libuninameslist
libuninameslist: 20190701 -> 20200313
2020-03-14 13:13:17 -07:00
Frederik Rietdijk dbf125d286 Python: introduce tests for interpreters
This adds tests to the passthru of all Python interpreters.
2020-03-14 15:01:30 +01:00
Graham Christensen 39aac70d74 pythonMinimal: don't include site-customise
Experimenting with patching the site-customize file causes mass
rebuilds for no reason.
2020-03-14 15:02:51 +01:00
Frederik Rietdijk 0c13b0d7d3 Merge staging-next into staging 2020-03-14 14:34:59 +01:00
Frederik Rietdijk 9fd82b3e7e Merge master into staging-next 2020-03-14 14:34:29 +01:00
R. RyanTM 93144e0f4a gitAndTools.stgit: 0.21 -> 0.22 2020-03-14 14:33:20 +01:00
R. RyanTM 699eb40353 libinput: 1.15.2 -> 1.15.3 2020-03-14 14:32:55 +01:00
R. RyanTM 08690436a8 xbps: 0.58 -> 0.59 2020-03-14 14:32:09 +01:00
Frederik Rietdijk bea63a74a6
Merge pull request #82035 from r-ryantm/auto-update/elementary-music
pantheon.elementary-music: 5.0.4 -> 5.0.5
2020-03-14 14:31:40 +01:00
Ryan Mulligan f273034efd
Merge pull request #82452 from r-ryantm/auto-update/atlassian-jira
atlassian-jira: 8.7.0 -> 8.7.1
2020-03-14 06:31:28 -07:00
R. RyanTM 7cb9d8cf42 sunvox: 1.9.5c -> 1.9.5d 2020-03-14 14:31:11 +01:00
R. RyanTM 79586e1b74 tomcat_connectors: 1.2.46 -> 1.2.48 2020-03-14 14:30:51 +01:00
R. RyanTM 63925c1cb9 calibre: 4.11.2 -> 4.12.0 2020-03-14 14:30:28 +01:00
R. RyanTM b577edfa8c plata-theme: 0.9.2 -> 0.9.3 2020-03-14 14:29:56 +01:00
Ryan Mulligan f124f11e50
Merge pull request #82535 from r-ryantm/auto-update/docui
docui: 2.0.0 -> 2.0.4
2020-03-14 06:29:44 -07:00
R. RyanTM 399d3b31d5 libzip: 1.6.0 -> 1.6.1 2020-03-14 14:29:31 +01:00
Frederik Rietdijk 5175c35a99
Merge pull request #81611 from r-ryantm/auto-update/R
R: 3.6.2 -> 3.6.3
2020-03-14 14:29:05 +01:00
R. RyanTM 4615b8b4c3 osinfo-db: 20200203 -> 20200214 2020-03-14 14:28:31 +01:00
R. RyanTM 742b61a9eb sickgear: 0.21.5 -> 0.21.17 2020-03-14 14:28:08 +01:00
R. RyanTM 47b4e97cda opera: 66.0.3515.72 -> 67.0.3575.31 2020-03-14 14:27:49 +01:00
R. RyanTM 08c0568cd9 frostwire-bin: 6.8.3 -> 6.8.4 2020-03-14 14:27:20 +01:00
R. RyanTM d88389048f elisa: 19.12.2 -> 19.12.3 2020-03-14 14:26:52 +01:00