Skip to content
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
base: ebc9e7a2017e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 929ae39dbe3b
Choose a head ref
  • 8 commits
  • 5 files changed
  • 2 contributors

Commits on Apr 11, 2017

  1. Configuration menu
    Copy the full SHA
    669f581 View commit details
    Browse the repository at this point in the history
  2. passlib: switch from insecure pybcrypt to bcrypt

    Also propagated bcrypt so that
    downstream dependencies are able to use the bcrypt backend.
    aneeshusa committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    0168e48 View commit details
    Browse the repository at this point in the history
  3. radicale: Add NixOS test with Python 2

    Includes testing bcrypt authentication.
    aneeshusa committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    189479a View commit details
    Browse the repository at this point in the history
  4. radicale: Remove optional deps on Python 3

    None of these dependencies is required for radicale to function,
    and flup in particular prevents usage with Python 3.
    aneeshusa committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    8ce337f View commit details
    Browse the repository at this point in the history
  5. 1 Configuration menu
    Copy the full SHA
    9821f82 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a3143b1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8f4d778 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2017

  1. Merge pull request #22683 from aneeshusa/add-nixos-test-for-radicale

    Add nixos test for radicale
    7c6f434c committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    929ae39 View commit details
    Browse the repository at this point in the history