Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 1a04bd44145d
head repository: NixOS/nixpkgs-channels
compare: 1a69b3303f3a
- 18 commits
- 12 files changed
- 12 contributors
Commits on Dec 9, 2018
Commits on Dec 10, 2018
Commits on Dec 11, 2018
-
libcouchbase: tests can't run in parallel
70e2b0b turned on parallel checking for cmake by default. This doesn't work for libcouchebase.
-
Nathan van Doorn committed
Dec 11, 2018 -
Merge pull request #51862 from Taneb/metamath-update
metamath: 0.167 -> 0.168
-
credstash: add standalone Python application (#51807)
credstash was only available as a library. Provide it as a standalone application as well. In order for this to work, I needed to remove the copy of the library that's placed in $out/bin and marked executable during the install phase. Other than the patched shebang and executable bit, it's identical to the library that's installed to $out/lib/python3.7/site-packages. Before the postFixup has run `wrapPythonPrograms`, $out/bin contains two Python files -- credstash and credstash.py -- where bin/credstash is the executable you'd expect a user to invoke from the command-line and bin/credstash.py contains the credstash module, which bin/credstash imports. After `wrapPythonPrograms` has run, bin/credstash is a shell wrapper around the bin/.credstash-wrapped python entrypoint, and bin/credstash.py is shell wrapper around bin/.credstash.py-wrapped. Invoking bin/credstash execs bin/.credstash-wrapped, and that python script attempts to import the credstash module from bin/credstash.py, the shell wrapper, rather than either bin/.credstash.py-wrapped or lib/python3.7/site-packages/credstash.py. This leads to an error: $ credstash get mykey Traceback (most recent call last): File "/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin/.credstash-wrapped", line 8, in <module> from credstash import main File "/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin/credstash.py", line 2 export PATH='/nix/store/6lm4gi5iv8fbf1b1mm6g3gfnnv63f1gn-python3-3.7.1/bin:/nix/store/hk6yma716w6141lcdh509d6qyyi7zm0i-python3.7-credstash-1.15.0/bin:/nix/store/2n13gf1zdr39ir5dynxlkqndxgy36g08-python3.7-setuptools-40.4.3/bin:/nix/store/mhnqwpa4y1l81zi4cwx989i8h8z9g67l-python3.7-jmespath-0.9.0/bin:/nix/store/qc6q3a2nv4211wyh7q319v6zzd3ab6pc-python3.7-docutils-0.14/bin'${PATH:+':'}$PATH ^ SyntaxError: invalid syntax If we try using `dontWrapPythonPrograms` to resolve this, runtime dependency lookups fail: $ credstash get mykey Traceback (most recent call last): File "/run/current-system/sw/bin/credstash", line 7, in <module> from credstash import main File "/nix/store/8rmldlvlv1z1xl7w02dy7f5qhkzdrg8z-python3.7-credstash-1.15.0/bin/credstash.py", line 26, in <module> import boto3 ModuleNotFoundError: No module named 'boto3' I was able to resolve things by simply removing bin/credstash.py before the postFixup phase has a chance to wrap any executables. Now the executable imports the library correctly: (shell wrapper) bin/credstash │ (python executable) └─> bin/.credstash-wrapped │ (python library) └─> lib/python3.7/site-packages/credstash.py
-
Merge pull request #51861 from hedning/fix-libcouchbase-test
libcouchbase: tests can't run in parallel
-
-
Merge pull request #51855 from samueldr/auto/dbeaver/nixpkgs-unstable…
…/5.3.0 dbeaver: 5.2.5 -> 5.3.0
-
Merge pull request #51851 from veprbl/pr/rivet_bump
rivet: 2.6.1 -> 2.6.2
-
Merge pull request #51814 from peterhoeg/u/pio
platformio: 3.6.1 -> 3.6.2
-
Merge pull request #51788 from plumelo/feature/distrobuilder
distrobuilder: 2018_06_29 -> 2018_10_04
-
wavebox: Update & Clean Dependencies
David McKay committedDec 11, 2018 -
David McKay committed
Dec 11, 2018 -
Merge pull request #51865 from rawkode/feature/fix-wavebox-deps
wavebox: 4.5.3 -> 4.5.5
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 1a04bd44145d...1a69b3303f3a