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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bd51071ca134
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f0aba000b89
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 18, 2019

  1. pythonPackages.gsd: freeze at 1.7.0

    Jonathan Ringer committed Oct 18, 2019
    Copy the full SHA
    697be75 View commit details

  2. python3Packages.gsd: 1.7.0 -> 1.9.3

    Jonathan Ringer committed Oct 18, 2019
    Copy the full SHA
    8f0aba0 View commit details
Showing with 46 additions and 12 deletions.
  1. +27 −0 pkgs/development/python-modules/gsd/1.7.nix
  2. +15 −11 pkgs/development/python-modules/gsd/default.nix
  3. +4 −1 pkgs/top-level/python-packages.nix
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/gsd/1.7.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, numpy
}:

buildPythonPackage rec {
version = "1.7.0";
pname = "gsd";

src = fetchPypi {
inherit pname version;
sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp";
};

propagatedBuildInputs = [ numpy ];

# tests not packaged with gsd
doCheck = false;

meta = with stdenv.lib; {
homepage = https://bitbucket.org/glotzer/gsd;
description = "General simulation data file format";
license = licenses.bsd2;
maintainers = [ maintainers.costrouc ];
};
}
26 changes: 15 additions & 11 deletions pkgs/development/python-modules/gsd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, numpy
, pytest
}:

buildPythonPackage rec {
version = "1.7.0";
version = "1.9.3";
pname = "gsd";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp";
src = fetchFromGitHub {
owner = "glotzerlab";
repo = pname;
rev = "v${version}";
sha256 = "07hw29r2inyp493dia4fx3ysfr1wxi2jb3n9cmwdi0l54s2ahqvf";
};

propagatedBuildInputs = [ numpy ];

# tests not packaged with gsd
doCheck = false;
checkInputs = [ pytest ];
checkPhase = ''
pytest
'';

meta = with stdenv.lib; {
homepage = https://bitbucket.org/glotzer/gsd;
meta = with lib; {
description = "General simulation data file format";
homepage = "https://github.com/glotzerlab/gsd";
license = licenses.bsd2;
maintainers = [ maintainers.costrouc ];
};
5 changes: 4 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -643,7 +643,10 @@ in {
inherit (pkgs) graphviz;
};

gsd = callPackage ../development/python-modules/gsd { };
gsd = if isPy27 then
callPackage ../development/python-modules/gsd/1.7.nix { }
else
callPackage ../development/python-modules/gsd { };

gssapi = callPackage ../development/python-modules/gssapi {
inherit (pkgs) darwin krb5Full;