JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48565 from rprospero/sasview-4.2.0

Browse Source 
Sasview: unstable -> 4.2.0
This commit is contained in:
Jörg Thalheim 2018-10-18 21:44:25 +01:00 committed by GitHub
commit 02405cfe83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/misc/sasview/default.nix
View File

@ -17,7 +17,7 @@ in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "sasview"; pname = "sasview";
version = "unstable-2018-05-05"; version = "4.2.0";
checkInputs = with python.pkgs; [ checkInputs = with python.pkgs; [
pytest pytest
@ -60,8 +60,8 @@ python.pkgs.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SasView"; owner = "SasView";
repo = "sasview"; repo = "sasview";
rev = "de431924d0ddf73cfb952df88bd6661181947019"; rev = "v${version}";
sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg"; sha256 = "0k3486h46k6406h0vla8h68fd78wh3dcaq5w6f12jh6g4cjxv9qa";
}; };
patches = [ ./pyparsing-fix.patch ./local_config.patch ]; patches = [ ./pyparsing-fix.patch ./local_config.patch ];

8
pkgs/development/python-modules/sasmodels/default.nix
View File

@ -3,14 +3,14 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "sasmodels-unstable"; pname = "sasmodels";
version = "2018-04-27"; version = "0.98";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SasView"; owner = "SasView";
repo = "sasmodels"; repo = "sasmodels";
rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2"; rev = "v${version}";
sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85"; sha256 = "02y4lpjwaa73pr46ylk0pw0kbill4nfzqgnfv16v5m0z9smd76ir";
}; };
buildInputs = [ opencl-headers ]; buildInputs = [ opencl-headers ];