Merge master into staging-next

Changed files
+377 -34
pkgs
applications
editors
supertux-editor
misc
jekyll
networking
browsers
window-managers
taffybar
development
haskell-modules
python-modules
dependency-injector
fpyutils
md-toc
mdformat
mypy-boto3-builder
mypy-boto3-s3
servers
tailscale
tools
package-management
auditwheel
top-level
+1 -1
pkgs/applications/editors/supertux-editor/default.nix
···
description = "Level editor for SuperTux";
homepage = "https://github.com/SuperTux/supertux-editor";
license = licenses.gpl3Plus;
-
maintainers = with maintainers; [ mathnerd314 ];
platforms = platforms.linux;
+
broken = true;
};
}
+1 -1
pkgs/applications/misc/jekyll/default.nix
···
homepage = "https://jekyllrb.com/";
#changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";
license = licenses.mit;
-
maintainers = with maintainers; [ primeos pesterhazy ];
+
maintainers = with maintainers; [ pesterhazy ];
platforms = platforms.unix;
};
}
+3 -3
pkgs/applications/networking/browsers/chromium/upstream-info.json
···
}
},
"beta": {
-
"version": "91.0.4472.38",
-
"sha256": "13kikqyxs7p25j7mxnr42614y92vmwsjqfd51dwdjh7wc2hb644a",
-
"sha256bin64": "1kjawp7q6r1r50h69jwrw84gqrya1jc8bq6x7bdplxlzgvy9qs3z",
+
"version": "91.0.4472.57",
+
"sha256": "1kbd5zyi5ndbln5pibdg3yhv65m84arfwfv4v00js3cbr13pyjzv",
+
"sha256bin64": "1bk30b9kn5bxp4yywdiy3dqd6km5q3rrf2z82kd1qyr9cc45hz8s",
"deps": {
"gn": {
"version": "2021-04-06",
+12 -3
pkgs/applications/window-managers/taffybar/default.nix
···
-
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
+
{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }:
let
-
taffybarEnv = haskellPackages.ghc.withPackages (self: [
+
taffybarEnv = ghcWithPackages (self: [
self.taffybar
] ++ packages self);
in stdenv.mkDerivation {
···
--set NIX_GHC "${taffybarEnv}/bin/ghc"
'';
-
inherit (haskellPackages.taffybar) meta;
+
# Trivial derivation
+
preferLocalBuild = true;
+
allowSubstitutes = false;
+
+
# For hacking purposes
+
passthru.env = taffybarEnv;
+
buildInputs = [ taffybarEnv ];
+
shellHook = "eval $(egrep ^export ${taffybarEnv}/bin/ghc)";
+
+
inherit (taffybar) meta;
}
+14
pkgs/development/haskell-modules/configuration-common.nix
···
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
+
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
+
# https://github.com/taffybar/gtk-sni-tray/pull/25
+
gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch {
+
url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch";
+
sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn";
+
});
+
+
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
+
# https://github.com/taffybar/taffybar/pull/507
+
taffybar = appendPatch super.taffybar (pkgs.fetchpatch {
+
url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch";
+
sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0";
+
});
+
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv;
-1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
···
- gtk2hs-rpn
- gtk3-mac-integration
- gtkglext
-
- gtk-sni-tray
- gtksourceview2
- gtksourceview3
- gtk-toy
+4
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
···
- hinit
bdesham:
- pinboard-notes-backup
+
rvl:
+
- taffybar
+
- arbtt
+
- lentil
unsupported-platforms:
Allure: [ x86_64-darwin ]
-1
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
···
- systemstats
- t3-client
- ta
-
- taffybar
- tagged-list
- tagged-th
- tagsoup-navigate
+3 -3
pkgs/development/haskell-modules/hackage-packages.nix
···
description = "Automatic Rule-Based Time Tracker";
license = lib.licenses.gpl2Only;
+
maintainers = with lib.maintainers; [ rvl ];
}) {};
"arcgrid" = callPackage
···
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-
hydraPlatforms = lib.platforms.none;
-
broken = true;
}) {inherit (pkgs) gtk3;};
"gtk-strut" = callPackage
···
description = "frugal issue tracker";
license = lib.licenses.gpl3Only;
+
maintainers = with lib.maintainers; [ rvl ];
}) {};
"lenz" = callPackage
···
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
-
hydraPlatforms = lib.platforms.none;
+
maintainers = with lib.maintainers; [ rvl ];
}) {inherit (pkgs) gtk3;};
"tag-bits" = callPackage
+43 -17
pkgs/development/python-modules/dependency-injector/default.nix
···
-
{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
-
-
let
-
testPath =
-
if isPy3k
-
then "test_*_py3.py"
-
else "test_*_py2_py3.py";
-
in
+
{ lib
+
, aiohttp
+
, buildPythonPackage
+
, fastapi
+
, fetchFromGitHub
+
, flask
+
, httpx
+
, mypy-boto3-s3
+
, numpy
+
, scipy
+
, pydantic
+
, pytestCheckHook
+
, pyyaml
+
, six
+
}:
buildPythonPackage rec {
pname = "dependency-injector";
-
version = "4.31.1";
+
version = "4.32.2";
-
src = fetchPypi {
-
inherit pname version;
-
sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad";
+
src = fetchFromGitHub {
+
owner = "ets-labs";
+
repo = "python-dependency-injector";
+
rev = version;
+
sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg";
};
-
propagatedBuildInputs = [ six ];
-
checkInputs = [ unittest2 pyyaml flask ];
+
propagatedBuildInputs = [
+
six
+
];
-
checkPhase = ''
-
unit2 discover -s tests/unit -p "${testPath}"
-
'';
+
checkInputs = [
+
aiohttp
+
fastapi
+
flask
+
httpx
+
mypy-boto3-s3
+
numpy
+
pydantic
+
scipy
+
pytestCheckHook
+
pyyaml
+
];
+
+
disabledTestPaths = [
+
# There is no unique identifier to disable the one failing test
+
"tests/unit/ext/test_aiohttp_py35.py"
+
];
+
+
pythonImportsCheck = [ "dependency_injector" ];
meta = with lib; {
description = "Dependency injection microframework for Python";
+46
pkgs/development/python-modules/fpyutils/default.nix
···
+
{ lib
+
, atomicwrites
+
, buildPythonPackage
+
, fetchFromGitHub
+
, pytestCheckHook
+
, pythonOlder
+
, requests
+
}:
+
+
buildPythonPackage rec {
+
pname = "fpyutils";
+
version = "2.0.0";
+
disabled = pythonOlder "3.5";
+
+
src = fetchFromGitHub {
+
owner = "frnmst";
+
repo = pname;
+
rev = version;
+
sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b";
+
};
+
+
propagatedBuildInputs = [
+
atomicwrites
+
requests
+
];
+
+
checkInputs = [
+
pytestCheckHook
+
];
+
+
pytestFlagsArray = [ "fpyutils/tests/*.py" ];
+
+
disabledTests = [
+
# Don't run test which requires bash
+
"test_execute_command_live_output"
+
];
+
+
pythonImportsCheck = [ "fpyutils" ];
+
+
meta = with lib; {
+
description = "Collection of useful non-standard Python functions";
+
homepage = "https://github.com/frnmst/fpyutils";
+
license = with licenses; [ gpl3Plus ];
+
maintainers = with maintainers; [ fab ];
+
};
+
}
+43
pkgs/development/python-modules/md-toc/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchFromGitHub
+
, fpyutils
+
, pytestCheckHook
+
, pythonOlder
+
}:
+
+
buildPythonPackage rec {
+
pname = "md-toc";
+
version = "7.2.0";
+
disabled = pythonOlder "3.5";
+
+
src = fetchFromGitHub {
+
owner = "frnmst";
+
repo = pname;
+
rev = version;
+
sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x";
+
};
+
+
propagatedBuildInputs = [
+
fpyutils
+
];
+
+
checkInputs = [
+
pytestCheckHook
+
];
+
+
postPatch = ''
+
substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2"
+
'';
+
+
pytestFlagsArray = [ "md_toc/tests/*.py" ];
+
+
pythonImportsCheck = [ "md_toc" ];
+
+
meta = with lib; {
+
description = "Table of contents generator for Markdown";
+
homepage = "https://docs.franco.net.eu.org/md-toc/";
+
license = with licenses; [ gpl3Plus ];
+
maintainers = with maintainers; [ fab ];
+
};
+
}
+49
pkgs/development/python-modules/mdformat/default.nix
···
+
{ lib
+
, buildPythonPackage
+
, fetchFromGitHub
+
, importlib-metadata
+
, markdown-it-py
+
, poetry-core
+
, pytestCheckHook
+
, pythonOlder
+
, typing-extensions
+
}:
+
+
buildPythonPackage rec {
+
pname = "mdformat";
+
version = "0.7.6";
+
format = "pyproject";
+
disabled = pythonOlder "3.6";
+
+
src = fetchFromGitHub {
+
owner = "executablebooks";
+
repo = pname;
+
rev = version;
+
sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif";
+
};
+
+
nativeBuildInputs = [
+
poetry-core
+
];
+
+
propagatedBuildInputs = [
+
markdown-it-py
+
] ++ lib.optionals (pythonOlder "3.10") [
+
importlib-metadata
+
] ++ lib.optionals (pythonOlder "3.7") [
+
typing-extensions
+
];
+
+
checkInputs = [
+
pytestCheckHook
+
];
+
+
pythonImportsCheck = [ "mdformat" ];
+
+
meta = with lib; {
+
description = "CommonMark compliant Markdown formatter";
+
homepage = "https://mdformat.rtfd.io/";
+
license = with licenses; [ mit ];
+
maintainers = with maintainers; [ fab ];
+
};
+
}
+49
pkgs/development/python-modules/mypy-boto3-builder/default.nix
···
+
{ lib
+
, black
+
, boto3
+
, buildPythonPackage
+
, fetchFromGitHub
+
, jinja2
+
, md-toc
+
, isort
+
, mdformat
+
, pyparsing
+
, pytestCheckHook
+
, pythonOlder
+
}:
+
+
buildPythonPackage rec {
+
pname = "mypy-boto3-builder";
+
version = "4.12.0";
+
disabled = pythonOlder "3.6";
+
+
src = fetchFromGitHub {
+
owner = "vemel";
+
repo = "mypy_boto3_builder";
+
rev = version;
+
sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9";
+
};
+
+
propagatedBuildInputs = [
+
black
+
boto3
+
isort
+
jinja2
+
md-toc
+
mdformat
+
pyparsing
+
];
+
+
checkInputs = [
+
pytestCheckHook
+
];
+
+
pythonImportsCheck = [ "mypy_boto3_builder" ];
+
+
meta = with lib; {
+
description = "Type annotations builder for boto3";
+
homepage = "https://vemel.github.io/mypy_boto3_builder/";
+
license = with licenses; [ bsd3 ];
+
maintainers = with maintainers; [ fab ];
+
};
+
}
+35
pkgs/development/python-modules/mypy-boto3-s3/default.nix
···
+
{ lib
+
, boto3
+
, buildPythonPackage
+
, fetchPypi
+
, pythonOlder
+
, typing-extensions
+
}:
+
+
buildPythonPackage rec {
+
pname = "mypy-boto3-s3";
+
version = "1.17.71";
+
disabled = pythonOlder "3.6";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn";
+
};
+
+
propagatedBuildInputs = [
+
boto3
+
] ++ lib.optionals (pythonOlder "3.8") [
+
typing-extensions
+
];
+
+
# Project has no tests
+
doCheck = false;
+
pythonImportsCheck = [ "mypy_boto3_s3" ];
+
+
meta = with lib; {
+
description = "Type annotations for boto3";
+
homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/";
+
license = with licenses; [ bsd3 ];
+
maintainers = with maintainers; [ fab ];
+
};
+
}
+3 -3
pkgs/servers/tailscale/default.nix
···
buildGoModule rec {
pname = "tailscale";
-
version = "1.8.0";
+
version = "1.8.3";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
-
sha256 = "urgXbfXEVu5ES140pIAZnQTjU3xWkkk9MPDmlRXa544=";
+
sha256 = "0q0nk0ychb00xhycq3kda57dzrswl8yhci7fzv8yiqzrv3ygpvyd";
};
nativeBuildInputs = [ makeWrapper ];
CGO_ENABLED = 0;
-
vendorSha256 = "NBdPGCmUyGKNr76CKwkXmqSVo502ZVrsbboNc+xnB04=";
+
vendorSha256 = "0cppblz1mnyb3c8xcry5mnf566s6l9409vf9572n1rs1bg91dvgn";
doCheck = false;
+56
pkgs/tools/package-management/auditwheel/default.nix
···
+
{ lib
+
, bzip2
+
, patchelf
+
, python3
+
, gnutar
+
, unzip
+
}:
+
+
python3.pkgs.buildPythonApplication rec {
+
pname = "auditwheel";
+
version = "4.0.0";
+
+
disabled = python3.pkgs.pythonOlder "3.6";
+
+
src = python3.pkgs.fetchPypi {
+
inherit pname version;
+
sha256 = "03a079fe273f42336acdb5953ff5ce7578f93ca6a832b16c835fe337a1e2bd4a";
+
};
+
+
nativeBuildInputs = with python3.pkgs; [
+
pbr
+
];
+
+
propagatedBuildInputs = with python3.pkgs; [
+
pyelftools
+
setuptools
+
];
+
+
# integration tests require docker and networking
+
disabledTestPaths = [ "tests/integration" ];
+
+
checkInputs = with python3.pkgs; [
+
pretend
+
pytestCheckHook
+
];
+
+
# ensure that there are no undeclared deps
+
postCheck = ''
+
PATH= PYTHONPATH= $out/bin/auditwheel --version > /dev/null
+
'';
+
+
makeWrapperArgs = [
+
"--prefix" "PATH" ":" (lib.makeBinPath [ bzip2 gnutar patchelf unzip ])
+
];
+
+
meta = with lib; {
+
description = "Auditing and relabeling cross-distribution Linux wheels";
+
homepage = "https://github.com/pypa/auditwheel";
+
license = with licenses; [
+
mit # auditwheel and nibabel
+
bsd2 # from https://github.com/matthew-brett/delocate
+
bsd3 # from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py
+
];
+
maintainers = with maintainers; [ davhau ];
+
};
+
}
+5 -1
pkgs/top-level/all-packages.nix
···
albert = libsForQt5.callPackage ../applications/misc/albert {};
+
auditwheel = callPackage ../tools/package-management/auditwheel { };
+
gobgp = callPackage ../tools/networking/gobgp { };
metapixel = callPackage ../tools/graphics/metapixel { };
···
# customConfig = builtins.readFile ./tabbed.config.h;
-
taffybar = callPackage ../applications/window-managers/taffybar {};
+
taffybar = callPackage ../applications/window-managers/taffybar {
+
inherit (haskellPackages) ghcWithPackages taffybar;
+
};
tagainijisho = callPackage ../applications/office/tagainijisho {};
+10
pkgs/top-level/python-packages.nix
···
fpylll = callPackage ../development/python-modules/fpylll { };
+
fpyutils = callPackage ../development/python-modules/fpyutils { };
+
freebox-api = callPackage ../development/python-modules/freebox-api { };
freetype-py = callPackage ../development/python-modules/freetype-py { };
···
mcstatus = callPackage ../development/python-modules/mcstatus { };
+
md-toc = callPackage ../development/python-modules/md-toc { };
+
md2gemini = callPackage ../development/python-modules/md2gemini { };
+
+
mdformat = callPackage ../development/python-modules/mdformat { };
mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
···
myjwt = callPackage ../development/python-modules/myjwt { };
mypy = callPackage ../development/python-modules/mypy { };
+
+
mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { };
+
+
mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { };
mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };