Commit Graph

7105 Commits

Author SHA1 Message Date
Ivan
ca8b128aa1 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
2018-12-11 10:49:27 +01:00
edef
995d224f44 Merge pull request #51664 from erictapen/tlslite-ng-init
pythonPackages.tlslite-ng: init at 0.7.5, migrate tlslite references to it, delete tlslite
2018-12-10 13:03:27 +00:00
Justin Humm
93bf0a02f5 pythonPackages.tlslite: delete, migrate refs to pythonPackages.tlslite-ng
tlslite has a test failure on Python 3.7 [0]. @tomato42, a commiter of
tlslite and author of tlslite-ng said, that tlslite is abandoned (last
commit 2015) and tlslite-ng should be used as a drop in replacement.

[0] https://github.com/trevp/tlslite/issues/121
2018-12-10 13:45:45 +01:00
Florian Jacob
02a1851362 pelican: 3.7.1 -> 4.0.1 2018-12-08 17:33:14 +01:00
Frederik Rietdijk
3e950d584c Merge staging-next into master 2018-12-08 16:29:21 +01:00
Ioannis Koutras
07e956171d shiboken: add support for Python 3.7 2018-12-08 15:57:47 +02:00
Mario Rodas
6e54e95616 pythonPackages.rednose: fix build on darwin 2018-12-07 10:31:23 -05:00
Justin Humm
09991d40e6 pythonPackages.tlslite-ng: init at 0.7.5 2018-12-07 15:28:55 +01:00
Frederik Rietdijk
5f554279ec Merge master into staging-next 2018-12-07 15:22:35 +01:00
Ioannis Koutras
6b5963ea22 python: pylint: 2.1.1 -> 2.2.2 2018-12-06 22:12:22 +02:00
Ioannis Koutras
ce728ce496 python: astroid: 2.0.4 -> 2.1.0 2018-12-06 22:12:09 +02:00
Robert Schütz
b8c76cbd99 Merge pull request #51610 from peterhoeg/u/octo
octoprint: 1.3.8 -> 1.3.9
2018-12-06 14:43:58 +01:00
Peter Hoeg
129502ec3f pythonPackages.flask_login: fetch from PyPi so we can override the version 2018-12-06 12:40:42 +08:00
Mario Rodas
8af15af15c pythonPackages.flake8-future-import: fix build on Python 3.7 2018-12-05 19:37:06 -05:00
Chris Ostrouchov
47f54a48bd pythonPackages.parsimonious: 0.7.0 -> 0.8.1 2018-12-05 12:05:17 -05:00
Alexey Shmalko
d5090fe57c Merge pull request #51542 from marsam/feature/update-python-svgwrite
pythonPackages.svgwrite: 1.1.6 -> 1.2.1
2018-12-05 13:44:44 +02:00
Jörg Thalheim
4e45eab9f7 Merge pull request #51513 from gnidorah/python-fontconfig
pythonPackages.python-fontconfig: regenerate sources using cython
2018-12-05 11:23:26 +00:00
Florian Klink
99c37b0d86 Merge pull request #51547 from marsam/fix-curtsies-build
pythonPackages.curtsies: fix build
2018-12-05 11:52:45 +01:00
Robert Schütz
8f2d5e6d07 Merge pull request #50308 from Synthetica9/arrelle-update
pythonPackages.arelle: 2017-08-24 -> 18.3
2018-12-05 10:50:37 +01:00
Mario Rodas
d9f90bae6d pythonPackages.curtsies: fix build 2018-12-04 23:01:45 -05:00
Mario Rodas
e728f2dab5 pythonPackages.qasm2image: fix build 2018-12-04 22:23:34 -05:00
Mario Rodas
c564ca83ee pythonPackages.CairoSVG: 2.1.3 -> 2.2.1 2018-12-04 22:21:43 -05:00
Mario Rodas
e8bfc317fd pythonPackages.svgwrite: 1.1.6 -> 1.2.1 2018-12-04 21:41:08 -05:00
worldofpeace
572b514582 Merge pull request #51229 from marsam/feature/fedpkg-cleanup
fedpkg: remove unneeded patch
2018-12-04 21:15:32 -05:00
Patrick Hilhorst
eaef9bc7d6 pythonPackages.arelle: 2017-08-24 -> 18.3 2018-12-04 21:11:05 +01:00
worldofpeace
e7ff7b9318 Merge pull request #51253 from worldofpeace/pywbem-update
pythonPackages.pywbem: 0.10.0 -> 0.12.6
2018-12-04 12:58:19 -05:00
gnidorah
445f79af1c pythonPackages.python-fontconfig: regenerate sources using cython 2018-12-04 20:22:26 +03:00
Tor Hedin Brønner
4361e50615 Revert "python: pyjwt: fix build"
This reverts commit bcf736b325.

28cdb6e841 fixed the issue with pytest-3.9.0.
2018-12-04 16:43:01 +01:00
Jörg Thalheim
49a9bd626d Merge pull request #51501 from timokau/pygraphviz-path
python.pkgs.pygraphviz: add graphviz path
2018-12-04 10:52:08 +00:00
Timo Kaufmann
21de751e74 python.pkgs.pygraphviz: add graphviz path 2018-12-04 11:44:40 +01:00
Benjamin Smith
83f782f175 Add mock to the list of whisper's test inputs.
This was required as the versiof whisper was upgraded from
1.1.3 to 1.1.4 and mock was added as a test dependency in
that release:
703dd9d3a6 (diff-62849af500c571aa4532da7be8833e73R14)
2018-12-03 14:20:25 -08:00
Frederik Rietdijk
a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
Renaud
e869896d00 Merge pull request #51411 from jfrankenau/update-ntfy
ntfy: 2.6.0 -> 2.7.0
2018-12-03 11:31:53 +01:00
Timo Kaufmann
5f2b8de75c Revert "pythonPackages.cypari2: 1.3.1 -> 2.0.1 (#49446)" (#51414)
This reverts commit d9b650f4cc.

The update is causing segfaults. See
https://trac.sagemath.org/ticket/26442.
2018-12-03 00:44:33 +01:00
Mario Rodas
be2e63edc4 pythonPackages.sybil: fix build (#51392) 2018-12-02 23:12:16 +01:00
Jörg Thalheim
5ae9250c3b Merge pull request #51381 from marsam/feature/update-python-effect
pythonPackages.effect: 0.11.0 -> 0.12.0
2018-12-02 19:06:16 +00:00
Daiderd Jordan
0e6e8c1305 Merge pull request #51311 from FRidh/docutils
python.pkgs.docutils: set LANG in case of darwin and python3
2018-12-02 19:24:51 +01:00
Mario Rodas
ffb5ebe9e0 pythonPackages.effect: 0.11.0 -> 0.12.0 2018-12-02 11:41:20 -05:00
Gabriel Ebner
9e8f6176e5 pythonPackages.ruamel_yaml: 0.15.35 -> 0.15.80
This fixes the build error with Python 3.7.
2018-12-02 17:31:47 +01:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
c0bw3b
0f868d8116 Treewide: use HTTPS on SourceForge 2018-12-02 15:33:08 +01:00
Jan Tojnar
a51a99c690 gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Mario Rodas
c220fe8e88 fedpkg: promote to python application 2018-12-01 10:59:34 -05:00
Mario Rodas
7905c38c74 fedpkg: fix patch 2018-12-01 10:37:31 -05:00
Jörg Thalheim
5e9922e800 python3.pkgs.unicorn: enable python3 2018-12-01 14:13:46 +00:00
Jörg Thalheim
13b5fa18bb python3.pkgs.flask-socketio: init at 3.1.0 2018-12-01 14:13:46 +00:00
Jörg Thalheim
3ad4a31c17 python3.pkgs.pygdbmi: init at 0.9.0.0 2018-12-01 14:13:46 +00:00
Jörg Thalheim
5b23da0595 python3.pkgs.python-socketio: init at 2.1.0 2018-12-01 14:13:46 +00:00
Jörg Thalheim
5e591a0087 python3.pkgs.python-engineio: init at 3.0.0 2018-12-01 14:13:46 +00:00
Timo Kaufmann
d9b650f4cc pythonPackages.cypari2: 1.3.1 -> 2.0.1 (#49446) 2018-12-01 12:57:55 +01:00