summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-11-19 14:53:29 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-11-19 14:53:29 +0100
commit5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4 (patch)
treec59afebc263ebb1693ae8c154164e5625c30ee76 /pkgs/applications/science
parent801d3b51f0ed2da1745c87eec8da2035d7dd5fb7 (diff)
parentf6b39f852e0a9eb35a7434f02e5579c15519c41c (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/biology/niftyseg/default.nix2
-rw-r--r--pkgs/applications/science/chemistry/octopus/default.nix2
-rw-r--r--pkgs/applications/science/logic/aspino/default.nix2
-rw-r--r--pkgs/applications/science/machine-learning/streamlit/default.nix4
-rw-r--r--pkgs/applications/science/math/glsurf/default.nix4
-rw-r--r--pkgs/applications/science/medicine/aliza/default.nix2
6 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix
index 689d3e42c979..f70054e97716 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/pkgs/applications/science/biology/niftyseg/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg;
description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation";
maintainers = with maintainers; [ bcdarwin ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.bsd3;
};
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 6dec5b3b11f1..d37f8d17336e 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Real-space time dependent density-functional theory code";
- homepage = http://octopus-code.org;
+ homepage = https://octopus-code.org;
maintainers = with maintainers; [ markuskowa ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index d6190942efab..6af7eaf3a5b8 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ gebner ma27 ];
platforms = platforms.unix;
license = licenses.asl20;
- homepage = http://alviano.net/software/maxino/;
+ homepage = https://alviano.net/software/maxino/;
# See pkgs/applications/science/logic/glucose/default.nix
badPlatforms = [ "aarch64-linux" ];
};
diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix
index f3d142739b8f..c7bdf0f12a40 100644
--- a/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/pkgs/applications/science/machine-learning/streamlit/default.nix
@@ -6,12 +6,12 @@
buildPythonApplication rec {
pname = "streamlit";
- version = "0.49.0";
+ version = "0.50.2";
format = "wheel"; # the only distribution available
src = fetchPypi {
inherit pname version format;
- sha256 = "1g12z93yh85vcgf3g9banshllr5fhz8i4f9llymcnk6mafvcsiv7";
+ sha256 = "1wymv7qckafs0p2jdjlxjaf1xrhm3iyd185jkldanbb0na5n3ndz";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index d35e0f0453f7..c11110e4bc49 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "glsurf-3.3.1";
src = fetchurl {
- url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
+ url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz";
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
+ homepage = https://raffalli.eu/~christophe/glsurf/;
description = "A program to draw implicit surfaces and curves";
license = stdenv.lib.licenses.lgpl21;
};
diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
index 218c2c325b6d..e135534d1acf 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/pkgs/applications/science/medicine/aliza/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
meta = {
description = "Medical imaging software with 2D, 3D and 4D capabilities";
- homepage = http://www.aliza-dicom-viewer.com;
+ homepage = https://www.aliza-dicom-viewer.com;
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ mounium ];
platforms = platforms.linux;