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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-13 18:15:31 +00:00 committed by GitHub
commit 73af09dfc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 132 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -6701,6 +6701,12 @@
githubId = 1449319; githubId = 1449319;
name = "Pacien Tran-Girard"; name = "Pacien Tran-Girard";
}; };
pacman99 = {
email = "pachum99@gmail.com";
github = "Pacman99";
githubId = 16345849;
name = "Parthiv Seetharaman";
};
paddygord = { paddygord = {
email = "pgpatrickgordon@gmail.com"; email = "pgpatrickgordon@gmail.com";
github = "paddygord"; github = "paddygord";

51
pkgs/applications/misc/deadd-notification-center/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ stdenv
, fetchurl
, autoPatchelfHook
, gtk3
, gobject-introspection
, libxml2
}:
let
version = "1.7.2";
dbusService = fetchurl {
url = "https://github.com/phuhl/linux_notification_center/raw/${version}/com.ph-uhl.deadd.notification.service.in";
sha256 = "0jvmi1c98hm8x1x7kw9ws0nbf4y56yy44c3bqm6rjj4lrm89l83s";
};
in
stdenv.mkDerivation rec {
inherit version;
pname = "deadd-notification-center";
src = fetchurl {
url = "https://github.com/phuhl/linux_notification_center/releases/download/${version}/${pname}";
sha256 = "13f15slkjiw2n5dnqj13dprhqm3nf1k11jqaqda379yhgygyp9zm";
};
dontUnpack = true;
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
gtk3
gobject-introspection
libxml2
];
installPhase = ''
mkdir -p $out/bin $out/share/dbus-1/services
cp $src $out/bin/deadd-notification-center
chmod +x $out/bin/deadd-notification-center
sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service
'';
meta = with stdenv.lib; {
description = "A haskell-written notification center for users that like a desktop with style";
homepage = "https://github.com/phuhl/linux_notification_center";
license = licenses.bsd3;
maintainers = [ maintainers.pacman99 ];
platforms = platforms.linux;
};
}

10
pkgs/applications/misc/ipmiview/default.nix
View File

@ -13,12 +13,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "IPMIView"; pname = "IPMIView";
version = "2.17.0"; version = "2.18.0";
buildVersion = "200505"; buildVersion = "201007";
src = fetchurl { src = fetchurl {
url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
sha256 = "0ba0694krj2q77zwdn22v2qzjdy52a7ryhgc3m51s7p17ahigz97"; sha256 = "10cv63yhh81gjxahsg4y3zp4mjivc217m4z1vcpwvvnds46c65h8";
}; };
nativeBuildInputs = [ patchelf makeWrapper ]; nativeBuildInputs = [ patchelf makeWrapper ];
@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
'' ''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM_v11_64.so
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
''; '';
@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
# WORK_DIR: unfortunately the ikvm related binaries are loaded from # WORK_DIR: unfortunately the ikvm related binaries are loaded from
# and user configuration is written to files in the CWD # and user configuration is written to files in the CWD
makeWrapper $out/jre/bin/java $out/bin/IPMIView \ makeWrapper $out/jre/bin/java $out/bin/IPMIView \
--set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \ --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \
--prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \
--add-flags "-jar $out/IPMIView20.jar" \ --add-flags "-jar $out/IPMIView20.jar" \
--run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview

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

