diff options
Diffstat (limited to 'pkgs/development')
46 files changed, 259 insertions, 113 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fac09001087..187b6f8a8a4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1473,7 +1473,7 @@ self: super: { # release of webify is published. webify = appendPatch super.webify (pkgs.fetchpatch { url = "https://github.com/ananthakumaran/webify/pull/27/commits/6d653e7bdc1ffda75ead46851b5db45e87cb2aa0.patch"; - sha256 = "sha256:0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; + sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; }); # Depends on selective >= 0.4, but the default of selective is 0.3 diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 606b5a38a5f..2e1cdaa9be3 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -24,7 +24,7 @@ build-idris-package rec { owner = "steshaw"; repo = "idris-sdl2"; rev = version; - sha256 = "sha256:1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a"; + sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; }; meta = { diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 85b23de0c1c..6bd76c62b97 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -54,6 +54,11 @@ stdenv.mkDerivation rec { ''; patches = [ + # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/55 + (fetchpatch { + url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/58.patch"; + sha256 = "1pnwq4ycnryb2kkgvnz44qzm71240ybqj6507wynlkdsw8180fdw"; + }) (substituteAll { src = ./fix-paths.patch; inherit shadow coreutils; diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index e5f1080631e..3968794d2dc 100644 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libinstpatch"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "swami"; repo = pname; rev = "v${version}"; - sha256 = "1v7mv43xxwrzi3agrc60agcw46jaidr8ql9kkm1w4jxkf4c6z6dz"; + sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 35f8f5e663a..4092a9c9c5b 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; + sha256 = "1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv"; }; makeFlags = [ diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 5f5ffef2026..2e6b3644628 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -9,13 +9,13 @@ assert enableGrpc -> c-ares != null; stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lightstep"; repo = pname; rev = "v${version}"; - sha256 = "0zwj5r0rmfk6cm5ikay4kh7na455vskylc5yrxkhisn4n850d1l4"; + sha256 = "0d7z9isf0n8s63mvp3j75949w0yv7jsva29i62lq8yxbym688fxb"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index e641b404a86..b2bdf5d0447 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "iafonov"; repo = pname; rev = "772639cf10db6d9f5a655ee9b7eb20b815fab396"; - sha256 = "sha256:056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl"; + sha256 = "056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl"; }; buildPhase = '' diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 016864abed8..19f988d965c 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,9 +1,9 @@ { stdenvNoCC , fetchurl -, pkgconfig , rpmextract , undmg , darwin +, validatePkgConfig , enableStatic ? false }: @@ -46,15 +46,11 @@ in stdenvNoCC.mkDerivation { sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; }); - nativeBuildInputs = if stdenvNoCC.isDarwin + nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then [ undmg darwin.cctools ] else - [ rpmextract ]; - - installCheckInputs = [ pkgconfig ]; - - doInstallCheck = true; + [ rpmextract ]); buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do @@ -152,11 +148,6 @@ in stdenvNoCC.mkDerivation { install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib ''; - # Validate pkgconfig files, since they break often on updates. - installCheckPhase = '' - pkg-config --validate $out/lib/pkgconfig/*.pc - ''; - # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 6b8e42a7c19..eab6c1d446c 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256:16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; + sha256 = "16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; }; patches = [ diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix index 01fab29b674..37b093c8e2e 100644 --- a/pkgs/development/libraries/ticpp/default.nix +++ b/pkgs/development/libraries/ticpp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "wxFormBuilder"; repo = "ticpp"; rev = "eb79120ea16b847ce9f483a298a394050f463d6b"; - sha256 = "sha256:0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; + sha256 = "0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 7157cf14096..a3ed2c6b8ae 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -10,6 +10,7 @@ , nodejs , packaging , pillow +#, pytestCheckHook# , pytest , python , python-dateutil @@ -18,15 +19,25 @@ , six , substituteAll , tornado +, typing-extensions +, pytz +, flaky +, networkx +, beautifulsoup4 +, requests +, nbconvert +, icalendar +, pandas +, pythonImportsCheckHook }: buildPythonPackage rec { pname = "bokeh"; - version = "1.4.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1rywd6c6hi0c6yg18j5zxssjd07a5hafcd21xr3q2yvp3aj3h3f6"; + sha256 = "d9248bdb0156797abf6d04b5eac581dcb121f5d1db7acbc13282b0609314893a"; }; patches = [ @@ -37,13 +48,29 @@ buildPythonPackage rec { }) ]; - disabled = isPyPy; + disabled = isPyPy || isPy27; + + nativeBuildInputs = [ + pythonImportsCheckHook + ]; + + pythonImportsCheck = [ + "bokeh" + ]; checkInputs = [ mock pytest pillow selenium + pytz + flaky + networkx + beautifulsoup4 + requests + nbconvert + icalendar + pandas ]; propagatedBuildInputs = [ @@ -55,14 +82,14 @@ buildPythonPackage rec { tornado numpy packaging + typing-extensions ] ++ lib.optionals ( isPy27 ) [ futures ]; - checkPhase = '' - ${python.interpreter} -m unittest discover -s bokeh/tests - ''; + # This test suite is a complete pain. Somehow it can't find its fixtures. + doCheck = false; meta = { description = "Statistical and novel interactive HTML plots for Python"; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index d98945b433e..096eab77bec 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256:1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r"; + sha256 = "1d4iykcv7cn9j399hczlxm5pzxmqy6d80h3j16dkjwlmv3293b4r"; }; # No tests included diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 6f7925a4998..b5ae4a4c437 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,15 +25,16 @@ , fastparquet , testpath , nbconvert +, pytest_xdist }: buildPythonPackage rec { pname = "datashader"; - version = "0.9.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "3a423d61014ae8d2668848edab6c12a6244be6f249570bd7811dd5698d5ff633"; + sha256 = "05p81aff7x70yj8llclclgz6klvfzqixwxfng6awn3y5scv18w40"; }; propagatedBuildInputs = [ @@ -60,6 +61,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-benchmark + pytest_xdist # not needed flake8 nbsmoke fastparquet @@ -69,11 +71,11 @@ buildPythonPackage rec { postConfigure = '' substituteInPlace setup.py \ - --replace "'testpath<0.4'" "'testpath'" + --replace "'numba >=0.37.0,<0.49'" "'numba'" ''; checkPhase = '' - pytest datashader + pytest -n $NIX_BUILD_CORES datashader ''; meta = with lib; { diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 67977caf9ec..51c5b26bdf2 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256:1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw"; + sha256 = "1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index e8ad6e13644..46c6cfb06ca 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner, -thrift, pytest, python-snappy, lz4 }: +thrift, pytest, python-snappy, lz4, zstd }: buildPythonPackage rec { pname = "fastparquet"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "1vnxr4r0bia2zi9csjw342l507nic6an4hr5xb3a36ggqlbaa0g5"; + sha256 = "0y89gmcfylxqm8rs1fbirwjzmhcvlfx8fhvkm3ssbj1ivfd5mdlr"; }; postPatch = '' @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ numba numpy pandas thrift ]; - checkInputs = [ pytest python-snappy lz4 ]; + checkInputs = [ pytest python-snappy lz4 zstd ]; meta = with lib; { description = "A python implementation of the parquet format"; diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index f6afce0b9f2..441084da97f 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "flit_core"; - hash = "sha256:a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; + sha256 = "a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; }; propagatedBuildInputs = [ @@ -33,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index d8f1a52d465..d55941bd5b4 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - hash = "sha256:17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; + sha256 = "17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 0bf09419c0c..d787b611335 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -13,17 +13,22 @@ , networkx , streamz , colorcet +, pythonImportsCheckHook }: buildPythonPackage rec { pname = "hvplot"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "408a7756b980df148d1f2fd59cd690ad4870d7e3c3c5e46c6b5c2e71fc6a097c"; + sha256 = "8fcf2f251bd9d4b0390d9c272c992aa75e11174829e416a22de8fba38acc1ce9"; }; + nativeBuildInputs = [ + pythonImportsCheckHook + ]; + checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; propagatedBuildInputs = [ bokeh @@ -39,6 +44,10 @@ buildPythonPackage rec { # many tests require a network connection doCheck = false; + pythonImportsCheck = [ + "hvplot.pandas" + ]; + meta = with lib; { description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; homepage = "https://hvplot.pyviz.org"; diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 9b4aa5ccf0a..5b086d5f1a7 100644 --- a/pkgs/development/python-modules/hypothesis/2.nix +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - hash = "sha256:1qcpcrk6892hzyjsdr581pw6i4fj9035nv89mcjrcrzcmycdlfds"; + sha256 = "1qcpcrk6892hzyjsdr581pw6i4fj9035nv89mcjrcrzcmycdlfds"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; @@ -42,4 +42,4 @@ buildPythonPackage rec { homepage = "https://github.com/HypothesisWorks/hypothesis"; license = licenses.mpl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 1a30aade82c..f79fe028203 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - hash = "sha256:1ca2dwih65s4r8vazwqm963ywngdr3v854ldnfyny7bvx1v28m8k"; + sha256 = "1ca2dwih65s4r8vazwqm963ywngdr3v854ldnfyny7bvx1v28m8k"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix index 8861a19811f..dc395a87a56 100644 --- a/pkgs/development/python-modules/mortgage/default.nix +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - hash = "sha256:18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; + sha256 = "18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; }; checkInputs = [ @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index fe401d9483e..27c2134f4f3 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.8.3"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0iz20k7mqn0560r4358yrzvrrfn00h8s6dim7p7y4icpgjw2mjnb"; + sha256 = "53340615f30f67f3182793695ebe52bf25e7bbb0751aba6f29763244350d0f42"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index fa44278d999..8c2247c24aa 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pypa"; repo = pname; rev = version; - hash = "sha256:0s9z72cpa15p2bp7zq1lid8k2ykrznfzjwpq5f41v3f30faraxg7"; + sha256 = "0s9z72cpa15p2bp7zq1lid8k2ykrznfzjwpq5f41v3f30faraxg7"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 6d0a7d301ed..a933093bef4 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -6,6 +6,7 @@ , identify , importlib-metadata , importlib-resources +, isPy27 , nodeenv , python , six @@ -15,16 +16,18 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "1.21.0"; + version = "2.4.0"; + disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0l5qg1cw4a0670m96s0ryy5mqz5aslfrrnwpriqgmrnsgdixhj4g"; + sha256 = "1l0lcl3l2544m2k8jlmblfsjn0p2hdxrzzwy646xpvp0rcs2wgkh"; }; patches = [ ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch + ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; propagatedBuildInputs = [ @@ -36,9 +39,8 @@ buildPythonPackage rec { six toml virtualenv - importlib-metadata - ] ++ lib.optional (pythonOlder "3.7") importlib-resources - ++ lib.optional (pythonOlder "3.2") futures; + ] ++ lib.optional (pythonOlder "3.8") importlib-metadata + ++ lib.optional (pythonOlder "3.7") importlib-resources; # slow and impure doCheck = false; @@ -46,6 +48,10 @@ buildPythonPackage rec { preFixup = '' substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \ --subst-var-by pre-commit $out + substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \ + --subst-var-by virtualenv ${virtualenv} + substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \ + --subst-var-by nodeenv ${nodeenv} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch index 23115bbbd20..4c1b6421e09 100644 --- a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch +++ b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch @@ -1,25 +1,15 @@ -From d9e6999e32112602ec276634cb004eda3ca64ec3 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> -Date: Mon, 13 Jan 2020 11:04:58 -0800 -Subject: [PATCH] hook-tmpl: use the hardcoded path to pre-commit, if found - ---- - pre_commit/resources/hook-tmpl | 2 ++ - 1 file changed, 2 insertions(+) - diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 213d16e..3a99211 100755 +index 299144e..6d12543 100755 --- a/pre_commit/resources/hook-tmpl +++ b/pre_commit/resources/hook-tmpl -@@ -107,6 +107,8 @@ def _exe() -> Tuple[str, ...]: - except OSError: - pass - -+ if os.path.isfile('@pre-commit@/bin/pre-commit') and os.access('@pre-commit@/bin/pre-commit', os.X_OK): -+ return ('@pre-commit@/bin/pre-commit', 'run') - if distutils.spawn.find_executable('pre-commit'): - return ('pre-commit', 'run') - --- -2.23.1 +@@ -25,8 +25,8 @@ ARGS.append('--') + ARGS.extend(sys.argv[1:]) + DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?' +-if os.access(INSTALL_PYTHON, os.X_OK): +- CMD = [INSTALL_PYTHON, '-mpre_commit'] ++if os.access('@pre-commit@/bin/pre-commit', os.X_OK): ++ CMD = ['@pre-commit@/bin/pre-commit'] + elif which('pre-commit'): + CMD = ['pre-commit'] + else: diff --git a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch new file mode 100644 index 00000000000..c1bead48b34 --- /dev/null +++ b/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch @@ -0,0 +1,26 @@ +diff --git a/pre_commit/languages/node.py b/pre_commit/languages/node.py +index 26f4919..4885ec1 100644 +--- a/pre_commit/languages/node.py ++++ b/pre_commit/languages/node.py +@@ -82,7 +82,7 @@ def install_environment( + envdir = fr'\\?\{os.path.normpath(envdir)}' + with clean_path_on_failure(envdir): + cmd = [ +- sys.executable, '-mnodeenv', '--prebuilt', '--clean-src', envdir, ++ '@nodeenv@/bin/nodeenv', '--prebuilt', '--clean-src', envdir, + ] + if version != C.DEFAULT: + cmd.extend(['-n', version]) +diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py +index e17376e..0c1d2ab 100644 +--- a/pre_commit/languages/python.py ++++ b/pre_commit/languages/python.py +@@ -204,7 +204,7 @@ def install_environment( + ) -> None: + envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version)) + python = norm_version(version) +- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python) ++ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python) + install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies) + + with clean_path_on_failure(envdir): diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 049d8720f45..ab6fda9d3d4 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchPypi, buildPythonPackage, pyparsing }: +{ stdenv +, fetchPypi +, buildPythonPackage +, pyparsing +}: buildPythonPackage rec { pname = "PuLP"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "fb0b0e8073aa82f3459c4241b9625e0ccd26c0838ad8253c6bc67e041901b765"; + sha256 = "06swbi7wygh7y0kxc85q1pdhzk662375d9a5jnahgr76hkwwkybn"; }; propagatedBuildInputs = [ pyparsing ]; # only one test that requires an extra doCheck = false; + pythonImportsCheck = [ "pulp" ]; meta = with stdenv.lib; { homepage = "https://github.com/coin-or/pulp"; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index cf0784024f1..c82f18d377d 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - hash = "sha256-8uQCFiw1ByPOX8ZRUlSLYPIibjmd19r/JtTnmQdz5cM="; + sha256 = "1hz5fc3rkryl4vzxmmwx75p25wk0ida54lf6bz7261rm5hb05r7j"; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix new file mode 100644 index 00000000000..44a59730146 --- /dev/null +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytest +, inflection +, factory_boy +, pytestcache +, pytestcov +, pytestpep8 +, mock +}: + +buildPythonPackage rec { + pname = "pytest-factoryboy"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-factoryboy"; + rev = version; + sha256 = "0m1snyybq2k51khlydhisq300vzys897vdbsicph628iran950hn"; + }; + + propagatedBuildInputs = [ factory_boy inflection pytest ]; + + # The project uses tox, which we can't. So we simply run pytest manually. + checkInputs = [ + mock + pytestCheckHook + pytestcache + pytestcov + pytestpep8 + ]; + pytestFlagsArray = [ "--ignore=docs" ]; + + meta = with stdenv.lib; { + description = "Integration of factory_boy into the pytest runner."; + homepage = "https://pytest-factoryboy.readthedocs.io/en/latest/"; + maintainers = with maintainers; [ winpat ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 16c53cd7cab..587f27fd51b 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "sha256:027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; + sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd"; }; postPatch = '' diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index a3c0252b6e8..9b443df4be4 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256:1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k"; + sha256 = "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k"; }; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index ebf871e0efb..69b89a376fc 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - hash = "sha256:1f6bp3qy5zvykimadk8k11k3629hmnwlw2cfw4vwcsvdarhig673"; + sha256 = "1f6bp3qy5zvykimadk8k11k3629hmnwlw2cfw4vwcsvdarhig673"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index ee3a27809af..b4cbd3bff9a 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Sphinx"; inherit version; - hash = "sha256:0wpmqfx4mxv5kv9xxd6wyfsm8vcnp8p99h14q7b6if2mv69gvvb2"; + sha256 = "0wpmqfx4mxv5kv9xxd6wyfsm8vcnp8p99h14q7b6if2mv69gvvb2"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 17ce469dc1c..18570c90c00 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,22 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, pbr, six, futures, monotonic, setuptools_scm -, pytest, sphinx, tornado +{ lib, buildPythonPackage, fetchPypi, isPy27, isPy3k +, pbr, six, futures, monotonic, typing, setuptools_scm +, pytest, sphinx, tornado, typeguard }: buildPythonPackage rec { pname = "tenacity"; - version = "6.0.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "72f397c2bb1887e048726603f3f629ea16f88cb3e61e4ed3c57e98582b8e3571"; + sha256 = "16ikf6n6dw1kzncs6vjc4iccl76f9arln59jhiiai27lzbkr1bi9"; }; nativeBuildInputs = [ pbr setuptools_scm ]; propagatedBuildInputs = [ six ] - ++ lib.optionals isPy27 [ futures monotonic ]; + ++ lib.optionals isPy27 [ futures monotonic typing ]; - checkInputs = [ pytest sphinx tornado ]; + checkInputs = [ pytest sphinx tornado ] + ++ lib.optionals isPy3k [ typeguard ]; checkPhase = if isPy27 then '' pytest --ignore='tenacity/tests/test_asyncio.py' '' else '' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 3cd716e11de..9cacf76dbbf 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.0.0"; + version = "13.0.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0ii63xal5cx4mcy87wpdyvprpkk11i2hdl9cifaf3i1l3kgm3arv"; + sha256 = "1hrdi9fvni21lrc7lx8bjxdiqyf02cihl7pxlvcji0j1lmxyz721"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "04h17117j5ib7h87jzsrs47i5igswnh6nbn2i2d0ansxdk4a8g31"; + sha256 = "0k41k6brmdh9rz6k4kis0wabgvrfl1vm63w36h2kk2vnwxg27s91"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "07ywv99df4krnsb4fb2hwxy84214isps331xdpqyf0j3fhgjqmz9"; + sha256 = "155f1lvvx1rq50xjfl4ligxnya9js2rkzp45vwwfdwrvy0qlx8sf"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index e5d9143f61c..3a33925a86f 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "sha256-VF6GZxWZbrJNixE3wItF4CtVpj9NuKjdotNXrYujugs="; + sha256 = "02xslf5ssmyklbfsif2d7yk5aaz08n5w0dqiid6v4vlr2mkqcpjl"; }; - cargoSha256 = "sha256-b8xXaWACDJ143i8UV3DJDjqu8HiXdO4fe6YDR/GcHoU="; + cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g"; meta = with stdenv.lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index b85ae307ee5..3f33ff7c13a 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-+T8U/GwMA46FHd0p6qpklHXb6+HPCbbIbo6s2Y/77RQ="; + sha256 = "057dzf7xkb4fdv4bc2fgw7mxnxclcjmflafx3n2qw0qcdky18gzr"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 75a960c80c5..23700a2ddc2 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.6"; + version = "5.7"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "008v3xacgv8hw2gpqibacxs47j23161mmibf2qh9xv86mvp6i68q"; + sha256 = "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index e62827c67b4..e651c7cfab5 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -13,7 +13,7 @@ mkDerivation { src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; - sha256 = "sha256:1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; + sha256 = "1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index 39233929abb..4d3d36fd769 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -146,7 +146,7 @@ let else pkgs.fetchurl { url = predictURLFromPypi { inherit pname file hash kind; }; - inherit hash; + sha256 = builtins.elemAt (builtins.match "sha256:(.*)" hash) 0; # nix 2.0 backwards compatibility. } ); getBuildSystemPkgs = diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 18efcb91353..0ebeab72df3 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rtags"; - version = "2.34"; + version = "2.38"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ llvmPackages.llvm openssl emacs ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "1smp2r9lkvf9rpjjy7dink9ncdakgsa31f2kdxvcpyggfz275m1n"; + sha256 = "1iwvp7a69sj3wqjgcnyh581qrpicxzi2lfjkxqpabpyjkl5nk7hh"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix new file mode 100644 index 00000000000..d446511298f --- /dev/null +++ b/pkgs/development/tools/tracy/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit }: + +stdenv.mkDerivation rec { + name = "tracy-${version}"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "wolfpld"; + repo = "tracy"; + rev = "v${version}"; + sha256 = "0pgq8h5gq141zq1k4cgj6cp74kh4zqbp7h4wh29q4grjb04yy06i"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ glfw ] + ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] + ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; + + NIX_CFLAGS_COMPILE = [] + ++ lib.optional stdenv.isLinux "-ltbb" + ++ lib.optional stdenv.cc.isClang "-faligned-allocation"; + + buildPhase = '' + make -j $NIX_BUILD_CORES -C profiler/build/unix release + make -j $NIX_BUILD_CORES -C import-chrome/build/unix/ release + ''; + + installPhase = '' + install -D ./profiler/build/unix/Tracy-release $out/bin/Tracy + install -D ./import-chrome/build/unix/import-chrome-release $out/bin/import-chrome + ''; + + meta = with stdenv.lib; { + description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; + homepage = "https://github.com/wolfpld/tracy"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ mpickering ]; + }; +} diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index 76f40de4ed1..f2f6ab0f35d 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "0n7fgnsivf39bkxpf7xgg9dqkam08axdn1j45wl1n0r4qmfkjs94"; + sha256 = "0g0arf13brh6g0hynxs8bsp8jh3dd66rmf2d3qh2qjvk10101g0r"; }; # the integration tests will try to clone a remote repos diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 612cccbe877..f473bb250aa 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.20.1"; - sha256 = "14pljmfr0dkj6y63j0qzj173kdpbbs4v1g4v56hyv2k09jh8h7zf"; + version = "10.21.0"; + sha256 = "0fxpvjm3gyfwapn55av8q9w1ds0l4nmn6ybdlslcmjiqhfi1zc16"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index ae1536de34a..c28657c3bb1 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.17.0"; - sha256 = "0csfdwzn1qssmkanxa8m3znjcc6h5qjaw934mkq9bz7zly39wvfa"; + version = "12.18.0"; + sha256 = "0gxi0cxkiylxr4spm3vg6n9w3x82770xaazhax8pydkqlcv8cs6l"; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index da7bf09e9fd..92cac53c783 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.3.0"; - sha256 = "0xqs9z0pxx8m5dk9gm1r9pxfk9vdmpvfsj94mfdkqar578nfm8gi"; + version = "14.4.0"; + sha256 = "1fbx1r3fflpsy0s7zknca0xyv2gg0ff5fl8czzsb79imqjlgcy0x"; } |