diff options
Diffstat (limited to 'pkgs')
61 files changed, 554 insertions, 144 deletions
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix new file mode 100644 index 00000000000..3310bfdf3f0 --- /dev/null +++ b/pkgs/applications/audio/parlatype/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "parlatype"; + version = "1.6-beta"; + + src = fetchFromGitHub { + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; + sha256 = "0bi0djic9kf178s7vl3y83v4rzhvynlvyf64n94fy80n2f100dj9"; + }; + + nativeBuildInputs = [ + pkgconfig + meson + ninja + gettext + appstream-glib + python3 + gobject-introspection + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.gtk + at-spi2-core + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + sphinxbase + pocketsphinx + glib + gsettings-desktop-schemas + hicolor-icon-theme + ]; + + mesonFlags = [ "-Dlibreoffice=false" ]; + + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + ''; + + doCheck = false; + enableParallelBuilding = true; + + buildPhase = '' + export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with stdenv.lib; { + description = "GNOME audio player for transcription"; + longDescription = '' + Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. + It plays audio sources to transcribe them in your favourite text application. + It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. + ''; + homepage = https://gkarsay.github.io/parlatype/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.melchips ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 9ba225e8c58..59bbceac705 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "05xrzr48b19mghbpbzjqw5fy6pl9140bm5m929lrsi4rq5hp3xgg"; + sha256 = "1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 9af60ca4fcb..fa547875a17 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem -, jdk, perl, python, unzip, which +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick +, jdk, perl, python }: let + version = "10.0"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -10,13 +11,14 @@ let desktopName = "Netbeans IDE"; genericName = "Integrated Development Environment"; categories = "Application;Development;"; + icon = "netbeans"; }; in stdenv.mkDerivation { - name = "netbeans-8.2"; + name = "netbeans-${version}"; src = fetchurl { - url = https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; - sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; + url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; + sha512 = "ba83575f42c1d5515e2a5336a621bc2b4087b2e0bcacb6edb76f376f8272555609bdd4eefde8beae8ffc6c1a7db2fb721b844638ce27933c3dd78f71cbb41ad8"; }; buildCommand = '' @@ -26,23 +28,38 @@ stdenv.mkDerivation { # Copy to installation directory and create a wrapper capable of starting # it. - mkdir -p $out/bin + mkdir -pv $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract $out/netbeans/nb/netbeans.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ -e netbeans_"$size"x"$size"x32.png ] + then + mv netbeans_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netbeans.png + else + convert -resize "$size"x"$size" netbeans_1024x1024x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netbeans.png + fi + done; + # Create desktop item, so we can pick it from the KDE/GNOME menu - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -pv $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ makeWrapper perl python unzip ]; + buildInputs = [ makeWrapper perl python unzip libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; - maintainers = [ stdenv.lib.maintainers.sander ]; + homepage = "https://netbeans.org/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ sander rszibele ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 29cc60c812f..07333a4b803 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -18,16 +18,16 @@ let }.${system}; sha256 = { - "i686-linux" = "08pyc33v2k00r3xasl3nxy090kv75l25l0kc42b5wnf46n6l50rz"; - "x86_64-linux" = "1r139a8ddxw9pww773f8p10hy6kkakn9ql83ab2pg7nzy9r0kfmk"; - "x86_64-darwin" = "11i5w0hdyjhjprckvcazwcj56l8bflbrgs3gzdhl8n5cjgxmxnzk"; + "i686-linux" = "1qll0hyqyn3vb0v35h9y8rk4l3r6zzc5bkra6pb23bnr4bna4y80"; + "x86_64-linux" = "1sfvv4g7kmvabqxasil41gasr7hsmgf8wwc4dl1940pb7x19fllq"; + "x86_64-darwin" = "0gjdppr59pyb2wawvf7yyk7357a5naxga74zf9gc7d9s1fz78hls"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.32.2"; + version = "1.32.3"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix index 3245a56e9de..9c99dcee2b3 100644 --- a/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/pkgs/applications/misc/bitcoinarmory/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages , pkgconfig, autoreconfHook, rsync -, swig, qt4, fcgi +, swig, qt48Full, fcgi , bitcoin, procps, utillinux }: let @@ -16,7 +16,6 @@ in buildPythonApplication { owner = "goatpig"; repo = "BitcoinArmory"; rev = "v${version}"; - #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; }; @@ -25,14 +24,18 @@ in buildPythonApplication { # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ autoreconfHook + pkgconfig swig - qt4 - fcgi + pyqt4 + qt48Full rsync # used by silly install script (TODO patch upstream) ]; + buildInputs = [ + qt48Full + fcgi + ]; propagatedBuildInputs = [ pyqt4 diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index da5cf83c02c..2ffa784360f 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, meson, ninja, gettext, python3, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, - vala, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection + vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.4.2"; + version = "0.7.4.3"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "15814czap0qg2h9nkcn9fg4i4xxa1lgw1vi6h3hi242qfwc7fh3i"; + sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5"; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { vala gnome3.yelp-tools wrapGAppsHook - # For setup hook + # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build gobject-introspection ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { json-glib sqlite librsvg - gnome3.gtk + gtk3 gnome3.adwaita-icon-theme ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - meta = { + meta = with stdenv.lib; { homepage = https://fontmanager.github.io/; description = "Simple font management for GTK+ desktop environments"; longDescription = '' @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { Font Manager is NOT a professional-grade font management solution. ''; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; repositories.git = https://github.com/FontManager/master; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index ec571c0284b..c27fda31a8f 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.5"; + version = "0.8.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1yhnmppp65xy8skainn438q3hwlpsz8qcj4ksvl8xdz5jzn7gs7k"; + sha256 = "1qzf9fkfkbv8vnc9p6lm7ya9hzydwk2f7671by9ij26f77lmxfb3"; name = "${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 978ac2b7035..2b44b0398b5 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages, ffmpeg }: python3Packages.buildPythonApplication rec { - version = "1.4.1"; + version = "2.0"; pname = "sigal"; src = python3Packages.fetchPypi { inherit version pname; - sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61"; + sha256 = "0ff8hpihbd30xjy155ksfpypjskilqg4zmyavgvpri8jaf1qpv89"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 75645fdb33a..6aacdde544b 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -33,13 +33,13 @@ let in with stdenv; mkDerivation rec { name = "quassel${tag}-${version}"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "quassel"; repo = "quassel"; rev = version; - sha256 = "1jnmc0xky91h81xjjgwg5zylfns0f1pvjy2rv39wlah890k143zr"; + sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 0139a3f3a93..be010c47179 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, makeWrapper }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -9,25 +9,29 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' + sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ -i linssid-app/linssid-app.pro linssid-app/linssid.desktop sed -e "s|\.\./\.\./\.\./\.\./usr|$out|g" -i linssid-app/*.ui - sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp - sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp - # Remove bundled qwt rm -fr qwt-lib ''; + postInstall = '' + wrapProgram $out/bin/linssid \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]} + ''; + meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; homepage = https://sourceforge.net/projects/linssid/; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 802a03bd4c7..340073b016e 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -6,6 +6,9 @@ url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4"; }; + nativeBuildInputs = with python2Packages; [ + pyqt4 + ]; propagatedBuildInputs = with python2Packages; [ pyqt4 lxml diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 5fcab43c86b..ae1e0c5dc86 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w"; + sha256 = "07fdz3y4iln7cizikdjj96dqvp2f8zzhs31ncxxwzdkngn5v8138"; }; patches = [ diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 28a7c1ec1f6..cade2bd352e 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -6,7 +6,7 @@ let params = "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; - "8.9" = { version = "0.10.0"; sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; }; + "8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; }; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5ee31d3c87f..9b89787531c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1169,9 +1169,6 @@ self: super: { # }); libnix = dontCheck super.libnix; - # https://github.com/jmillikin/chell/issues/1 - chell = super.chell.override { patience = self.patience_0_1_1; }; - # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. xmobar = dontCheck super.xmobar; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index c26956f6ea2..4eaded81436 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.10.0"; + version = "2.12.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy"; + sha256 = "0rqkx6p85b0v6zdkm4q2r516b7ldkxhkfc0cwkl24djlkv7fanpp"; }; postPatch = '' diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index edd84d5a951..1a4da7713af 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libelf }: +{ stdenv, fetchurl, libelf, zlib }: let version = "20181024"; @@ -24,7 +24,7 @@ in rec { preConfigure = '' cd libdwarf ''; - buildInputs = [ libelf ]; + buildInputs = [ libelf zlib ]; installPhase = '' mkdir -p $out/lib $out/include diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index dee441a0c2f..92cc76273ba 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "thrift-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; - sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; + sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3"; }; #enableParallelBuilding = true; problems on hydra diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 51f883a020b..9f2b83d7597 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xxHash-${version}"; - version = "0.6.5"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks"; + sha256 = "19iyr7x0s7in9kp9wrj4iimdx58nv6jndz9x5ndnl07gd90y7jxb"; }; outputs = [ "out" "dev" ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/Cyan4973/xxHash; license = with licenses; [ bsd2 gpl2 ]; + maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix new file mode 100644 index 00000000000..a173a58032d --- /dev/null +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, astropy +, astropy-helpers +, matplotlib +, reproject +, pyavm +, pyregion +, pillow +, scikitimage +, shapely +}: + +buildPythonPackage rec { + pname = "aplpy"; + version = "2.0.3"; + + doCheck = false; # tests require pytest-astropy + + src = fetchPypi { + pname = "APLpy"; + inherit version; + sha256 = "239f3d83635ca4251536aeb577df7c60df77fc4d658097b92094719739aec3f3"; + }; + + propagatedBuildInputs = [ + numpy + astropy + astropy-helpers + matplotlib + reproject + pyavm + pyregion + pillow + scikitimage + shapely + ]; + + # Disable automatic update of the astropy-helper module + postPatch = '' + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + ''; + + meta = with lib; { + description = "The Astronomical Plotting Library in Python"; + homepage = http://aplpy.github.io; + license = licenses.mit; + maintainers = [ maintainers.smaret ]; + }; +} diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix new file mode 100644 index 00000000000..2027f694c77 --- /dev/null +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, astropy +, astropy-helpers +}: + +buildPythonPackage rec { + pname = "astropy-healpix"; + version = "0.4"; + + doCheck = false; # tests require pytest-astropy + + src = fetchPypi { + inherit pname version; + sha256 = "8c9709ac923759c92eca6d2e623e734d0f417eed40ba835b77d99dec09e51aa2"; + }; + + propagatedBuildInputs = [ numpy astropy astropy-helpers ]; + + # Disable automatic update of the astropy-helper module + postPatch = '' + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + ''; + + meta = with lib; { + description = "BSD-licensed HEALPix for Astropy"; + homepage = https://github.com/astropy/astropy-healpix; + license = licenses.bsd3; + maintainers = [ maintainers.smaret ]; + }; +} diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix new file mode 100644 index 00000000000..79d6e852c68 --- /dev/null +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "astropy-helpers"; + version = "3.1"; + + disabled = !isPy3k; + + doCheck = false; # tests requires sphinx-astropy + + src = fetchPypi { + inherit pname version; + sha256 = "37caf1f21bfdf653f7bb9f5b070dc1bb59cd70c0e09f9c5742401f57400a6e52"; + }; + + meta = with lib; { + description = "Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation"; + homepage = https://github.com/astropy/astropy-helpers; + license = licenses.bsd3; + maintainers = [ maintainers.smaret ]; + }; +} diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index bbba8deb459..9a6952c88f0 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -15,6 +15,12 @@ buildPythonPackage rec { sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "bidict>=0.17,<0.18" "bidict" \ + --replace "more-itertools>=4.0,<5.0" "more-itertools" + ''; + propagatedBuildInputs = [ attrs bidict diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 673a570c61f..daf522fe653 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, click, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, click, pytest_3 }: buildPythonPackage rec { pname = "click-default-group"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; meta = with lib; { homepage = https://github.com/click-contrib/click-default-group; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 5c8dab79f00..90b81c8379e 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, python, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , django_environ, mock, django, six -, pytest, pytestrunner, pytest-django, setuptools_scm +, pytest, pytestrunner, pytest-django }: buildPythonPackage rec { pname = "django-guardian"; @@ -12,16 +12,12 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ django six ]; - - checkPhase = '' - ${python.interpreter} nix_run_setup test --addopts="--ignore build" - ''; + propagatedBuildInputs = [ django ]; meta = with stdenv.lib; { description = "Per object permissions for Django"; homepage = https://github.com/django-guardian/django-guardian; license = [ licenses.mit licenses.bsd2 ]; + broken = !isPy3k; # https://github.com/django-guardian/django-guardian/pull/605 }; } diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index d7fb8a91707..84f677d4d4e 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "google-music-utils"; - version = "2.0.0"; + version = "2.1.0"; # Pypi tarball doesn't contain tests src = fetchFromGitHub { owner = "thebigmunch"; repo = "google-music-utils"; rev = version; - sha256 = "0i5zcr1ypnxizi41s3lrplz9m9rmb56s5iihjx61kbybxcq2b6gk"; + sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index b0fe0f8a254..71aa37d0086 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -16,6 +16,11 @@ buildPythonPackage rec { sha256 = "13i9nd62wqfg0f5r7ykr15q83397vdpw0js50fy5nbgs33sbf6b7"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "audio-metadata>=0.3,<0.4" "audio-metadata" + ''; + propagatedBuildInputs = [ appdirs audio-metadata diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index e7b78edbb3a..551614409db 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "4.0.2"; + version = "6.0.2"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "0aa7j9b4f9gz198j8svxdrffwva1ai8vc55v6xbb2a3lfzmpsf9n"; + sha256 = "1778c9vabn9a7b7lbirwclswnqmzqm00slklvnhqacbbdf4rp417"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 9cb56b1f912..bef18255804 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -15,8 +15,9 @@ buildPythonPackage rec { py.test test ''; - buildInputs = [ six pathpy pytest ]; - propagatedBuildInputs = [ decorator zetup ]; + nativeBuildInputs = [ zetup ]; + checkInputs = [ six pathpy pytest ]; + propagatedBuildInputs = [ decorator ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix new file mode 100644 index 00000000000..2279f792818 --- /dev/null +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, astropy +, astropy-helpers +, pillow +}: + +buildPythonPackage rec { + pname = "pyavm"; + version = "0.9.4"; + + src = fetchPypi { + pname = "PyAVM"; + inherit version; + sha256 = "f298b864e5bc101ecbb0e46252e95e18a180ac28ba6ec362e63c12a7e914e386"; + }; + + propagatedBuildInputs = [ astropy-helpers ]; + + checkInputs = [ pytest astropy pillow ]; + + checkPhase = "pytest"; + + # Disable automatic update of the astropy-helper module + postPatch = '' + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + ''; + + meta = with lib; { + description = "Simple pure-python AVM meta-data handling"; + homepage = http://astrofrog.github.io/pyavm/; + license = licenses.mit; + maintainers = [ maintainers.smaret ]; + }; +} diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix new file mode 100644 index 00000000000..dda3a3cd161 --- /dev/null +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyparsing +, numpy +, cython +, astropy +}: + +buildPythonPackage rec { + pname = "pyregion"; + version = "2.0"; + + doCheck = false; # tests require pytest-astropy + + src = fetchPypi { + inherit pname version; + sha256 = "a8ac5f764b53ec332f6bc43f6f2193ca13e8b7d5a3fb2e20ced6b2ea42a9d094"; + }; + + propagatedBuildInputs = [ + pyparsing + numpy + cython + astropy + ]; + + meta = with lib; { + description = "Python parser for ds9 region files"; + homepage = https://github.com/astropy/pyregion; + license = licenses.mit; + maintainers = [ maintainers.smaret ]; + }; +} diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 882aed18c59..514ff6eb8fe 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -1,11 +1,11 @@ { stdenv -, buildPythonApplication +, buildPythonPackage , fetchFromGitHub , chardet , nose }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pysrt"; version = "1.1.1"; @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "0rwjaf26885vxhxnas5d8zwasvj7x88y4y2pdivjd4vdcpqrqdjn"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index ec28c8af442..4b31e655a6d 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.4.7"; + version = "3.4.8"; src = fetchPypi { inherit pname version; - sha256 = "3d489db7c9bd18d7c154347b1bdfb82cc6b1ec8539543508b199c77e5eb2caec"; + sha256 = "1vj2xfb6jl570zmmwlhvfpj7af5q554z72z51ril07gyfkkq6cjd"; }; nativeBuildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 8c030ec8639..167da239fd1 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "17nh09c28vf2daamyq97bdzgr685lyh668haisqbbp5lkn9gh7j0"; + sha256 = "1rwkl36n1synyggg2li7r075fq5k3cmpgyazinw24bkf7z2kpc56"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 9717a9cda23..6306267ba2a 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; - buildInputs = [ cython ]; + nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ]; meta = with lib; { diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix new file mode 100644 index 00000000000..f84508fe53c --- /dev/null +++ b/pkgs/development/python-modules/reproject/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, astropy +, astropy-healpix +, astropy-helpers +, scipy +}: + +buildPythonPackage rec { + pname = "reproject"; + version = "0.4"; + + doCheck = false; # tests require pytest-astropy + + src = fetchPypi { + inherit pname version; + sha256 = "dbbb18a8b211292c7ce61121b8538fc279540337be1c05cabc7570c5aca6d734"; + }; + + propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ]; + + # Disable automatic update of the astropy-helper module + postPatch = '' + substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + ''; + + meta = with lib; { + description = "Reproject astronomical images"; + homepage = https://reproject.readthedocs.io; + license = licenses.bsd3; + maintainers = [ maintainers.smaret ]; + }; +} diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 9f73ba28362..eeed4289230 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -1,11 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, isPy37 , docutils , nose -, stdenv -, flake8 -, pyyaml , testtools }: @@ -13,16 +11,19 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; version = "1.2.2"; + # https://github.com/twolfson/restructuredtext-lint/pull/47 + disabled = isPy37; + src = fetchPypi { inherit pname version; sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350"; }; - checkInputs = [ nose flake8 pyyaml testtools ]; + checkInputs = [ nose testtools ]; propagatedBuildInputs = [ docutils ]; checkPhase = '' - ${stdenv.shell} test.sh + nosetests --nocapture ''; meta = { @@ -30,4 +31,4 @@ buildPythonPackage rec { homepage = https://github.com/twolfson/restructuredtext-lint; license = lib.licenses.unlicense; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 98bed064b1f..be8b0b9454d 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -1,11 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , robotframework , moretools , pathpy , six -, setuptools +, zetup }: buildPythonPackage rec { @@ -17,13 +18,14 @@ buildPythonPackage rec { sha256 = "04gkn1zpf3rsvbqdxrrjqqi8sa0md9gqwh6n5w2m03fdwjg4lc7q"; }; - propagatedBuildInputs = [ robotframework moretools pathpy six setuptools ]; + nativeBuildInputs = [ zetup ]; + + propagatedBuildInputs = [ robotframework moretools pathpy six ]; meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; homepage = https://bitbucket.org/userzimmermann/robotframework-tools; license = licenses.gpl3; - platforms = platforms.linux; + broken = isPy3k; # 2019-03-15, missing dependency robotframework-python3 }; - } diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index e7ce3b5b50d..a468bee275c 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -2,16 +2,16 @@ buildPythonPackage rec { pname = "rply"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "alex"; repo = "rply"; rev = "v${version}"; - sha256 = "0a9r81kaibgr26psss02rn2nc6bf84a8q9nsywkm1xcswy8xrmcx"; + sha256 = "1qv37hn7hhxd388znri76g0zjxsbwhxhcaic94dvw9pq4l60vqp6"; }; - buildInputs = [ appdirs ]; + propagatedBuildInputs = [ appdirs ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index 3e0ffe4110d..017ea7e0d5f 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "snuggs"; - version = "1.4.2"; + version = "1.4.3"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = pname; rev = version; - sha256 = "1q6jqwai4qgghdjgwhyx3yz8mlrm7p1vvnwc339lfl028hrgb5kb"; + sha256 = "198nbgkhlg4ik2i1r2cp900iqlairh2hnii2y8v5wy1qk3rv0s9g"; }; propagatedBuildInputs = [ click numpy pyparsing ]; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 4e607799d22..e7f8be7b469 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.30.0"; + version = "1.30.1"; src = fetchPypi { inherit pname version; - sha256 = "0161pwgv6514ks6lky8642phlcqks5w8j5sacdnbfgx5s6nwfaxr"; + sha256 = "1860zslirsqskc2iifljxcyly28zqgjpmkm7k3bj6zyqagzriq3v"; }; doCheck = false; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 0da11909de9..61d406edafc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib , fetchPypi -, buildPythonApplication +, buildPythonPackage +, isPy3k , guessit , babelfish , enzyme @@ -16,9 +17,16 @@ , rarfile , pytz , futures +, sympy +, vcrpy +, pytest +, pytestpep8 +, pytest-flakes +, pytestcov +, pytestrunner }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "subliminal"; version = "2.0.5"; @@ -27,13 +35,21 @@ buildPythonApplication rec { sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; }; - # Too many test dependencies + propagatedBuildInputs = [ + guessit babelfish enzyme beautifulsoup4 requests + click dogpile_cache stevedore chardet pysrt six + appdirs rarfile pytz + ] ++ lib.optional (!isPy3k) futures; + + checkInputs = [ + sympy vcrpy pytest pytestpep8 pytest-flakes + pytestcov pytestrunner + ]; + + # https://github.com/Diaoul/subliminal/pull/963 doCheck = false; - propagatedBuildInputs = [ guessit babelfish enzyme beautifulsoup4 requests - click dogpile_cache stevedore chardet pysrt six - appdirs rarfile pytz futures ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/Diaoul/subliminal; description = "Python library to search and download subtitles"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 4e494244d31..88b41793180 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tldextract"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1d5s8v6kpsgazyahflhji1cfdcf89rv7l7z55v774bhzvcjp2y99"; + sha256 = "1lcywabjy7vpm6awl2cw4m6rk6h85qnbql0j33xcfryy2dhfyaxp"; }; propagatedBuildInputs = [ requests requests-file idna ]; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 8f57bd127fd..15be28b62fb 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "6ce45a87b61af6d3c24fed4221642de9115dc9cb9ea65887b0926fd0fab0a597"; + sha256 = "1f44k1q9jhn2iwabpj663l5wmm7zh6bp5402p659pxf11m8y4c2x"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 5772308f967..abbc4a974f0 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert -, pytest }: +, pytest_3 }: buildPythonPackage rec { pname = "zetup"; @@ -11,11 +11,18 @@ buildPythonPackage rec { sha256 = "f1cde33d0ef3bedaf697e432201fa86da698dadd3445c0efd2a114753853c675"; }; + # Python 3.7 compatibility + # See https://github.com/zimmermanncode/zetup/pull/1 + postPatch = '' + substituteInPlace zetup/zetup_config.py \ + --replace "'3.6']" "'3.6', '3.7']" + ''; + checkPhase = '' py.test test ''; - checkInputs = [ pytest pathpy nbconvert ]; + checkInputs = [ pytest_3 pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 2bbb0bc6080..5dcc9e2ec20 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.13.0"; + version = "1.14.0"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "0wkh8m41g5sajxlchsaqardn4v2ax06xywk12fwdjn5j3sxlgq2a"; + sha256 = "167lpw4bnw8845ip6cvdk827lwdbprisd7ygl7vqv4p1wgdcrkqq"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 0cd80b6cae3..7364789d505 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -72,7 +72,6 @@ in postPatch = '' patchShebangs . - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py # fix tests for a in test/parallel/test-child-process-env.js \ @@ -84,6 +83,7 @@ in --replace "/usr/bin/env" "${coreutils}/bin/env" done '' + optionalString stdenv.isDarwin '' + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py sed -i -e "s|tr1/type_traits|type_traits|g" \ -e "s|std::tr1|std|" src/util.h ''; @@ -97,10 +97,18 @@ in ${optionalString enableNpm '' mkdir -p $out/share/bash-completion/completions/ $out/bin/npm completion > $out/share/bash-completion/completions/npm + for dir in "$out/lib/node_modules/npm/man/"*; do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/*; do + ln -rs $page $out/share/man/$(basename "$dir") + done + done ''} # install the missing headers for node-gyp cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node + '' + optionalString (stdenv.isDarwin && enableNpm) '' + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py ''; passthru.updateScript = import ./update.nix { diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 99870ca52de..8c32e164afa 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "hyperrogue-${version}"; - version = "10.5a"; + version = "10.5e"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "1s5jm5qrbw60s8q73fzjk9g2fmapd0i7zmrna2dqx55i1gg9d597"; + sha256 = "1sjr26if3xv8xv52app1hkxs0bbgbviagydm4mdwbxjpd6v3d1aa"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 5ce50d6b463..345965b476e 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "klavaro-${version}"; - version = "3.03"; + version = "3.04"; src = fetchurl { url = "mirror://sourceforge/klavaro/${name}.tar.bz2"; - sha256 = "1dc75jd5bx5w3rr4zaqyf2cci3vzgac18fia0h04fzsfwlhrz5g0"; + sha256 = "148vznikdn424938fmizgd281ky7311q51mw2zfzrallj87dzbqf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 999b1a12bbc..40963d32860 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "evdi-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; rev = "v${version}"; - sha256 = "0jy0ia5fsx54d2wv4d2jqnc8rc5x16781a3bcb857apc47zr387h"; + sha256 = "1mv2sydynhqxhzyqqma4hjpm8y7pzxpg1gdmwnjq8h2680q70m91"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index fb609f4a727..4bd811496b1 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.01.00"; + version = "19.02.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "00vixb8kml5hgdqscqr9biwbvivfjwpf1fk53425kdqzyg6bqsmq"; + sha256 = "1rjyfscchman9ih0473hgzvfzrvkfwl5bjf7c9ksr3d9plz3n7ad"; stripRoot = false; }; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index d99a04642de..742db556707 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.8.3"; + version = "10.9"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${version}"; - sha256 = "057kglz5grrxg5m2brr7mcncwd3idxzczq5vg8yd1iri2rq63hdc"; + sha256 = "0mcg36bidy3p57nyk9nliqjipfb3r2irziavlbr2d5g3smfv52z2"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 01eeeb15efa..7af785aa87c 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "postsrsd-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; rev = version; - sha256 = "09yzb0fvnbfy534maqlqk79c41p1yz8r9f73n7bahm5lwd0livk9"; + sha256 = "170pbjicpfac8qca2vkp6bpbw42xrcm14b3p1dhnp877glrzlih8"; }; cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ]; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 44f690bcf9d..6422d723803 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "1li2qgfi4lfa2i1m7ykjxy1xm9hlq42fgdkb2wh2db9chyg5r4qp"; + sha256 = "14v4xjycr34kvilidhhavc8yvhkxb7mxc9qd56jd1x2c42lfna8k"; }; nativeBuildInputs = [ go ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 8a185990725..2fc190d8e00 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "1mpns28f5hk528i5x7rkj9jp3qdhxmicmz13aj4lzlwa8yssx9ws"; + sha256 = "0k3cxl58rdbs19sv27sk8yhk8ai8r046hyg9araxqiplrxx9y01s"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 696baff0ca3..e193a3601fd 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.25"; + version = "2.0.26"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,14 +13,14 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "151szgfbikijpwqrvqj43kw38kbbgx2g1khlbj6l4925qba7fycd"; + sha256 = "0z6x3rf0wm1d7ws1n3m0vq8jmjjki2r9qrq4hkdq4nv61mw4ivyc"; }; meta = with stdenv.lib; { description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = https://trezor.io; license = licenses.lgpl3; - maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"]; + maintainers = with maintainers; [ canndrew jb55 "1000101" prusnak ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 96d002e6331..e7e4c86e6a2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,7 +1,6 @@ { abiCompat ? null, stdenv, makeWrapper, lib, fetchurl, fetchpatch, buildPackages, - - automake, autoconf, libiconv, libtool, intltool, mtdev, libevdev, libinput, + automake, autoconf, gettext, libiconv, libtool, intltool, mtdev, libevdev, libinput, freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, @@ -442,6 +441,10 @@ self: super: ''; }); + xload = super.xload.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [ gettext ]; + }); + xlsfonts = super.xlsfonts.overrideAttrs (attrs: { meta = attrs.meta // { license = lib.licenses.mit; }; }); diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix index a718ea55746..ba3437c08cd 100644 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -2,21 +2,22 @@ python3.pkgs.buildPythonApplication rec { pname = "google-music-scripts"; - version = "3.0.0"; + version = "4.0.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "12risivi11z3shrgs1kpi7x6lvk113cbp3dnczw9mmqhb4mmwviy"; + sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d"; }; propagatedBuildInputs = with python3.pkgs; [ appdirs audio-metadata - click - click-default-group google-music + google-music-proto google-music-utils - logzero + #loguru + pendulum + natsort tomlkit ]; @@ -28,5 +29,6 @@ python3.pkgs.buildPythonApplication rec { description = "A CLI utility for interacting with Google Music"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; + broken = true; # 2019-03-15, missing dependency loguru }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index d34ccaa4b9e..f2fac5e3d0f 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -3,8 +3,8 @@ }: let - date = "20180220"; - rev = "47849be3a900c546cf92066849be0806f4e611d9"; + date = "20190310"; + rev = "b6ffe28a21c53a0946d95751c905d9e0b6c3b630"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchgit { url = git://git.ipxe.org/ipxe.git; - sha256 = "1f4pi1dp2zqnrbfnggnzycfvrxv0bqgw73dxbyy3hfy4mhdj6z45"; + sha256 = "1s8sy75lpx8zq60wc0i35d8c1wwm1rq3scxpkq31623d097mch59"; inherit rev; }; diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix new file mode 100644 index 00000000000..68b1b158524 --- /dev/null +++ b/pkgs/tools/networking/junkie/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libpcap, guile, openssl }: + +stdenv.mkDerivation rec { + pname = "junkie"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "rixed"; + repo = "junkie"; + rev = "v${version}"; + sha256 = "c9b57bd6e06d4f90e6a88b775f33fa00f66313ba0f663df70198eddf1d4be298"; + }; + buildInputs = [ libpcap guile openssl ]; + nativeBuildInputs = [ pkgconfig ]; + configureFlags = [ + "GUILELIBDIR=\${out}/share/guile/site" + "GUILECACHEDIR=\${out}/lib/guile/ccache" + ]; + + meta = { + description = "Deep packet inspection swiss-army knife"; + homepage = "https://github.com/rixed/junkie"; + license = stdenv.lib.licenses.agpl3Plus; + maintainers = [ stdenv.lib.maintainers.rixed ]; + platforms = stdenv.lib.platforms.unix; + longDescription = '' + Junkie is a network sniffer like Tcpdump or Wireshark, but designed to + be easy to program and extend. + + It comes with several command line tools to demonstrate this: + - a packet dumper; + - a nettop tool; + - a tool listing TLS certificates... + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e209991730b..7fe8f295a48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3610,6 +3610,8 @@ in jnettop = callPackage ../tools/networking/jnettop { }; + junkie = callPackage ../tools/networking/junkie { }; + go-jira = callPackage ../applications/misc/go-jira { }; john = callPackage ../tools/security/john { }; @@ -16093,7 +16095,7 @@ in xkeyboard_config = xorg.xkeyboardconfig; - xlsx2csv = pythonPackages.xlsx2csv; + xlsx2csv = with python3Packages; toPythonApplication xlsx2csv; xorg-rgb = callPackage ../data/misc/xorg-rgb {}; @@ -18835,6 +18837,8 @@ in paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + parlatype = callPackage ../applications/audio/parlatype { }; + packet = callPackage ../development/tools/packet { }; pb_cli = callPackage ../tools/misc/pb_cli {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5045aaa9255..a58046aa156 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -178,6 +178,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + aplpy = callPackage ../development/python-modules/aplpy { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; asana = callPackage ../development/python-modules/asana { }; @@ -194,6 +196,10 @@ in { astropy = callPackage ../development/python-modules/astropy { }; + astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + + astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; @@ -794,6 +800,8 @@ in { relatorio = callPackage ../development/python-modules/relatorio { }; + reproject = callPackage ../development/python-modules/reproject { }; + remotecv = callPackage ../development/python-modules/remotecv { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -1526,6 +1534,8 @@ in { cffi = callPackage ../development/python-modules/cffi { }; + pyavm = callPackage ../development/python-modules/pyavm { }; + pycollada = callPackage ../development/python-modules/pycollada { }; pycontracts = callPackage ../development/python-modules/pycontracts { }; @@ -4977,6 +4987,8 @@ in { potr = callPackage ../development/python-modules/potr {}; + pyregion = callPackage ../development/python-modules/pyregion {}; + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; pluggy = callPackage ../development/python-modules/pluggy {}; |