@ -66,7 +66,6 @@ python3Packages.buildPythonApplication rec {
mock mock
pytest pytest
pytest-mock pytest-mock
pytestpep8
xvfb_run xvfb_run
]; ];
@ -95,7 +94,7 @@ python3Packages.buildPythonApplication rec {
# skip tests in invocation that handle paths that # skip tests in invocation that handle paths that
# aren't nix friendly (i think) # aren't nix friendly (i think)
xvfb-run -s '-screen 0 1024x768x16' \ xvfb-run -s '-screen 0 1024x768x16' \
pytest -k 'not TestPath and not test_handle_key_press_event' --pep8 tests pytest -k 'not TestPath and not test_handle_key_press_event' tests
runHook postCheck runHook postCheck
''; '';

4
pkgs/development/libraries/cddlib/default.nix
View File

@ -7,12 +7,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cddlib"; pname = "cddlib";
version = "0.94l"; version = "0.94m";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cddlib"; owner = "cddlib";
repo = "cddlib"; repo = "cddlib";
rev = version; rev = version;
sha256 = "0934a0i2m2bamlibi4cbrf1md1pz7dp35jbfamb0k7x644sayl4k"; sha256 = "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0";
}; };
buildInputs = [gmp]; buildInputs = [gmp];
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock, pytestpep8 { stdenv, buildPythonPackage, fetchPypi, pytest, pytestcov, mock
, pytest_xdist, covCore, glibcLocales }: , pytest_xdist, covCore, glibcLocales }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,7 +16,6 @@ buildPythonPackage rec {
pytest pytest
pytestcov pytestcov
mock mock
pytestpep8
pytest_xdist pytest_xdist
covCore covCore
]; ];

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

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, tatsu, arrow , tatsu, arrow
, pytestCheckHook, pytestpep8, pytest-flakes , pytestCheckHook, pytest-flakes
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -20,9 +20,10 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "arrow>=0.11,<0.15" "arrow" --replace "arrow>=0.11,<0.15" "arrow"
substituteInPlace setup.cfg --replace "--pep8" ""
''; '';
checkInputs = [ pytestCheckHook pytestpep8 pytest-flakes ]; checkInputs = [ pytestCheckHook pytest-flakes ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Pythonic and easy iCalendar library (RFC 5545)"; description = "Pythonic and easy iCalendar library (RFC 5545)";

4
pkgs/development/python-modules/jsonlines/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, buildPythonPackage, six { lib, fetchFromGitHub, buildPythonPackage, six
, flake8, pep8-naming, pytest, pytestcov, pytestpep8 }: , flake8, pep8-naming, pytest, pytestcov }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "jsonlines"; pname = "jsonlines";
@ -14,7 +14,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];
checkInputs = [ flake8 pep8-naming pytest pytestcov pytestpep8 ]; checkInputs = [ flake8 pep8-naming pytest pytestcov ];
checkPhase = '' checkPhase = ''
pytest pytest
''; '';

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

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, pytest, pytestcov, pytestpep8, pytest_xdist , pytest, pytestcov, pytest_xdist
, six, numpy, scipy, pyyaml, h5py , six, numpy, scipy, pyyaml, h5py
, keras-applications, keras-preprocessing , keras-applications, keras-preprocessing
}: }:
@ -16,7 +16,6 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
pytest pytest
pytestcov pytestcov
pytestpep8
pytest_xdist pytest_xdist
]; ];

4
pkgs/development/python-modules/mwclient/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub { stdenv, buildPythonPackage, fetchFromGitHub
, requests, requests_oauthlib, six , requests, requests_oauthlib, six
, pytest, pytestpep8, pytestcache, pytestcov, responses, mock , pytest, pytestcache, pytestcov, responses, mock
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,7 +14,7 @@ buildPythonPackage rec {
sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj";
}; };
checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; checkInputs = [ pytest pytestcache pytestcov responses mock ];
propagatedBuildInputs = [ requests requests_oauthlib six ]; propagatedBuildInputs = [ requests requests_oauthlib six ];

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

@ -6,7 +6,6 @@
, python-utils , python-utils
, sphinx , sphinx
, flake8 , flake8
, pytestpep8
, pytest-flakes , pytest-flakes
, pytestcov , pytestcov
, pytestcache , pytestcache
@ -26,7 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ python-utils ]; propagatedBuildInputs = [ python-utils ];
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
checkInputs = [ checkInputs = [
pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov pytest sphinx flake8 pytest-flakes pytestcov
pytestcache freezegun pytestcache freezegun
]; ];
# ignore tests on the nix wrapped setup.py # ignore tests on the nix wrapped setup.py

6
pkgs/development/python-modules/pydocstyle/2.nix
View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder { lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder
, snowballstemmer, six, configparser , snowballstemmer, six, configparser
, pytest, pytestpep8, mock, pathlib }: , pytest, mock, pathlib }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pydocstyle"; pname = "pydocstyle";
@ -17,11 +17,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser;
checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ pytest mock ] ++ lib.optional (pythonOlder "3.4") pathlib;
checkPhase = '' checkPhase = ''
# test_integration.py installs packages via pip # test_integration.py installs packages via pip
py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" py.test --cache-clear -vv src/tests -k "not test_integration"
''; '';
meta = with lib; { meta = with lib; {

1
pkgs/development/python-modules/pydocstyle/default.nix
View File

@ -1,7 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k { lib, buildPythonPackage, fetchFromGitHub, isPy3k
, mock , mock
, pytest , pytest
, pytestpep8
, snowballstemmer , snowballstemmer
}: }:

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

@ -14,7 +14,6 @@
, pytestcov , pytestcov
, covCore , covCore
, pytest-flakes , pytest-flakes
, pytestpep8
, sphinx , sphinx
, mock , mock
, chalice , chalice
@ -35,7 +34,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
checkInputs = [ checkInputs = [
flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
pytest-flakes pytestpep8 sphinx mock chalice pytest-flakes sphinx mock chalice
]; ];
src = fetchPypi { src = fetchPypi {

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

@ -7,7 +7,6 @@
, factory_boy , factory_boy
, pytestcache , pytestcache
, pytestcov , pytestcov
, pytestpep8
, mock , mock
}: }:
@ -22,6 +21,9 @@ buildPythonPackage rec {
sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn";
}; };
# TODO: remove in next release, it's removed in master.
postPatch = "substituteInPlace tox.ini --replace '--pep8' ''";
propagatedBuildInputs = [ factory_boy inflection pytest ]; propagatedBuildInputs = [ factory_boy inflection pytest ];
# The project uses tox, which we can't. So we simply run pytest manually. # The project uses tox, which we can't. So we simply run pytest manually.
@ -30,7 +32,6 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
pytestcache pytestcache
pytestcov pytestcov
pytestpep8
]; ];
pytestFlagsArray = [ "--ignore=docs" ]; pytestFlagsArray = [ "--ignore=docs" ];

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

@ -1,5 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder { stdenv, buildPythonPackage, fetchPypi, pythonOlder
, pytestpep8
, pytest , pytest
, pyflakes , pyflakes
}: }:
@ -16,7 +15,7 @@ buildPythonPackage rec {
sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754"; sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754";
}; };
checkInputs = [ pytestpep8 pytest ]; checkInputs = [ pytest ];
propagatedBuildInputs = [ pytest pyflakes ]; propagatedBuildInputs = [ pytest pyflakes ];
# no longer passes # no longer passes

28
pkgs/development/python-modules/pytest-pep8/default.nix
View File

@ -1,28 +0,0 @@
{ stdenv, buildPythonPackage, fetchPypi
, pytest, pytestcache, pep8 }:
buildPythonPackage rec {
pname = "pytest-pep8";
version = "1.0.6";
src = fetchPypi {
inherit pname version;
sha256 = "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3";
};
buildInputs = [ pytest ];
propagatedBuildInputs = [ pytestcache pep8 ];
checkPhase = ''
py.test
'';
# Fails
doCheck = false;
meta = with stdenv.lib; {
license = licenses.mit;
homepage = "https://pypi.python.org/pypi/pytest-pep8";
description = "pytest plugin to check PEP8 requirements";
};
}

