Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sasview: unstable -> 4.2.0 #48565

Merged
merged 2 commits into from Oct 18, 2018
Merged

Sasview: unstable -> 4.2.0 #48565

merged 2 commits into from Oct 18, 2018

Conversation

rprospero
Copy link
Contributor

Motivation for this change

Upgraded sasview from an old unstable commit to the recently released version 4.2.0.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@@ -17,7 +17,7 @@ in

python.pkgs.buildPythonApplication rec {
pname = "sasview";
version = "unstable-2018-05-05";
version = "v4.2.0";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version = "4.2.0";

@@ -60,8 +60,8 @@ python.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "SasView";
repo = "sasview";
rev = "de431924d0ddf73cfb952df88bd6661181947019";
sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg";
rev = "v4.2.0";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rev = "v${version}";

pname = "sasmodels-unstable";
version = "2018-04-27";
pname = "sasmodels";
version = "v0.98";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.


src = fetchFromGitHub {
owner = "SasView";
repo = "sasmodels";
rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2";
sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85";
rev = "v0.98";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

@FRidh
Copy link
Member

FRidh commented Oct 17, 2018

Please rebase instead of merge.

@rprospero
Copy link
Contributor Author

Rebased with the requested changes

@Mic92 Mic92 merged commit 02405cf into NixOS:master Oct 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants