Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: 1a04bd44145d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 1a69b3303f3a
Choose a head ref
  • 18 commits
  • 12 files changed
  • 12 contributors

Commits on Dec 9, 2018

  1. Copy the full SHA
    efe8be7 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. yoda: 1.7.3 -> 1.7.4

    veprbl committed Dec 10, 2018
    Copy the full SHA
    7726c8b View commit details
    Browse the repository at this point in the history
  2. rivet: 2.6.1 -> 2.6.2

    veprbl committed Dec 10, 2018
    Copy the full SHA
    99d4e65 View commit details
    Browse the repository at this point in the history
  3. dbeaver: 5.2.5 -> 5.3.0

    samueldr committed Dec 10, 2018
    Copy the full SHA
    1c3079f View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

  1. platformio: 3.6.1 -> 3.6.2

    Broken on aarch64.
    peterhoeg committed Dec 11, 2018
    Copy the full SHA
    796d270 View commit details
    Browse the repository at this point in the history
  2. libcouchbase: tests can't run in parallel

    70e2b0b turned on parallel checking for cmake
    by default. This doesn't work for libcouchebase.
    hedning committed Dec 11, 2018
    Copy the full SHA
    7cadf5f View commit details
    Browse the repository at this point in the history
  3. metamath: 0.167 -> 0.168

    Nathan van Doorn committed Dec 11, 2018
    Copy the full SHA
    69ee0a8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #51862 from Taneb/metamath-update

    metamath: 0.167 -> 0.168
    alyssais committed Dec 11, 2018
    Copy the full SHA
    3bfef3f View commit details
    Browse the repository at this point in the history
  5. 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
    ivanbrennan authored and dotlambda committed Dec 11, 2018
    Copy the full SHA
    ca8b128 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #51861 from hedning/fix-libcouchbase-test

    libcouchbase: tests can't run in parallel
    hedning committed Dec 11, 2018
    Copy the full SHA
    f07d5d1 View commit details
    Browse the repository at this point in the history
  7. doc: Fix insecure nginx docs (#51840)

    jappeace authored and Mic92 committed Dec 11, 2018
    Copy the full SHA
    e576c3b View commit details
    Browse the repository at this point in the history
  8. Merge pull request #51855 from samueldr/auto/dbeaver/nixpkgs-unstable…

    …/5.3.0
    
    dbeaver: 5.2.5 -> 5.3.0
    srhb committed Dec 11, 2018
    Copy the full SHA
    b960d1a View commit details
    Browse the repository at this point in the history
  9. Merge pull request #51851 from veprbl/pr/rivet_bump

    rivet: 2.6.1 -> 2.6.2
    srhb committed Dec 11, 2018
    Copy the full SHA
    4d34cfc View commit details
    Browse the repository at this point in the history
  10. Merge pull request #51814 from peterhoeg/u/pio

    platformio: 3.6.1 -> 3.6.2
    srhb committed Dec 11, 2018
    Copy the full SHA
    29860f2 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #51788 from plumelo/feature/distrobuilder

    distrobuilder: 2018_06_29 -> 2018_10_04
    srhb committed Dec 11, 2018
    Copy the full SHA
    6449501 View commit details
    Browse the repository at this point in the history
  12. wavebox: Update & Clean Dependencies

    David McKay committed Dec 11, 2018
    Copy the full SHA
    8ad1ef1 View commit details
    Browse the repository at this point in the history
  13. Adhere to Styleguide

    David McKay committed Dec 11, 2018
    Copy the full SHA
    eb1e6bf View commit details
    Browse the repository at this point in the history
  14. Merge pull request #51865 from rawkode/feature/fix-wavebox-deps

    wavebox: 4.5.3 -> 4.5.5
    alyssais committed Dec 11, 2018
    Copy the full SHA
    1a69b33 View commit details
    Browse the repository at this point in the history