Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar 2021-02-02 19:46:31 +01:00
commit 75153ede17
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
51 changed files with 540 additions and 267 deletions

1
.github/CODEOWNERS vendored
View file

@ -76,6 +76,7 @@
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh @jonringer
/doc/languages-frameworks/python.section.md @FRidh
/pkgs/development/tools/poetry2nix @adisbladis
# Haskell
/pkgs/development/compilers/ghc @cdepillabout

View file

@ -8429,6 +8429,12 @@
githubId = 997855;
name = "Narazaki Shuji";
};
shofius = {
name = "Sam Hofius";
email = "sam@samhofi.us";
github = "kf5grd";
githubId = 18297490;
};
shou = {
email = "x+g@shou.io";
github = "Shou";

View file

@ -7,6 +7,7 @@ with lib;
options.services.hadoop = {
coreSite = mkOption {
default = {};
type = types.attrsOf types.anything;
example = literalExample ''
{
"fs.defaultFS" = "hdfs://localhost";
@ -17,6 +18,7 @@ with lib;
hdfsSite = mkOption {
default = {};
type = types.attrsOf types.anything;
example = literalExample ''
{
"dfs.nameservices" = "namenode1";
@ -27,6 +29,7 @@ with lib;
mapredSite = mkOption {
default = {};
type = types.attrsOf types.anything;
example = literalExample ''
{
"mapreduce.map.cpu.vcores" = "1";
@ -37,6 +40,7 @@ with lib;
yarnSite = mkOption {
default = {};
type = types.attrsOf types.anything;
example = literalExample ''
{
"yarn.resourcemanager.ha.id" = "resourcemanager1";

View file

@ -76,8 +76,8 @@ let
def assemble_qemu_flags():
flags = "-cpu max"
${if system == "x86_64-linux"
then ''flags += " -m 768"''
else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"''
then ''flags += " -m 1024"''
else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"''
}
return flags

View file

@ -16,15 +16,12 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace is_KeyFinder.pro \
--replace "keyfinder.0" "keyfinder" \
--replace "-stdlib=libc++" "" \
--replace "\$\$[QT_INSTALL_PREFIX]" "$out"
'';
dontWrapQtApps = true;
enableParallelBuilding = true;
meta = with lib; {
description = "Musical key detection for digital audio (graphical UI)";
longDescription = ''

View file

@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec {
substituteInPlace requirements.txt \
--replace 'WTForms ==' 'WTForms >=' \
--replace 'attrs == 20.2.0' 'attrs' \
--replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \
--replace 'elasticsearch ==' 'elasticsearch >=' \
--replace 'python_dotenv ==' 'python_dotenv >=' \
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \

View file

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "1.6.7";
version = "1.7.10";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
x86_64-linux = "0g1fac8l0w0b11bs4c9mi2k426hcqa7q4ks48fzxq0yl9ricjlrb";
x86_64-darwin = "1h5crdjzvjg30hdmh3fkygxi5gy714wpz4gwy5dn8s3xr12mmgka";
x86_64-linux = "1f8pfssfqigh0fl5r5wpvdpn48dx1q9qq4mfqi2s5z94h7ci2jxg";
x86_64-darwin = "0s29mhf88nlhaabmd32k21h1qiavgpqqksbdjxkx8bfg591s8jqb";
}.${system} or throwSystem;
};

View file

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz";
};
doBuild = false;
doCheck = false;
installPhase = ''

View file

@ -70,6 +70,10 @@ in buildPythonPackage {
'';
dontPatchShebangs = true;
postFixup = ''
addToSearchPath program_PYTHONPATH $out/${python.sitePackages}
patchPythonScript $out/share/matrix.py
'';
meta = with lib; {
description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol";

View file

@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
buildInputs = [ fahviewer python ];
doBuild = false;
unpackPhase = ''
dpkg-deb -x ${src} ./
'';

View file

@ -16,10 +16,8 @@ python3Packages.buildPythonApplication rec {
six
];
# Prevent tests from trying to create configuration in /homeless-shelter.
preCheck = ''
export HOME=$PWD/test-home
'';
# no tests
doCheck = false;
meta = with lib; {
homepage = "https://github.com/frostming/legit";

View file

@ -18,7 +18,6 @@ stdenv.mkDerivation {
unpackCmd = "mkdir src; cp $curSrc src/vcs";
patches = [ ./fonts.patch ];
nativeBuildInputs = [ makeWrapper ];
doBuild = false;
inherit dejavu_fonts;
installPhase = ''

View file

@ -25,6 +25,10 @@
, libXcursor
, libXdamage
, libXfixes
, libXrender
, libXtst
, libXi
, libXext
, libGL
, nspr
, nss
@ -114,7 +118,11 @@ let
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrender
libXtst
libGL
nspr
nss

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, gaucheBootstrap, pkg-config, texinfo
, libiconv, gdbm, openssl, zlib, mbedtls, cacert }:
, libiconv, gdbm, openssl, zlib, mbedtls, cacert }:
stdenv.mkDerivation rec {
pname = "gauche";
@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ mnacamura ];
license = licenses.bsd3;
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}

View file

@ -1,12 +1,8 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, autoconf
, automake
, libtool
, autoreconfHook
, docbook_xml_dtd_412
, docbook_xml_dtd_42
, docbook_xml_dtd_43
, docbook_xml_dtd_45
, docbook-xsl-nons
, which
, libxml2
@ -49,7 +45,7 @@
, xorg
, valgrind
, glib-networking
, wrapGAppsHook
, wrapGAppsNoGuiHook
, dconf
, gsettings-desktop-schemas
, librsvg
@ -57,14 +53,14 @@
stdenv.mkDerivation rec {
pname = "flatpak";
version = "1.8.2";
version = "1.10.1";
# TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "eSZiXffCKCpe4aizwxevU9QKZjsbxrGKLch0fiZQhbA=";
sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
};
patches = [
@ -104,24 +100,15 @@ stdenv.mkDerivation rec {
# But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator.
./validate-icon-pixbuf.patch
# Fix `flatpak/test-oci-registry@{user,system}.wrap.test` installed tests.
# https://github.com/flatpak/flatpak/pull/3762
(fetchpatch {
url = "https://github.com/flatpak/flatpak/commit/c1447dadecd50f384b6d11dac18b014245267d00.patch";
sha256 = "UAA/wGr8/aMbx5MV+8Ilro2kgKkx2QOn88lDUjCgeDA=";
})
];
nativeBuildInputs = [
autoconf
automake
libtool
autoreconfHook
libxml2
# TODO: replace with docbook_xml_dtd_45 https://github.com/flatpak/flatpak/pull/3760
# Remove 4.1.2 again once the following is merged
# https://github.com/flatpak/flatpak/pull/4102
docbook_xml_dtd_412
docbook_xml_dtd_42
docbook_xml_dtd_43
docbook_xml_dtd_45
docbook-xsl-nons
which
gobject-introspection
@ -132,7 +119,7 @@ stdenv.mkDerivation rec {
xmlto
appstream-glib
yacc
wrapGAppsHook
wrapGAppsNoGuiHook
];
buildInputs = [
@ -147,7 +134,7 @@ stdenv.mkDerivation rec {
libseccomp
libsoup
lzma
# zstd # TODO: broken paths in .pc file
zstd
polkit
python3
systemd
@ -199,16 +186,6 @@ stdenv.mkDerivation rec {
PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build variant-schema-compiler/variant-schema-compiler
'';
preConfigure = ''
# TODO: remove the condition once autogen.sh is shipped in the tarball
# https://github.com/flatpak/flatpak/pull/3761
if [[ -f autogen.sh ]]; then
NOCONFIGURE=1 ./autogen.sh
else
autoreconf --install --force --verbose
fi
'';
passthru = {
tests = {
installedTests = nixosTests.installed-tests.flatpak;
@ -218,7 +195,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Linux application sandboxing and distribution framework";
homepage = "https://flatpak.org/";
license = licenses.lgpl21;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
};

View file

@ -32,11 +32,8 @@ stdenv.mkDerivation rec {
prePatch = ''
substituteInPlace CMakeLists.txt \
--replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \
'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \
--replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \
'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' \
--replace 'find_library( OpenCL REQUIRED' 'find_library( OpenCL'
'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})'
substituteInPlace device/comgrctx.cpp \
--replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so"
'';

View file

@ -143,11 +143,9 @@ buildPythonPackage rec {
--replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
--replace "flask-admin==1.5.3" "flask-admin" \
--replace "flask-login>=0.3, <0.5" "flask-login" \
--replace "pendulum==1.4.4" "pendulum" \
--replace "cached_property~=1.5" "cached_property" \
--replace "dill>=0.2.2, <0.3" "dill" \
--replace "configparser>=3.5.0, <3.6.0" "configparser" \
--replace "jinja2>=2.10.1, <2.11.0" "jinja2" \
--replace "colorlog==4.0.2" "colorlog" \
--replace "funcsigs==1.0.0" "funcsigs" \
--replace "flask-swagger==0.2.13" "flask-swagger" \

View file

@ -1,17 +1,15 @@
{
lib,
buildPythonApplication,
fetchFromGitHub,
fetchpatch,
cpyparsing,
ipykernel,
mypy,
pygments,
pytest,
prompt_toolkit,
tkinter,
watchdog
{ lib
, buildPythonApplication
, fetchFromGitHub
, fetchpatch
, cpyparsing
, ipykernel
, mypy
, pygments
, pytestCheckHook
, prompt_toolkit
, tkinter
, watchdog
}:
buildPythonApplication rec {
@ -33,15 +31,26 @@ buildPythonApplication rec {
url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
})
(fetchpatch {
name = "support-python-3.9.patch";
url = "https://github.com/evhub/coconut/commit/5c724b4dd92fb62c614d8192e3cac3dd1d475790.patch";
sha256 = "04xmzyfmyv6gr2l2z6pdxlllwzcmwxvahxzqyxglr36hfl33ad71";
})
];
checkInputs = [
pytestCheckHook
tkinter
];
checkInputs = [ pytest tkinter ];
# Currently most tests do not work on Hydra due to external fetches.
checkPhase = ''
pytest tests/constants_test.py
pytest tests/main_test.py::TestShell::test_compile_to_file
pytest tests/main_test.py::TestShell::test_convenience
'';
pytestFlagsArray = [
"tests/constants_test.py"
"tests/main_test.py::TestShell::test_compile_to_file"
"tests/main_test.py::TestShell::test_convenience"
];
pythonImportsCheck = [ "coconut" ];
meta = with lib; {
homepage = "http://coconut-lang.org/";

View file

@ -11,11 +11,6 @@ buildPythonPackage rec {
sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367";
};
postPatch = ''
substituteInPlace setup.py \
--replace "iso8601<=0.1.11" iso8601
'';
propagatedBuildInputs = [
chameleon
colander

View file

@ -25,6 +25,9 @@ buildPythonPackage rec {
++ lib.optional stdenv.isLinux pyinotify
++ lib.optional stdenv.isDarwin macfsevents;
# hangs on darwin
doCheck = !stdenv.isDarwin;
checkInputs = [ mock pytestCheckHook ];
disabledTests = [

View file

@ -6,6 +6,7 @@
, importlib-metadata
, matplotlib
, numpy
, exdown
, pytestCheckHook
}:
@ -32,12 +33,9 @@ buildPythonPackage rec {
mkdir -p $HOME/.matplotlib
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
'';
checkInputs = [ pytestCheckHook ];
checkInputs = [ exdown pytestCheckHook ];
pythonImportsCheck = [ "dufte" ];
pytestFlagsArray = [
# we don't have the "exdown" package (yet)
"--ignore=test/test_readme.py"
];
meta = with lib; {
description = "Clean matplotlib plots";

View file

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder
, importlib-metadata }:
buildPythonPackage rec {
pname = "exdown";
version = "0.7.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vnSso3vmPIjX7JX+NwoxguwqwPHocJACeh5H0ClPcUI=";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
pythonImportsCheck = [ "exdown" ];
meta = with lib; {
description = "Extract code blocks from markdown";
homepage = "https://github.com/nschloe/exdown";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View file

@ -15,6 +15,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ GitPython ];
# no tests
doCheck = false;
pythonImportsCheck = [ "gitsweep" ];
meta = with lib; {
description = "A command-line tool that helps you clean up Git branches";
homepage = "https://github.com/arc90/git-sweep";

View file

@ -12,7 +12,7 @@
, tabulate
, nbformat
, jsonschema
, pytest
, pytestCheckHook
, colorama
, pygments
, tornado
@ -40,7 +40,16 @@ buildPythonPackage rec {
jsonschema
mock
tabulate
pytest
pytestCheckHook
];
disabledTests = [
"test_apply_filter_no_repo"
"test_diff_api_checkpoint"
"test_filter_cmd_invalid_filter"
"test_inline_merge"
"test_interrogate_filter_no_repo"
"test_merge_input_strategy_inline_source_conflict"
];
nativeBuildInputs = [ setuptools_scm ];

View file

@ -2,16 +2,15 @@
, buildPythonPackage
, isPy3k
, fetchFromGitHub
, fetchpatch
, substituteAll
, xmlsec
, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
, mock, pyasn1, pymongo, pytest, responses
, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six
, mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources
}:
buildPythonPackage rec {
pname = "pysaml2";
version = "5.0.0";
version = "6.5.1";
disabled = !isPy3k;
@ -20,7 +19,7 @@ buildPythonPackage rec {
owner = "IdentityPython";
repo = pname;
rev = "v${version}";
sha256 = "0hwhxz45h8l1b0615hf855z7valfcmm0nb7k31bcj84v68zp5rjs";
sha256 = "1gh74csjk6af23agyigk4id79s4li1xnkmbpp73aqyvlly2kd0b7";
};
patches = [
@ -28,12 +27,6 @@ buildPythonPackage rec {
src = ./hardcode-xmlsec1-path.patch;
inherit xmlsec;
})
# remove on next release
(fetchpatch {
name = "fix-test-dates.patch";
url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
})
];
postPatch = ''
@ -41,7 +34,17 @@ buildPythonPackage rec {
sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
'';
propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];
propagatedBuildInputs = [
cryptography
dateutil
defusedxml
importlib-resources
pyopenssl
pytz
requests
six
xmlschema
];
checkInputs = [ mock pyasn1 pymongo pytest responses ];

View file

@ -22,6 +22,7 @@ buildPythonPackage rec {
description = "Python bindings to Slurm";
license = licenses.gpl2;
maintainers = with maintainers; [ bhipple ];
platforms = platforms.linux;
broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now
};
}

View file

@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
doBuild = false;
installPhase = ''
mkdir -p $out

View file

@ -1,4 +1,4 @@
{ pkgs, lib, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
buildPythonPackage rec {
pname = "SoMaJo";
@ -14,6 +14,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ regex ];
# loops forever
doCheck = !stdenv.isDarwin;
meta = with lib; {
description = "Tokenizer and sentence splitter for German and English web texts";
homepage = "https://github.com/tsproisl/SoMaJo";

View file

@ -5,22 +5,34 @@
, pathtools
, pyyaml
, pkgs
, pytest-cov
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "watchdog";
version = "0.10.4";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43";
sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI=";
};
buildInputs = lib.optionals stdenv.isDarwin
[ pkgs.darwin.apple_sdk.frameworks.CoreServices ];
propagatedBuildInputs = [ argh pathtools pyyaml ];
doCheck = false;
propagatedBuildInputs = [
argh
pathtools
pyyaml
];
checkInputs = [
pytest-cov
pytestCheckHook
];
pythonImportsCheck = [ "watchdog" ];
meta = with lib; {
description = "Python API and shell utilities to monitor file system events";

View file

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "4db8d5c27413f69297adfffac57485d88d73c60e";
version = "2020-12-26";
rev = "562e2f74295f9c3ba2b3c8a87f6665b171dcdf47";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "B8abzdohkw3aPhbENJ2vxZFLWhIpf0HF/uv+WJbVRYg=";
sha256 = "1787ghqc62wnhkhc6x2ly63bvkmprgifw497npx2l08d3s4q7kbk";
};
dontBuild = true;
@ -25,9 +25,7 @@ stdenv.mkDerivation rec {
install bin/sbt $out/bin
wrapProgram $out/bin/sbt --prefix PATH : ${
lib.makeBinPath [ which curl ]
}
wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]}
'';
passthru = {

View file

@ -49,6 +49,9 @@ python.pkgs.buildPythonApplication rec {
ruamel_yaml
];
# no tests
doCheck = false;
meta = with lib; {
homepage = "https://f-droid.org";
description = "Server and tools for F-Droid, the Free Software repository system for Android";

View file

@ -12,6 +12,9 @@ buildPythonApplication rec {
propagatedBuildInputs = [ colorama GitPython ];
# no tests
doCheck = false;
meta = with lib; {
description = "Easily update multiple Git repositories at once";
homepage = "https://github.com/earwig/git-repo-updater";

View file

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gomacro";
rev = "b4c3ab9b218fd12f22759354f4f3e37635828d1f";
version = "20210131-${lib.strings.substring 0 7 rev}";
src = fetchFromGitHub {
owner = "cosmos72";
repo = "gomacro";
sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g";
inherit rev;
};
vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx";
subPackages = [ "." ];
meta = with lib; {
description = "Interactive Go interpreter and debugger with generics and macros";
homepage = "https://github.com/cosmos72/gomacro";
license = licenses.mpl20;
maintainers = with maintainers; [ shofius ];
};
}

View file

@ -13,13 +13,13 @@
let ccache = stdenv.mkDerivation rec {
pname = "ccache";
version = "4.1";
version = "4.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m";
sha256 = "1lr9804xyzbs72f9jbbzy1fjqxwrwpb4rp431wqialvms4251d8f";
};
patches = lib.optional stdenv.isDarwin (substituteAll {

View file

@ -1,7 +1,7 @@
{ pkgs ? import <nixpkgs> { }
, lib ? pkgs.lib
, poetry ? null
, poetryLib ? import ./lib.nix { inherit lib pkgs; }
, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; }
}:
let
inherit (poetryLib) isCompatible readTOML moduleName;
@ -71,7 +71,40 @@ in
lib.makeScope pkgs.newScope (self: {
# Poetry2nix version
version = "1.14.0";
version = "1.15.2";
/* Returns a package of editable sources whose changes will be available without needing to restart the
nix-shell.
In editablePackageSources you can pass a mapping from package name to source directory to have
those packages available in the resulting environment, whose source changes are immediately available.
*/
mkPoetryEditablePackage =
{ projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, python ? pkgs.python3
, pyProject ? readTOML pyproject
# Example: { my-app = ./src; }
, editablePackageSources
}:
assert editablePackageSources != { };
import ./editable.nix {
inherit pyProject python pkgs lib poetryLib editablePackageSources;
};
/* Returns a package containing scripts defined in tool.poetry.scripts.
*/
mkPoetryScriptsPackage =
{ projectDir ? null
, pyproject ? projectDir + "/pyproject.toml"
, python ? pkgs.python3
, pyProject ? readTOML pyproject
, scripts ? pyProject.tool.poetry.scripts
}:
assert scripts != { };
import ./shell-scripts.nix {
inherit lib python scripts;
};
/*
Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile.
@ -84,11 +117,25 @@ lib.makeScope pkgs.newScope (self: {
, python ? pkgs.python3
, pwd ? projectDir
, preferWheels ? false
# Example: { my-app = ./src; }
, editablePackageSources ? { }
, __isBootstrap ? false # Hack: Always add Poetry as a build input unless bootstrapping
}@attrs:
let
poetryPkg = poetry.override { inherit python; };
pyProject = readTOML pyproject;
scripts = pyProject.tool.poetry.scripts or { };
hasScripts = scripts != { };
scriptsPackage = self.mkPoetryScriptsPackage {
inherit python scripts;
};
hasEditable = editablePackageSources != { };
editablePackage = self.mkPoetryEditablePackage {
inherit pyProject python editablePackageSources;
};
poetryLock = readTOML poetrylock;
lockFiles =
let
@ -180,10 +227,13 @@ lib.makeScope pkgs.newScope (self: {
inputAttrs = mkInputAttrs { inherit py pyProject; attrs = { }; includeBuildSystem = false; };
storePackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs);
in
{
python = py;
poetryPackages = builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs);
poetryPackages = storePackages
++ lib.optional hasScripts scriptsPackage
++ lib.optional hasEditable editablePackage;
poetryLock = poetryLock;
inherit pyProject;
};
@ -203,38 +253,17 @@ lib.makeScope pkgs.newScope (self: {
, pwd ? projectDir
, python ? pkgs.python3
, preferWheels ? false
# Example: { my-app = ./src; }
, editablePackageSources ? { }
}:
let
py = self.mkPoetryPackages (
{
inherit pyproject poetrylock overrides python pwd preferWheels;
}
);
inherit (py) pyProject;
# Add executables from tool.poetry.scripts
scripts = pyProject.tool.poetry.scripts or { };
hasScripts = scripts != { };
scriptsPackage = import ./shell-scripts.nix {
inherit scripts lib;
inherit (py) python;
poetryPython = self.mkPoetryPackages {
inherit pyproject poetrylock overrides python pwd preferWheels editablePackageSources;
};
hasEditable = editablePackageSources != { };
editablePackage = import ./editable.nix {
inherit pkgs lib poetryLib editablePackageSources;
inherit (py) pyProject python;
};
inherit (poetryPython) poetryPackages;
in
py.python.withPackages (
_: py.poetryPackages
++ lib.optional hasEditable editablePackage
++ lib.optional hasScripts scriptsPackage
);
poetryPython.python.withPackages (_: poetryPackages);
/* Creates a Python application from pyproject.toml and poetry.lock

View file

@ -1,4 +1,4 @@
{ lib, pkgs }:
{ lib, pkgs, stdenv }:
let
inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver;
inherit (builtins) genList length;
@ -194,6 +194,23 @@ let
inherit src;
};
};
# Maps Nixpkgs CPU values to target machines known to be supported for manylinux* wheels.
# (a.k.a. `uname -m` output from CentOS 7)
#
# This is current as of manylinux2014 (PEP-0599), and is a superset of manylinux2010 / manylinux1.
# s390x is not supported in Nixpkgs, so we don't map it.
manyLinuxTargetMachines = {
x86_64 = "x86_64";
i686 = "i686";
aarch64 = "aarch64";
armv7l = "armv7l";
powerpc64 = "ppc64";
powerpc64le = "ppc64le";
};
# Machine tag for our target platform (if available)
targetMachine = manyLinuxTargetMachines.${stdenv.targetPlatform.parsed.cpu.name} or null;
in
{
inherit
@ -207,5 +224,6 @@ in
cleanPythonSources
moduleName
getPythonVersion
targetMachine
;
}

View file

@ -31,7 +31,7 @@ pythonPackages.callPackage
inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName;
inherit (import ./pep425.nix {
inherit lib python;
inherit lib poetryLib python;
inherit (pkgs) stdenv;
}) selectWheel
;
@ -161,7 +161,7 @@ pythonPackages.callPackage
builtins.fetchGit {
inherit (source) url;
rev = source.resolved_reference or source.reference;
ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD";
ref = sourceSpec.branch or sourceSpec.rev or (if sourceSpec?tag then "refs/tags/${sourceSpec.tag}" else "HEAD");
}
)
else if isUrl then

View file

@ -132,6 +132,18 @@ self: super:
}
);
datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: {
postPatch = ''
substituteInPlace setup.py --replace "setuptools==" "setuptools>="
'';
buildInputs = old.buildInputs ++ [ self.setuptools ];
});
ddtrace = super.ddtrace.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++
(pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ];
});
dictdiffer = super.dictdiffer.overridePythonAttrs (
old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ];
@ -235,7 +247,7 @@ self: super:
old:
if old.format != "wheel" then rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
configure_flags = "--hdf5=${pkgs.hdf5}";
postConfigure = ''
${self.python.executable} setup.py configure ${configure_flags}
@ -407,7 +419,7 @@ self: super:
export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
'';
__impureHostDeps = pkgs.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
__impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
passthru = old.passthru // { llvm = pkgs.llvm; };
}
@ -549,6 +561,12 @@ self: super:
}
);
mysqlclient = super.mysqlclient.overridePythonAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.libmysqlclient ];
}
);
netcdf4 = super.netcdf4.overridePythonAttrs (
old: {
buildInputs = old.buildInputs ++ [
@ -615,6 +633,13 @@ self: super:
}
);
osqp = super.osqp.overridePythonAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ];
dontUseCmakeConfigure = true;
}
);
parsel = super.parsel.overridePythonAttrs (
old: rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ];
@ -642,6 +667,28 @@ self: super:
}
);
# Work around https://github.com/nix-community/poetry2nix/issues/244
# where git deps are not picked up as they should
pip =
if lib.versionAtLeast super.pip.version "20.3" then
super.pip.overridePythonAttrs
(old:
let
pname = "pip";
version = "20.2.4";
in
{
name = pname + "-" + version;
inherit version;
src = pkgs.fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
name = "${pname}-${version}-source";
};
}) else super.pip;
poetry-core = super.poetry-core.overridePythonAttrs (old: {
# "Vendor" dependencies (for build-system support)
postPatch = ''
@ -972,6 +1019,10 @@ self: super:
pytest = super.pytest.overridePythonAttrs (
old: {
# Fixes https://github.com/pytest-dev/pytest/issues/7891
postPatch = old.postPatch or "" + ''
sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
'';
doCheck = false;
}
);
@ -996,6 +1047,28 @@ self: super:
}
);
# pytest-splinter seems to put a .marker file in an empty directory
# presumably so it's tracked by and can be installed with MANIFEST.in, see
# https://github.com/pytest-dev/pytest-splinter/commit/a48eeef662f66ff9d3772af618748e73211a186b
#
# This directory then gets used as an empty initial profile directory and is
# zipped up. But if the .marker file is in the Nix store, it has the
# creation date of 1970, and Zip doesn't work with such old files, so it
# fails at runtime!
#
# We fix this here by just removing the file after the installation
#
# The error you get without this is:
#
# E ValueError: ZIP does not support timestamps before 1980
# /nix/store/55b9ip7xkpimaccw9pa0vacy5q94f5xa-python3-3.7.6/lib/python3.7/zipfile.py:357: ValueError
pytest-splinter = super.pytest-splinter.overrideAttrs (old: {
postInstall = old.postInstall or "" + ''
rm $out/${super.python.sitePackages}/pytest_splinter/profiles/firefox/.marker
'';
});
ffmpeg-python = super.ffmpeg-python.overridePythonAttrs (
old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ];
@ -1168,14 +1241,16 @@ self: super:
# is explicitly disabled with USE_CUDA=0.
find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \;
'';
buildInputs = old.buildInputs ++ lib.optionals enableCuda [
buildInputs = (old.buildInputs or [ ])
++ [ self.typing-extensions ]
++ lib.optionals enableCuda [
pkgs.linuxPackages.nvidia_x11
pkgs.nccl.dev
pkgs.nccl.out
];
propagatedBuildInputs = [
super.numpy
super.future
self.numpy
self.future
];
})
)
@ -1257,15 +1332,15 @@ self: super:
format = "wheel";
};
# If "wheel" is built from source
sourcePackage = (
sourcePackage = ((
pkgs.python3.pkgs.override {
python = self.python;
}
).wheel.overridePythonAttrs (
old: {
inherit (super.wheel) pname name version src;
}
);
).wheel.override {
inherit (self) buildPythonPackage bootstrapped-pip setuptools;
}).overrideAttrs (old: {
inherit (super.wheel) pname name version src;
});
in
if isWheel then wheelPackage else sourcePackage;
@ -1303,6 +1378,15 @@ self: super:
}
);
packaging = super.packaging.overridePythonAttrs (
old: {
buildInputs = old.buildInputs ++
# From 20.5 until 20.7, packaging used flit for packaging (heh)
# See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367
lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ];
}
);
supervisor = super.supervisor.overridePythonAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
@ -1317,4 +1401,47 @@ self: super:
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ];
}
);
# For some reason the toml dependency of tqdm declared here:
# https://github.com/tqdm/tqdm/blob/67130a23646ae672836b971e1086b6ae4c77d930/pyproject.toml#L2
# is not translated correctly to a nix dependency.
tqdm = super.tqdm.overrideAttrs (
old: {
buildInputs = [ super.toml ] ++ old.buildInputs;
}
);
watchdog = super.watchdog.overrideAttrs (
old: {
buildInputs = old.buildInputs or [ ]
++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices;
}
);
# pyee cannot find `vcversioner` and other "setup requirements", so it tries to
# download them from the internet, which only works when nix sandboxing is disabled.
# Additionally, since pyee uses vcversioner to specify its version, we need to do this
# manually specify its version.
pyee = super.pyee.overrideAttrs (
old: {
postPatch = old.postPatch or "" + ''
sed -i setup.py \
-e '/setup_requires/,/],/d' \
-e 's/vcversioner={},/version="${old.version}",/'
'';
}
);
# nixpkgs has setuptools_scm 4.1.2
# but newrelic has a seemingly unnecessary version constraint for <4
# So we patch that out
newrelic = super.newrelic.overridePythonAttrs (
old: {
postPatch = old.postPatch or "" + ''
substituteInPlace setup.py --replace '"setuptools_scm>=3.2,<4"' '"setuptools_scm"'
'';
}
);
}

View file

@ -1,6 +1,7 @@
{ lib, stdenv, python, isLinux ? stdenv.isLinux }:
{ lib, stdenv, poetryLib, python, isLinux ? stdenv.isLinux }:
let
inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix;
inherit (poetryLib) targetMachine;
# The 'cpxy" as determined by `python.version`
#
@ -72,12 +73,16 @@ let
withPlatform =
if isLinux
then
(
x: x.platform == "manylinux1_${stdenv.hostPlatform.linuxArch}"
|| x.platform == "manylinux2010_${stdenv.hostPlatform.linuxArch}"
|| x.platform == "manylinux2014_${stdenv.hostPlatform.linuxArch}"
|| x.platform == "any"
)
if targetMachine != null
then
(
x: x.platform == "manylinux1_${targetMachine}"
|| x.platform == "manylinux2010_${targetMachine}"
|| x.platform == "manylinux2014_${targetMachine}"
|| x.platform == "any"
)
else
(x: x.platform == "any")
else (x: hasInfix "macosx" x.platform || x.platform == "any");
filterWheel = x:
let

View file

@ -1,6 +1,6 @@
{ lib, stdenv, poetryLib }: python:
let
inherit (poetryLib) ireplace;
inherit (poetryLib) ireplace targetMachine;
# Like builtins.substring but with stop being offset instead of length
substr = start: stop: s: builtins.substring start (stop - start) s;
@ -95,7 +95,7 @@ let
else if stdenv.isDarwin then "darwin"
else throw "Unsupported platform"
);
platform_machine = stdenv.hostPlatform.linuxArch;
platform_machine = targetMachine;
platform_python_implementation =
let
impl = python.passthru.implementation;
@ -132,7 +132,7 @@ let
mVal = ''[a-zA-Z0-9\'"_\. ]+'';
mOp = "in|[!=<>]+";
e = stripStr exprs.value;
m = builtins.map stripStr (builtins.match "^(${mVal}) *(${mOp}) *(${mVal})$" e);
m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
m0 = processVar (builtins.elemAt m 0);
m2 = processVar (builtins.elemAt m 2);
in

View file

@ -3,6 +3,7 @@
rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name')
nix-prefetch-github --rev "$rev" python-poetry poetry > src.json
echo >> src.json
src=$(nix-build --no-out-link --expr 'with import <nixpkgs> {}; fetchFromGitHub (lib.importJSON ./src.json)')
cp $src/pyproject.toml $src/poetry.lock .

View file

@ -16,7 +16,7 @@ mv poetry2nix-master/* .
mkdir build
cp *.* build/
cp -r pkgs hooks bin build/
rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix
rm build/shell.nix build/generate.py build/overlay.nix build/flake.*
cat > build/README.md << EOF
Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix

View file

@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
version = "2021-01-31";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
rev = "c747c277c2ead915b56be0f7e25a9f0c8b91b78e";
sha256 = "0nf8d3rry75lkn2acn94pnpgmimd0gpi4yrqkrv1n7cns8lrjd7j";
rev = "9b5c09047361f3ec2cf18afbb6d1e03047a59778";
sha256 = "0bdqr1k3cllgqclshxsmcd16ba63bw0ig3sqj46an3mgpvd6v4xd";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@ -377,12 +377,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-02-01";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "fa9ca44790510bca23a3b3f151b3cb7726e6d542";
sha256 = "0fg49aw5wkb2sv4sipvr9041hd0z0czfg5yn5z7rz1m52i5j3cwz";
rev = "addb3b3f9963b86b1d3626e4b1920b129148625b";
sha256 = "1fpws70lxa9vs4yv6wpgnvw0khxhavq23plnsil29j4xlfm3ivw9";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -473,12 +473,12 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
version = "2021-01-31";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
rev = "6d98eb18e2e11f7272fb4882e9d946da62322199";
sha256 = "0nfza3d7iji9ri3q0xvr38qdpp22j9is4djii95n8781l85fphay";
rev = "ee76911b1fa4a12833e53a1f56b03ada4fc3b6cf";
sha256 = "0n2za8f43gj9mjcjvwdrd2q17qn72fl1d7invnhrcyq44452y0z5";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
@ -846,12 +846,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2021-01-31";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "ff2b0af13c63fe22ea5653ee27e7b62716929623";
sha256 = "1kz77ab2i30ckz5kgf9bh8z92cn1kbrvmhcz8dbmlfyd7hmywm50";
rev = "fe855a14eaf4ede5c040704770202fe954addbda";
sha256 = "1f7gg77q8h227kbbf73d697v1x8w42szfckxmyskwb5wrvsxinpc";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@ -894,12 +894,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-01-31";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "ee807bee58aee7d8477ef7179451124cc344ea01";
sha256 = "1pzpw5x25aj87xm1jkw87siff06h1mf1pbq6dwj9xvjgwjb5lw2n";
rev = "b3c400c1d71a7451ce4c181e81d33373100ac4ac";
sha256 = "1k4qgdmpn5r8h8d3arq9zis6m0h8fagikrjb0v8lfhsz83zl1293";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@ -1306,12 +1306,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
version = "2020-04-16";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
rev = "da3468536410eb1ea59a0dd3054edf28d4577d8c";
sha256 = "1cvw3n8ysxnm3w0rvk1rks815ha5grca1p3c7bkas6klrplfhlsc";
rev = "e2efdb0d0827f7ec417583b25142f19714ece2ea";
sha256 = "1s4i9rv1kcpry1zldpml908xv1r5hn0darip701y14njbmk9fff8";
};
meta.homepage = "https://github.com/fenetikm/falcon/";
};
@ -1475,12 +1475,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
version = "2021-01-27";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
rev = "707f5b6269337ea5c19fc4054cd2574939f817f5";
sha256 = "1xb6zs7k8d815jzjs877ik6bp9bnyasv59jpnjv6fanxaaqas711";
rev = "02a192ea0bed22a015e005b281e55e0da2a8e496";
sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@ -2232,12 +2232,12 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
version = "2021-02-01";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "4235966fcc6fcbd3245af8be2a53fbe4c69ae435";
sha256 = "0sk3bv4ijrw8ac9icq4yi8vc5054hmxs7j42nirqp3la2qac6g0j";
rev = "1a39791278d1ce53ffdbb9b455e5150d44b0b600";
sha256 = "0x0kanhpb1q4bzwsvv0288rh1gqgbq1j9r8a2f9q22nlppqr1by0";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
@ -2628,12 +2628,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-01-25";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "f1ed542f846242e9cc052f43f730c1daf479dce6";
sha256 = "0xqy688h2kff2lp490qi9i7gmafy21bxx0dpq7j0bzy55ycw70q6";
rev = "c3c3d2aa860f2b4acbdb334ce0777e3ec25259d9";
sha256 = "1mxbpv9vv2mb0dgdyb97gw1c5nfjvzkbn7fkwvcvg996xhvap9cs";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -2760,12 +2760,12 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
version = "2021-01-31";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdcommenter";
rev = "898de2de1bf78c16768a188f5b1a26f6e3252fd1";
sha256 = "0jm4a79fwvi9agh0bq3h0wnz6nis71p3v4a898dd74d224y36l8g";
rev = "b83e9cdf835161b398e04e4c462103fd21801ee3";
sha256 = "15x4qw0l9j228rrfqnwzg13j7cr0k69xd46rcsa4886lw8nmpsak";
};
meta.homepage = "https://github.com/preservim/nerdcommenter/";
};
@ -2880,12 +2880,12 @@ let
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-02-01";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
rev = "9dabee7364dfaf61091e80dc8574529e30ff7cc3";
sha256 = "0fr87v91p8smfdswm0f91ccna8awibnbx8240jdps17p6xr1ym55";
rev = "f2573c9dd52be7e7ced176a6375766758cf646be";
sha256 = "1c2xib3vqjc8z1z1v1b11iywimxrbawma3zn5kl5fzihnc67mxkd";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@ -2986,6 +2986,18 @@ let
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
rev = "3437cc5696f6c6f1a46b1ad1445d9c917d3fa4bc";
sha256 = "1i53c7wrbx52ybm9v1m6p8n8894gyb2hylv7iac063nkhnhl7v6h";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-02-01";
@ -3048,12 +3060,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-01-31";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "a077f61b675367bddf00fda86d980125495b7dba";
sha256 = "0scfa61cbswq1f4zmksasjih0vwb23wspwyz40k4crinxl1maxm7";
rev = "d3901e583389ef0c356203f056bad37ec81a888c";
sha256 = "033w6x6yg4p6dfqs753vbwyl22aar24jn87ya9l07nm4wkm7w7d9";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3228,12 +3240,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
version = "2021-01-29";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
rev = "1d9eb05fb64b5b67a8599fce8687270949de87cb";
sha256 = "10169l3ysrqnrzzrkd1r2f0dcf2d1b97p3zxp21xanj98b9z4xjd";
rev = "8262aa68acb1b3e95f96bc66d70e92578fd82a6d";
sha256 = "1j0w71igl2icdmprl0krbv9ndda52dmmq9ijbz747x1g421d4rgn";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@ -3854,12 +3866,12 @@ let
sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim";
version = "2021-01-27";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "tami5";
repo = "sql.nvim";
rev = "91b7138c0a766bfe3964507951ee39e2f38344da";
sha256 = "09mk4r7c5shbn34v1fkj312zp11f0yjp07ck7i6lijm7kcj77fmq";
rev = "b9fcca9444861b013c4de20f9e732f0bcd88a570";
sha256 = "03kmxargbsyasimgq6mq5i6795gjbxxdj237gvzfx4vjgaifm55c";
};
meta.homepage = "https://github.com/tami5/sql.nvim/";
};
@ -4034,12 +4046,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim";
version = "2021-01-28";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
rev = "7afdd3c32c222a359d6a906968dcbed5fbea2fb7";
sha256 = "0g8gb3agscp9g2dcmzqf77x2g7l4pm34k5s23laa7864jfjnpzvb";
rev = "93904dd90fd474e846d823901a1880e43e7177aa";
sha256 = "189a5jlirgzvx7pgij6jil2kl0qhgg2kzl9sqn5ay98gcvcl6adk";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@ -4071,12 +4083,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-01-31";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "ef3262f94ae95c8e91bcc79ff7ed149a420ba1b9";
sha256 = "17mkniwa1lic4clvfgw6hr823sir23nskb9kil06qakrwh7yakj7";
rev = "9e76b1613a25cc6f63d17eb73432523924662619";
sha256 = "1yr7a7z48nfm5c7mmblbpdp42kfyp14b2d1fg03pkb792dkcqk2a";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -4228,12 +4240,12 @@ let
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
version = "2020-12-14";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
rev = "c270950492d71bac0317d47d42cd0884eefe6490";
sha256 = "1k58wp6y6i0xr4pnp2h7r31229ngp3zadyi374c5nlf2pa3zc1d8";
rev = "0e84f61b8184981012a32642f78ad88aafcf4258";
sha256 = "183y7bzc9lix536wla1p6niyl1w17jpjm2ild6pc593pl194qjm5";
};
meta.homepage = "https://github.com/SirVer/ultisnips/";
};
@ -4576,12 +4588,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2021-01-14";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "c7a633ce8f4547e680377efe8ea70493fcce1349";
sha256 = "10n70bk6nsc5sgd95d80jna4v77dlla6x0886kb5lwzmiflfq31x";
rev = "bffa7a4d23addaedc64075b06c00f1cbb5dec667";
sha256 = "0ghf7z6ras1jslirf9dxq8xxjksyaj6nlr0js385g5z8n9xv1chp";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -4840,12 +4852,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
version = "2021-01-28";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "d3536cae87fc9ac106f25f0a2d8d96c697bccb08";
sha256 = "1sag4018is0az3nvck592k4b6nl9ah82b55kr55p4y6wssgm7aak";
rev = "01d0a16456a5a3daeb88a66b12e160d4b8aec8e8";
sha256 = "1xmsp2rf5av9vfn8ynzm5kgxz0cv2wnnjmsmp4m2p5yjdwjxn669";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@ -5032,12 +5044,12 @@ let
vim-css-color = buildVimPluginFrom2Nix {
pname = "vim-css-color";
version = "2020-08-16";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "ap";
repo = "vim-css-color";
rev = "4694c6ea03a065a3f6ddbebce56797a21e8241ef";
sha256 = "12bzxrdvb9s0d8llkq6h63g86qxs0gv9x7401apl6qrs79prrb4a";
rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8";
sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql";
};
meta.homepage = "https://github.com/ap/vim-css-color/";
};
@ -5116,12 +5128,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
version = "2020-12-10";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
rev = "0d0bd57246b3285caec4737dc0f1c6b17ebb2787";
sha256 = "1kkc3hgfz0qr84r873gjmjhgwph0nhyan6v69b55ph5qqsksrl42";
rev = "0329d89c5114dc285939050fd5777dbcc450ddd7";
sha256 = "0g8pipayg643xjs3dmpbwp91ycyg8b20qgr0mnmxzll0nan8zjny";
};
meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
};
@ -6294,12 +6306,12 @@ let
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
version = "2021-01-26";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
rev = "0c77beb2eb99263e69a25b4d66e7ca2cd15cb0ef";
sha256 = "0r981drs6cikhbkabjr7r30hszmbwkz98c8ldraw984r2zhllw1y";
rev = "21a29936ed74b2212e1904cca6c22bff4e27b637";
sha256 = "11jlqri1fyh1mbxrkihg1jj7g8mllh9w6gy64ah8gvpw505fws4c";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@ -7027,12 +7039,12 @@ let
vim-qf = buildVimPluginFrom2Nix {
pname = "vim-qf";
version = "2020-11-18";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "romainl";
repo = "vim-qf";
rev = "23c9d67cdd0739c9d74ac9e4a494b7cb7351170c";
sha256 = "15kj1wvd3wlmn982l2v8sv2lc3q39bz3jw94jvmkh7nz51xvmfqc";
rev = "0da85ff4270c2be10e24729dd42fb749ad1b69b7";
sha256 = "0f8qnxy18qskbr3m8hn4vqv7bcvr2b0xqi64bxx078an5x8lbgx2";
};
meta.homepage = "https://github.com/romainl/vim-qf/";
};
@ -8181,12 +8193,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2021-01-31";
version = "2021-02-01";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "fae465c4f2d219b7794caacbcd5bd2c06fc17e97";
sha256 = "1lgsyjgpz4np74qp8xsmazp0rdsgprajms6nbgcsb7shn4ymc5rg";
rev = "0bc7c9c5f8376978ea2667f9fb54c293921183cc";
sha256 = "10k7265iwn7pr567g0kl159xwi7zjkjhal62c0n0d98akzdi4wbi";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@ -8229,12 +8241,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
version = "2021-01-17";
version = "2021-02-02";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
rev = "a648aab8b35401bea2b9192efe171b3787264abd";
sha256 = "15ib66lsx2wpbykv5pmr4ly2gkksml2dp6nmb2iv7zy70655whsf";
rev = "5e5f89f1c02579f1587475e0671cf0fe4b1bfeaf";
sha256 = "11h27vm0gi4lxf68dwnsr86ch6f0kyglfzg5a0i6av9mlsw7fj9z";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};

View file

@ -263,6 +263,7 @@ kien/rainbow_parentheses.vim
knubie/vim-kitty-navigator
konfekt/fastfold
konfekt/vim-DetectSpellLang
kosayoda/nvim-lightbulb
kristijanhusak/defx-git
kristijanhusak/defx-icons
kristijanhusak/deoplete-phpactor

View file

@ -8,12 +8,12 @@ let
_kernel = kernel;
pythonEnv = python3.withPackages (ps: with ps; [ six ]);
in stdenv.mkDerivation rec {
version = "2.14.0";
version = "2.14.1";
pname = "openvswitch";
src = fetchurl {
url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz";
sha256 = "0q52k6mq1jfsv0ix55mjd5ljlalhklhqfrma3l61dzhgihmfawa1";
sha256 = "sha256-GAttQsCrSybyH1i4vzszdiA9dHWqeo7xUTZVFMNQiP4=";
};
kernel = optional (_kernel != null) _kernel.dev;

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "routinator";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "NLnetLabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rxCgW4cuYNSJ9P+cBYWAYJsghz2bp9mpAh6AuwLoV5o=";
sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
};
cargoSha256 = "0fcp4b2b0mjddj4blr20gvp1ih3ldzzr04rm1m06i8d2lnl68i79";
cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ=";
meta = with lib; {
description = "An RPKI Validator written in Rust";

View file

@ -15,8 +15,6 @@ buildPythonApplication rec {
sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34=";
};
doBuild = false;
installPhase = ''
mkdir -p $out/bin $out/libexec/tautulli
cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli

View file

@ -21,18 +21,18 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
sha256 = "0ziz7cipi3m4aiba6ljz8419w2rps20rii6nwv0pyq5j7qvlvnqp";
sha256 = "09pv1xvycgfai151z6kbsggyldcd3cx6x1p04dcim2xrawqvng6s";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
sha256 = "1a9mqhqzmn0zfc1ab6jmac15yn192cmqkijw34di3ld6syqvaziw";
sha256 = "1iybbvxjny33mw3h2f81fdvsvp65xa62c2qrzjv8hkrqkw69ckrp";
};
}.${system};
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
version = "323.0.0";
version = "325.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

View file

@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
pname = "tridactyl-native";
# this is actually the version of tridactyl itself; the native messenger will
# probably not change with every tridactyl version
version = "1.20.3";
version = "1.20.4";
src = fetchFromGitHub {
owner = "tridactyl";
repo = "tridactyl";
rev = version;
sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps";
sha256 = "sha256-BjjRB9VadQ/MSwNK2QLbcTDoRs6Ua+5MONHtmfq4xz0=";
};
sourceRoot = "source/native";

View file

@ -112,17 +112,21 @@ in
{ name = "auto-blas-hook"; deps = [ blas lapack ]; }
../build-support/setup-hooks/audit-blas.sh;
autoreconfHook = makeSetupHook
{ deps = [ autoconf automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoreconfHook = callPackage (
{ makeSetupHook, autoconf, automake, gettext, libtool }:
makeSetupHook
{ deps = [ autoconf automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh
) { };
autoreconfHook264 = makeSetupHook
{ deps = [ autoconf264 automake111x gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoreconfHook264 = autoreconfHook.override {
autoconf = autoconf264;
automake = automake111x;
};
autoreconfHook269 = makeSetupHook
{ deps = [ autoconf269 automake gettext libtool ]; }
../build-support/setup-hooks/autoreconf.sh;
autoreconfHook269 = autoreconfHook.override {
autoconf = autoconf269;
};
autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
../build-support/setup-hooks/auto-patchelf.sh;
@ -19615,6 +19619,8 @@ in
go-migrate = callPackage ../development/tools/go-migrate { };
gomacro = callPackage ../development/tools/gomacro { };
gomodifytags = callPackage ../development/tools/gomodifytags { };
go-langserver = callPackage ../development/tools/go-langserver { };

View file

@ -2105,6 +2105,8 @@ in {
ewmh = callPackage ../development/python-modules/ewmh { };
exdown = callPackage ../development/python-modules/exdown { };
exchangelib = callPackage ../development/python-modules/exchangelib { };
execnet = callPackage ../development/python-modules/execnet { };