4
pkgs/development/python-modules/pytest-quickcheck/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }: { stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, tox }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytest-quickcheck"; pname = "pytest-quickcheck";
version = "0.8.6"; version = "0.8.6";
@ -9,7 +9,7 @@ buildPythonPackage rec {
}; };
buildInputs = [ pytest ]; buildInputs = [ pytest ];
propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ]; propagatedBuildInputs = [ pytest-flakes tox ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
license = licenses.asl20; license = licenses.asl20;

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

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }: { lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytestrunner, pytestcov, pytest-flakes, sphinx, six }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-utils"; pname = "python-utils";
@ -12,13 +12,10 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
rm -r tests/__pycache__ rm -r tests/__pycache__
rm tests/*.pyc rm tests/*.pyc
substituteInPlace pytest.ini --replace "--pep8" ""
''; '';
checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ]; checkInputs = [ pytestCheckHook pytestrunner pytestcov pytest-flakes sphinx ];
checkPhase = ''
py.test tests
'';
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

4
pkgs/development/python-modules/requests-unixsocket/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, pbr, requests , pbr, requests
, pytest, pytestpep8, waitress }: , pytest, waitress }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "requests-unixsocket"; pname = "requests-unixsocket";
@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pbr ]; nativeBuildInputs = [ pbr ];
propagatedBuildInputs = [ requests ]; propagatedBuildInputs = [ requests ];
checkInputs = [ pytest pytestpep8 waitress ]; checkInputs = [ pytest waitress ];
checkPhase = '' checkPhase = ''
rm pytest.ini rm pytest.ini
py.test py.test

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

@ -20,7 +20,6 @@
, sympy , sympy
, vcrpy , vcrpy
, pytest , pytest
, pytestpep8
, pytest-flakes , pytest-flakes
, pytestcov , pytestcov
, pytestrunner , pytestrunner
@ -42,7 +41,7 @@ buildPythonPackage rec {
] ++ lib.optional (!isPy3k) futures; ] ++ lib.optional (!isPy3k) futures;
checkInputs = [ checkInputs = [
sympy vcrpy pytest pytestpep8 pytest-flakes sympy vcrpy pytest pytest-flakes
pytestcov pytestrunner pytestcov pytestrunner
]; ];

26
pkgs/development/tools/devpi-server/default.nix
View File

@ -30,24 +30,30 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [
beautifulsoup4 beautifulsoup4
nginx nginx
pytest pytestCheckHook
pytest-flake8 pytest-flake8
pytestpep8
webtest webtest
] ++ stdenv.lib.optionals isPy27 [ mock ]; ] ++ stdenv.lib.optionals isPy27 [ mock ];
# root_passwd_hash tries to write to store # root_passwd_hash tries to write to store
# TestMirrorIndexThings tries to write to /var through ngnix # TestMirrorIndexThings tries to write to /var through ngnix
# nginx tests try to write to /var # nginx tests try to write to /var
checkPhase = '' preCheck = ''
PATH=$PATH:$out/bin HOME=$TMPDIR pytest \ export PATH=$PATH:$out/bin
./test_devpi_server --slow -rfsxX \ export HOME=$TMPDIR
--ignore=test_devpi_server/test_nginx_replica.py \
--ignore=test_devpi_server/test_streaming_nginx.py \
--ignore=test_devpi_server/test_streaming_replica_nginx.py \
-k 'not root_passwd_hash_option \
and not TestMirrorIndexThings'
''; '';
pytestFlagsArray = [
"./test_devpi_server"
"--slow"
"-rfsxX"
"--ignore=test_devpi_server/test_nginx_replica.py"
"--ignore=test_devpi_server/test_streaming_nginx.py"
"--ignore=test_devpi_server/test_streaming_replica_nginx.py"
];
disabledTests = [
"root_passwd_hash_option"
"TestMirrorIndexThings"
];
meta = with stdenv.lib;{ meta = with stdenv.lib;{
homepage = "http://doc.devpi.net"; homepage = "http://doc.devpi.net";

42
pkgs/development/tools/electron/default.nix
View File

@ -75,30 +75,30 @@ rec {
headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5";
}; };
electron_9 = mkElectron "9.3.5" { electron_9 = mkElectron "9.4.0" {
x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa"; x86_64-linux = "2a81ef31fc4b1e1ea450f2c145179ad7c4b6fc752a7b9f3e27abd2461e908ea6";
x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78"; x86_64-darwin = "38fa3d93b74c425008d17712daa7676a0f4eb1a70b92da6d7a5c66bb078546cd";
i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61"; i686-linux = "629caa459e2fdf31e82501dfd194358d14112152c9d719be579850605ddd929a";
armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f"; armv7l-linux = "f46ae7a45d89007cec1c3f45e8e059f2d0e0b73dcadc009b96589ce8bb5e0e21";
aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30"; aarch64-linux = "7ebb9cebfa32add20f56b9b414a473f1cb55c90d55735b133f353a23ad76becd";
headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b"; headers = "17729m93a387v1sc0ayzfjpvbl1wr9vhlf8y11wyr4704iyimr72";
}; };
electron_10 = mkElectron "10.1.6" { electron_10 = mkElectron "10.2.0" {
x86_64-linux = "d538ed7bb632d213a4b88d13bb038de65b85ae7b28a574c9efac7dc5a502ebbf"; x86_64-linux = "71e6f27433c7a098d0d0d4f2b624bc05cc81614d4e8cd0df71a78a6f9f4e4d5a";
x86_64-darwin = "7f24c666cc59935a49e5b82b4d4c1d008e4d6fac49c78d0645596f2cc8c7218d"; x86_64-darwin = "c6c32fa6b59d33f79e2f5cc317d7c61f0e1b8d7ab22c46a7a4e3fc3233785d7c";
i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e"; i686-linux = "d18208292cc5b64fed42b7ed21740b20f31c92b7612eb54ea1b71f8058a7439d";
armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; armv7l-linux = "b588b1d14b6f13b1e705180c52fae85113033efa630417a97555a085d7442ec4";
aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; aarch64-linux = "6cd8172939005cd12705d3c30be57e02e8b5271362ad60fb7378cc99a21db1e0";
headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z"; headers = "116h3b02da18w5mqgw6adgbzc9l02vl3c62syw4wsy6xww6i0mgr";
}; };
electron_11 = mkElectron "11.0.3" { electron_11 = mkElectron "11.1.0" {
x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff"; x86_64-linux = "64f9c0864a12a9e0a435b967ed63209a9bb447456aafe8660edaaa2f6517c538";
x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027"; x86_64-darwin = "827b0b3e562535de25d3e4d2c4d7529338efae9197e8cf6702dda786b5870bd0";
i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729"; i686-linux = "aa424de2c480d0deb26aa53dc45622857521cb9876cf29a52d32a4da66cae3c6";
armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e"; armv7l-linux = "375bbea1ecf521ab95760052df5e0ad167e41f61cc79c7c441553ecc2f64d1dd";
aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0"; aarch64-linux = "caaf1f9a2e62c9dbbcb777e5c64640d8a1f60a0f5791a2c8f62ab44067c88777";
headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0"; headers = "1kafrz2rxryv7psgfn20qrkpcn83hi9fz7df2ra1nzkngfj7xdjr";
}; };
} }

4
pkgs/tools/admin/lego/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "lego"; pname = "lego";
version = "4.0.1"; version = "4.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "go-acme"; owner = "go-acme";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1s3sh4n12g7ylkpmxqjcpdw3gqhdjbh9r09h2rsrm30xr4qaqpng"; sha256 = "05fy6826n449adlglwi8s31km4yhd8hbd9yml8k204cb81w00zyk";
}; };
vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp"; vendorSha256 = "0p2pibid2d761whfk7zgq230lyqi2f0wmfvxqkjzrd1sba40r9bp";

2
pkgs/top-level/all-packages.nix
View File

@ -21618,6 +21618,8 @@ in
linssid = libsForQt5.callPackage ../applications/networking/linssid { }; linssid = libsForQt5.callPackage ../applications/networking/linssid { };
deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { };
lollypop = callPackage ../applications/audio/lollypop { }; lollypop = callPackage ../applications/audio/lollypop { };
m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; m32edit = callPackage ../applications/audio/midas/m32edit.nix {};

2
pkgs/top-level/python-packages.nix
View File

@ -5820,7 +5820,7 @@ in {
pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { };
pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };