diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-10 12:12:56 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-10 12:12:56 +0200 |
| commit | 1ab03c3a76dd142a44c27951018f145ff78fb57e (patch) | |
| tree | 3b5d5847cddc04766e5a755a33bbcc0f0b9ab88c /pkgs/development | |
| parent | 2e6fb229923cc2fd7275d26ea87f22898bdc24fa (diff) | |
| parent | 807ca93fadd5197c2260490de0c76e500562dc05 (diff) | |
| download | nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.tar nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.tar.gz nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.tar.bz2 nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.tar.lz nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.tar.xz nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.tar.zst nixpkgs-1ab03c3a76dd142a44c27951018f145ff78fb57e.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development')
203 files changed, 1745 insertions, 1002 deletions
diff --git a/pkgs/development/compilers/matter-compiler/Gemfile.lock b/pkgs/development/compilers/matter-compiler/Gemfile.lock index ab1833b3cfe..230b99d91a6 100644 --- a/pkgs/development/compilers/matter-compiler/Gemfile.lock +++ b/pkgs/development/compilers/matter-compiler/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES matter_compiler BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index ef27fc41b07..94ed520ee6c 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.5.4"; + version = "3.6.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c"; - sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl"; + rev = "2860cc274b1b5b76a71d0e5190bf67a133d6f809"; + sha256 = "05wcg0gfln85spjfgsij818h2sp4y6s8bvdcwmzv0r8jblr8402b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index e1d404a6b15..1572f5e4be2 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "10nn04hfky4x75nss33vvslw958pjvhw35lcfb3lxvaifqg23cpl"; + sha256 = "1ddw3fqrmwh4w6z6xgck4jhmq33rwgbmpjw07g12ri1vgw4xks9w"; }; buildInputs = [ unzip makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; - homepage = http://groovy-lang.org/; + homepage = "http://groovy-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index d260a90e8ea..1d6576b383c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -189,7 +189,7 @@ let in symlinkJoin { name = "php-with-extensions-${version}"; - inherit (php) version dev; + inherit (php) version; nativeBuildInputs = [ makeWrapper ]; passthru = { inherit buildEnv withExtensions enabledExtensions; @@ -218,8 +218,8 @@ let }); php72base = generic' { - version = "7.2.28"; - sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw"; + version = "7.2.29"; + sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; self = php72base; selfWithExtensions = php72; @@ -228,8 +228,8 @@ let }; php73base = generic' { - version = "7.3.15"; - sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld"; + version = "7.3.16"; + sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; self = php73base; selfWithExtensions = php73; @@ -238,8 +238,8 @@ let }; php74base = generic' { - version = "7.4.3"; - sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ="; + version = "7.4.4"; + sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; self = php74base; selfWithExtensions = php74; }; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6c0b3c867a4..f6710d4fc57 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.850.1"; + version = "9.860.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "07y0s87srj2wxbywmnxam9bif0x625n6b8np19832mvsb6wqkhyl"; + sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ linear algebra library"; - homepage = http://arma.sourceforge.net; + homepage = "http://arma.sourceforge.net"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 3552e335fed..0165e8ea0d3 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; + sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805"; }; bass_fx = { diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index d5c15ad3e38..e5f1080631e 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.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "swami"; repo = pname; rev = "v${version}"; - sha256 = "0ksilyszcm7mwb6m8qyrgalvh4h2vkyz7wzj0xczcqkj15bcl4lw"; + sha256 = "1v7mv43xxwrzi3agrc60agcw46jaidr8ql9kkm1w4jxkf4c6z6dz"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.swamiproject.org/; + homepage = "http://www.swamiproject.org/"; description = "MIDI instrument patch files support library"; license = licenses.lgpl21; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 32e723671e8..6cb2ac60443 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -5,14 +5,14 @@ let pname = "clutter"; - version = "1.26.2"; + version = "1.26.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; + sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 596de28d2df..f6a7f6c12fb 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.03"; + version = "20.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0wlbh1py9074896fxa8lcfvjj3l943zz8wjl2rn7g21xf0ar9kyv"; + sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 855ca0385df..52c3f047c19 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.6"; + version = "1.1.26"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; + sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd"; }; buildInputs = [ diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 2d2a9a3c350..ec9bf2e5cb9 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.1"; + version = "3.26.2"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"; + sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 873865cdf83..8d52f190d01 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "0.99.0"; + version = "1.0.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"; + sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index c9fb5091239..1f25abd2cf3 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -28,11 +28,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.0"; + version = "1.64.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vynivp1d10jkxfcgb5vcjkba5dvi7amkm8axmyad7l4dfy4qf36"; + sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -70,29 +70,6 @@ in stdenv.mkDerivation rec { # Hard-code various paths ./fix-paths.patch - # Clean-ups to make installing installed tests separately easier. - # https://gitlab.gnome.org/GNOME/gjs/merge_requests/403 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/commit/14bae0e2bc7e817f53f0dcd8ecd032f554d12e6f.patch"; - sha256 = "4eaNl2ddRMlUfBoOUnRy10+RlQR4f/mDMhjQ2txmRcg="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/commit/075f015d7980dc94fff48a1c4021cb50691dddb1.patch"; - sha256 = "Iw0XfGiOUazDbpT5SqFx3UVvBRtNm3Fds1gCsdxKucw="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/commit/5cfd2c2ffd2d8c002d40f658e1c54027dc5d8506.patch"; - sha256 = "rJ5Je1zcfthIl7+hRoWw3cwzz/ZkS2rtjvFOQ8znBi8="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/commit/1a81f40e8783fe97dd00f009eb0d9ad45297e831.patch"; - sha256 = "+k4Xv3sJ//iDqkVTkO51IA7FPtWsS0P9YUVTWnIym4I="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/commit/361a319789310292787d9c62665cef9e386a9b20.patch"; - sha256 = "ofOP1OFs9q5nW9rE/2ovbwZR6gTrDDh8cczdYipoWNE="; - }) - # Allow installing installed tests to a separate output. ./installed-tests-path.patch ]; diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 8b522c6e92b..2ed717a49b8 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -2,12 +2,12 @@ , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "gl2ps"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; + sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk"; }; buildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://geuz.org/gl2ps; + homepage = "http://geuz.org/gl2ps"; description = "An OpenGL to PostScript printing library"; platforms = platforms.all; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 45096e031d3..818d3c30de2 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "grantlee"; - version = "5.1.0"; + version = "5.2.0"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; - sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; + sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk"; name = "${pname}-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch deleted file mode 100644 index d049d6c96f8..00000000000 --- a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Sat, 20 Jul 2019 17:35:30 +0200 -Subject: [PATCH] Fix compile with newer Qt/cmake combination - -Without this i get huge errors about Qt needing C++11 support ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d51110..0859788 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,9 @@ endif() - - project(Grantlee) - -+set (CMAKE_CXX_STANDARD 11) -+set (CMAKE_CXX_EXTENSIONS OFF) -+ - # Workaround for http://public.kitware.com/Bug/view.php?id=12301 - if (MINGW) - if(NOT CMAKE_BUILD_TYPE) diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch index d78ef74ce35..64eb11c3f15 100644 --- a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -2,17 +2,17 @@ Index: grantlee-5.1.0/templates/lib/templateloader.cpp =================================================================== --- grantlee-5.1.0.orig/templates/lib/templateloader.cpp +++ grantlee-5.1.0/templates/lib/templateloader.cpp -@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB +@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName, + QLatin1Char('/') + fileName); const QFileInfo fi(file); - + - if (file.exists() - && !fi.canonicalFilePath().contains( -- QDir(d->m_templateDirs.at(i)).canonicalPath())) +- QDir(d->m_templateDirs.at(i)).canonicalPath())) - return Template(); ++i; } - + @@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co + QLatin1Char('/') + fileName); diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 19850b2e7e4..9c4015a1c19 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1,3 +1,2 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch -grantlee-cxx11.patch diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 025fc42553b..588cf4d2b4d 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16k8kqw9w775f1ijsk898hp210an5mv4yfyrmik9m8khxx593nwx"; + sha256 = "11csdnb5xj1gkn1shynp3jdsfhhi7ks3apgmavfan0p6n85f64sc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 8c6c9dde878..cff6569be50 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "165fa81v7b4ca6brsjxmhkv0r542f93204zvckhqsjswwsp6195w"; + sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh"; }; postPatch = '' diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index ffa64858b75..35f8a8484e7 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; let - version = "2.1.0"; + version = "2.2.0"; versmm = versions.major version + "." + versions.minor version; name = "hwloc-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"; + sha256 = "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f"; }; configureFlags = [ @@ -80,7 +80,7 @@ in stdenv.mkDerivation { # https://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = https://www.open-mpi.org/projects/hwloc/; + homepage = "https://www.open-mpi.org/projects/hwloc/"; maintainers = with maintainers; [ fpletz markuskowa ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 4637c8c950f..23b26c9a890 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "19.4.1"; + version = "20.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "167g5rmrmzmfp4y4vghyxqi4schvvkwax3cvqgniqx8q1ib5l346"; + sha256 = "0k130yiq8n34ppddpgl7kwq5w2y7n49jxiyk7x52y773m97xd6y1"; }; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/gmmlib; + homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; description = "Intel Graphics Memory Management Library"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index d4fcf620db6..b7e6d781471 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.66/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.68/ ) diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch index 0411755f45a..f966064f929 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch @@ -2,12 +2,12 @@ Index: kcmutils-5.33.0/src/kcmoduleloader.cpp =================================================================== --- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp +++ kcmutils-5.33.0/src/kcmoduleloader.cpp -@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con - KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); - KPluginFactory* factory = loader.factory(); - if (!factory) { -- qWarning() << "Error loading plugin:" << loader.errorString(); -+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); - } else { - KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >(); - if (!cm) { +@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep + KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); + KPluginFactory* factory = loader.factory(); + if (!factory) { +- qWarning() << "Couldn't load plugin:" << loader.errorString(); ++ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); + } else { + std::unique_ptr<KQuickAddons::ConfigModule> cm(factory->create<KQuickAddons::ConfigModule>(nullptr, args2)); + if (!cm) { diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 2441ff69359..ffea42c130f 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,661 +1,662 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks { fetchurl, mirror }: { attica = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/attica-5.66.0.tar.xz"; - sha256 = "e87ea061d393104804aa65db69ec3489512b472d8fb821c9fc49ffdcb85177fb"; - name = "attica-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/attica-5.68.0.tar.xz"; + sha256 = "9b4001a32831c9bae1d44161247acd5e6d3048ca2ece98c2c756c72a1464b9e9"; + name = "attica-5.68.0.tar.xz"; }; }; baloo = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/baloo-5.66.0.tar.xz"; - sha256 = "9495869eee72f587efadc8a848c3f76b93a1dcb1914c8e818d7084451107a1f8"; - name = "baloo-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/baloo-5.68.0.tar.xz"; + sha256 = "4b599fb279ef92dc4f575847767c370f2633b27e884e372c3f7b92f08917865e"; + name = "baloo-5.68.0.tar.xz"; }; }; bluez-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/bluez-qt-5.66.0.tar.xz"; - sha256 = "cc3f3fcc1df87b61480549d658c1a27690661aaa4f22a65552efe3f6bf41c887"; - name = "bluez-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/bluez-qt-5.68.0.tar.xz"; + sha256 = "99889cac874820e83a32bee938b6cc8e25dca6a3013d4a589ac7b8f5d32b4224"; + name = "bluez-qt-5.68.0.tar.xz"; }; }; breeze-icons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/breeze-icons-5.66.0.tar.xz"; - sha256 = "445a77204c7d9ac398e7f1d1594cd93e719665c85c7fb9ef71fde1ce68cb64d7"; - name = "breeze-icons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/breeze-icons-5.68.0.tar.xz"; + sha256 = "750fff6560abfa85a2243187d14f1b8f1d3d1c4097d84cbf8c58d2f48102fe8d"; + name = "breeze-icons-5.68.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/extra-cmake-modules-5.66.0.tar.xz"; - sha256 = "2ff1a4ede28488ea787e742ab37edaacc5f59bf9188476e48f681ce23300b9c4"; - name = "extra-cmake-modules-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/extra-cmake-modules-5.68.0.tar.xz"; + sha256 = "4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e"; + name = "extra-cmake-modules-5.68.0.tar.xz"; }; }; frameworkintegration = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/frameworkintegration-5.66.0.tar.xz"; - sha256 = "55c01613436781d74652bef19fc594448cdee4c002d5e1713b583473455f54d8"; - name = "frameworkintegration-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/frameworkintegration-5.68.0.tar.xz"; + sha256 = "5bb3c2e56b2c4c41d8a472363f80445fd3fc28656e6a3163d48ed826a133985a"; + name = "frameworkintegration-5.68.0.tar.xz"; }; }; kactivities = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kactivities-5.66.0.tar.xz"; - sha256 = "7c37c8f189cb3c9f0cacbcef606562d8bc596e685d2a47bc9994deae6e69f41f"; - name = "kactivities-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kactivities-5.68.0.tar.xz"; + sha256 = "1853135feb6adfec252e6fab0b1472450422afd5998a9a31d942e8672fbe7111"; + name = "kactivities-5.68.0.tar.xz"; }; }; kactivities-stats = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kactivities-stats-5.66.0.tar.xz"; - sha256 = "567de599a8fd8b6a5304fc1696e24b069b4eaa7bbc643b1e760293d8c1162b73"; - name = "kactivities-stats-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kactivities-stats-5.68.0.tar.xz"; + sha256 = "fb645db4685113dfd98834f48d8941529fee53d5e26ec5e36cfee8a9bfae97ae"; + name = "kactivities-stats-5.68.0.tar.xz"; }; }; kapidox = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kapidox-5.66.0.tar.xz"; - sha256 = "19af4d93adfa22ff4de832185c1e9191d35039394bb032ee60e33efc5cc456db"; - name = "kapidox-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kapidox-5.68.0.tar.xz"; + sha256 = "4f60582cb0771c38733989f192694636b1c93ecae290bfbe551030dd397e976e"; + name = "kapidox-5.68.0.tar.xz"; }; }; karchive = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/karchive-5.66.0.tar.xz"; - sha256 = "434f315af624d315b06a35ba5e71e570f36ca454af891833d6e896e42edf23d8"; - name = "karchive-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/karchive-5.68.0.tar.xz"; + sha256 = "518f07629d87e5778e1d8ce066f5590941472d9fffa7bd74819759be5c6edf0d"; + name = "karchive-5.68.0.tar.xz"; }; }; kauth = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kauth-5.66.0.tar.xz"; - sha256 = "f167ec8f926caf348a161a39e0c0588f517fe3a49ab4f39c1dfa94f47e104414"; - name = "kauth-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kauth-5.68.0.tar.xz"; + sha256 = "b9a7cd724709ea188852f7656fbeda2dc3cc40cc5d09573049c2680c0edbd41f"; + name = "kauth-5.68.0.tar.xz"; }; }; kbookmarks = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kbookmarks-5.66.0.tar.xz"; - sha256 = "b225463ec0fe2424a1f5e70c83b02e3ece6a3ca80832cd2621732d18d7160a43"; - name = "kbookmarks-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kbookmarks-5.68.0.tar.xz"; + sha256 = "80dc06188a5e1d960d46f527bd82d9b79df75a785164fa29a088a7b705abbf84"; + name = "kbookmarks-5.68.0.tar.xz"; }; }; kcalendarcore = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcalendarcore-5.66.0.tar.xz"; - sha256 = "bbdb48c775ccc1e1bdba962b5ccdc0611a2d14523076d33c4507c05db3ab33d3"; - name = "kcalendarcore-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcalendarcore-5.68.0.tar.xz"; + sha256 = "50ffbe4feb9a602c09e130d6f10f0f260fa7625bc266003697895e1d716d6ba9"; + name = "kcalendarcore-5.68.0.tar.xz"; }; }; kcmutils = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcmutils-5.66.0.tar.xz"; - sha256 = "e02dbf996ed93bdc2813a2a64dcb0ddeb54987dd84bbe787bd890b17d57e4a85"; - name = "kcmutils-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcmutils-5.68.0.tar.xz"; + sha256 = "a688d54286fe11b23e11e2100536a513a332d2a7d784fcbebeaccbfb980d83d1"; + name = "kcmutils-5.68.0.tar.xz"; }; }; kcodecs = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcodecs-5.66.0.tar.xz"; - sha256 = "0dcb684ad75374bbab82b90bda20e914cf656bd51a6dff69bbb1bfc650481a05"; - name = "kcodecs-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcodecs-5.68.0.tar.xz"; + sha256 = "5f1e6ae3a51ca817aa0a5082ce4ce5490cb527388ef1888a642fb374c5e2bb48"; + name = "kcodecs-5.68.0.tar.xz"; }; }; kcompletion = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcompletion-5.66.0.tar.xz"; - sha256 = "be5e272e257b9fe5b951d7c596fef7c75b16886e6b1cd5ebff60d87bd6dd495d"; - name = "kcompletion-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcompletion-5.68.0.tar.xz"; + sha256 = "642d68b4c472e11a8861a61238297633be288bfd72c13547707754f1ae2be33a"; + name = "kcompletion-5.68.0.tar.xz"; }; }; kconfig = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kconfig-5.66.0.tar.xz"; - sha256 = "c0df73bde40162a5ffc20604c2ad343e71a6df852c3f7b05e70e1464f5f63256"; - name = "kconfig-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kconfig-5.68.0.tar.xz"; + sha256 = "c3bf138a7a4d002475f2483987baf40a61cda7d491c3cc292dd2c6da726ee898"; + name = "kconfig-5.68.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kconfigwidgets-5.66.0.tar.xz"; - sha256 = "730834528307c65691d67c901f1c186b49d74ee986ef75e171e867e8751bf10a"; - name = "kconfigwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kconfigwidgets-5.68.0.tar.xz"; + sha256 = "f50421e9dbb6669e8d7c10605f7779ad03f30ea7c9c4451a70a7be66cd9df995"; + name = "kconfigwidgets-5.68.0.tar.xz"; }; }; kcontacts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcontacts-5.66.0.tar.xz"; - sha256 = "08086f554eb4718e91a9e96d143ba05fc741289928db9bcc21b21ca7125b0017"; - name = "kcontacts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcontacts-5.68.0.tar.xz"; + sha256 = "532f1e89c7412e971db8c431d627d38144470ddf5c978a7fa9348e418b6cd3c3"; + name = "kcontacts-5.68.0.tar.xz"; }; }; kcoreaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcoreaddons-5.66.0.tar.xz"; - sha256 = "8a8edf566cb08ad83cb17f942eeb8746993249cd0f7679f7eb810201b85e464b"; - name = "kcoreaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcoreaddons-5.68.0.tar.xz"; + sha256 = "c578ae30b4161e45e672d613d2d9c5575a849d21909d9817f90a441044df65d7"; + name = "kcoreaddons-5.68.0.tar.xz"; }; }; kcrash = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcrash-5.66.0.tar.xz"; - sha256 = "5a518059de3f3e85ee7b38a0edf348d097993518ce9b17504470f0d8aad3f2e4"; - name = "kcrash-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcrash-5.68.0.tar.xz"; + sha256 = "60daf2cee87c652619b098b688edce6f993c7960783159cd8be9d9145df29f7f"; + name = "kcrash-5.68.0.tar.xz"; }; }; kdbusaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdbusaddons-5.66.0.tar.xz"; - sha256 = "ee600f15af2fb9a28ad15f7e0689d519211fa63b86f2e6c356bd32530ebdfa46"; - name = "kdbusaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdbusaddons-5.68.0.tar.xz"; + sha256 = "839fe42f9ac8df353f87245110fd7b515a8eb29f0840f54481bd89e5175bf1af"; + name = "kdbusaddons-5.68.0.tar.xz"; }; }; kdeclarative = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdeclarative-5.66.0.tar.xz"; - sha256 = "ed3a334d8bce6d70e68e013d4210bd6e11cb2ebce9ede4c1813f44dada7eca73"; - name = "kdeclarative-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdeclarative-5.68.0.tar.xz"; + sha256 = "96a032bcb360e0ffcfe51d4d2f6153786682c2f967592bffcf15b9e6cd4cd3ae"; + name = "kdeclarative-5.68.0.tar.xz"; }; }; kded = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kded-5.66.0.tar.xz"; - sha256 = "52223e641c4e8e3158220ed7b6c48e4c3f3e67f882603ada0e3757b4136255a4"; - name = "kded-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kded-5.68.0.tar.xz"; + sha256 = "b03afe48fbdbd7d92c46b3b60bdb4b825f77e1a9d00c16a5f236b24a0135e4b7"; + name = "kded-5.68.0.tar.xz"; }; }; kdelibs4support = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdelibs4support-5.66.0.tar.xz"; - sha256 = "314d0ddb95c024c3d36dd262fcaa9295b462e6430f84b22c82f145029e3b2708"; - name = "kdelibs4support-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdelibs4support-5.68.0.tar.xz"; + sha256 = "2fca7bf9d31b081e7568631b6b6d2f7847068217261e47ef0dea106470c22df1"; + name = "kdelibs4support-5.68.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdesignerplugin-5.66.0.tar.xz"; - sha256 = "a7f9c530d8c7d214a176ee381541bd45f3a000a3e86404040b11f1394912d40b"; - name = "kdesignerplugin-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdesignerplugin-5.68.0.tar.xz"; + sha256 = "ae433e0eeaf0007312b1f32fc4349cf26c34617a5a9951ae4155c5c4e4009b72"; + name = "kdesignerplugin-5.68.0.tar.xz"; }; }; kdesu = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdesu-5.66.0.tar.xz"; - sha256 = "764d30acb0ef1d609c9454ecabb939bd64a814442e01aba769eba0673b56f88a"; - name = "kdesu-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdesu-5.68.0.tar.xz"; + sha256 = "427ba50bcd14308980cbdfdc77a6b7419277942a42d83da72ff3afbc1ec78903"; + name = "kdesu-5.68.0.tar.xz"; }; }; kdewebkit = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdewebkit-5.66.0.tar.xz"; - sha256 = "f73d2599ce2269eaab45ddc11bdeb49dc887e950ded57454f3fd6499c370a777"; - name = "kdewebkit-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdewebkit-5.68.0.tar.xz"; + sha256 = "181b14bd80e9f34aa2f896d39aca5be91f65d65bfaaf47660e91fdd98b7f36a2"; + name = "kdewebkit-5.68.0.tar.xz"; }; }; kdnssd = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdnssd-5.66.0.tar.xz"; - sha256 = "e280246212329f2834437ea3e84971fc85f3a3e6824963322e1f5de6aa04709c"; - name = "kdnssd-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdnssd-5.68.0.tar.xz"; + sha256 = "3369da85c0088c375f2123a82132fb84490c46ebc8e9cd1253c795ef45fd4403"; + name = "kdnssd-5.68.0.tar.xz"; }; }; kdoctools = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdoctools-5.66.0.tar.xz"; - sha256 = "41e4ca7aceab17919ef4a82ad99606f520ebfe57f30205597b4184f7a3730a7a"; - name = "kdoctools-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdoctools-5.68.0.tar.xz"; + sha256 = "93f5bee9dfaacacacfbeb3e915b192b5e645c1d01057b0cea4081c9ae5285670"; + name = "kdoctools-5.68.0.tar.xz"; }; }; kemoticons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kemoticons-5.66.0.tar.xz"; - sha256 = "dc307192d883108134da104d1507709a3b80c5b5e9984377840bd42d39a431dd"; - name = "kemoticons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kemoticons-5.68.0.tar.xz"; + sha256 = "e03fe81ad34e107dc5fe61f9bf424ecef7716bf8a62f8abb78fd3f6bd6806f56"; + name = "kemoticons-5.68.0.tar.xz"; }; }; kfilemetadata = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kfilemetadata-5.66.0.tar.xz"; - sha256 = "d78c2128887591229e6c61c60e77af8647e407d570b07892f5f06ab682f807b9"; - name = "kfilemetadata-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kfilemetadata-5.68.0.tar.xz"; + sha256 = "c2a8aee8243efa30fc921b7f50b390b47ee2cf83aa83b125a530a25de6d6fe21"; + name = "kfilemetadata-5.68.0.tar.xz"; }; }; kglobalaccel = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kglobalaccel-5.66.0.tar.xz"; - sha256 = "fae805994f946791525da65ca15f93b65b2001241c7539ad04b3aaef937fb1c3"; - name = "kglobalaccel-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kglobalaccel-5.68.0.tar.xz"; + sha256 = "2eb710a3f29cbc8b7875fb3e8315d7c8e3b5bb93867e0a34cd5cdbac690bcbbf"; + name = "kglobalaccel-5.68.0.tar.xz"; }; }; kguiaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kguiaddons-5.66.0.tar.xz"; - sha256 = "379e5ed87b00d344a13e424e39d97d74d494c503400bcd72df132de74c8cc591"; - name = "kguiaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kguiaddons-5.68.0.tar.xz"; + sha256 = "cdbf694e92b47358c2e2c31917bf5f01382042c2cb99b65faf3bc00a0eb52c64"; + name = "kguiaddons-5.68.0.tar.xz"; }; }; kholidays = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kholidays-5.66.0.tar.xz"; - sha256 = "2d9bb70fbcb3a45208409228b5e5a88b0cb00fe8f2621e2e938bc77c2df11f02"; - name = "kholidays-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kholidays-5.68.0.tar.xz"; + sha256 = "067a544c22f5988cf959a475b66ed62e419b975b3ee22810667a076f3d50dbba"; + name = "kholidays-5.68.0.tar.xz"; }; }; khtml = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/khtml-5.66.0.tar.xz"; - sha256 = "ee34b082760262fb9b5e287960955075ec72179585e51567350a08bf0b4b7a10"; - name = "khtml-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/khtml-5.68.0.tar.xz"; + sha256 = "af97da0a5d877c928d98690c3629a8f9788b29b27f583c9e3e26144a6abb9dcc"; + name = "khtml-5.68.0.tar.xz"; }; }; ki18n = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ki18n-5.66.0.tar.xz"; - sha256 = "9622337a513fcb8f0b5100c218b9fa85617f92024e5d7feada6d071f58a329e3"; - name = "ki18n-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ki18n-5.68.0.tar.xz"; + sha256 = "2c59dd55d032c95710e338e376a31bf11d799bceba8ebfdb148c8b77067a1e92"; + name = "ki18n-5.68.0.tar.xz"; }; }; kiconthemes = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kiconthemes-5.66.0.tar.xz"; - sha256 = "93fa9b8d0f951c2c9991f366081f98670086f2b66a740d7be95b64c35dff111d"; - name = "kiconthemes-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kiconthemes-5.68.0.tar.xz"; + sha256 = "ac3f322f2644dd0468cd2b07cc0c7f853f1ac4bc714fe532bbe92e88141f6729"; + name = "kiconthemes-5.68.0.tar.xz"; }; }; kidletime = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kidletime-5.66.0.tar.xz"; - sha256 = "66e891b33ed9026ed6fd211cd1ecf3405255b19d3a58199b87af0b22a40d7185"; - name = "kidletime-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kidletime-5.68.0.tar.xz"; + sha256 = "cd6309d403ea36553abc99af4fa7e4ed3f8b3b2c55d14887ef09d68e5627b3e7"; + name = "kidletime-5.68.0.tar.xz"; }; }; kimageformats = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kimageformats-5.66.0.tar.xz"; - sha256 = "c3b02befbb03f25deca0c7ffafea8c8a5eb79e21d8e2e566bf6fddf4f8afe04d"; - name = "kimageformats-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kimageformats-5.68.0.tar.xz"; + sha256 = "498fab29d19f10f2c91c796134f959b2cf3ce8372087b5eeb62f07e62af85949"; + name = "kimageformats-5.68.0.tar.xz"; }; }; kinit = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kinit-5.66.0.tar.xz"; - sha256 = "6d9b6ea1542ff5529fd42f49240be37bbd8a3dfdfe8c45ac980b3c9b3fee650e"; - name = "kinit-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kinit-5.68.0.tar.xz"; + sha256 = "fa136996eaaa7d2adb5a341c2b7a1abe86d8139c6f18999e0b0dc0220e512559"; + name = "kinit-5.68.0.tar.xz"; }; }; kio = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kio-5.66.0.tar.xz"; - sha256 = "c5350e20474b48c4fc02347186b7e4db24cb7580ba8c0f1e120b302e6b8db17d"; - name = "kio-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kio-5.68.0.tar.xz"; + sha256 = "9cc2fb2da84d6661a90eac81eb12c2e37921a5c34cbc1975f48d613e5a9d9eef"; + name = "kio-5.68.0.tar.xz"; }; }; kirigami2 = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kirigami2-5.66.0.tar.xz"; - sha256 = "4e4abfeaa5e997de52076786dd0d314f178bc883b1b48a8b2cf37dd5979ac41b"; - name = "kirigami2-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kirigami2-5.68.0.tar.xz"; + sha256 = "ad5f78afc916e9cb26f23918a6eb1983d4a57aa7e4f7314a8c23fb81e0fcaf4b"; + name = "kirigami2-5.68.0.tar.xz"; }; }; kitemmodels = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kitemmodels-5.66.0.tar.xz"; - sha256 = "5c8bcc36b9c29868ba7fa1ece9b83385379d7fed04937a92454ac94a356b3854"; - name = "kitemmodels-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kitemmodels-5.68.0.tar.xz"; + sha256 = "4f435db4362832cf63e49896229affd07f125567931fc499751d37ac3bafb149"; + name = "kitemmodels-5.68.0.tar.xz"; }; }; kitemviews = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kitemviews-5.66.0.tar.xz"; - sha256 = "026461fa2e3e0237a56eb18a2817453c788514578f27a4aa0832b85fe98a09ab"; - name = "kitemviews-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kitemviews-5.68.0.tar.xz"; + sha256 = "5196885ac42347d67779df61a03d7f9c54f38053ff91348ef6fdc08439b4742f"; + name = "kitemviews-5.68.0.tar.xz"; }; }; kjobwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kjobwidgets-5.66.0.tar.xz"; - sha256 = "34501be3ec85f0e71dba22669b3c862b297606e9bbff9aae466667c7075b6f8d"; - name = "kjobwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kjobwidgets-5.68.0.tar.xz"; + sha256 = "a11ba51ed0ab330f9a921cf0a61e604c27d88c1c2ea477a875bc0a0cd228a292"; + name = "kjobwidgets-5.68.0.tar.xz"; }; }; kjs = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kjs-5.66.0.tar.xz"; - sha256 = "9bed62ebf9fba7d986ff7baabf6c4431f02826c9be70beda15cc62c692fb5f7f"; - name = "kjs-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kjs-5.68.0.tar.xz"; + sha256 = "18e3d7c667aec21e9e4d0d4730ad32a10475b7db5a574a674a8b90a6f9e0cd0e"; + name = "kjs-5.68.0.tar.xz"; }; }; kjsembed = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kjsembed-5.66.0.tar.xz"; - sha256 = "58fe647901b69167b7c66a284c3181c2eda9c3b751548eb43bfe0795d10eb0ce"; - name = "kjsembed-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kjsembed-5.68.0.tar.xz"; + sha256 = "e9b9ac63f06447ffc6870806eb1507f0281281bae907fdbae42ee87a2b926db2"; + name = "kjsembed-5.68.0.tar.xz"; }; }; kmediaplayer = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kmediaplayer-5.66.0.tar.xz"; - sha256 = "7ec1fea10a1017a0f32183fdc3b2cca38c11273240423ac0d393626436fd4230"; - name = "kmediaplayer-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kmediaplayer-5.68.0.tar.xz"; + sha256 = "aa07466ea27b2e042e03d76fe3a23c570ba6521f57a2a51dc0ddf32fc8276db0"; + name = "kmediaplayer-5.68.0.tar.xz"; }; }; knewstuff = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knewstuff-5.66.0.tar.xz"; - sha256 = "acef94661e3a0e42938224c17b90f835d6686d88a25698fe82980d7e1139b1fe"; - name = "knewstuff-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knewstuff-5.68.0.tar.xz"; + sha256 = "f7c13b133f8b87ceece2d33d3f69215912b3b8c1dbb92ac39a1a6a0a42b7c93a"; + name = "knewstuff-5.68.0.tar.xz"; }; }; knotifications = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knotifications-5.66.0.tar.xz"; - sha256 = "aad3697a35109fad49fa286b7837d382599478bac33151cd7991c760866c12c1"; - name = "knotifications-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knotifications-5.68.0.tar.xz"; + sha256 = "646bd3bac073fbf4f19f9047360325c933751d605cf1311f4c922d7457fbda51"; + name = "knotifications-5.68.0.tar.xz"; }; }; knotifyconfig = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knotifyconfig-5.66.0.tar.xz"; - sha256 = "fd9e09b099f49896b5afa6f5663ef82266531ec413d4edeb03ebc768314a37d8"; - name = "knotifyconfig-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knotifyconfig-5.68.0.tar.xz"; + sha256 = "36c7c93964f2b9b584d73de1757f75d6ee8bb29ebe860e8fd6905354d2f10145"; + name = "knotifyconfig-5.68.0.tar.xz"; }; }; kpackage = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpackage-5.66.0.tar.xz"; - sha256 = "ae848a72e789a80d4a9d0346e90cb1038ebc784da6e7ff645411edd878554ab5"; - name = "kpackage-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpackage-5.68.0.tar.xz"; + sha256 = "49727d89f1ca7ee504397d6e8b5cd25c26cd0061596b26d8ab2b64e3987d2d16"; + name = "kpackage-5.68.0.tar.xz"; }; }; kparts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kparts-5.66.0.tar.xz"; - sha256 = "6de2395cd6a9993f216f4dc4718f352bc4cbbd8147734c76be0e1e6149f733d0"; - name = "kparts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kparts-5.68.0.tar.xz"; + sha256 = "fd17d0b0ff41d66c122530bbd8d1187f3271382207f63237ce72147865bf6d29"; + name = "kparts-5.68.0.tar.xz"; }; }; kpeople = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpeople-5.66.0.tar.xz"; - sha256 = "2728f08a9417ceb62aa9fc5a3340aed291aeb8a852e5f6f46c5a23fcc34168ab"; - name = "kpeople-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpeople-5.68.0.tar.xz"; + sha256 = "1cae86d527d650d9fa311f6007cc33b5dcd858bcfe4eb7cae65b5402205c4675"; + name = "kpeople-5.68.0.tar.xz"; }; }; kplotting = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kplotting-5.66.0.tar.xz"; - sha256 = "2a4387f748614f005cf67e549b9466c6eed52589ac58297857ba6a0be92c32ee"; - name = "kplotting-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kplotting-5.68.0.tar.xz"; + sha256 = "ccae7f90c016a1c517db820f352bb962f600678efdc4ac6b12e33d2c48f5c268"; + name = "kplotting-5.68.0.tar.xz"; }; }; kpty = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpty-5.66.0.tar.xz"; - sha256 = "a7fac6ced7504cec13a6776f0f4ba22db9878e44e2bbf85a219a2590e061c859"; - name = "kpty-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpty-5.68.0.tar.xz"; + sha256 = "35b838cff80311db52d83e1f61bc365277d54929742ee34265f36a12ce7689e3"; + name = "kpty-5.68.0.tar.xz"; }; }; kquickcharts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kquickcharts-5.66.0.tar.xz"; - sha256 = "70fae10b2af1c504e3b166beb0a342cdef0e0f8eb42e53ba88f0e3b174331624"; - name = "kquickcharts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kquickcharts-5.68.0.tar.xz"; + sha256 = "2cfb78bc2a7659a8c4ca6b072ff586c44e6da64e10b84a0fb0c5e3f03c944628"; + name = "kquickcharts-5.68.0.tar.xz"; }; }; kross = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kross-5.66.0.tar.xz"; - sha256 = "109159996da54ec52ec8114ff05f88bdee6428e49ca84515ab73c457e0005ebc"; - name = "kross-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kross-5.68.0.tar.xz"; + sha256 = "2f5a79a2097f84bfd2033ca183abdbf6626f6e5dc2c6f781c312f15c97dace33"; + name = "kross-5.68.0.tar.xz"; }; }; krunner = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/krunner-5.66.0.tar.xz"; - sha256 = "b7d67d61c0b0f96128c143e3d2694dc5ced88a7de73db0f4493f084de9dc9701"; - name = "krunner-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/krunner-5.68.0.tar.xz"; + sha256 = "4575ae1d658d32c15f9d57dc30616073e9d143d1a7f9632556906ef10e82e3b8"; + name = "krunner-5.68.0.tar.xz"; }; }; kservice = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kservice-5.66.0.tar.xz"; - sha256 = "f1174576f6e3e562d7de65494efc2c1c3ac569c656b8301ffbe34576ea623a6a"; - name = "kservice-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kservice-5.68.0.tar.xz"; + sha256 = "c774ce1738081c17e6e105e506aa89c22a9db07e73972d4b18ce733ec8ad0a8a"; + name = "kservice-5.68.0.tar.xz"; }; }; ktexteditor = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ktexteditor-5.66.0.tar.xz"; - sha256 = "9156e5e554b17d73078e4df09ae524a684f6adff8c2bbd40705b67fd30a6cc0b"; - name = "ktexteditor-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ktexteditor-5.68.0.tar.xz"; + sha256 = "dad373d4c136d113cca1ee6d700753563b7348813ff3229db670eedc63980cd6"; + name = "ktexteditor-5.68.0.tar.xz"; }; }; ktextwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ktextwidgets-5.66.0.tar.xz"; - sha256 = "dcc4595ceeecd3f59236ed303f2a0d61915c88eb36ad040a0562b60fb10cb9a1"; - name = "ktextwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ktextwidgets-5.68.0.tar.xz"; + sha256 = "23b354469afed21c840ca36e2bb5b2b383ed5c4ec3690bb009e273c39fbe00c0"; + name = "ktextwidgets-5.68.0.tar.xz"; }; }; kunitconversion = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kunitconversion-5.66.0.tar.xz"; - sha256 = "82db51b59ffdb5b2e69bc5c6ea54521acbc49ee5601baaf4e43cba50d12b418c"; - name = "kunitconversion-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kunitconversion-5.68.0.tar.xz"; + sha256 = "39ec06e2439306ce5b5efe5fe972d201e8c8e5fda634652cdc01c58427574adb"; + name = "kunitconversion-5.68.0.tar.xz"; }; }; kwallet = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwallet-5.66.0.tar.xz"; - sha256 = "6e48070e22a822a4003e1f7a739fe1e335bcf46982cbf4909d23a6e40689a827"; - name = "kwallet-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwallet-5.68.0.tar.xz"; + sha256 = "7524eeffdde3166df182f0dbf0f3f461905547bfd7a06387c7c503cd1ab75ecf"; + name = "kwallet-5.68.0.tar.xz"; }; }; kwayland = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwayland-5.66.0.tar.xz"; - sha256 = "f43231f10a5294f7ac3d43d2b903f1cf9649364782ca55831e0c069a54cc170d"; - name = "kwayland-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwayland-5.68.0.tar.xz"; + sha256 = "7c99bfac8f4bff457a5384c846be776c385649ced76be0f48699c6e12de24e7c"; + name = "kwayland-5.68.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwidgetsaddons-5.66.0.tar.xz"; - sha256 = "311d8274469f03b1938da5a4f7ad17c82e3f96bc79ec28624cb748b13403f451"; - name = "kwidgetsaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwidgetsaddons-5.68.0.tar.xz"; + sha256 = "b4ff96b4ec6365e5f9e4da5e651da99be491799a4e6cfd982d0838dda39844ac"; + name = "kwidgetsaddons-5.68.0.tar.xz"; }; }; kwindowsystem = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwindowsystem-5.66.0.tar.xz"; - sha256 = "416e2ba52a8c95a6b161ca306724525c1971723cb12e7d8ad7fa108e0b820f0c"; - name = "kwindowsystem-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwindowsystem-5.68.0.tar.xz"; + sha256 = "859c930a04c2588f792bfb9a28ed40b226db632b15c2851b186301b70d4c825a"; + name = "kwindowsystem-5.68.0.tar.xz"; }; }; kxmlgui = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kxmlgui-5.66.0.tar.xz"; - sha256 = "a8f9ed354e30ff1f40306e876d96fcd1fa3a26a8e6acfccdeab8f3437d7231bc"; - name = "kxmlgui-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kxmlgui-5.68.0.tar.xz"; + sha256 = "6310e9a725a982d3b70672367c5858727437fe08c8e409458e48b6015c7bf10e"; + name = "kxmlgui-5.68.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kxmlrpcclient-5.66.0.tar.xz"; - sha256 = "6b637c138414d93104477034737c9e866d99e43f883a3dfc45d3220df6c21e6c"; - name = "kxmlrpcclient-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kxmlrpcclient-5.68.0.tar.xz"; + sha256 = "e49f2ab649aafb292e01dacefb7b6f28fc596606764bef61e7ce622b67241324"; + name = "kxmlrpcclient-5.68.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/modemmanager-qt-5.66.0.tar.xz"; - sha256 = "50e24894d0243dbd2fc1a44a1e6368e3bb95a20c1ca56106d26752d5854d8be9"; - name = "modemmanager-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/modemmanager-qt-5.68.0.tar.xz"; + sha256 = "9c0febf18a04b69e47cffdb4563390a79a4a673da856502cbf50d5c7707670ec"; + name = "modemmanager-qt-5.68.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/networkmanager-qt-5.66.0.tar.xz"; - sha256 = "3089951c69845c4f6d1848bbbaf05116a72d4207a9f2d63b063a76c78549bf45"; - name = "networkmanager-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/networkmanager-qt-5.68.0.tar.xz"; + sha256 = "6a9bea5e6d58f5322848114e4e827edadee6b5a890a3549446ff23a568325e2c"; + name = "networkmanager-qt-5.68.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/oxygen-icons5-5.66.0.tar.xz"; - sha256 = "c6275fdcd4883c143adf4f16450a63dcb8651073a205bd14c599ec6ab638e8ef"; - name = "oxygen-icons5-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/oxygen-icons5-5.68.0.tar.xz"; + sha256 = "75a8113e567d8cbba57bda3c8829d116d58ebf6bc5ace88aed7700b28a00c463"; + name = "oxygen-icons5-5.68.0.tar.xz"; }; }; plasma-framework = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/plasma-framework-5.66.0.tar.xz"; - sha256 = "3263ccf95a6fcf8fde087d402d89d64c64c0130d4df62b95b860fada13aad419"; - name = "plasma-framework-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/plasma-framework-5.68.0.tar.xz"; + sha256 = "d27c7a62231784ecad1246f8a81b02fd6db2e9818244a06650fd6c972a69ea74"; + name = "plasma-framework-5.68.0.tar.xz"; }; }; prison = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/prison-5.66.0.tar.xz"; - sha256 = "ff5b4ae32ae44f2aea4b9254afe54af0fc9ea742517116cd2322e1a71a7315ce"; - name = "prison-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/prison-5.68.0.tar.xz"; + sha256 = "22e2b8e9ca06e4fb7ab91afeddbaebe6e2b6792bbcd5ba6c440c6fad0df176b7"; + name = "prison-5.68.0.tar.xz"; }; }; purpose = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/purpose-5.66.0.tar.xz"; - sha256 = "33b8ec6ede6a1deee6c85e45ebe42aca9a3add7884ee68aa8f1a16ed0637b4db"; - name = "purpose-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/purpose-5.68.0.tar.xz"; + sha256 = "c8c8f8244b568e52b4c02b89b71611bb8ba7cd07173645caa022b4bd90b41ab0"; + name = "purpose-5.68.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/qqc2-desktop-style-5.66.0.tar.xz"; - sha256 = "49bb518fc9f3c08cb330b1d82cb5c68d9ea358a562c6e460ea06aaaa13812b87"; - name = "qqc2-desktop-style-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/qqc2-desktop-style-5.68.0.tar.xz"; + sha256 = "0f522861e5757de6a1205c86a2e5f8d2a7375c96eac1ece95d03a35858dc7b03"; + name = "qqc2-desktop-style-5.68.0.tar.xz"; }; }; solid = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/solid-5.66.0.tar.xz"; - sha256 = "78deab8c55c30f2c923795730a9655b4d05a75cd6240bc0caa64104b141a3a39"; - name = "solid-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/solid-5.68.0.tar.xz"; + sha256 = "472c1934b3c9cf917f28ac0e5b0864de442b96852744c301d88d8ab7269d74c3"; + name = "solid-5.68.0.tar.xz"; }; }; sonnet = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/sonnet-5.66.0.tar.xz"; - sha256 = "5ca700e8e9954b380cc5f4cee0f392888ae240ccd2c4d3a37a2f41f8ac9c8294"; - name = "sonnet-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/sonnet-5.68.0.tar.xz"; + sha256 = "079c4f5fcb9fe670e1242b18648e178aaa01eb81dbdfc881805eea1ec585bd67"; + name = "sonnet-5.68.0.tar.xz"; }; }; syndication = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/syndication-5.66.0.tar.xz"; - sha256 = "5e6c90360461b820a48069af2838cffbcbedfe8bcd042535823e1cf1b43cd6b7"; - name = "syndication-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/syndication-5.68.0.tar.xz"; + sha256 = "0715fc1b7312b5081521b781d0878d88cc70dcb77272ee173cecca03cc221fd3"; + name = "syndication-5.68.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/syntax-highlighting-5.66.0.tar.xz"; - sha256 = "e572719cb64524c6abc476eeccca56f54cb0d7352fc747af3036dbe817566c25"; - name = "syntax-highlighting-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/syntax-highlighting-5.68.0.tar.xz"; + sha256 = "a857c743aa60b21eea7e4b986e8b195882aa2c18358412e767e68d93ce35e134"; + name = "syntax-highlighting-5.68.0.tar.xz"; }; }; threadweaver = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/threadweaver-5.66.0.tar.xz"; - sha256 = "a63db1ef8421e68534f5b9891013286fbad2ef8677f28c15ec733f086ae5cee3"; - name = "threadweaver-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/threadweaver-5.68.0.tar.xz"; + sha256 = "e28c0bfff375b3e1e9e4eec72f0a804f3f41c4ec5fd59af9b951708d229eff64"; + name = "threadweaver-5.68.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index bda7d560fcd..2b3ef8c99c8 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; + sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; }; buildInputs = [ libgcrypt libgpgerror ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = https://www.videolan.org/developers/libaacs.html; + homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index b66e3fd28e7..7bfd9a8a2d0 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook +{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ++ optional withJava jdk ++ optional withMetadata libxml2 ++ optional withFonts freetype + ++ optional stdenv.isDarwin DiskArbitration ; propagatedBuildInputs = optional withAACS libaacs; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 76887347a18..6d77a28d55f 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1r337ici2nvi9v2h33nf3b7nisirc4s8p31cpv1cg8jbzn3wi15g"; + sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 8d480c2d882..411ae0a3316 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd fuse yajl libvirt gmp readline file hivex numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) + ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) ++ stdenv.lib.optional javaSupport jdk; prePatch = '' diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index c6278552737..67ee59b6107 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.3"; + version = "0.2.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"; + sha256 = "T+Ckvta0w65ySdNBAxwnsy+Nng/7UzfXHLzscWA2LPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 92fe81c73f4..ab7bb7e6cb9 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz"; + sha256 = "0wkzj5s34m8dvy7hif4h8f90q8ncrzd930gij1zzw3h5nw732j38"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for mediainfo"; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index 37753b92c62..f296883b686 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -38,10 +38,14 @@ stdenv.mkDerivation rec { }) # Install pygobject overrides to our prefix instead of python3 one. - # https://github.com/fedora-modularity/libmodulemd/pull/467 + # https://github.com/fedora-modularity/libmodulemd/pull/469 (fetchpatch { - url = "https://github.com/fedora-modularity/libmodulemd/commit/516cb64fd1488716a188add2715c8b3296960bd6.patch"; - sha256 = "ZWagkqKkD9CIkcYsKLtC0+qjLp80wH3taivUCn8jQbY="; + url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch"; + sha256 = "7/76N9ZQ7qv/DjsaMCL+YWPDzarH1JWW4Sg5HzBJLuc="; + }) + (fetchpatch { + url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch"; + sha256 = "JibEmxMiTmu3ShhWLIWfMCtu3c30UcHqXmX9b+2VZXw="; }) ]; @@ -65,9 +69,15 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddeveloper_build=false" - "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + "-Dgobject_overrides_dir_py3=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + postFixup = '' + # Python overrides depend our own typelibs and other packages + mkdir -p "$py/nix-support" + echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs" + ''; + meta = with stdenv.lib; { description = "C Library for manipulating module metadata files"; homepage = "https://github.com/fedora-modularity/libmodulemd"; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 24b94827122..e69cc04d6f0 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.74"; + name = "libpst-0.6.75"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "0dzx8jniz7mczbbp08zfrl46h27hyfrsnjxmka9pi5aawzfdm1zp"; + sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.five-ten-sg.com/libpst/; + homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; maintainers = [maintainers.tohl]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 05c81e3c73e..a8924ca4782 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.32.1"; + version = "2.33.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "1l45hrb3lgjh1kdi4khqhljndc434zf9llzbii6dcv911gxkipjr"; + sha256 = "04macplj3k2sdpf1wdjm6gsghak5dzfhi2pmr47qldh2sy2zz0a3"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9767ea4fdeb..c6407c30953 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; - buildInputs = [ libxml2 bzip2 pango libintl ]; + buildInputs = [ libxml2 bzip2 pango libintl ] + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + + NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null; propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 02a8abb7c85..d90106f89d8 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "08wdlxsa9zg2pyasz1lwg70d5psi4amv81v4yxwffx67ndzb9yp5"; + sha256 = "18wwfbbggsjrd4w3dczxa2gv3zvx0fqp68b8h1zzvdbyn91f16mz"; }; nativeBuildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with stdenv.lib; { - homepage = http://librsync.sourceforge.net/; + homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 17e6fce33cd..89617b864ac 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -17,19 +17,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.1.0"; + version = "6.2.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "1h7bmd7zgl64mwnxx4ji8l0mqmcbfxsx6kp1scyyfq2mwidihz0n"; + sha256 = "1c8grqf751blsgs15wx2p05wvankdrady6290vwc85v94cgqij5f"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "18sr3jvpxn45c4vrjzpa4qgnnfxxh95v6l6qk31zka3siv8rrwqx"; + sha256 = "1wyihi8bhwsck9b7f3b8yhlz145sjdyyj3ykjiszrqnp0y99xxy2"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix new file mode 100644 index 00000000000..14a6719533b --- /dev/null +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -0,0 +1,183 @@ +{ stdenv, fetchFromGitHub, perl, yasm +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, sizeLimitSupport ? true # limit max size to allow in the decoder +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, debugLibsSupport ? false # include debug version of each library +, postprocSupport ? true # postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, spatialResamplingSupport ? true # spatial sampling (scaling) +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, webmIOSupport ? true # input from and output to webm container +, libyuvSupport ? true # libyuv +, decodePerfTestsSupport ? false # build decoder perf tests with unit tests +, encodePerfTestsSupport ? false # build encoder perf tests with unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range +, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 +# Experimental features +, experimentalSpatialSvcSupport ? false # Spatial scalable video coding +, experimentalFpMbStatsSupport ? false +, experimentalEmulateHardwareSupport ? false +}: + +let + inherit (stdenv) is64bit isMips isDarwin isCygwin; + inherit (stdenv.lib) enableFeature optional optionals; +in + +assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; +assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; +/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if spatialResamplingSupport is enabled */ +assert spatialResamplingSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert unitTestsSupport -> curl != null && coreutils != null; +assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); +assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; + +stdenv.mkDerivation rec { + pname = "libvpx"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "webmproject"; + repo = "libvpx"; + rev = "v${version}"; + sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr"; + }; + + patches = [ +# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch + ]; + + postPatch = ''patchShebangs .''; + + outputs = [ "bin" "dev" "out" ]; + setOutputFlags = false; + + configurePlatforms = []; + configureFlags = [ + (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") + (enableFeature vp8EncoderSupport "vp8-encoder") + (enableFeature vp8DecoderSupport "vp8-decoder") + (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") + (enableFeature vp9EncoderSupport "vp9-encoder") + (enableFeature vp9DecoderSupport "vp9-decoder") + (enableFeature extraWarningsSupport "extra-warnings") + (enableFeature werrorSupport "werror") + "--disable-install-docs" + (enableFeature examplesSupport "install-bins") + "--enable-install-libs" + "--disable-install-srcs" + (enableFeature debugSupport "debug") + (enableFeature gprofSupport "gprof") + (enableFeature gcovSupport "gcov") + # Required to build shared libraries + (enableFeature (!isCygwin) "pic") + (enableFeature optimizationsSupport "optimizations") + (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") + (enableFeature thumbSupport "thumb") + "--enable-libs" + (enableFeature examplesSupport "examples") + "--disable-docs" + "--as=yasm" + # Limit default decoder max to WHXGA + (if sizeLimitSupport then "--size-limit=5120x3200" else null) + "--disable-codec-srcs" + (enableFeature debugLibsSupport "debug-libs") + (enableFeature isMips "dequant-tokens") + (enableFeature isMips "dc-recon") + (enableFeature postprocSupport "postproc") + (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") + (enableFeature multithreadSupport "multithread") + (enableFeature internalStatsSupport "internal-stats") + (enableFeature spatialResamplingSupport "spatial-resampling") + (enableFeature realtimeOnlySupport "realtime-only") + (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") + (enableFeature errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (if isDarwin || isCygwin then + "--enable-static --disable-shared" + else + "--enable-shared") + (enableFeature smallSupport "small") + (enableFeature postprocVisualizerSupport "postproc-visualizer") + (enableFeature unitTestsSupport "unit-tests") + (enableFeature webmIOSupport "webm-io") + (enableFeature libyuvSupport "libyuv") + (enableFeature decodePerfTestsSupport "decode-perf-tests") + (enableFeature encodePerfTestsSupport "encode-perf-tests") + (enableFeature multiResEncodingSupport "multi-res-encoding") + (enableFeature temporalDenoisingSupport "temporal-denoising") + (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") + (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") + (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") + (enableFeature (experimentalSpatialSvcSupport || + experimentalFpMbStatsSupport || + experimentalEmulateHardwareSupport) "experimental") + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.hostPlatform.config}${ + if stdenv.hostPlatform.isDarwin then + if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" + else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" + else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" + else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" + else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" + else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" + else "8" + else ""}-gcc" + (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + ] # Experimental features + ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" + ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optionals unitTestsSupport [ coreutils curl ]; + + NIX_LDFLAGS = [ + "-lpthread" # fixes linker errors + ]; + + enableParallelBuilding = true; + + postInstall = ''moveToOutput bin "$bin" ''; + + meta = with stdenv.lib; { + description = "WebM VP8/VP9 codec SDK"; + homepage = https://www.webmproject.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 732a529c21f..ddafc9bc659 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -17,6 +17,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; meta = with stdenv.lib; { description = "Light, portable C library for websockets"; @@ -39,9 +40,12 @@ rec { }; libwebsockets_3_2 = generic { - version = "3.2.0"; - sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; + version = "3.2.2"; + sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; }; - libwebsockets = libwebsockets_3_2; + libwebsockets_4_0 = generic { + version = "4.0.1"; + sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; + }; } diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index fbbfb5364b0..80a570dd697 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.37"; + version = "0.4.38"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn"; + sha256 = "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for libmediainfo and mediainfo"; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/malcontent/better-separation.patch b/pkgs/development/libraries/malcontent/better-separation.patch new file mode 100644 index 00000000000..cd91760bff5 --- /dev/null +++ b/pkgs/development/libraries/malcontent/better-separation.patch @@ -0,0 +1,35 @@ +diff --git a/meson.build b/meson.build +index a6c477d..f7b2f0a 100644 +--- a/meson.build ++++ b/meson.build +@@ -125,8 +125,8 @@ test_env = [ + 'LC_ALL=C.UTF-8', + ] + +-subdir('accounts-service') + if not get_option('use_system_libmalcontent') ++ subdir('accounts-service') + subdir('libmalcontent') + else + libmalcontent_api_version = '0' +@@ -137,11 +137,17 @@ endif + if get_option('ui').enabled() + subdir('libmalcontent-ui') + endif +-subdir('malcontent-client') ++if not get_option('use_system_libmalcontent') ++ subdir('malcontent-client') ++endif + if get_option('ui').enabled() + subdir('malcontent-control') + endif +-subdir('pam') ++if not get_option('use_system_libmalcontent') ++ subdir('pam') ++endif + subdir('po') + +-meson.add_install_script('build-aux/meson_post_install.py') ++if get_option('ui').enabled() ++ meson.add_install_script('build-aux/meson_post_install.py') ++endif diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index bd8988390c9..bf2ec772507 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -9,10 +10,7 @@ , coreutils , accountsservice , dbus -, flatpak -, gtk3 , pam -, desktop-file-utils , polkit , glib-testing , python3 @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "bin" "out" "dev" "man" "installedTests" ]; @@ -30,16 +28,22 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ="; + sha256 = "cP2l6nl6cuBQYwkmBj8APu/vH3jTeScXf3ffcuSfqlM="; }; patches = [ # Allow installing installed tests to a separate output. ./installed-tests-path.patch - # This is unnecessary and breaks when submodules are not available. - # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/3 - ./use-system-dependencies.patch + # Do not build things that are part of malcontent-ui package + ./better-separation.patch + + # Fix pam installed test + # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/50 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pwithnall/malcontent/commit/5d102eeb0604e65fc977ca77d4b249e986e634cc.patch"; + sha256 = "5PD/eJBw/8Uqcia7ena9mu45DgREBFj0zUJpcd0vQ+8="; + }) ]; nativeBuildInputs = [ @@ -47,15 +51,12 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection - desktop-file-utils wrapGAppsHook ]; buildInputs = [ accountsservice dbus - flatpak - gtk3 pam polkit glib-testing @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dui=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch index ac87ddf6ccb..5d26c0f864f 100644 --- a/pkgs/development/libraries/malcontent/installed-tests-path.patch +++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch @@ -22,12 +22,12 @@ index 610bc35..13e0713 100644 \ No newline at end of file +endforeach diff --git a/meson_options.txt b/meson_options.txt -index 06329d4..72aa505 100644 +index d516c70..583cb94 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -9,3 +9,9 @@ option( - type: 'string', - description: 'directory for PAM modules' +@@ -4,6 +4,12 @@ option( + value: false, + description: 'enable installed tests' ) +option( + 'installed_test_prefix', @@ -35,6 +35,9 @@ index 06329d4..72aa505 100644 + value: '', + description: 'Prefix for installed tests' +) + option( + 'pamlibdir', + type: 'string', diff --git a/pam/tests/meson.build b/pam/tests/meson.build index 0560dcb..a74dab2 100644 --- a/pam/tests/meson.build diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix new file mode 100644 index 00000000000..af1fa6b4138 --- /dev/null +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -0,0 +1,70 @@ +{ stdenv +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook +, glib +, accountsservice +, dbus +, flatpak +, malcontent +, gtk3 +, desktop-file-utils +, polkit +, glib-testing +}: + +stdenv.mkDerivation rec { + pname = "malcontent-ui"; + + inherit (malcontent) version src; + + outputs = [ "bin" "out" "dev" ]; + + patches = [ + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # Do not build things that are part of malcontent package + ./better-separation.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + dbus + polkit + glib-testing + flatpak + ]; + + propagatedBuildInputs = [ + accountsservice + malcontent + glib + gtk3 + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Duse_system_libmalcontent=true" + "-Dui=enabled" + ]; + + meta = with stdenv.lib; { + description = "UI components for parental controls library"; + homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch deleted file mode 100644 index 8920b1f4a99..00000000000 --- a/pkgs/development/libraries/malcontent/use-system-dependencies.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 3575224..0abea63 100644 ---- a/meson.build -+++ b/meson.build -@@ -40,9 +40,8 @@ polkit_gobject = dependency('polkit-gobject-1') - polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', - define_variable: ['prefix', prefix]) - --libglib_testing = subproject('libglib-testing') - libglib_testing_dep = dependency( -- 'libglib-testing', -+ 'glib-testing-0', - fallback: ['libglib-testing', 'libglib_testing_dep'], - ) - diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index e79ef1a0cde..c03b0944778 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.10"; + name = "nss_wrapper-1.1.11"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1fifl3allz4hwl331j6fwacc4z2fqwyxdnnkadv518ir8nza3xl8"; + sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index c1f354a1ac9..0cda3d6ac9a 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "1cyvvf5f92a777qgh00ja43z43j5nhc9dw5l3wvw9j6j9bqc4i8p"; + sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 6bf5ea6023e..2abad0f705f 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig -, nettle, gnutls, msgpack, readline, libargon2 +, cmake, pkg-config +, asio, nettle, gnutls, msgpack, readline, libargon2 }: stdenv.mkDerivation rec { pname = "opendht"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl"; + sha256 = "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr"; }; nativeBuildInputs = - [ autoreconfHook - pkgconfig + [ cmake + pkg-config ]; buildInputs = - [ nettle + [ asio + nettle gnutls msgpack readline diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 4e4c9ea6b40..b37bbd273e2 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.1"; + version = "0.3.2"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "DfUgXTSSCl+JszFEKwBha67nauQi4noR25m00auXDnA="; + sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index e221c82edec..168b82eec16 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.5"; + name = "resolv_wrapper-1.1.6"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0v5hw5ipq2rrpraf4ck4r9w9xihmgwzkpf5wgppz7gc52fmgv2g9"; + sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 38ad31cc625..efad842bd35 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -3,6 +3,14 @@ # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). , blas64 ? null +# Multi-threaded applications must not call a threaded OpenBLAS +# (the only exception is when an application uses OpenMP as its +# *only* form of multi-threading). See +# https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded +# https://github.com/xianyi/OpenBLAS/issues/2543 +# This flag builds a single-threaded OpenBLAS using the flags +# stated in thre. +, singleThreaded ? false , buildPackages # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt @@ -146,7 +154,12 @@ stdenv.mkDerivation rec { NO_BINARY_MODE = if stdenv.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; - }); + } // (stdenv.lib.optionalAttrs singleThreaded { + # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded + USE_THREAD = false; + USE_LOCKING = true; # available with openblas >= 0.3.7 + USE_OPENMP = false; # openblas will refuse building with both USE_OPENMP=1 and USE_THREAD=0 + })); doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 492ad63f27b..911f0a1cf89 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.12.4"; + version = "3.13.0"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan"; + sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( $configureFlagsArray "--CC=$CC" - "--with-cxx=g++" + "--with-cxx=$CXX" "--with-fc=0" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index d5491b5da03..39a4f8c5208 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "totem-pl-parser"; - version = "3.26.4"; + version = "3.26.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w34hdr09v3wy1cfvzhcmxc6b5p9ngcabgix59iv7hk739anymy1"; + sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"; }; passthru = { diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 6d63825bac6..63b9189a4ae 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.60.0"; + version = "0.60.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06rs356lpyq60r3szhms152f7kj5jnki6a49b2w7ai0bnig9blbj"; + sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay"; }; passthru = { diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9aa7dfbf230..b8db94ca06a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -87,4 +87,4 @@ DEPENDENCIES cocoapods! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index bc76cfcd64c..8a16dcec343 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.15.1"; + version = "0.17.1"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "0adas974bwinn8jidb6chljkpd70s041h2a969dicsj0xsg6wys6"; + sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ocamllabs/ocaml-ctypes; + homepage = "https://github.com/ocamllabs/ocaml-ctypes"; description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 014525ef2b4..547fa77ae6e 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -1,38 +1,28 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }: +{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-gettext-${version}"; - version = "0.3.8"; +buildDunePackage rec { + pname = "gettext"; + version = "0.4.1"; + + minimumOCamlVersion = "4.03"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1731/ocaml-gettext-${version}.tar.gz"; - sha256 = "05wnpxwzzpn2qinah2wb5wzfh5iz8gyf8jyihdbjxc8mk4hf70qv"; + url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; + sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158"; }; - propagatedBuildInputs = [ gettext fileutils camomile ]; - - buildInputs = [ ocaml findlib camlp4 ounit ]; - - postPatch = stdenv.lib.optionalString (camlp4 != null) '' - substituteInPlace test/test.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/OCamlGettext.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/Makefile --replace "unix.cma" "" - substituteInPlace libgettext-ocaml/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace libgettext-ocaml/Makefile --replace "\$(shell ocamlc -where)" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib" - ''; + propagatedBuildInputs = [ gettext fileutils ]; - configureFlags = [ "--disable-doc" ]; + doCheck = true; - createFindlibDestdir = true; + checkInputs = lib.optional doCheck ounit; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml Bindings to gettext"; - homepage = https://forge.ocamlcore.org/projects/ocaml-gettext; - license = licenses.gpl2; + homepage = "https://github.com/gildor478/ocaml-gettext"; + license = licenses.lgpl21; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix new file mode 100644 index 00000000000..b18c0abc530 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, ocaml_gettext, ounit }: + +buildDunePackage rec { + + pname = "gettext-stub"; + + inherit (ocaml_gettext) src version meta; + + propagatedBuildInputs = [ ocaml_gettext ]; + + doCheck = true; + + checkInputs = lib.optional doCheck ounit; +} diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 653f4532585..e9b3721bc68 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }: +{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "sedlex is not available for OCaml ${ocaml.version}" @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0phnqyn6mpv5byr1kkphl24y9q9fb2k3xg9yb457h5816q6ya72n"; }; - buildInputs = [ ocaml findlib ppx_tools_versioned ]; + buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ gen ]; + propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ]; buildFlags = [ "all" "opt" ]; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 6a3ed466e8f..ea05ecd299d 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -2,13 +2,13 @@ buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.3.0"; + version = "3.7.5"; src = fetchFromGitHub { owner = "trizen"; repo = "youtube-viewer"; rev = version; - sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; + sha256 = "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 792db7091d0..392c77036ca 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.6"; + version = "0.3.7"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "0js7p9qj5x6k8i2cby4c6mw6xrp4dy4m82f3n1l8rz00qibmj37j"; + sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index c80af1acdc5..f5076953bf2 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.0.1"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "145gjad415zjfp0ciq1b19i97ibavj8fki1vzhjppqz55k4704nk"; + sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; - homepage = https://github.com/altair-viz/altair; + homepage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 77b93ce890e..65f51c17d7d 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.1.3"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg"; + sha256 = "02sknsbx55r6nylznslmmzzkfi3rsw7akpyzi6f1bqvr2ila8p0f"; }; checkPhase = '' @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "ANSI cursor movement and graphics"; - homepage = https://github.com/tehmaze/ansi/; + homepage = "https://github.com/tehmaze/ansi/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index c45a73f24bf..f23d16c2695 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -145,6 +145,7 @@ buildPythonPackage rec { --replace "dill>=0.2.2, <0.3" "dill" \ --replace "configparser>=3.5.0, <3.6.0" "configparser" \ --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \ + --replace "colorlog==4.0.2" "colorlog" \ --replace "funcsigs==1.0.0" "funcsigs" \ --replace "flask-swagger==0.2.13" "flask-swagger" \ --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 186bda86842..9e06abd9a71 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage -, traits, traitsui, configobj +{ lib, fetchPypi, buildPythonPackage +, configobj, six, traitsui , nose, tables, pandas }: buildPythonPackage rec { pname = "apptools"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1dw6vvq7lqkj7mgn3s7r5hs937kl4mj5g7jf2qgvhdld9lsc5xbk"; + sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6"; }; - propagatedBuildInputs = [ traits traitsui configobj ]; + propagatedBuildInputs = [ configobj six traitsui ]; checkInputs = [ nose @@ -21,11 +21,12 @@ buildPythonPackage rec { ]; doCheck = true; + checkPhase = ''HOME=$TMP nosetests''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications."; - homepage = https://github.com/enthought/apptools; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + homepage = "https://github.com/enthought/apptools"; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 3aa5a432c4b..870f0598e5e 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.19.0"; + version = "3.19.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a8378ab57e91cfe1ba09b3639d8409bb7fc1a40b59479c7822d206e673ad93f9"; + sha256 = "03xzpmpask2q2609kkq0hfgzsfvkyjpbjws7qx00nnfrbbnjk443"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Atomic Simulation Environment"; - homepage = https://wiki.fysik.dtu.dk/ase/; + homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 9fa7d8c7c42..56c69bb97ed 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.2.7"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "040g2cghpskp427xiw9jv7c0lfj1sk5fc01dds8pi7grkk0br357"; + sha256 = "1qf29blzhh6sljaj1adc0p8cnyxh9ar6hky9ccdfbgmrk4rw5kwc"; }; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 9ef332827eb..e58fa446f81 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.4"; + version = "1.15.6"; src = fetchPypi { inherit pname version; - sha256 = "0vkq3sr4a23ipk74swsmc3ydg3q91asixb7hzl8mzkfpgnnyvr77"; + sha256 = "0nn3g2sb0pqfacsqcw94n8v9jbn4ip0pvhvczasfvks2w9q9sij7"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index f772d16942f..05021c73edb 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + sha256 = "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 581242dfb4b..e786731dcd0 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3"; + sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; }; propagatedBuildInputs = [ azure-mgmt-common ]; diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index c199fbbeb36..e2037bb7d21 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -10,20 +10,21 @@ }: buildPythonPackage rec { - version = "0.20.3"; + version = "0.36.0"; pname = "azure-storage"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; propagatedBuildInputs = [ azure-common dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + postPatch = '' + rm azure_bdist_wheel.py + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-nspkg" "" ''; meta = with pkgs.lib; { diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 6470b7da859..36361ac0118 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,21 +2,21 @@ buildPythonPackage rec { pname = "boltons"; - version = "20.0.0"; + version = "20.1.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz"; + sha256 = "0mbxc2n10mlmpbwhg0byddl1i0s6rlrr6z9xm8zzmkv62136irqh"; }; checkInputs = [ pytest ]; checkPhase = "pytest tests"; meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/boltons; + homepage = "https://github.com/mahmoud/boltons"; description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library"; longDescription = '' Boltons is a set of over 220 BSD-licensed, pure-Python utilities diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 427108a9391..71a7174fb23 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "9ecda1469e497e3fed346b23ac94fd576e1bd9962677ab88975f4f598186e851"; + sha256 = "08ndphpcbdx2ab4f5jsn2y4l5p55h9wscbg7clhbyyh03r5hianr"; }; # Carbon-s default installation is /opt/graphite. This env variable ensures diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 811ecef1f86..3bf660bd098 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1fid6li95jx9c3v83v8c2c8lb03jgirkk9mjmck30yxcwmlxp6a2"; + sha256 = "1ai1i0wydxfbdakqnrlpgdk4l2ps7gw0r9nihv9p2jgyqbl13kj3"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python CBOR (de)serializer with extensive tag support"; - homepage = https://github.com/agronholm/cbor2; + homepage = "https://github.com/agronholm/cbor2"; license = licenses.mit; maintainers = with maintainers; [ taneb ]; }; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a2e5862f540..13f68d6a392 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GtSqmkWCHX/1t31sny3f2ek8uTS1oEMSM1rRXG9DuFI="; + sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; }; LC_ALL="en_US.UTF-8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Enhancements for standard library's cmd module"; - homepage = https://github.com/python-cmd2/cmd2; + homepage = "https://github.com/python-cmd2/cmd2"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index edcd040b066..aa39588f313 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42"; + sha256 = "1lpk8zmfv8vz090h5d0hzb4n39wgasxdd3x3bpn3v1x1n9dfzaih"; }; checkInputs = [ pytest ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Log formatting with colors"; - homepage = https://github.com/borntyping/python-colorlog; + homepage = "https://github.com/borntyping/python-colorlog"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index e33382ffd01..643556d8793 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.7.12"; + version = "0.8.1"; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "1i7r0f8ldxpy9vkwjla6rfkaq37071d36zfhb1dwm9jgp6ggi34m"; + sha256 = "12g9w5674fmyf3f4plbhvpxpyhzw32pzwl0hvwswzrc2823xl6vx"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 2af9d020c95..6c338ce6dc2 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308"; + sha256 = "029mr75wgah0z1ilsf3vf3dmjn65y4fy1jgq5qny2qsb9hvwbblw"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index f0de263f130..9f50a7ea22b 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.1.0"; + version = "2.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d"; + sha256 = "1j1fwinbkr4khn9i869r22jfdgw2kli0jqrz5shyd36jllsvrfzs"; }; propagatedBuildInputs = [ ldap django ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django authentication backend that authenticates against an LDAP service"; - homepage = https://github.com/django-auth-ldap/django-auth-ldap; + homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = licenses.bsd2; maintainers = with maintainers; [ mmai ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 903e74e3278..c8b1a376f26 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0dd5si2ml3srn8snp7x3y4xjamssmnp05h41aqazzd9ykwmhh919"; + sha256 = "18gqqdsrdlgwn93xnxy6ifxrk7ppaimijinflphxia2qcm8czkgf"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index 4edf0f71cf2..47305d89540 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "etesync"; - version = "0.10.0"; + version = "0.11.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09sdqviv9jyd013gxjjcw6vd4si860304haylvw4dp9kljsd94qa"; + sha256 = "0yads0s84z41hf003qk5i8222fi7096whzwfp48kf369gchp39kc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index daec9218a1d..0ed9d42c3b0 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchurl , uvicorn , starlette , pydantic @@ -12,11 +11,12 @@ , passlib , aiosqlite , peewee +, flask }: buildPythonPackage rec { pname = "fastapi"; - version = "0.49.0"; + version = "0.54.0"; format = "flit"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "1dw5f2xvn0fqqsy29ypba8v3444cy7dvc7gkpmnhshky0rmfni3n"; + sha256 = "17bicrpr801z71wrn9iimvh7qk6iwyxvr89ialf0s2rxxa2s0yb5"; }; propagatedBuildInputs = [ @@ -40,10 +40,16 @@ buildPythonPackage rec { passlib aiosqlite peewee + flask ]; + # test_default_response_class.py: requires orjson, which requires rust toolchain + # test_custom_response/test_tutorial001b.py: requires orjson + # tests/test_tutorial/test_sql_databases/test_testing_databases.py: just broken, don't know why checkPhase = '' - pytest --ignore=tests/test_default_response_class.py + pytest --ignore=tests/test_default_response_class.py \ + --ignore=tests/test_tutorial/test_custom_response/test_tutorial001b.py \ + --ignore=tests/test_tutorial/test_sql_databases/test_testing_databases.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix new file mode 100644 index 00000000000..d6912de6fe8 --- /dev/null +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, flask +}: + +buildPythonPackage rec { + pname = "flask-reverse-proxy-fix"; + version = "0.2.1"; + + # master fixes flask import syntax and has no major changes + # new release requested: https://github.com/sublee/flask-silk/pull/6 + src = fetchFromGitHub { + owner = "antarctica"; + repo = "flask-reverse-proxy-fix"; + rev = "v${version}"; + sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + flask + ]; + + meta = with stdenv.lib; { + description = "Python Flask middleware for applications running under a reverse proxy"; + maintainers = with maintainers; [ matthiasbeyer ]; + homepage = "https://github.com/antarctica/flask-reverse-proxy-fix"; + + license = { + fullName = "Open Government Licence"; + url = "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"; + }; + }; +} diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 1b8b8c17846..7b633680b4c 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,6 +4,7 @@ , fetchPypi , html5lib , wcwidth +, setuptools , pytest }: @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ html5lib wcwidth + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 88e0902529c..2197cfd9d0f 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.30"; + version = "2.31"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "1gy8xhwfms0psdji7vzqjbzj3l0k743aw20db27zxyq89cvz6g42"; + sha256 = "0z6n9xkb5yz7z6rlwl6z9gq3ac5vdsby90nhvvvskadsx2pagd7v"; }; configureFlags = [ diff --git a/pkgs/development/python-modules/graspy/default.nix b/pkgs/development/python-modules/graspy/default.nix new file mode 100644 index 00000000000..2a7fab12fa2 --- /dev/null +++ b/pkgs/development/python-modules/graspy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytest +, pytestcov +, matplotlib +, networkx +, numpy +, scikitlearn +, scipy +, seaborn +}: + +buildPythonPackage rec { + pname = "graspy"; + version = "0.2"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "neurodata"; + repo = pname; + rev = "v${version}"; + sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd"; + }; + + propagatedBuildInputs = [ + matplotlib + networkx + numpy + scikitlearn + scipy + seaborn + ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + runHook preCheck + # `test_autogmm` takes too long; fixed in next release (graspy/pull/328) + pytest tests -k 'not test_autogmm' + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://graspy.neurodata.io"; + description = "A package for graph statistical algorithms"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index a4b7fb3a652..6f2bf5d511d 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.2.29"; + version = "2020.3.31"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1s6f9sdr5l9dqri92s8qr7r1nyvai3vnpcaw06293kc8dribi0m2"; + sha256 = "12hncxzawvdsrssl350xxn1byfm1firgd3ziqfll4xhhw403jaa9"; }; # tests require network connection diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix deleted file mode 100644 index dcf39dd24f0..00000000000 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, requests -, requests_ntlm -}: - -buildPythonPackage rec { - pname = "IBMQuantumExperience"; - version = "2.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja"; - }; - - propagatedBuildInputs = [ - requests - requests_ntlm - ]; - - # test requires an API token - doCheck = false; - - meta = { - description = "A Python library for the Quantum Experience API"; - homepage = https://github.com/QISKit/qiskit-api-py; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - pandaman - ]; - }; -} diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index ef023727d70..0c5da2cd7a9 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.3.3"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0m5sh2ha9hlgigc5xxsy7nd0gdadx797h1i66i9z616p0r43gx7d"; + sha256 = "1sak58wcpikn4ww1k8gr2vf1hmwzfly31hzcnwiizp7l0vk40qh7"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Matplotlib Jupyter Extension"; - homepage = https://github.com/matplotlib/jupyter-matplotlib; + homepage = "https://github.com/matplotlib/jupyter-matplotlib"; maintainers = with maintainers; [ jluttine ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix new file mode 100644 index 00000000000..2b03fd368d9 --- /dev/null +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -0,0 +1,31 @@ +{ lib +, isPy27 +, buildPythonPackage +, fetchPypi + # Python Inputs +, ipywidgets +}: + +buildPythonPackage rec { + pname = "ipyvue"; + version = "1.3.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "01kp7d8iyz04d0m4njhv8rg72daqmgd93bdljwyffzxg71pwq92a"; + }; + + propagatedBuildInputs = [ ipywidgets ]; + + doCheck = false; # No tests in package or GitHub + pythonImportsCheck = [ "ipyvue" ]; + + meta = with lib; { + description = "Jupyter widgets base for Vue libraries."; + homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix new file mode 100644 index 00000000000..dc9df34c0d0 --- /dev/null +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi + # Python Inputs +, ipyvue +}: + +buildPythonPackage rec { + pname = "ipyvuetify"; + version = "1.2.2"; + + # GitHub version tries to run npm (Node JS) + src = fetchPypi { + inherit pname version; + sha256 = "0vg3sdkdhba917xs6gyzwpp10gi2gszihf45cw2llwsfgb7kpfw8"; + }; + + propagatedBuildInputs = [ ipyvue ]; + + doCheck = false; # no tests on PyPi/GitHub + pythonImportsCheck = [ "ipyvuetify" ]; + + meta = with lib; { + description = "Jupyter widgets based on Vuetify UI Components."; + homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index af12ba587d4..6b238163cb5 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.10"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1a389556cc5cf82b7ad95924710101e3bd06d809d6f889a3f437975b275af944"; + sha256 = "1p7iaa6ykvhalpv09svxs50hnp25j5nv1zzp42n5r7a7rw70wlf8"; }; checkInputs = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; - homepage = https://github.com/xlcnd/isbnlib; + homepage = "https://github.com/xlcnd/isbnlib"; license = licenses.lgpl3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 98725ca4767..b2b80e2766c 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -1,9 +1,9 @@ { stdenv , buildPythonPackage , fetchPypi -, nose , jinja2 , pyyaml +, setuptools }: buildPythonPackage rec { @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "6f6f643b3fa5c0f72fbe9f07e246f8e138052b9f689e14c7c64d582c59709ae4"; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ jinja2 pyyaml ]; + doCheck = false; # tests aren't installed thus aren't found, so skip + propagatedBuildInputs = [ jinja2 pyyaml setuptools ]; meta = with stdenv.lib; { homepage = "https://github.com/kolypto/j2cli"; diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index 8e5458509c4..c9ce6915d2e 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,12 +1,13 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six, more-itertools }: +{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, six, more-itertools }: buildPythonPackage rec { pname = "jaraco.classes"; - version = "3.0.0"; + version = "3.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "886ad165d495e7d18781142d6dda4f0045053a038f9e63c38ef03e2f7127bafc"; + sha256 = "1avsxzm5mwylmy2zbxq3xvn48z5djb0qy3hwv4ryncprivzri1n3"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 3faa0a2edc3..d3b67ba87bc 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17p8rpihid0103fyjndk2yvg18n3ypn3hxay92ckcv10vsbiys5b"; + sha256 = "10fwpgsi996nk2hcva14k8x6znczxgfmydvfsfrs1fpmmfmrl8wc"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 9a526169489..db9fd195ae5 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.0.7"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1qnqxy6812py7xklg7xfrkadm0v4z8x6n1035i26h2z7y891ff0j"; + sha256 = "0cqpyy4jr3023c47ij08djkpx526gmz8fab45mcnws0glhp7xhms"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index ddf6cabcae9..41c16548032 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1i585q27qlwk4rpgsh621s60im1j9ynwyz5pcc8s3ffmjam28vss"; + sha256 = "1rfybmr0rlljhc0dpd9npbw8x7r6dvnn2wvclz93rmgkzhmd3zah"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 62058ea62c3..a7c620d8d87 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "6.1.0"; + version = "6.2.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0h3w1p5y4kg2hdbhxmg4lphcnmr7979iwi0m750f8vzbfccsrp7k"; + sha256 = "0a8crk29rmnw1kcgi72crb7syacdk03lkl05yand5cxs0l65jwdl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 9784d3af61f..dbbe3d25212 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.6.3"; + version = "0.6.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "161g3s3nwbkn3s101g8l4axll0kk8xxahxnvjrjdg2cghcjq9n8n"; + sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with luftdaten.info"; - homepage = https://github.com/fabaff/python-luftdaten; + homepage = "https://github.com/fabaff/python-luftdaten"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 5db5c28a4cb..9e73001a149 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.11.2"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"; + sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"; }; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ]; - postPatch = '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Securely transfer data between computers"; - homepage = https://github.com/warner/magic-wormhole; + homepage = "https://github.com/warner/magic-wormhole"; license = licenses.mit; # Currently broken on Python 2.7. See # https://github.com/NixOS/nixpkgs/issues/71826 diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 427f0af4573..fb84847acff 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -29,6 +29,13 @@ buildPythonPackage rec { checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; propagatedBuildInputs = [ six ruamel_yaml ]; + # test suite tries to decode bytes, but msgpack now returns a str + # https://github.com/materialsvirtuallab/monty/pull/121 + postPatch = '' + substituteInPlace tests/test_serialization.py \ + --replace ".decode('utf-8')" "" + ''; + preCheck = '' substituteInPlace tests/test_os.py \ --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' diff --git a/pkgs/development/python-modules/morphys/default.nix b/pkgs/development/python-modules/morphys/default.nix new file mode 100644 index 00000000000..8f8525f7afe --- /dev/null +++ b/pkgs/development/python-modules/morphys/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: +buildPythonPackage rec { + pname = "morphys"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "mkalinski"; + repo = "morphys"; + rev = "0642a71126c32cd26b3a443a5cac27e4e1f7240f"; + sha256 = "1da8s04m5wwih9cvkrks3ymb8v082lia47f274hxmfhi6ma3qc8b"; + }; + + pythonImportsCheck = [ "morphys" ]; + + meta = with lib; { + description = "Smart conversions between unicode and bytes types"; + homepage = "https://github.com/mkalinski/morphys"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index d6b8b16cda9..2daabf22d9e 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -25,13 +25,13 @@ assert advancedProcessing -> ( buildPythonPackage rec { pname = "moviepy"; - version = "1.0.1"; + version = "1.0.2"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "1vgi9k1r4f5s9hzfzlhmmc574n80aq713ahv8cnbj3jci070lnwx"; + sha256 = "0ajw2xmcd962qw2kxxnbp08l5vgk5k78sls9bb227lw8aa51ln80"; }; # No tests, require network connection diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index dbbbc04d141..1934317a112 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,16 +5,16 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.2"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "1cbd885n3sf4qg1dv3mk1ggr5ssk48yzrzssznr92dh53g04ly7g"; + sha256 = "0l43k0lx7r6izancfhhg68x82mvws2di1a9w2y12l1a446vr9q8l"; }; - # tests not packaged with source dist as of 1.3.0/1.3.0, and + # tests not packaged with source dist as of 1.3.2/1.3.2, and # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) doCheck = false; pythonImportsCheck = [ "nest_asyncio" ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 3a907bc8ca0..751cc139548 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://nipy.org/nibabel/; + homepage = "https://nipy.org/nibabel"; description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 4a92ec7109d..1e58aee503b 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = http://nilearn.github.io; + homepage = "http://nilearn.github.io"; description = "A module for statistical learning on neuroimaging data"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 5b8c1e5185d..fef24e837d1 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://nipy.org/nipy/; + homepage = "https://nipy.org/nipy"; description = "Software for structural and functional neuroimaging analysis"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 5944e4d863f..436c9fe6379 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://nipy.org/nipype/; + homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index b61c3d92bc9..8fa40465c10 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { checkPhase = "pytest nitime/tests"; meta = with lib; { - homepage = https://nipy.org/nitime; + homepage = "https://nipy.org/nitime"; description = "Algorithms and containers for time-series analysis in time and spectral domains"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 4c2af8a0081..5acdfd6f8c6 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.10.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c"; + sha256 = "1z6b740fpkr8fbbhw79l29hmwf76xcda6ni804sqz0jghm7883yy"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/pam/default.nix b/pkgs/development/python-modules/pam/default.nix new file mode 100644 index 00000000000..6b585537978 --- /dev/null +++ b/pkgs/development/python-modules/pam/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pam +}: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchFromGitHub { + owner = "FirefighterBlu3"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; + }; + + buildInputs = [ + pam + ]; + + postPatch = '' + sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py + ''; + + meta = with lib; { + description = "Python pam module supporting py3 (and py2)"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + license = licenses.mit; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 726df160929..7cab2570798 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -1,15 +1,15 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi }: buildPythonPackage rec { - version = "1.17.2"; # note: `conan` package may require a hardcoded one + version = "1.17.4"; # note: `conan` package may require a hardcoded one pname = "patch-ng"; - src = fetchurl { - url = "mirror://pypi/p/${pname}/${pname}-${version}.tar.gz"; - sha256 = "02nadk70sk51liv0qav88kx8rzfdjc1x52023zayanz44kkcjl2i"; + src = fetchPypi { + inherit pname version; + sha256 = "1kja1nn08w0k8k6j4kad48k581hh9drvjjb8x60v9j13sxdvqyk2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index bc54c18ac81..1165157fecc 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.8"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "115067100fbb9eb36f530d94b64b4e1e36a8d304537af0847d562ff9ed399c05"; + sha256 = "a26ba77127b363446955e8a5317b3194defb1c1bb9d2ed5e7d4830fd4f066d97"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 22c14cc0dfb..c69e4fc4867 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.12"; + version = "0.7.13"; src = fetchPypi { inherit pname version; - sha256 = "02njpqwfvzxj9icabil8ycmfx8avzih3g1kcdif290qgsy57a28r"; + sha256 = "1fqc45m106xfy4hhzzwb8p7s2fh5x2x7s143dib84lbszqwp77la"; }; doCheck = true; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 3f427e34002..8e6678a42b9 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.34.0"; + version = "2.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j3f75j0zd6ca8msg7yr19qsfirqkn9fk8pqbjnlhqrpri455g4p"; + sha256 = "UTbBv5GeEB1OyQGiduhupg5Ygaj/d2PjVvGYQOX/4d0="; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index b40305c0dce..d3e0da07868 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.1"; + version = "0.4.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "13nszg2plfvza3syki1rxnx3k3h90qq4wkgv86l1xpz31k3pf6k4"; + sha256 = "01y5fn3pis43i0w0858wmrc8azfinp07a16ixglmg28gg07c0zkd"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a3286b31461..2ab33fb1838 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.12"; + version = "1.16.16"; src = fetchPypi { inherit pname version; - sha256 = "0mywnhn8ylm9xy23yfgnxiq4akk1rq3n7bl1m7pw6imsgbdhzrwg"; + sha256 = "1rw4wjbsp8pnkkqcn097psjd6qinv70pjzvrbns04maybhn4ni6v"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix new file mode 100644 index 00000000000..40e2783aa57 --- /dev/null +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: + +buildPythonPackage rec { + pname = "pynanoleaf"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ced000e3c37f4e2ce0ea177d924af71c97007de9e4fd0ef37dcd7b4a6d1b622"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + # pynanoleaf does not contain tests + doCheck = false; + + pythonImportsCheck = [ + "pynanoleaf" + ]; + + meta = with lib; { + homepage = "https://github.com/Oro/pynanoleaf"; + description = "A Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas"; + license = licenses.mit; + maintainers = with maintainers; [ oro ]; + }; +} diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 76007b83588..5a49fa10fbf 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.10"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "0akls1w67v17dmgr07n6rr5xy6yyj6p83ss05033gk1c3mfsbb1r"; + sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 6847c5e05d4..2c0c23ebdca 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "14cy5iixi6i8i5r5xvvkhwk48zgxnb1ypbp0g1343mwfdihshic6"; + sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-baseconv/default.nix b/pkgs/development/python-modules/python-baseconv/default.nix new file mode 100644 index 00000000000..f9ac014919c --- /dev/null +++ b/pkgs/development/python-modules/python-baseconv/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "python-baseconv"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version ; + sha256 = "0539f8bd0464013b05ad62e0a1673f0ac9086c76b43ebf9f833053527cd9931b"; + }; + + pythonImportsCheck = [ "baseconv" ]; + + meta = with lib; { + description = "Python module to convert numbers from base 10 integers to base X strings and back again"; + homepage = "https://github.com/semente/python-baseconv"; + license = licenses.psfl; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 30c6dff048a..ca82f8aa187 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, lxml , oath , pycryptodome , requests @@ -10,15 +9,14 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.10.3"; + version = "0.12"; src = fetchPypi { inherit pname version; - sha256 = "1m6b7qipiaj6pz86kjhyq5m5jxxijpk58gpsdkj5bn0wjl6x1pg2"; + sha256 = "0g6mmf896wp036263zkkvi3ff59zcrzssjsw7csfmbisiszgdnrj"; }; propagatedBuildInputs = [ - lxml oath pycryptodome requests diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index e4b4d87c11b..7c36328f557 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -95,5 +95,9 @@ buildPythonPackage rec { homepage = "https://github.com/QISKit/qiskit-aer"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; + # Doesn't build on aarch64 (libmuparserx issue). + # Can fix by building muparserx from source (https://github.com/beltoforion/muparserx) + # or in future updates (e.g. Raspberry Pi enabled via https://github.com/Qiskit/qiskit-aer/pull/651 & https://github.com/Qiskit/qiskit-aer/pull/660) + platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix new file mode 100644 index 00000000000..ee01a5c4cb5 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -0,0 +1,131 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, cvxopt +, dlx +, docplex +, fastdtw +, h5py +, networkx +, numpy +, psutil +, qiskit-ignis +, qiskit-terra +, quandl +, scikitlearn + # Check Inputs +, parameterized +, pytestCheckHook +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-aqua"; + version = "0.6.5"; + + disabled = pythonOlder "3.5"; + + # Pypi's tarball doesn't contain tests + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "qiskit-aqua"; + rev = version; + sha256 = "03c0gl2qxyngf3cccjghjb0bhp0w78sdbvhim08cimf3cd577ldz"; + }; + + # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. + propagatedBuildInputs = [ + cvxopt + docplex + dlx # Python Dancing Links package + fastdtw + h5py + networkx + numpy + psutil + qiskit-terra + qiskit-ignis + quandl + scikitlearn + ]; + + # *** NOTE *** + # We make pyscf optional in this package, due to difficulties packaging it in Nix (test failures, complicated flags, etc). + # See nixpkgs#78772, nixpkgs#83447. You are welcome to try to package it yourself, + # or use the Nix User Repository version (https://github.com/drewrisinger/nur-packages). + # It can also be installed at runtime from the pip wheel. + # We disable appropriate tests below to allow building without pyscf installed + + postPatch = '' + substituteInPlace setup.py \ + --replace "pyscf; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')" "" + + # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included + echo -e "\nimport warnings\ntry: import pyscf;\nexcept:\n " \ + "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ + "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ + "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ + >> qiskit/chemistry/__init__.py + ''; + + checkInputs = [ parameterized qiskit-aer pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ + "qiskit.aqua" + "qiskit.aqua.algorithms" + "qiskit.chemistry" + "qiskit.finance" + "qiskit.ml" + "qiskit.optimization" + ]; + pytestFlagsArray = [ + # Disabled b/c missing pyscf + "--ignore=test/chemistry/test_qeom_ee.py" + "--ignore=test/chemistry/test_qeom_vqe.py" + "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" + + # Following tend to be slow tests, all pass + "--ignore=test/aqua/test_vqc.py" + "--ignore=test/aqua/test_hhl.py" + "--ignore=test/aqua/test_qgan.py" + "--ignore=test/aqua/test_mcr.py" + "--ignore=test/aqua/test_mcu1.py" + "--ignore=test/aqua/test_vqe.py" + ]; + disabledTests = [ + # Disabled due to missing pyscf + "test_validate" # test/chemistry/test_inputparser.py + + # Disabling slow tests > 10 seconds + "test_clique_vqe" + "test_delta_3_qasm" + "test_evaluate_qasm_mode" + "test_evolve_1_suzuki" + "test_exact_cover_vqe" + "test_exchangedata" + "test_expected_value_0_statevector" + "test_expected_value_1_qasm" + "test_expected_value_2_statevector" + "test_graph_partition_vqe" + "test_lookup_rotation" + "test_mct_with_dirty_ancillae_15" + "test_mcrz_11" + "test_measurement_error_mitigation_auto_refresh" + "test_qgan_training" + "test_qsvm_multiclass" + "test_shor_factoring_0" + "test_vertex_cover_vqe" + "test_vqc_with_raw_feature_vector_on_wine" + "test_vqe_2_iqpe" + "test_vqe_qasm" + "test_wikipedia" + ]; + + meta = with lib; { + description = "An extensible library of quantum computing algorithms"; + homepage = "https://github.com/QISKit/qiskit-aqua"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 2d6d02b5ad4..bed1bffe1a6 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -8,15 +8,25 @@ , requests , requests_ntlm , websockets + # Visualization inputs +, ipykernel +, ipyvuetify +, ipywidgets +, matplotlib +, nbconvert +, nbformat +, plotly +, pyperclip +, seaborn # check inputs , pytestCheckHook -, vcrpy , pproxy +, vcrpy }: buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.6"; @@ -24,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1jhgsfspmry0qk7jkcryn4225j2azys3rm99agk6mh0jzwrvx4am"; + sha256 = "0arbhwaa2kx04jbrj6hk3vvn92wdk6lrr9zx36pr6p22r0yyxnj9"; }; propagatedBuildInputs = [ @@ -34,6 +44,16 @@ buildPythonPackage rec { requests requests_ntlm websockets + # Visualization/Jupyter inputs + ipykernel + ipyvuetify + ipywidgets + matplotlib + nbconvert + nbformat + plotly + pyperclip + seaborn ]; # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) @@ -43,18 +63,24 @@ buildPythonPackage rec { ''; # Most tests require credentials to run on IBMQ - checkInputs = [ pytestCheckHook vcrpy pproxy ]; + checkInputs = [ + pytestCheckHook + pproxy + vcrpy + ]; dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "qiskit.providers.ibmq" ]; - disabledTests = [ "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" ]; # tests require internet connection - # skip tests that require IBMQ credentials, vs failing. - preCheck = '' - pushd /build/source # run pytest from /build vs $out - substituteInPlace test/decorators.py --replace "Exception('Could not locate valid credentials.')" "SkipTest('No IBMQ Credentials provided for tests')" - ''; - postCheck = '' - popd - ''; + # These disabled tests require internet connection, aren't skipped elsewhere + disabledTests = [ + "test_old_api_url" + "test_non_auth_url" + "test_non_auth_url_with_hub" + ]; + + # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud). + # Options defined in qiskit.terra.test.testing_options.py::get_test_options + QISKIT_TESTS = "skip_online"; meta = with lib; { description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ"; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 89d02f7b803..3b5c9e706dc 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -1,65 +1,49 @@ -{ stdenv -, isPy3k +{ lib +, pythonOlder , buildPythonPackage -, fetchPypi -, numpy -, scipy -, sympy -, matplotlib -, networkx -, ply -, pillow -, cffi -, requests -, requests_ntlm -, IBMQuantumExperience -, jsonschema -, psutil -, cmake -, llvmPackages +, fetchFromGitHub + # Python Inputs +, qiskit-aer +, qiskit-aqua +, qiskit-ibmq-provider +, qiskit-ignis +, qiskit-terra + # Check Inputs +, pytestCheckHook }: buildPythonPackage rec { pname = "qiskit"; - version = "0.14.0"; + # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history + version = "0.17.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "d086a21d0eee61bb12e1f2cd6148a7292005fd10584ca33d6c404dd5c53ba95f"; + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "qiskit"; + rev = version; + sha256 = "1cnjcvvzklyq102fipqnwd5ham0sp0451gp7j79cwwsxzvji6pcc"; }; - buildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp; - propagatedBuildInputs = [ - numpy - matplotlib - networkx - ply - scipy - sympy - pillow - cffi - requests - requests_ntlm - IBMQuantumExperience - jsonschema - psutil + qiskit-aer + qiskit-aqua + qiskit-ibmq-provider + qiskit-ignis + qiskit-terra ]; - # Pypi's tarball doesn't contain tests - doCheck = false; + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. + # pythonImportsCheck = [ "qiskit" "qiskit.terra" "qiskit.ignis" "qiskit.aer" "qiskit.aqua" ]; meta = { - description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; - homepage = https://github.com/QISKit/qiskit-terra; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ - pandaman - ]; - # Needs to be updated and have its new dependencies added - broken = true; + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger pandaman ]; }; } diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index be149e7edea..4f6cc190f0e 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "simplekml"; - version = "1.3.3"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "08l24gfql83yjcdqb51nnnvckbnfb7bl89am4q9zr0fslrbcn3vf"; + sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5"; }; - doCheck = false; # no tests are defined in 1.3.3 + doCheck = false; # no tests are defined in 1.3.5 meta = with lib; { description = "Generate KML with as little effort as possible"; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 4a44b7d0b7a..0af09cc01ce 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "soco"; - version = "0.18.1"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "de033ad69f86a655f50d407648b3aa2dd9647c69fd7bb317e9adfcd38a1adf4b"; + sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck"; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://python-soco.com/; + homepage = "http://python-soco.com/"; description = "A CLI and library to control Sonos speakers"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index f052da2bf7b..306737c4002 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.4"; + version = "2.0.5"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "126jaslg8cfap2is3sy3v13xpl9drb80yc5lfsm1nw5s2xcxklqw"; + sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e733c269cd0..74ab81c2f08 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "163z3j0sd9a7cc9pv9hcrh230gisvvi2fxabh1f6nzhfr8avrncr"; + sha256 = "0s2f9yxhfkfipbb06965gfjq4lg0khp5vcykijrx6dzxyh20vggm"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 1e8993bd0d3..82c45f3cb64 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.1"; + version = "4.1.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "13ajjifyf7w895vpl0h9r59m73zisby81xjw2c5pk49fh5l6ycs9"; + sha256 = "0qyisrs9xkzx4hbyin9nasvl10qk7jlxrmyasxycz4zwnvzfvxzf"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 1e35d4024eb..e6227e4ced3 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0qp9j8c92zbkwlbv5ywrszil6kvlkkf3wkc4krh2vdsrwd9cnf2g"; + sha256 = "0chnb421g4bsshbkx6d1xnhsda4250jsn8zyklg5p1vqyr12mhik"; }; postPatch = '' diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index a6d93465ffc..cad0aa79705 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.12.9"; + version = "0.13.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0w44s8ynzy8w8dgm755c8jina9i4dd87vqkcv7jc1kwkg384w9i5"; + sha256 = "1ls8d121zyyhry5ji7gf7vjvhyqdpr4za3qx1llq48943fmaxxpq"; }; propagatedBuildInputs = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://www.starlette.io/; + homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4acc694a572..ff520c5ffe3 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.43.0"; + version = "2.44.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0jikvcapg2xp3w824wz0wn74mx91nl3vmd92a10il3gli2p4wcnp"; + sha256 = "0aaaf8dp989im2n0cdmslq0ys4ia970yl1irhxiwwqarmh6fap5i"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 8e7a5643d70..617ba227c41 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage -, traits, pyface, wxPython +{ lib, fetchPypi, buildPythonPackage +, traits, pyface, six }: buildPythonPackage rec { @@ -11,14 +11,14 @@ buildPythonPackage rec { sha256 = "0kw1xy5ax6l0lzmk7pfzjw6qs0idv78k3118my7cbvw1n5iiff28"; }; - propagatedBuildInputs = [ traits pyface wxPython ]; + propagatedBuildInputs = [ traits pyface six ]; doCheck = false; # Needs X server - meta = with stdenv.lib; { + meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 3b60c63d964..01a7cd3d87a 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "19.1.0"; + version = "20.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "19ayn5w9ayxbb1m84l1s9qlb6kv7sz6sg34mzy8bnidc7qnfbn15"; + sha256 = "0yipb41w2icbj50d3z1j92d8w6xhbqd1rnmd31vzb5k3g20x0b0j"; }; # zope.interface issue @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; - homepage = https://github.com/meejah/txtorcon; + homepage = "https://github.com/meejah/txtorcon"; maintainers = with lib.maintainers; [ jluttine ]; # Currently broken on Python 2.7. See # https://github.com/NixOS/nixpkgs/issues/71826 diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index af2224e3536..11c50646700 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -1,10 +1,13 @@ { buildPythonPackage +, isPy27 , fetchPypi , pytestrunner , setuptools_scm +, singledispatch , pytest , lib }: + buildPythonPackage rec { pname = "variants"; version = "0.2.0"; @@ -21,12 +24,12 @@ buildPythonPackage rec { checkInputs = [ pytest - ]; - + ] ++ lib.optionals isPy27 [ singledispatch ]; + meta = with lib; { description = "Library providing syntactic sugar for creating variant forms of a canonical function"; homepage = "https://github.com/python-variants/variants"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix new file mode 100644 index 00000000000..5f32dff4aa5 --- /dev/null +++ b/pkgs/development/python-modules/varint/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "varint"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version ; + sha256 = "a6ecc02377ac5ee9d65a6a8ad45c9ff1dac8ccee19400a5950fb51d594214ca5"; + }; + + # No tests are available + doCheck = false; + + pythonImportsCheck = [ "varint" ]; + + meta = with lib; { + description = "A basic varint implementation in python"; + homepage = "https://github.com/fmoo/python-varint"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index b1ce764c4ac..cc68d4b7090 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "c88ae171a11b087ea2513f260cdac9232461d8e9369bcd1dc143fc399d220557"; + sha256 = "0absh96fsxk9di7ir76f5djyfm2c214wnyk53avrhjy8akflhpk6"; }; buildInputs = [ pytest ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/edwardgeorge/virtualenv-clone; + homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index d0a5d6116f8..7c3d25068e3 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 +, Babel , cssselect , dateutil , feedparser @@ -24,11 +25,11 @@ buildPythonPackage rec { pname = "weboob"; - version = "1.5"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "1c9z9gid1mbm1cakb2wj6jjkbrmji8y8ac46iqpih9x1h498bhbs"; + sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw"; }; postPatch = '' @@ -44,13 +45,12 @@ buildPythonPackage rec { }; p' weboob/browser/browsers.py weboob/browser/pages.py ''; - setupPyBuildFlags = ["--qt" "--xdg"]; - checkInputs = [ nose ]; nativeBuildInputs = [ pyqt5 ]; propagatedBuildInputs = [ + Babel cssselect dateutil feedparser @@ -77,7 +77,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://weboob.org; + homepage = "http://weboob.org"; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = lib.licenses.agpl3; }; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 134d797ecf8..70709d3e666 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "8dbb3b7cf4a02a080162467fff5cd38bf77940c3e2b25f7c4f78529427ca9cfe"; + sha256 = "08biw3g6x6p2aa1nlvfazbgcs1xvf6m0hvskdjhgwnsbwxk1xq46"; }; propagatedBuildInputs = [ six ]; checkInputs = [ mock ]; meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphite.wikidot.com/"; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 03e91c0cff4..b4c8e46f146 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.2.3"; + version = "4.2.4"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0yjb07gk74qsag4ahjrbqgl7pgr2kvm43c7yrv10mwxk0ax51337"; + sha256 = "0nq6ijmj48c2dk75vmb040wgvr4y7wyjxrcm2dyvcwfk2h6phwri"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b4d5834b242..b883a3d2bc8 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "1gx3f9wcf8af9cz2v3x3196pab34n8mlqk5iswahhzpxc9i2p4bn"; + sha256 = "14yijcnmanyd3s2ir38sxl07rzpxgpgw9s6b8sy68jrl7n5nj7ky"; }; checkInputs = [ nose ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A linter for YAML files"; - homepage = https://github.com/adrienverge/yamllint; + homepage = "https://github.com/adrienverge/yamllint"; license = licenses.gpl3; maintainers = with maintainers; [ mikefaille ]; }; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 66f33f6e31f..65416d9295b 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -124,7 +124,7 @@ let for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ --set BUNDLE_GEMFILE ${confFiles}/Gemfile \ - --set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \ + --unset BUNDLE_PATH \ --set BUNDLE_FROZEN 1 \ --set GEM_HOME ${basicEnv}/${ruby.gemPath} \ --set GEM_PATH ${basicEnv}/${ruby.gemPath} diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index add5db56d1d..2bf9d84caa0 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -32,10 +32,12 @@ paths.each do |path| # ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} -ENV["BUNDLE_PATH"] = #{bundle_path.dump} +ENV.delete 'BUNDLE_PATH' ENV['BUNDLE_FROZEN'] = '1' -$LOAD_PATH.unshift #{bundler_path.dump} + "/lib" +Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } + +$LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump} require 'bundler' Bundler.setup(#{groups.map(&:dump).join(', ')}) diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 2fa70664323..0859f08c2f7 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -53,7 +53,7 @@ in ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ - "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ + "--unset BUNDLE_PATH "+ "--set BUNDLE_FROZEN 1 "+ "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 6190b4210cd..fc2733de3f0 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.17.3"; - source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw"; + version = "2.1.4"; + source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 70a3afb6e57..d9438a79956 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -52,4 +52,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 14b61eac374..4fbf986e41a 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.21"; + version = "4.5.22"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc"; + sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix new file mode 100644 index 00000000000..db150b2eef1 --- /dev/null +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "bazel-gazelle"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = pname; + rev = "v${version}"; + sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1"; + }; + + modSha256 = "0bfhy0ig8apxb5qzxjdj6q7jr2i6rdq0ffby0pha8viadah8v2rm"; + + subPackages = [ "cmd/gazelle" ]; + + meta = with lib; { + homepage = https://github.com/bazelbuild/bazel-gazelle; + description = '' + Gazelle is a Bazel build file generator for Bazel projects. It natively + supports Go and protobuf, and it may be extended to support new languages + and custom rule sets. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index f54868de533..6d4ba50a9fb 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -161,6 +161,14 @@ stdenv.mkDerivation rec { postPatch = let darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + # Disable Bazel's Xcode toolchain detection which would configure compilers # and linkers from Xcode instead of from PATH export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 @@ -170,14 +178,14 @@ stdenv.mkDerivation rec { # Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ scripts/bootstrap/compile.sh \ src/tools/xcode/realpath/BUILD \ src/tools/xcode/stdredirect/BUILD \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index 1c731a0b9e2..eff8aede6c1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -258,20 +258,20 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; } else {}) // { - bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually diff --git a/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix index 2de8f683d30..edda48c4b99 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix @@ -258,20 +258,20 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; } else {}) // { - bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index ed1e6a174ce..944bbd9d4bb 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200212"; + version = "20200318"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2"; + sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 5990208b645..114cdc634c8 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,12 +39,12 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.23.0"; + version = "1.24.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "06jnmgvzdyxjpcmyj1804mlq6b842jvvbsngsamdy976sqws870g"; + sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y"; }; propagatedBuildInputs = with newPython.pkgs; [ diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock index 52060a0e625..466133010e0 100644 --- a/pkgs/development/tools/build-managers/drake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES drake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock index 992a0bc8929..f89ceae9344 100644 --- a/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 719aad17203..7fbb21ffb12 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.14.6"; + version = "1.14.8"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1sx4jl34l9djf115zv266qhz4sm1ndv0k0z49fbr3b6m7ll2mmlv"; + sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; }; outputs = [ "bin" "man" "out" ]; @@ -39,6 +39,6 @@ buildGoPackage rec { homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ]; + maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; }; } diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/development/tools/cadre/Gemfile.lock index c14df9cffa6..5d22e69f31c 100644 --- a/pkgs/development/tools/cadre/Gemfile.lock +++ b/pkgs/development/tools/cadre/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES cadre (= 1.0.4) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock index 9f9a160c587..8bebc81ebd9 100644 --- a/pkgs/development/tools/cbor-diag/Gemfile.lock +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock index cd4e1407637..796a7743cac 100644 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -27,4 +27,4 @@ DEPENDENCIES cddl BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 47346c1bc45..ce23018bd73 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -723,4 +723,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock index 43790d9e7a1..ecae8fdd7f6 100644 --- a/pkgs/development/tools/compass/Gemfile.lock +++ b/pkgs/development/tools/compass/Gemfile.lock @@ -28,4 +28,4 @@ DEPENDENCIES compass! BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/development/tools/corundum/Gemfile.lock index 40ad1948394..596a689e3a2 100644 --- a/pkgs/development/tools/corundum/Gemfile.lock +++ b/pkgs/development/tools/corundum/Gemfile.lock @@ -53,4 +53,4 @@ DEPENDENCIES corundum (= 0.6.2) BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock index a9a2d073de4..82a97214493 100644 --- a/pkgs/development/tools/cucumber/Gemfile.lock +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -31,4 +31,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock index 52c82545bf3..d0a51c0a062 100644 --- a/pkgs/development/tools/ejson/Gemfile.lock +++ b/pkgs/development/tools/ejson/Gemfile.lock @@ -51,4 +51,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/development/tools/github-changelog-generator/Gemfile.lock index b1b955cba94..d1f67ddd474 100644 --- a/pkgs/development/tools/github-changelog-generator/Gemfile.lock +++ b/pkgs/development/tools/github-changelog-generator/Gemfile.lock @@ -46,4 +46,4 @@ DEPENDENCIES github_changelog_generator (= 1.14.3) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 210dc101a24..f703cb707e6 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -100,4 +100,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock index 2a95d72c946..d8331181652 100644 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -20,4 +20,4 @@ DEPENDENCIES jsduck BUNDLED WITH - 1.13.6 + 2.1.4 diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5641a14e1ab..b0b73d03d10 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.5"; + version = "0.5.10"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9"; + sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1"; }; - cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b"; + cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; + + postInstall = '' + # generate completion scripts for just + + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + + $out/bin/just --completions bash > "$out/share/bash-completion/completions/just" + $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish" + $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just" + ''; checkInputs = [ coreutils bash dash ]; @@ -20,20 +30,25 @@ rustPlatform.buildRustPackage rec { export USER=just-user export USERNAME=just-user - sed -i tests/integration.rs \ - -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" - - sed -i tests/interrupts.rs \ - -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" - sed -i src/justfile.rs \ + -i tests/*.rs \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \ -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" + -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \ + -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g" + ''; + + # Skip "edit" when running "cargo test", + # since this test case needs "cat". + checkPhase = '' + runHook preCheck + echo "Running cargo test -- + --skip edit + ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test -- \ + --skip edit \ + ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + runHook postCheck ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 921ee3d158c..aedf2ab881d 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let - version = "2.4.2"; + version = "2.4.3"; in stdenv.mkDerivation { pname = "minizinc-ide"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "1xqs27f14r79vcxf9bx72bbnhxc913lpr5d8cv31dacbq5fyxkw7"; + sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr"; }; sourceRoot = "source/MiniZincIDE"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.minizinc.org/; + homepage = "https://www.minizinc.org/"; description = "IDE for MiniZinc, a medium-level constraint modelling language"; longDescription = '' diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 5aee5df847f..52a91db6758 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -4,7 +4,7 @@ , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null -, migration ? false +, migration ? false, patches ? [] }: with stdenv; @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - inherit stdenv src version; + inherit stdenv src version patches; buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 35c069211b3..9e14e16dbaa 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, nixUnstable, callPackage, nixFlakes }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: { # Package for phase-1 of the db migration for Hydra. @@ -15,28 +15,24 @@ migration = true; }; - # Hydra from latest master (or flakes) branch. Contains breaking changes, + # Hydra from latest master branch. Contains breaking changes, # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-03-24"; + version = "2020-04-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "12cc46cdb36321acd4c982429a86eb0f8f3cc969"; - sha256 = "10ipxzdxr47c8w5jg69mbax2ykc7lb5fs9bbdd3iai9wzyfz17ln"; - }; - nix = nixUnstable; - }; - - hydra-flakes = callPackage ./common.nix { - version = "2020-03-27"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "hydra"; - rev = "a7540b141d085a7e78c21fda8e8c05907c659b34"; - sha256 = "08fs7593w5zs8vh4c66gvrxk6s840pp6hj8nwf51wsa27kg5a943"; + rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; + sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; }; + patches = [ + # https://github.com/NixOS/hydra/pull/732 + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; + sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; + }) + ]; nix = nixFlakes; }; } diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index aabcd784d86..04268d3306c 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES mdl BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index ea31cc3704f..db20c8b0ffd 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES one_gadget BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 77d03f299f4..778d3079471 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 meta = with stdenv.lib; { - homepage = https://nixos.org/patchelf.html; + homepage = https://github.com/NixOS/patchelf/blob/master/README; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index f5ff1c74bcc..349c6a4e1eb 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://nixos.org/patchelf.html; + homepage = https://github.com/NixOS/patchelf/blob/master/README; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index c13c9646393..e26b31cbaf0 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -54,4 +54,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock index fa157d794f7..9e3c166400f 100644 --- a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES watson-ruby BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index d6327010e30..63c169f045f 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -6,9 +6,14 @@ in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if stdenv.lib.versionAtLeast ocaml.version "4.02" then + (if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "1.6.6"; + sha256 = "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs"; + } else { version = "1.6.5"; sha256 = "03c0amszy28shinvz61hm340jz446zz5763a1pdqlza36kwcj0p0"; + }) // { buildInputs = [ dune ]; extra = { inherit (dune) installPhase; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 47e71c41568..510dd183f00 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "096wp6aawgh1ffhbnjfxgakwqd02kfkz2i6m6cc040w1g554iw98"; + sha256 = "1nnpg0fvmp4vf5mk203xk83pkkm953pgip3yhs1x2g8pkcdndhcw"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 310ef0be151..5daeb384cc5 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.34.11"; + version = "1.34.15"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63"; + sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock index bf88c1bb148..9a6441e76b8 100644 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ b/pkgs/development/tools/overcommit/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES overcommit BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index e4b50f31776..a7fabb78395 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,34 +1,30 @@ -{ stdenv, python3Packages }: -with python3Packages; buildPythonApplication rec { - pname = "pew"; - version = "1.1.2"; +{ stdenv, python3 }: - src = fetchPypi { - inherit pname version; - sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; - }; +with python3.pkgs; - propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; +buildPythonApplication rec { + pname = "pew"; + version = "1.2.0"; - LC_ALL = "en_US.UTF-8"; + src = fetchPypi { + inherit pname version; + sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; + }; - postFixup = '' - set -euo pipefail - PEW_SITE="$out/lib/${python.libPrefix}/site-packages" - SETUPTOOLS="${setuptools}/lib/${python.libPrefix}/site-packages" - SETUPTOOLS_SITE=$SETUPTOOLS/$(cat $SETUPTOOLS/setuptools.pth) - CLONEVENV_SITE="${virtualenv-clone}/lib/${python.libPrefix}/site-packages" - SITE_PACKAGES="[\'$PEW_SITE\',\'$SETUPTOOLS_SITE\',\'$CLONEVENV_SITE\']" - substituteInPlace $PEW_SITE/pew/pew.py \ - --replace "from pew.pew" "import sys; sys.path.extend($SITE_PACKAGES); from pew.pew" \ - --replace 'sys.executable, "-m", "virtualenv"' "'${virtualenv}/bin/virtualenv'" - ''; + propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; - meta = with stdenv.lib; { - homepage = https://github.com/berdario/pew; - description = "Tools to manage multiple virtualenvs written in pure python"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; - } + # no tests are packaged + checkPhase = '' + $out/bin/pew > /dev/null + ''; + + pythonImportsCheck = [ "pew" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/berdario/pew"; + description = "Tools to manage multiple virtualenvs written in pure python"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; +} diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock index e6025f50ca1..d76845bc05a 100644 --- a/pkgs/development/tools/pry/Gemfile.lock +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES pry BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock index 8c5d369fb37..870652b567a 100644 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/development/tools/redis-dump/Gemfile.lock index 364bdb778f5..f789ae87d8d 100644 --- a/pkgs/development/tools/redis-dump/Gemfile.lock +++ b/pkgs/development/tools/redis-dump/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES redis-dump BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock index c2b90f63494..ff71ebd7a01 100644 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 9d166f0fad5..0e6e3a7f361 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index d9980df02a0..8374e065356 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53"; + sha256 = "04h9yyna47cgn2d232v2fpbgki9gg4lykpmx46ncpsq4g6azl1a9"; }; - cargoSha256 = "00j2czhb0ag10hwq7ycdwr2ndb6gz99kg12hlmaq4mkaf8h254nn"; + cargoSha256 = "0lzc2nwz9lpwxv704k40d1416qnf3wy3g6ad8w8xbkfc6ydcaa4l"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 9613313078f..f5ad1b413ca 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.30.2" +version = "0.30.4" dependencies = [ "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 94fbd4678d5..04e7d17503b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.2"; + version = "0.30.4"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1p7j80vqlrrprrlnaysng542kl3q87r6kv9mxzdb8605g1ma8wd6"; + sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0j5ky547xlgfiz4mk7n7fhv1s9v697lvyqsjlj7jc5y9knx56n1j"; + cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock index 1b99dd3a136..9882e1efcc4 100644 --- a/pkgs/development/tools/sass/Gemfile.lock +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES sass BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/development/tools/scss-lint/Gemfile.lock index 546dfabe4d7..08e2fe4e64d 100644 --- a/pkgs/development/tools/scss-lint/Gemfile.lock +++ b/pkgs/development/tools/scss-lint/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES scss_lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index c065629018c..4425640828c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,17 +1,27 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux -, go-md2man }: +{ stdenv +, lib +, buildGoPackage +, fetchFromGitHub +, runCommand +, gpgme +, libgpgerror +, lvm2 +, btrfs-progs +, pkg-config +, libselinux +, go-md2man +}: with stdenv.lib; let - version = "0.1.41"; + version = "0.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs"; + sha256 = "09zqzrw6f1s6kaknnj3hra3xz4nq6y86vmw5vk8p4f6g7cwakg1x"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; @@ -28,7 +38,7 @@ buildGoPackage { excludedPackages = "integration"; - nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; + nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ]; buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; buildFlagsArray = '' @@ -49,10 +59,10 @@ buildGoPackage { popd ''; - meta = { + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; - maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ]; - license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ lewo ] ++ teams.podman.members; + license = licenses.asl20; }; } diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 6fc638615fb..a57d1811b19 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - pg_query (1.1.0) - sqlint (0.1.9) + pg_query (1.2.0) + sqlint (0.1.10) pg_query (~> 1) PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index b10a56c4c92..a86277363fb 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "070iy9jdj0snfl42my5n6i2svcnn87cbffcjvvq5068hw0b0296w"; + sha256 = "0p9s6znavm6v5dwk1hxg9a8h2lrrwh9l0rlk0sy8cx4sq2mq82m1"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sqlint = { dependencies = ["pg_query"]; @@ -15,9 +15,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg9c00w520mw1mzq8kls8whwgqva1alksdsv536bh9nq7m2hnky"; + sha256 = "0ds7qsaqi745fda8nliy15is36l1bkfbfkr43q6smpy103xbk44c"; type = "gem"; }; - version = "0.1.9"; + version = "0.1.10"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock index 6f1ba7545a8..c0b9676d27b 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/development/tools/xcpretty/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.16.4 + 2.1.4 diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 4086566f681..fc68fa53246 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49"; + sha256 = "107dvgwv2ldpdr99q1nvb1i93jj635p1n7md6q14v9m4a6a226sa"; }; buildInputs = [ unzip ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { over configuration to provide a productive and stream-lined development experience. ''; - homepage = https://grails.org/; + homepage = "https://grails.org/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 560213897c9..69cc56a0029 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -38,4 +38,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 815b569a7eb..9a50d5fbd35 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.19.0"; - sha256 = "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2"; + version = "10.20.0"; + sha256 = "0cvjwnl0wkcsyw3kannbdv01s235wrnp11n2s6swzjx95gpichfi"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 3fa5216ccf8..6d7f213536a 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.1"; - sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a"; + version = "12.16.2"; + sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index aea451ff8ae..ba304972d9a 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.20.0"; + version = "7.21.2"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "1al0kl2snbxzmprn13vbna4wyd72dya5lyfkhjgqabm4b7mign6c"; + sha256 = "18lb8csfmy5j97zdg3c5l23aaw9hjg04qhfc1sz9pgi7xhwz5g1b"; name = "${pname}.tar.gz"; }; |