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: a7341d70ef3b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6a74718e0067
Choose a head ref
  • 10 commits
  • 11 files changed
  • 2 contributors

Commits on Mar 9, 2018

  1. pythonPackages.periodictable: init at 1.5.0

    This package is a required dependency of SasView, which will be added
    in a later commit.
    rprospero committed Mar 9, 2018
    Copy the full SHA
    e1edb55 View commit details
    Browse the repository at this point in the history
  2. pythonPackages.unittest-xml-reporting: init at 2.1.1

    This package is used by Sasview, which will be added in a later commit.
    rprospero committed Mar 9, 2018
    Copy the full SHA
    db2e6b6 View commit details
    Browse the repository at this point in the history
  3. pythonPackage.bumps: init at 0.7.6

    This package is required by SasView, which will be added in a later commit.
    rprospero committed Mar 9, 2018
    Copy the full SHA
    242e378 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. pythonPackages.sasmodels: init at 0.96

    Sasmodels provides a library of small angle scattering calculations
    that are needed by Sasview, which will be added in my next commit.
    rprospero committed Mar 12, 2018
    Copy the full SHA
    27f14b5 View commit details
    Browse the repository at this point in the history
  2. sasview: init at 4.1.2

    Sasview is a data fitting and analysis package for small angle
    scattering data.  More information can be found at
    https://www.sasview.org.
    
    There is some unfortunate cruft to this commit.  SasView uses the
    xhtml2pdf python package, which has a specific version of html5lib as
    a dependency.  This module manually loads that version into sasview.
    I haven't made xhtml2pdf available as its own package due to these
    circumstances.
    rprospero committed Mar 12, 2018
    Copy the full SHA
    73ed353 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Remove explicit licenses import from python package sasmodels

    The licenses variable was being required by sasmoels, but licenses was
    already a child of the lib parameter and was redundant.
    rprospero committed Mar 21, 2018
    Copy the full SHA
    6093745 View commit details
    Browse the repository at this point in the history
  2. Make xhtml2pdf its own package in python-packages

    xhtml2pdf now uses the main package html5lib with just an override to
    pull the correct version number.
    rprospero committed Mar 21, 2018
    Copy the full SHA
    01c1385 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    068d792 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

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

Commits on Apr 9, 2018

  1. Merge pull request #36852 from rprospero/sasview-for-pr

    sasview: init at 4.1.2
    matthewbauer committed Apr 9, 2018
    Copy the full SHA
    6a74718 View commit details
    Browse the repository at this point in the history