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

Merge pull request #110824 from SuperSandro2000/fix-collection5

Browse Source
This commit is contained in:
Sandro 2021-01-31 00:35:55 +01:00 committed by GitHub
commit d0dc21f539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -4079,6 +4079,12 @@
githubId = 45598;
name = "William Casarin";
};
jbcrail = {
name = "Joseph Crail";
email = "jbcrail@gmail.com";
github = "jbcrail";
githubId = 6038;
};
jbedo = {
email = "cu@cua0.org";
github = "jbedo";
@ -10572,10 +10578,4 @@
github = "zupo";
githubId = 311580;
};
jbcrail = {
name = "Joseph Crail";
email = "jbcrail@gmail.com";
github = "jbcrail";
githubId = 6038;
};
}

4
pkgs/applications/audio/linuxband/default.nix
View File

@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
pname = "linuxband";
src = fetchurl {
url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
url = "https://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment";
homepage = "http://linuxband.org/";
homepage = "https://linuxband.org/";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.linux;

2
pkgs/applications/audio/qmmp/default.nix
View File

@ -12,7 +12,7 @@
}:
# Additional plugins that can be added:
# wavpack (http://www.wavpack.com/)
# wavpack (https://www.wavpack.com/)
# gme (Game music support)
# Ogg Opus support
# BS2B effect plugin (http://bs2b.sourceforge.net/)

3
pkgs/applications/misc/rofimoji/default.nix
View File

@ -38,6 +38,9 @@ buildPythonApplication rec {
substituteInPlace setup.py --replace 'pyxdg==0.26' 'pyxdg'
'';
# no tests executed
doCheck = false;
meta = with lib; {
description = "A simple emoji and character picker for rofi";
homepage = "https://github.com/fdw/rofimoji";

2
pkgs/applications/misc/snowmachine/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A python script that will make your terminal snow";
homepage = "http://github.com/sontek/snowmachine";
homepage = "https://github.com/sontek/snowmachine";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ djanatyn ];
};

2
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
++ optional sslSupport "--enable-ssl";
meta = {
homepage = "http://sylpheed.sraoss.jp/en/";
homepage = "https://sylpheed.sraoss.jp/en/";
description = "Lightweight and user-friendly e-mail client";
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin;

3
pkgs/applications/office/qnotero/default.nix
View File

@ -26,6 +26,9 @@ python3Packages.buildPythonPackage rec {
wrapQtApp "$out"/bin/qnotero
'';
# no tests executed
doCheck = false;
meta = {
description = "Quick access to Zotero references";
homepage = "http://www.cogsci.nl/software/qnotero";

4
pkgs/applications/science/logic/clprover/clprover.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation {
version = "1.0.3";
src = fetchzip {
url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip";
url = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip";
sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s";
stripRoot = false;
};
@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Resolution-based theorem prover for Coalition Logic implemented in C++";
homepage = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/";
homepage = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/";
license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3
maintainers = with maintainers; [ mgttlinger ];
platforms = [ "x86_64-linux" ];

2
pkgs/applications/science/math/ginac/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GiNaC is Not a CAS";
homepage = "http://www.ginac.de/";
homepage = "https://www.ginac.de/";
maintainers = with maintainers; [ lovek323 ];
license = licenses.gpl2;
platforms = platforms.all;

2
pkgs/development/libraries/ndn-cxx/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "http://named-data.net/";
homepage = "https://named-data.net/";
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
longDescription = ''
ndn-cxx is a C++ library, implementing Named Data Networking (NDN)

12
pkgs/development/node-packages/node-packages.nix generated
View File

@ -64655,7 +64655,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The browser package manager";
homepage = http://bower.io/;
homepage = https://bower.io/;
license = "MIT";
};
production = true;
@ -81529,7 +81529,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
homepage = http://github.com/remy/inliner;
homepage = https://github.com/remy/inliner;
license = "MIT";
};
production = true;
@ -83404,7 +83404,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = http://jshint.com/;
homepage = https://jshint.com/;
license = "MIT";
};
production = true;
@ -91362,7 +91362,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Low-code programming for event-driven applications";
homepage = http://nodered.org/;
homepage = https://nodered.org/;
license = "Apache-2.0";
};
production = true;
@ -95346,7 +95346,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Production process manager for Node.JS applications with a built-in load balancer.";
homepage = http://pm2.keymetrics.io/;
homepage = https://pm2.keymetrics.io/;
license = "AGPL-3.0";
};
production = true;
@ -110719,7 +110719,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "CLI tool for running Yeoman generators";
homepage = http://yeoman.io/;
homepage = https://yeoman.io/;
license = "BSD-2-Clause";
};
production = true;

9
pkgs/development/python-modules/capturer/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytest, pytestcov }:
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }:
buildPythonPackage rec {
pname = "capturer";
@ -13,10 +13,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ humanfriendly ];
checkPhase = ''
PATH=$PATH:$out/bin pytest .
'';
checkInputs = [ pytest ];
# hangs on darwin
doCheck = !stdenv.isDarwin;
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Easily capture stdout/stderr of the current process and subprocesses";

3
pkgs/development/python-modules/coloredlogs/default.nix
View File

@ -8,7 +8,6 @@
, pytest
, mock
, util-linux
, isPy38
}:
buildPythonPackage rec {
@ -24,7 +23,7 @@ buildPythonPackage rec {
# capturer is broken on darwin / py38, so we skip the test until a fix for
# https://github.com/xolox/python-capturer/issues/10 is released.
doCheck = !(isPy38 && stdenv.isDarwin);
doCheck = !stdenv.isDarwin;
checkPhase = ''
PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
and not test_auto_install"

7
pkgs/development/python-modules/gym/default.nix
View File

@ -12,13 +12,6 @@ buildPythonPackage rec {
sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \
--replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2"
'';
# cloudpickle range has been expanded in package but not yet released
propagatedBuildInputs = [
numpy requests six pyglet scipy cloudpickle
];

2
pkgs/development/python-modules/mpmath/default.nix
View File

@ -16,7 +16,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
homepage = "http://mpmath.org/";
homepage = "https://mpmath.org/";
description = "A pure-Python library for multiprecision floating arithmetic";
license = licenses.bsd3;
maintainers = with maintainers; [ lovek323 ];

5
pkgs/development/python-modules/pyres/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
let
@ -31,6 +31,9 @@ buildPythonPackage rec {
sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y";
};
# started redis-server makes this hang on darwin
doCheck = !stdenv.isDarwin;
checkPhase = ''
redis-server &
nosetests . --exclude test_worker_pids

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

@ -1,7 +1,6 @@
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k
, numpy
, pyqt5
, nose
}:
buildPythonPackage rec {
@ -14,15 +13,14 @@ buildPythonPackage rec {
sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365";
};
checkInputs = [
nose
];
propagatedBuildInputs = [
numpy
pyqt5
];
# no tests executed
doCheck = false;
meta = {
homepage = "https://github.com/hmeine/qimage2ndarray";
description = "A small python extension for quickly converting between QImages and numpy.ndarrays (in both directions)";

2
pkgs/development/python-modules/urwid/default.nix
View File

@ -21,7 +21,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A full-featured console (xterm et al.) user interface library";
homepage = "http://excess.org/urwid";
homepage = "https://excess.org/urwid";
repositories.git = "git://github.com/wardi/urwid.git";
license = licenses.lgpl21;
maintainers = with maintainers; [ ];

2
pkgs/development/web/remarkjs/node-packages.nix generated
View File

@ -3871,7 +3871,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = "http://jshint.com/";
homepage = "https://jshint.com/";
license = "(MIT AND JSON)";
};
production = true;

2
pkgs/misc/cups/drivers/dymo/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "CUPS Linux drivers and SDK for DYMO printers";
homepage = "http://www.dymo.com/";
homepage = "https://www.dymo.com/";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ makefu ];
};

4
pkgs/os-specific/linux/speedometer/default.nix
View File

@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
version = "2.8";
src = fetchurl {
url = "http://excess.org/speedometer/speedometer-${version}.tar.gz";
url = "https://excess.org/speedometer/speedometer-${version}.tar.gz";
sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm";
};
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
meta = with lib; {
description = "Measure and display the rate of data across a network connection or data being stored in a file";
homepage = "http://excess.org/speedometer/";
homepage = "https://excess.org/speedometer/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ Baughn ];

2
pkgs/tools/misc/disper/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "On-the-fly display switch utility";
homepage = "http://willem.engen.nl/projects/disper/";
homepage = "https://willem.engen.nl/projects/disper/";
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};

2
pkgs/tools/misc/mimeo/default.nix
View File

@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Open files by MIME-type or file name using regular expressions";
homepage = "http://xyne.archlinux.ca/projects/mimeo/";
homepage = "https://xyne.archlinux.ca/projects/mimeo/";
license = [ licenses.gpl2 ];
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;

2
pkgs/tools/system/vbetool/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Video BIOS execution tool";
homepage = "http://www.codon.org.uk/~mjg59/vbetool/";
homepage = "https://www.codon.org.uk/~mjg59/vbetool/";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2;