diff options
Diffstat (limited to 'pkgs/development')
99 files changed, 1243 insertions, 237 deletions
diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 9665f5006ede..12f833f55255 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -86,7 +86,5 @@ stdenv.mkDerivation rec { platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; license = licenses.free; # Combination of LGPL/X11/GPL ? - # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06 - broken = stdenv.isAarch64 && (versionAtLeast version "5"); }; } diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 55348c5795ad..e738dd7acaed 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.28.0"; + version = "1.29.2"; - # fetch hashes by running `print-hashes.sh 1.24.1` + # fetch hashes by running `print-hashes.sh 1.29.2` hashes = { - i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f"; - x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810"; - armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2"; - aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1"; - i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68"; - x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393"; + i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e"; + x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8"; + armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0"; + aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f"; + i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f"; + x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 25a71965e0b4..02ea7ebbbfbf 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,13 +1,10 @@ { stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib -, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin +, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 +, CoreFoundation, Security , version , patches ? [] , src }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; -in - rustPlatform.buildRustPackage rec { name = "cargo-${version}"; inherit version src patches; @@ -24,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG=1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7d785093f9b3..a925127596d5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,4 +1,5 @@ { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl +, CoreFoundation, Security , targets ? [] , targetToolchains ? [] , targetPatches ? [] @@ -6,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.1"; - cargoVersion = "1.29.1"; + version = "1.30.0"; + cargoVersion = "1.30.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; + sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd"; }; in rec { rustc = callPackage ./rustc.nix { @@ -44,8 +45,7 @@ in rec { cargo = callPackage ./cargo.nix rec { version = cargoVersion; - inherit src; - inherit stdenv; + inherit src stdenv CoreFoundation Security; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo }; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a054ed0eb557..decf14a32948 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -92,15 +92,15 @@ stdenv.mkDerivation { #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ # Disable fragile tests. - rm -vr src/test/run-make/linker-output-non-utf8 || true - rm -vr src/test/run-make/issue-26092 || true + rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true + rm -vr src/test/run-make-fulldeps/issue-26092 || true # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 - rm -vr src/test/run-pass/issue-36023.rs || true + rm -vr src/test/ui/run-pass/issue-36023.rs || true # Disable test getting stuck on hydra - possible fix: # https://reviews.llvm.org/rL281650 - rm -vr src/test/run-pass/issue-36474.rs || true + rm -vr src/test/ui/run-pass/issue-36474.rs || true # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs @@ -116,18 +116,18 @@ stdenv.mkDerivation { # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* - rm -v src/test/run-pass/backtrace-debuginfo.rs + rm -v src/test/run-pass/backtrace-debuginfo.rs || true # error: No such file or directory - rm -v src/test/run-pass/issue-45731.rs + rm -v src/test/ui/run-pass/issues/issue-45731.rs || true # Disable tests that fail when sandboxing is enabled. substituteInPlace src/libstd/sys/unix/ext/net.rs \ --replace '#[test]' '#[test] #[ignore]' substituteInPlace src/test/run-pass/env-home-dir.rs \ --replace 'home_dir().is_some()' true - rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes? - rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? + rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes? + rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ??? ''; # rustc unfortunately need cmake for compiling llvm-rt but doesn't diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6155e158e9de..f4ebe549c502 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -245,12 +245,13 @@ rec { on hackage. This can be used as a test for the source distribution, assuming the build fails when packaging mistakes are in the cabal file. */ - buildFromSdist = pkg: lib.overrideDerivation pkg (drv: { - unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' - echo "Source tarball is at ${src}/${tarname}.tar.gz" - tar xf ${src}/${tarname}.tar.gz - cd ${pkg.pname}-* - ''; + buildFromSdist = pkg: overrideCabal pkg (drv: { + src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz"; + + # Revising and jailbreaking the cabal file has been handled in sdistTarball + revision = null; + editedCabalFile = null; + jailbreak = false; }); /* Build the package in a strict way to uncover potential problems. diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index 1e234b3f6934..91ee174dadff 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -6,11 +6,10 @@ build-idris-package { name = "categories"; version = "2018-07-02"; - # https://github.com/danilkolikov/categories/pull/5 src = fetchFromGitHub { - owner = "infinisil"; + owner = "danilkolikov"; repo = "categories"; - rev = "9722d62297e5025431e91b271ab09c5d14867236"; + rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35"; sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2"; }; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7b6cb64cfe37..7f3164f3160d 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -10,12 +10,11 @@ build-idris-package { idrisDeps = [ contrib pruviloj ]; - # https://github.com/david-christiansen/derive-all-the-instances/pull/9 src = fetchFromGitHub { - owner = "infinisil"; + owner = "david-christiansen"; repo = "derive-all-the-instances"; - rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604"; - sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn"; + rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950"; + sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m"; }; meta = { diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index d97d416bc27d..adbbbaff890b 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.7.3"; - sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa"; + version = "1.7.4"; + sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; } diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 01600f90f284..23d20f418c30 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -3,7 +3,7 @@ , enablePython ? false, pythonPackages , enablePosixThreads ? false , enableOpenMPThreads ? false}: -with stdenv.lib; +with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; version = "2.9.0"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z"; }; + postPatch = '' + substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ netcdf diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch new file mode 100644 index 000000000000..0aa2034e3996 --- /dev/null +++ b/pkgs/development/libraries/gsignond/conf.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index cb1e0df..d90c85c 100644 +--- a/meson.build ++++ b/meson.build +@@ -95,6 +95,6 @@ endif + configure_file( + input: 'gsignond.conf.in', + configuration: conf_data, +- install_dir: sysconf_dir, ++ install_dir: 'etc/', + output: 'gsignond.conf' + ) diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix new file mode 100644 index 000000000000..11dcc2a2ee91 --- /dev/null +++ b/pkgs/development/libraries/gsignond/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking +, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl +, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper +, symlinkJoin, gsignondPlugins, plugins }: + +let +unwrapped = stdenv.mkDerivation rec { + pname = "gsignond"; + version = "39022c86ddb5062a10fb0503ad9d81a8e532d527"; + + name = "${pname}-2018-10-04"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = pname; + rev = version; + sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff"; + }; + + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + glib-networking + libsecret + ]; + + propagatedBuildInputs = [ sqlite ]; + + mesonFlags = [ + "-Dbus_type=session" + "-Dextension=desktop" + ]; + + LC_ALL = "en_US.UTF-8"; + + patches = [ + ./conf.patch + ./plugin-load-env.patch + ]; + + meta = with stdenv.lib; { + description = "D-Bus service which performs user authentication on behalf of its clients"; + homepage = https://gitlab.com/accounts-sso/gsignond; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +}; + +in if plugins == [] then unwrapped + else import ./wrapper.nix { + inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins; + gsignond = unwrapped; + } + diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch new file mode 100644 index 000000000000..5da2b4c157e8 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch @@ -0,0 +1,35 @@ +diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c +index 5497b32..979e1b4 100644 +--- a/src/gplugind/gsignond-plugin-loader.c ++++ b/src/gplugind/gsignond-plugin-loader.c +@@ -38,11 +38,10 @@ gsignond_load_plugin ( + gchar *plugin_filename; + GSignondPlugin *plugin; + +-# ifdef ENABLE_DEBUG + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + plugin_filename = g_module_build_path (plugin_path, plugin_type); + plugin = gsignond_load_plugin_with_filename (plugin_type, + plugin_filename); +diff --git a/src/gplugind/main.c b/src/gplugind/main.c +index 1c6cdb6..c85c623 100644 +--- a/src/gplugind/main.c ++++ b/src/gplugind/main.c +@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop) + static const gchar* _plugin_path(void) + { + const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR; +-# ifdef ENABLE_DEBUG ++ + const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR"); + if (env_val) + plugin_path = env_val; +-# endif ++ + return plugin_path; + } + diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix new file mode 100644 index 000000000000..a23c14878818 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-lastfm-${version}"; + version = "2018-05-07"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-lastfm"; + rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c"; + sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + json-glib + libsoup + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix new file mode 100644 index 000000000000..763e76c9cc94 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-mail-${version}"; + version = "2018-10-04"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-mail"; + rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346"; + sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw"; + }; + + nativeBuildInputs = [ + gobjectIntrospection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + glib + gsignond + ]; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix new file mode 100644 index 000000000000..ee45430122c5 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check +, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 +, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-oauth-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-oa"; + rev = "d471cebfd7c50567b1244277a9559f18f8d58691"; + sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gnutls + gsignond + json-glib + libsoup + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix new file mode 100644 index 000000000000..25f205579066 --- /dev/null +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check +, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "gsignond-plugin-sasl-${version}"; + version = "2018-10-15"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = "gsignond-plugin-sasl"; + rev = "b304c70b7dad9368b23b1205122d10de684c896a"; + sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xml_dtd_45 + docbook_xsl + glibcLocales + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + ]; + + buildInputs = [ + glib + gsasl + gsignond + ]; + + LC_ALL = "en_US.UTF-8"; + + PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; + + meta = with stdenv.lib; { + description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol."; + homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix new file mode 100644 index 000000000000..a5df6bbeafb2 --- /dev/null +++ b/pkgs/development/libraries/gsignond/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }: + +symlinkJoin { + name = "gsignond-with-plugins-${gsignond.version}"; + + paths = [ gsignond ] ++ plugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/gsignond \ + --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins" + + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service + rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \ + --replace ${gsignond} $out + + substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \ + --replace ${gsignond} $out + ''; +} diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 4da9db3ef047..f445f90f308f 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,30 +1,38 @@ -{stdenv, fetchurl -, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala_0_38 +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44 +, glib, systemd, libusb1, vala, hwdata }: stdenv.mkDerivation rec { name = "gusb-${version}"; - version = "0.2.11"; - enableParallelBuilding = true; + version = "0.3.0"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw"; + sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq"; }; - preConfigure = "./autogen.sh"; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext - gobjectIntrospection libxslt vala_0_38 ]; - buildInputs = [ systemd glib ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext + gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 + gobjectIntrospection vala + ]; + buildInputs = [ systemd glib ]; propagatedBuildInputs = [ libusb1 ]; - meta = { + mesonFlags = [ + "-Dusb_ids=${hwdata}/share/hwdata/usb.ids" + ]; + + doCheck = false; # tests try to access USB + + meta = with stdenv.lib; { description = "GLib libusb wrapper"; - homepage = https://people.freedesktop.org/~hughsient/releases/; - license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/hughsie/libgusb; + license = licenses.lgpl21; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index e2d7d09b259c..87c6bb03d4bb 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p"; + sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index ba267b797870..d4c324d4f23b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" - "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" "--enable-gtk-doc" ]; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix new file mode 100644 index 000000000000..2c0ef60bc635 --- /dev/null +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }: + +stdenv.mkDerivation rec { + pname = "libsignon-glib"; + version = "3639a2e90447e4640a03a44972560afe8f61aa48"; + + name = "${pname}-2018-10-24"; + + outputs = [ "out" "dev" "devdoc" "py" ]; + + src = fetchgit { + url = "https://gitlab.com/accounts-sso/${pname}"; + rev = version; + fetchSubmodules = true; + sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w"; + }; + + nativeBuildInputs = [ + check + docbook_xml_dtd_412 + docbook_xml_dtd_43 + docbook_xsl + gobjectIntrospection + gtk-doc + meson + ninja + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + python3.pkgs.pygobject3 + ]; + + mesonFlags = [ + "-Dintrospection=true" + "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + postPatch = '' + chmod +x build-aux/gen-error-map.py + patchShebangs build-aux/gen-error-map.py + ''; + + meta = with stdenv.lib; { + description = '' + A library for managing single signon credentials which can be used from GLib applications + ''; + homepage = https://gitlab.com/accounts-sso/libsignon-glib; + license = licenses.lgpl21; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index f50b64fca3ed..8f72b333aa48 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -1,14 +1,14 @@ { stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.1.5"; name = "nanomsg-${version}"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nanomsg"; rev = version; - sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl"; + sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index d0f992efb2bc..87f9b5effacd 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 7aad5be36f70..61a40753a56f 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { checkInputs = [ perl ]; doCheck = false; # fails, needs the net - meta = { + meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; homepage = http://www.webdav.org/neon/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 7d0e934d911c..0c597fc4b335 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -43,5 +43,8 @@ in stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; homepage = https://www.unidata.ucar.edu/software/netcdf/; + license = { + url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + }; }; } diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index c7e133d94b23..3c5ae8537a41 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 9cb7d701b9da..cdbd57d785f8 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -35,9 +35,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 44c8f51e856a..25e084bfb74a 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c ''; - meta = { + meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index b67288296606..aa1886508609 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; }; - meta = { + meta = with stdenv.lib; { description = "Open Dynamics Engine"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/opende; + platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index f86e4d120976..1658e831ddd1 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ptlib srtp libtheora speex ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; + propagatedBuildInputs = [ speex ]; configureFlags = [ "--enable-h323" ]; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - + meta = with stdenv.lib; { description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; }; passthru = { diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 6af15d90cefd..4a12217443c5 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = http://www.opencascade.org/; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 2724976c5ae8..e0a6c6a5705e 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -26,13 +26,12 @@ stdenv.mkDerivation rec { cp license.txt "$out/share/doc/opencsg" ''; - meta = { + meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; homepage = http://www.opencsg.org/; - platforms = with stdenv.lib.platforms; - linux; - maintainers = with stdenv.lib.maintainers; - [raskin]; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a073a29b507d..f954aaf72457 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -15,4 +15,10 @@ stdenv.mkDerivation rec { ''; buildInputs = [ readline mysql.connector-c postgresql sqlite ]; + + meta = with stdenv.lib; { + description = "Extremely lightweight but extensible database access library written in C"; + license = licenses.lgpl21; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix index d18c971dc112..d18c971dc112 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.x.nix diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 7d84392d204a..339f60649997 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; }; - meta = { + meta = with lib; { homepage = https://www.openpam.org; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 86015abb9817..973f83042737 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.cstrahan ]; + license = licenses.openssl; priority = 10; # resolves collision with ‘man-pages’ }; } diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index aae6ed0f688a..b69ded648397 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { pango ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; + homepage = https://sourceforge.net/projects/pangopdf; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index b29388790d02..67f343d60380 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21; }; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 0487886a8966..773478f4dc03 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = https://phonon.kde.org/; description = "GStreamer backend for Phonon"; platforms = platforms.linux; + license = with licenses; [ bsd3 lgpl2Plus ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index acf531390226..1704703f8012 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 54e10b965926..b13335561ac0 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "A Qt wrapper around PolKit"; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index edec0b7f0699..592a1f1470a4 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = { + meta = with stdenv.lib; { description = "Command line option parsing library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 29ff988a2266..d40b4442e38e 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index ae60a6f69d63..d425de243f50 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = with licenses; [ beerware bsdOriginal mpl10 ]; }; passthru = { diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index b74c58a2e38c..6577ebeae28e 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "szip-${version}"; version = "2.1.1"; src = fetchurl { - url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz"; - sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9"; + url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz"; + sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1"; }; meta = { diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 67db6e5097d0..a2cb103a1821 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; }) + + (fetchpatch { + # https://github.com/taglib/taglib/pull/869 + name = "CVE-2018-11439.patch"; + url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; + sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index ab9839a21031..003bd5166570 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.0.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4c020807b3f3cfd90f59203077dd5e1f59671833f8c3c5028ec029ed5072f9ce"; + sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix new file mode 100644 index 000000000000..6bbcd1703822 --- /dev/null +++ b/pkgs/development/python-modules/awkward/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "awkward"; + + src = fetchPypi { + inherit pname version; + sha256 = "fc3080c66987f2a03aa9ba0809e51227eb7aa34198da4b1ee4deb95356409693"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/awkward-array; + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch new file mode 100644 index 000000000000..e1019115ac74 --- /dev/null +++ b/pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch @@ -0,0 +1,106 @@ +From c636f0cc386c9ded9f31947bbd74affccc93c21a Mon Sep 17 00:00:00 2001 +From: yoch <yoch.melka@gmail.com> +Date: Mon, 14 May 2018 21:55:00 +0300 +Subject: [PATCH] Adding buffer protocol support for Python 3 + +--- + bitarray/_bitarray.c | 12 ++++++++++-- + bitarray/test_bitarray.py | 14 +++++++------- + 2 files changed, 17 insertions(+), 9 deletions(-) + +diff --git a/bitarray/_bitarray.c b/bitarray/_bitarray.c +index d2c19cb..be6b379 100644 +--- a/bitarray/_bitarray.c ++++ b/bitarray/_bitarray.c +@@ -48,7 +48,7 @@ int PyIndex_Check(PyObject *o) + #define Py_SIZE(ob) (((PyVarObject *) (ob))->ob_size) + #endif + +-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7 ++#if PY_MAJOR_VERSION == 3 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7) + /* (new) buffer protocol */ + #define WITH_BUFFER + #endif +@@ -2787,6 +2787,8 @@ static PyTypeObject BitarrayIter_Type = { + + /********************* Bitarray Buffer Interface ************************/ + #ifdef WITH_BUFFER ++ ++#if PY_MAJOR_VERSION == 2 + static Py_ssize_t + bitarray_buffer_getreadbuf(bitarrayobject *self, + Py_ssize_t index, const void **ptr) +@@ -2831,6 +2833,8 @@ bitarray_buffer_getcharbuf(bitarrayobject *self, + return Py_SIZE(self); + } + ++#endif ++ + static int + bitarray_getbuffer(bitarrayobject *self, Py_buffer *view, int flags) + { +@@ -2857,14 +2861,18 @@ bitarray_releasebuffer(bitarrayobject *self, Py_buffer *view) + } + + static PyBufferProcs bitarray_as_buffer = { ++#if PY_MAJOR_VERSION == 2 // old buffer protocol + (readbufferproc) bitarray_buffer_getreadbuf, + (writebufferproc) bitarray_buffer_getwritebuf, + (segcountproc) bitarray_buffer_getsegcount, + (charbufferproc) bitarray_buffer_getcharbuf, ++#endif + (getbufferproc) bitarray_getbuffer, + (releasebufferproc) bitarray_releasebuffer, + }; ++ + #endif /* WITH_BUFFER */ ++ + /************************** Bitarray Type *******************************/ + + static PyTypeObject Bitarraytype = { +@@ -2898,7 +2906,7 @@ static PyTypeObject Bitarraytype = { + 0, /* tp_as_buffer */ + #endif + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_WEAKREFS +-#ifdef WITH_BUFFER ++#if defined(WITH_BUFFER) && PY_MAJOR_VERSION == 2 + | Py_TPFLAGS_HAVE_NEWBUFFER + #endif + , /* tp_flags */ +diff --git a/bitarray/test_bitarray.py b/bitarray/test_bitarray.py +index 44de2f0..b72b554 100644 +--- a/bitarray/test_bitarray.py ++++ b/bitarray/test_bitarray.py +@@ -2113,10 +2113,10 @@ def test_read1(self): + a = bitarray('01000001' '01000010' '01000011', endian='big') + v = memoryview(a) + self.assertEqual(len(v), 3) +- self.assertEqual(v[0], 'A') +- self.assertEqual(v[:].tobytes(), 'ABC') ++ #self.assertEqual(v[0], 'A') ++ self.assertEqual(v[:].tobytes(), b'ABC') + a[13] = 1 +- self.assertEqual(v[:].tobytes(), 'AFC') ++ self.assertEqual(v[:].tobytes(), b'AFC') + + def test_read2(self): + a = bitarray([randint(0, 1) for d in range(8000)]) +@@ -2131,14 +2131,14 @@ def test_write(self): + a.setall(0) + v = memoryview(a) + self.assertFalse(v.readonly) +- v[50000] = '\xff' ++ v[50000] = 255 if is_py3k else '\xff' + self.assertEqual(a[399999:400009], bitarray('0111111110')) + a[400003] = 0 + self.assertEqual(a[399999:400009], bitarray('0111011110')) +- v[30001:30004] = 'ABC' +- self.assertEqual(a[240000:240040].tobytes(), '\x00ABC\x00') ++ v[30001:30004] = b'ABC' ++ self.assertEqual(a[240000:240040].tobytes(), b'\x00ABC\x00') + +-if sys.version_info[:2] == (2, 7): ++if sys.version_info[:2] >= (2, 7): + tests.append(BufferInterfaceTests) + + # --------------------------------------------------------------------------- diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix new file mode 100644 index 000000000000..c413303dd21d --- /dev/null +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.8.3"; + pname = "bitarray"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pl9p4j3dhlyffsqra6h28q7jph6v3hgppg786lkmnqdh45x6305"; + }; + + # Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged + patches = [ ./0001-Buffer-Protocol-Py3.patch ]; + + meta = with lib; { + description = "Efficient arrays of booleans"; + homepage = https://github.com/ilanschnell/bitarray; + license = licenses.psfl; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 4855a07a479b..567ea4518f88 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "0.13.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d0cf59774d7c74b7173b82ce36bde35b8fe9da0f960364ba3c4df0d1fbd874d6"; + sha256 = "1h1g3jw53srcvbgl1jb9p2rfi7kjz6c91hbqxfbr3s2wx1f67ahn"; }; disabled = isPyPy; @@ -48,6 +48,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest pillow selenium ]; propagatedBuildInputs = [ + pillow flask jinja2 markupsafe diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 1a2811b50b67..104bdb86bf00 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "2.25"; + version = "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0va95cml7wfjpvgj3dc9xdn8psyjh3zbk6v51b0hcqv2fzh409vb"; + sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index ed27464d1fe0..5cfa1862f48b 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -1,16 +1,16 @@ { lib, buildPythonPackage, fetchPypi -, translationstring, iso8601 }: +, translationstring, iso8601, enum34 }: buildPythonPackage rec { pname = "colander"; - version = "1.4"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e20e9acf190e5711cf96aa65a5405dac04b6e841028fc361d953a9923dbc4e72"; + sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; }; - propagatedBuildInputs = [ translationstring iso8601 ]; + propagatedBuildInputs = [ translationstring iso8601 enum34 ]; meta = with lib; { description = "A simple schema-based serialization and deserialization library"; diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix new file mode 100644 index 000000000000..c9e56017447e --- /dev/null +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "dj-email-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "84f32673156f58d740a14cab09f04ca92a65b2c8881b60e31e09e67d7853e544"; + }; + + checkPhase = '' + ${python.interpreter} test_dj_email_url.py + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/migonzalvar/dj-email-url; + description = "Use an URL to configure email backend settings in your Django Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix new file mode 100644 index 000000000000..b66f6b8f73a3 --- /dev/null +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "0.1"; + pname = "dj-search-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "424d1a5852500b3c118abfdd0e30b3e0016fe68e7ed27b8553a67afa20d4fb40"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/dstufft/dj-search-url; + description = "Use Search URLs in your Django Haystack Application"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix new file mode 100644 index 000000000000..4cff6f2a69b0 --- /dev/null +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + version = "3.0.0"; + pname = "django-cache-url"; + + src = fetchPypi { + inherit pname version; + sha256 = "235950e2d7cb16164082167c2974301e2f0fb2313d40bfacc9d24f5b09c3514b"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + # tests not included with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/ghickman/django-cache-url; + description = "Use Cache URLs in your Django application"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix new file mode 100644 index 000000000000..0ca6c400df28 --- /dev/null +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django-discover-runner +, mock +, dj-database-url +, dj-email-url +, dj-search-url +, django-cache-url +, six +, django +}: + +buildPythonPackage rec { + version = "2.1"; + pname = "django-configurations"; + + src = fetchPypi { + inherit pname version; + sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8"; + }; + + checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; + + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + export DJANGO_SETTINGS_MODULE="tests.settings.main" + export DJANGO_CONFIGURATION="Test" + ${django}/bin/django-admin.py test + ''; + + # django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://django-configurations.readthedocs.io/; + description = "A helper for organizing Django settings"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix new file mode 100644 index 000000000000..d25d9e79947b --- /dev/null +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + version = "1.0"; + pname = "django-discover-runner"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ba91fe722c256bcbfdeb36fac7eac0f27e5bfda55d98c4c1cf9ab62b5b084fe"; + }; + + propagatedBuildInputs = [ django ]; + + # tests not included with release + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://github.com/jezdez/django-discover-runner; + description = "A Django test runner based on unittest2's test discovery"; + license = licenses.bsd0; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 3548e930ab3d..30ef1a104188 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "2.0.7"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a"; + sha256 = "0ns1m9sdkcbbz84wvzgxa4f8hf4a8z656jzwx4bw8np9kh96zfjy"; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 7037f23b071c..694b11c6ca87 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "1.0.0"; + version = "1.1.0"; meta = { description = "A pickled object field for Django"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "61e3ba7f6df82d8df9e6be3a8c55ef589eb3bf926c3d25d2b7949b07eae78354"; + sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; }; } diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix index 79ec94a2c828..a947faec4537 100644 --- a/pkgs/development/python-modules/elpy/default.nix +++ b/pkgs/development/python-modules/elpy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "elpy"; - version = "1.9.0"; + version = "1.25.0"; src = fetchPypi { inherit pname version; - sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0"; + sha256 = "10n20lw7n728ahnfrx03vgx9zim7jb8s1zqhw8yivksm9c1a6i12"; }; propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ] diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 2deb16924d20..c4543032c2b3 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.0.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "be0288ef1125bf1c539bb8f3079ef4aa5fb813af28f0c5294a4e744ee554398a"; + sha256 = "0l837gm9cjdp3lybnam38ip0q3n1xy0j6vzgx11hdrr0ps8p5mid"; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 3642d4e55b90..809871b50de0 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j"; + sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q"; }; # The pypi package does not include tests diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 1f4f914968f6..caaf0a61152b 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.11.2"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0"; + sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index d2e806e43b90..ce847b81de63 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ftfy"; - version = "4.4.3"; + version = "5.3.0"; # ftfy v5 only supports python3. Since at the moment the only # packages that use ftfy are spacy and textacy which both support # python 2 and 3, they have pinned ftfy to the v4 branch. @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w"; + sha256 = "0zybd0ypxhb83bgdbwzi120n02328v4j0ndm6bgkb6wg2gah59qb"; }; propagatedBuildInputs = [ html5lib wcwidth ]; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 74ab0fc01a69..80ca5099f344 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fusepy"; - version = "2.0.4"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h"; + sha256 = "1gg69qfi9pjcic3g98l8ya64rw2vc1bp8gsf76my6gglq8z7izvj"; }; propagatedBuildInputs = [ pkgs.fuse ]; diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index ded728bdc0d6..899a315da653 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "ac85fc7f6687bb0271f2f70ca298da90f35789f9de1fe3a11e8caeb571332b77"; + sha256 = "16ximavy7zgg0427790fmyma03xnkywar9krp4lx6bcphvyiahh3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 492c4da6fcc9..cf206472cd3b 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "i3ipc"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh"; + sha256 = "06d7g4d7cnh0vp5diavy3x9wz1w5nwdrb7ipc4g1c3a2wc78862d"; }; propagatedBuildInputs = [ enum-compat ]; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix new file mode 100644 index 000000000000..db0b8301f008 --- /dev/null +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ipaddress +, python +, pythonOlder +}: + +buildPythonPackage rec { + version = "0.1.4"; + pname = "ifaddr"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + }; + + # ipaddress is provided in python stdlib > 3.3 + postPatch = if pythonOlder "3.4" then "" else '' + sed -i "s/'ipaddress'//" setup.py + ''; + + propagatedBuildInputs = [ ipaddress ]; + + checkPhase = '' + ${python.interpreter} ifaddr/test_ifaddr.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pydron/ifaddr; + description = "Enumerates all IP addresses on all network adapters of the system"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 100ca5b0ff9a..0d6828bff72b 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "4.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0injsml6zmb3hkgc03117fdlg573kbfgjbijpd5npf0vsy0xnpvz"; + sha256 = "0fqnshmsgifvp79pd4g9a1kyfxvpa9vczv0dv8x2jr2c5m1mi99v"; }; # ImportError: No module named tests diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 4325e6ea8844..6aecf5959ff8 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "ipaddr"; - version = "2.1.11"; + version = "2.2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; + sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 5f40ce0f1aad..7587e5f33c95 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,19 +1,27 @@ { stdenv , buildPythonPackage , fetchPypi +, psutil +, python }: buildPythonPackage rec { pname = "memory_profiler"; - version = "0.41"; + version = "0.54.0"; src = fetchPypi { inherit pname version; - sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10"; + sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a"; }; + propagatedBuildInputs = [ psutil ]; + + checkPhase = '' + make test PYTHON=${python.interpreter} + ''; + # Tests don't import profile - doCheck = false; + # doCheck = false; meta = with stdenv.lib; { description = "A module for monitoring memory usage of a python program"; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index a3e67fa7b985..b5150382b362 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -1,17 +1,21 @@ { stdenv , buildPythonPackage , fetchPypi +, glibcLocales }: buildPythonPackage rec { pname = "nameparser"; - version = "0.3.4"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag"; + sha256 = "c7eeeffbf16e263452b17b5f4b544d366c3364e966721f39d490e6c7c8b44b7f"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "A simple Python module for parsing human names into their individual components"; homepage = https://github.com/derek73/python-nameparser; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 9d5c1675359e..e708ff2ee3e7 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -2,18 +2,23 @@ , buildPythonPackage , fetchPypi , six +, pythonOlder +, mock +, coverage }: buildPythonPackage rec { pname = "nose2"; - version = "0.5.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr"; + sha256 = "9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six coverage ] + ++ stdenv.lib.optionals (pythonOlder "3.4") [ mock ]; + # AttributeError: 'module' object has no attribute 'collector' doCheck = false; diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix index 5d54b0928b6f..efbd1eec35a3 100644 --- a/pkgs/development/python-modules/ntfy/default.nix +++ b/pkgs/development/python-modules/ntfy/default.nix @@ -2,26 +2,32 @@ , buildPythonPackage , fetchFromGitHub , appdirs -, pyyaml +, ruamel_yaml , requests -, dbus-python , emoji , sleekxmpp , mock +, psutil +, python +# , dbus-python }: buildPythonPackage rec { - version = "1.2.0"; + version = "2.6.0"; pname = "ntfy"; src = fetchFromGitHub { owner = "dschep"; repo = "ntfy"; rev = "v${version}"; - sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; + sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1"; }; - propagatedBuildInputs = [ appdirs pyyaml requests dbus-python emoji sleekxmpp mock ]; + propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ]; + + checkPhase = '' + HOME=$(mktemp -d) ${python.interpreter} setup.py test + ''; meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 8ebb88fa6a73..d588ebb12e47 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -13,12 +13,13 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ pandas pytest pytestrunner JPype1 ]; + checkInputs = [ pandas pytest ]; PYARROW_BUILD_TYPE = "release"; PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' + rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py rm pyarrow/tests/test_cuda.py @@ -43,6 +44,14 @@ buildPythonPackage rec { setupPyBuildFlags = ["--with-parquet" ]; + checkPhase = '' + mv pyarrow/tests tests + rm -rf pyarrow + mkdir pyarrow + mv tests pyarrow/tests + pytest -v + ''; + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 23633ce248db..cd9c054ddcaa 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi -, nose, pyparsing, decorator, six }: +, nose, pyparsing, decorator, six, future }: buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.3"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "8e52c4ddbc015b56cc672b7c005c11f3df4fe407b832964099836fa3cccb8b9d"; + sha256 = "8b6ad8750bbb712b1c7b8f89772b42baeefd35b3c7085233e8027b92f277e073"; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ pyparsing decorator six ]; + propagatedBuildInputs = [ pyparsing decorator six future ]; meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 1a3eb0475105..a331f5e11755 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -5,19 +5,15 @@ buildPythonPackage rec { pname = "Pympler"; - version = "0.4.3"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "0mhyxqlkha98y8mi5zqcjg23r30mgdjdzs05lghbmqfdyvzjh1a3"; + sha256 = "c262ceca4dac67b8b523956833c52443420eabc3321a07185990b358b8ba13a7"; }; - # Remove test asizeof.flatsize(), broken and can be missed as - # test is only useful on python 2.5, see https://github.com/pympler/pympler/issues/22 - patchPhase = '' - substituteInPlace ./test/asizeof/test_asizeof.py --replace "n, e = test_flatsize" "#n, e = test_flatsize" - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(n," "#self.assert_(n," - substituteInPlace ./test/asizeof/test_asizeof.py --replace "self.assert_(not e" "#self.assert_(not e" + postPatch = '' + rm test/asizeof/test_asizeof.py ''; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index db17d60b6280..481e4154ddb3 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,27 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, django, setuptools_scm -, fetchpatch +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, django +, setuptools_scm +, django-configurations +, pytest_xdist +, six }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.1.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"; + sha256 = "b379282feaf89069cb790775ab6bbbd2bd2038a68c7ef9b84a41898e0b551081"; }; buildInputs = [ pytest setuptools_scm ]; + checkInputs = [ django-configurations pytest_xdist six ]; propagatedBuildInputs = [ django ]; - patches = [ - # Unpin setuptools-scm - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; - sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws"; - }) - ]; - # Complicated. Requires Django setup. doCheck = false; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix new file mode 100644 index 000000000000..d245d472a007 --- /dev/null +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, pytz +, glibcLocales +}: + +buildPythonPackage rec { + version = "0.6.3"; + pname = "python-rapidjson"; + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + }; + + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + + # buildInputs = [ ]; + checkInputs = [ pytest pytz ]; + # propagatedBuildInputs = [ ]; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-rapidjson/python-rapidjson; + description = "Python wrapper around rapidjson "; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5bb20ae8e77c..5af4383d44b3 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchPypi, buildPythonPackage, certifi, future, urllib3 }: +{ stdenv +, fetchPypi +, buildPythonPackage +, certifi +, future +, urllib3 +, tornado +, pytest +}: buildPythonPackage rec { pname = "python-telegram-bot"; - version = "10.1.0"; + version = "11.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ca2f8a44ddef7271477e16f4986647fa90ef4df5b55a7953e53b9c9d2672f639"; + sha256 = "cca4e32ebb8da7fdf35ab2fa2b3edd441211364819c5592fc253acdb7561ea5b"; }; prePatch = '' @@ -16,10 +24,14 @@ buildPythonPackage rec { --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" + + touch LICENSE.dual ''; - propagatedBuildInputs = [ certifi future urllib3 ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ certifi future urllib3 tornado ]; + # tests not included with release doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index c6cd2521292a..a8997e279b27 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -1,15 +1,21 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv +, buildPythonPackage +, fetchurl +, glibcLocales +}: buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.3"; - name = "${pname}-${version}"; + version = "0.5.5"; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${name}.tar.xz"; - sha256 = "1i45f012ngpxs83m3dpmaj3hs8z7r9sbf05vnvzgs3hpgsbhxa7r"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "lightweight way of building RPMs, and sabotaging them"; homepage = https://pagure.io/rpmfluff; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index cd4a6389a351..b64b53fb2fbb 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , buildPythonPackage , geckodriver +, urllib3 , xorg }: @@ -22,17 +23,17 @@ in buildPythonPackage rec { pname = "selenium"; - version = "3.8.1"; + version = "3.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1lqm2md84g11g7lqi94xqb5lydm93vgmlznfhf27g6sy9ayjvgcs"; + sha256 = "ab192cd046164c40fabcf44b47c66c8b12495142f4a69dcc55ea6eeef096e614"; }; buildInputs = [xorg.libX11]; propagatedBuildInputs = [ - geckodriver + geckodriver urllib3 ]; patchPhase = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix new file mode 100644 index 000000000000..badc99f5e377 --- /dev/null +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, click +}: + +buildPythonPackage rec { + pname = "spark_parser"; + version = "1.8.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c5e6064afbb3c114749016d585b0e4f9222d4ffa97a1854c9ab70b25783ef48"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ click ]; + + meta = with stdenv.lib; { + description = ''An Early-Algorithm Context-free grammar Parser''; + homepage = "https://github.com/rocky/python-spark"; + license = licenses.mit; + maintainers = with maintainers; [raskin]; + }; + +} diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f667f17f77df..a4130502e4b9 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -3,34 +3,30 @@ , fetchPypi , fetchpatch , pytest +, python-rapidjson , pretend , freezegun +, twisted , simplejson , six +, pythonAtLeast }: buildPythonPackage rec { pname = "structlog"; - version = "17.2.0"; + version = "18.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; + sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; }; - patches = [ - # Fix tests for pytest 3.3 - (fetchpatch { - url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch"; - sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv"; - }) - ]; - - checkInputs = [ pytest pretend freezegun simplejson ]; + checkInputs = [ pytest pretend freezegun simplejson twisted ] + ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; propagatedBuildInputs = [ six ]; checkPhase = '' - rm tests/test_twisted.py* + # rm tests/test_twisted.py* py.test ''; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index ab816cde8355..215f39da30b4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,22 +9,24 @@ , pyopenssl , trustme , sniffio +, jedi +, pylint }: buildPythonPackage rec { pname = "trio"; - version = "0.7.0"; + version = "0.9.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n"; + sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b"; }; - checkInputs = [ pytest pyopenssl trustme ]; + checkInputs = [ pytest pyopenssl trustme jedi pylint ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. checkPhase = '' - py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname' + HOME="$(mktemp -d)" py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname and not test_waitpid' ''; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index dfcce835e658..4c031c20aa1e 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -6,18 +6,19 @@ , requests_toolbelt , tqdm , pyblake2 +, readme_renderer }: buildPythonPackage rec { pname = "twine"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g"; + sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; }; - propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ]; + propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; # Requires network doCheck = false; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 89edc8f184ca..f0428f176034 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -3,19 +3,30 @@ , fetchPypi , spark_parser , xdis +, nose +, pytest +, hypothesis +, six }: buildPythonPackage rec { pname = "uncompyle6"; - version = "2.8.3"; + version = "3.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1"; + sha256 = "bd882f3c979b49d28ba7accc5ce7380ced8cab12e782e9170769ca15f0b81f8a"; }; + checkInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark_parser xdis ]; + # six import errors (yet it is supplied...) + checkPhase = '' + pytest ./pytest --ignore=pytest/test_build_const_key_map.py \ + --ignore=pytest/test_grammar.py + ''; + meta = with stdenv.lib; { description = "Python cross-version byte-code deparser"; homepage = https://github.com/rocky/python-uncompyle6/; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix new file mode 100644 index 000000000000..b3c2ce714ce4 --- /dev/null +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, awkward +}: + +buildPythonPackage rec { + version = "0.2.5"; + pname = "uproot-methods"; + + src = fetchPypi { + inherit pname version; + sha256 = "7d5563b3335af414a12caf5b350c952fdc7576abb17630382de5564a7c254ae6"; + }; + + propagatedBuildInputs = [ numpy awkward ]; + + meta = with stdenv.lib; { + homepage = https://github.com/scikit-hep/uproot-methods; + description = "Pythonic mix-ins for ROOT classes"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e2cc1105f093..120f728365d3 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,17 +1,30 @@ -{lib, fetchPypi, buildPythonPackage, numpy}: +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, python-lz4 +, uproot-methods +, awkward +, cachetools +, pythonOlder +, pytestrunner +, pytest +, backports_lzma +}: buildPythonPackage rec { pname = "uproot"; - version = "2.9.11"; + version = "3.2.6"; src = fetchPypi { inherit pname version; - sha256 = "da71e9e239129ec2ae7a62f9d35aebd46456f05e000ef14f32fe2c9fa8ec92c2"; + sha256 = "af0a093f0788b8983d07b88fac3094b26c3e28358bc10cdb8d757cc07956f8d4"; }; - propagatedBuildInputs = [ - numpy - ]; + buildInputs = [ pytestrunner ]; + checkInputs = [ pytest ] + ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ]; + propagatedBuildInputs = [ numpy python-lz4 cachetools uproot-methods awkward ]; meta = with lib; { homepage = https://github.com/scikit-hep/uproot; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index 89be87e18491..498c1c401f81 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -1,14 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales }: buildPythonPackage rec { pname = "whichcraft"; - version = "0.4.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "9e0d51c9387cb7e9f28b7edb549e6a03da758f7784f991eb4397d7f7808c57fd"; + sha256 = "fecddd531f237ffc5db8b215409afb18fa30300699064cca4817521b4fc81815"; }; + LC_ALL="en_US.utf-8"; + buildInputs = [ glibcLocales ]; + checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 5973414f8dc5..76e424cf0118 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -1,20 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest , six +, click }: buildPythonPackage rec { pname = "xdis"; - version = "3.2.4"; + version = "3.8.8"; src = fetchPypi { inherit pname version; - sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk"; + sha256 = "4d212df8a85ab55a35f6ad71b2c29818d903c3e6a95e31eb26d5f3fc66a4e015"; }; - propagatedBuildInputs = [ nose six ]; + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six click ]; + + # newest release moves to pytest (tests not packaged with release) + doCheck = false; meta = with stdenv.lib; { description = "Python cross-version byte-code disassembler and marshal routines"; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 06c5fe3a1be0..b77215a2d246 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,16 +1,32 @@ -{ stdenv, buildPythonPackage, fetchPypi -, netifaces, six, enum-compat }: +{ stdenv +, buildPythonPackage +, fetchPypi +, ifaddr +, typing +, isPy27 +, pythonOlder +, python +}: buildPythonPackage rec { pname = "zeroconf"; - version = "0.20.0"; + version = "0.21.3"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e3f1e7b5871e3d1410ac29b9fb85aafc1e2d661ed596b07a6f84559a475efcb"; + sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713"; }; - propagatedBuildInputs = [ netifaces six enum-compat ]; + propagatedBuildInputs = [ ifaddr ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} test_zeroconf.py + ''; meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix new file mode 100644 index 000000000000..8def71568e79 --- /dev/null +++ b/pkgs/development/tools/database/cdb/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, writeText }: + +let + version = "0.75"; + sha256 = "1iajg55n47hqxcpdzmyq4g4aprx7bzxcp885i850h355k5vmf68r"; + # Please don’t forget to update the docs: + # clone https://github.com/Profpatsch/cdb-docs + # and create a pull request with the result of running + # ./update <version> + # from the repository’s root folder. + docRepo = fetchFromGitHub { + owner = "Profpatsch"; + repo = "cdb-docs"; + rev = "359b6c55c9e170ebfc88f3f38face8ae2315eacb"; + sha256 = "1y0ivviy58i0pmavhvrpznc4yjigjknff298gnw9rkg5wxm0gbbq"; + }; + +in stdenv.mkDerivation { + name = "cdb-${version}"; + + src = fetchurl { + url = "https://cr.yp.to/cdb/cdb-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "doc" "out" ]; + + postPatch = '' + # A little patch, borrowed from Archlinux AUR, borrowed from Gentoo Portage + sed -e 's/^extern int errno;$/#include <errno.h>/' -i error.h + ''; + + postInstall = '' + # don't use make setup, but move the binaries ourselves + mkdir -p $bin/bin + install -m 755 -t $bin/bin/ cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest + + # patch paths in scripts + function cdbmake-subst { + substituteInPlace $bin/bin/$1 \ + --replace /usr/local/bin/cdbmake $bin/bin/cdbmake + } + cdbmake-subst cdbmake-12 + cdbmake-subst cdbmake-sv + + # docs + mkdir -p $doc/share/cdb + cp -r "${docRepo}/docs" $doc/share/cdb/html + ''; + + meta = { + homepage = "https://cr.yp.to/cdb"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.Profpatsch ]; + platforms = [ lib.platforms.unix ]; + }; +} diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix new file mode 100644 index 000000000000..25bc79340001 --- /dev/null +++ b/pkgs/development/tools/kind/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +with stdenv.lib; + +buildGoPackage rec { + name = "kind-${version}"; + version = "2018-10-03-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "2ae73f8ef93609991b0e47a67825390ceec95b3f"; + + src = fetchFromGitHub { + rev = rev; + owner = "kubernetes-sigs"; + repo = "kind"; + sha256 = "0bg3y35sc1c73z4rfq11x1jz340786q91ywm165ri7vx280ffjgh"; + }; + + goPackagePath = "sigs.k8s.io/kind"; + excludedPackages = "images/base/entrypoint"; + + meta = { + description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; + homepage = https://github.com/kubernetes-sigs/kind; + maintainers = with maintainers; [ offline ]; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce297df13c3a..15ae07962c59 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -3,9 +3,9 @@ buildGoPackage rec { name = "kustomize-${version}"; - version = "1.0.8"; + version = "1.0.9"; # rev is the 1.0.8 commit, mainly for kustomize version command output - rev = "58492e2d83c59ed63881311f46ad6251f77dabc3"; + rev = "ec86b30d2b01a8fa62e645f024f26bfea5dcd30d"; goPackagePath = "sigs.k8s.io/kustomize"; @@ -17,7 +17,7 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx"; + sha256 = "06a0iic8sp745q71bh0k2zbcdhppp85bx9c3fwwr4wl77dlybz4f"; rev = "v${version}"; repo = "kustomize"; owner = "kubernetes-sigs"; @@ -32,6 +32,6 @@ buildGoPackage rec { ''; homepage = https://github.com/kubernetes-sigs/kustomize; license = licenses.asl20; - maintainers = [ maintainers.carlosdagos maintainers.vdemeester ]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis ]; }; } diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 1d23f5426a55..7d4a58d0e394 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.10.9"; + version = "2018.10.13"; src = fetchPypi { inherit pname version; - sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j"; + sha256 = "0qwflq00rwk3pnldndb30f3avnbi4hvv6c8mm6l5xxnxy9dj71d7"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix index b2497633a680..a2d98bcf2387 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/tools/profiling/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "pyprof2calltree"; - version = "1.4.3"; + version = "1.4.4"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "0i0a895zal193cpvzbv68fch606g4ik27rvzbby3vxk61zlxfqy5"; + sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; }; meta = with lib; { |