diff options
Diffstat (limited to 'pkgs')
39 files changed, 426 insertions, 208 deletions
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 8e99005bbf6c5..11566293c49b0 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,17 +4,17 @@ with stdenv.lib; pythonPackages.buildPythonPackage rec { pname = "neovim-remote"; - version = "2.1.0"; + version = "2.1.1"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0gri4d8gg5hvywffvj8r123d06x006qhink7d54yk6lvplw64gyc"; + sha256 = "1hkzcc141imjin03wpfykw50k0vs7vj1lr09czb2hsyf937gyjqn"; }; - propagatedBuildInputs = with pythonPackages; [ neovim psutil ]; + propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; meta = { description = "A tool that helps controlling nvim processes from a terminal"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index bd4304560fd13..3dd3710da772e 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -16,7 +16,6 @@ let , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ , withNodeJs? false , withRuby ? true - , withPyGUI ? false , vimAlias ? false , viAlias ? false , configure ? {} @@ -43,13 +42,13 @@ let pluginPythonPackages = getDeps "pythonDependencies" requiredPlugins; pythonEnv = pythonPackages.python.withPackages(ps: - (if withPyGUI then [ ps.neovim_gui ] else [ ps.neovim ]) + [ ps.pynvim ] ++ (extraPythonPackagesFun ps) ++ (concatMap (f: f ps) pluginPythonPackages)); pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; python3Env = python3Packages.python.withPackages (ps: - [ ps.neovim ] + [ ps.pynvim ] ++ (extraPython3PackagesFun ps) ++ (concatMap (f: f ps) pluginPython3Packages)); @@ -88,10 +87,6 @@ let makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH '' + optionalString withRuby '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' - + optionalString withPyGUI '' - makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ - --prefix PATH : "$out/bin" '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' + optionalString viAlias '' diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index c9cc2d6db4247..1c2045f4141ea 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget, -qtquickcontrols, qtgraphicaleffects, qmake }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmltermwidget +, qtquickcontrols, qtgraphicaleffects, qmake }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr + '' + stdenv.lib.optionalString stdenv.isDarwin '' + ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; enableParallelBuilding = true; @@ -37,8 +39,8 @@ stdenv.mkDerivation rec { eye-candy, customizable, and reasonably lightweight. ''; homepage = https://github.com/Swordfish90/cool-retro-term; - license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3Plus; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 170690cdad3a9..fff67b0add628 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -7,14 +7,14 @@ let in python3Packages.buildPythonApplication rec { - version = "3.3.1"; + version = "3.3.2"; name = "electron-cash-${version}"; src = fetchurl { url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "1jdy89rfdwc2jadx3rqj5yvynpcn90cx6482ax9f1cj9gfxp9j2b"; + sha256 = "4538044cfaa4f87a847635849e0733f32b183ac79abbd2797689c86dc3cb0d53"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2f7f3c5836afe..9dd9a0d33345c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, wrapGAppsHook -, gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig +, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev, libnotify @@ -24,6 +24,7 @@ let rpath = lib.makeLibraryPath [ alsaLib atk + at-spi2-atk cairo cups dbus @@ -49,18 +50,17 @@ let libXtst nspr nss - stdenv.cc.cc udev xorg.libxcb ]; in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1gak6nhv5gk37iv1bfmjx6wf0p1vcln5y29i6fkzmvcrp3j2cmfh"; + sha256 = "19a585mylbwrxd2m75hgp77ys1r350xkvawq2ysp0cxzr04l46z7"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -84,6 +84,7 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop wrapProgram $out/libexec/signal-desktop \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \ ${customLanguageWrapperArgs} \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 9f42324e6d6d8..c932c7f06c036 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip}: fetchzip { - name = "powerline-fonts-2017-05-25"; + name = "powerline-fonts-2018-11-11"; - url = https://github.com/powerline/fonts/archive/fe396ef6f6b9b315f30af7d7229ff21f67a66e12.zip; + url = https://github.com/powerline/fonts/archive/e80e3eba9091dac0655a0a77472e10f53e754bb0.zip; postFetch = '' mkdir -p $out/share/fonts/opentype @@ -22,7 +22,7 @@ fetchzip { unzip -j $downloadedFile '*/PSF/*.psf.gz' -d $out/share/fonts/psf ''; - sha256 = "07yjbwri7nnnnynps86sz0dlivwqw7gfw045v63q969nab9dw388"; + sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww"; meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix new file mode 100644 index 0000000000000..ce7bb11522ba5 --- /dev/null +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }: + +stdenv.mkDerivation rec { + name = "bibata-cursors-${version}"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "KaizIqbal"; + repo = "Bibata_Cursor"; + rev = "v${version}"; + sha256 = "14gvpjp4gv0m59qr8wls7xs5yjx5llldyzack5kg5cg2mzk2nsml"; + }; + + postPatch = '' + patchShebangs . + substituteInPlace build.sh --replace "gksu " "" + ''; + + nativeBuildInputs = [ + gnome-themes-extra + inkscape + xcursorgen + ]; + + buildPhase = '' + HOME="$NIX_BUILD_ROOT" ./build.sh + ''; + + installPhase = '' + install -dm 0755 $out/share/icons + cp -pr Bibata_* $out/share/icons/ + ''; + + meta = with stdenv.lib; { + description = "Material Based Cursor"; + homepage = https://github.com/KaizIqbal/Bibata_Cursor; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ rawkode ]; + }; +} diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 7b13c59a1a8c7..3f1dad87548ee 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.30.2"; + version = "3.30.3"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1ps49js0110lrvg5xiylj9ky0ndp43wrnm0l6p6phmhx4h4477mj"; + sha256 = "1v0bqqwv34j8qamby7dwgnha50fpjs8mhlq0h6c35jxsqb2f3k66"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 07c00f5b6325e..2f7e5bbe80718 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.30.2.1"; + version = "3.30.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57"; + sha256 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index af5b861ab4724..344fb4a5738e3 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -4,15 +4,13 @@ , gnome3, gpgme, python3, openldap , libsecret, avahi, p11-kit, openssh }: -let +stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.30"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.30.1.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index c88d8c9c381fb..c9c8acfecb3bc 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.30.2"; + version = "3.30.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv"; + sha256 = "1q1wpsc3p6b1cacwgkgqbni7rdx3skvb2fm6fyjs2wjgq6zi5753"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 286bec4a367e8..a7347f74ca4b6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.30.1"; + version = "3.30.2"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1vizpjb3ll7pndxpvwjjplgdn6b2wf0mjqr9fga0p2cj57v00m89"; + sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index f37a86be4f1fb..7e7c40e81309a 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -4,13 +4,13 @@ let pname = "nautilus"; - version = "3.30.4"; + version = "3.30.5"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1"; + sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv"; }; nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ]; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index baecba8d35507..3b70159191410 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "totem-${version}"; - version = "3.26.2"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g"; + sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 96b18a7d7c56a..904bdd323d812 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "vte-${version}"; - version = "0.54.2"; + version = "0.54.3"; src = fetchurl { url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj"; + sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 436b12d10644a..626f4652ecec4 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -371,8 +371,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - libgda = callPackage ./misc/libgda { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index d985eac4030fc..77edf27fbdd66 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-tweaks"; - version = "3.30.1"; + version = "3.30.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa"; + sha256 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 7054e41d72954..3776a9adbf2cf 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -3,13 +3,13 @@ let pname = "libgnome-games-support"; - version = "1.4.2"; + version = "1.4.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088"; + sha256 = "0g6a1vvhrbs0pfnzjfg3lgqvppwkydn6j3dn713zhrjhma9pljkh"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix new file mode 100644 index 0000000000000..49a71987e7549 --- /dev/null +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: + +stdenv.mkDerivation rec { + name = "lxrandr-0.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/lxde/${name}.tar.xz"; + sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e"; + }; + + configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; + + meta = with stdenv.lib; { + description = "LXRandR is the standard screen manager of LXDE."; + homepage = https://lxde.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ rawkode ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 93e18f519163d..ee9323ebc5c05 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -8,18 +8,13 @@ assert mysqlSupport -> mysql != null; assert postgresSupport -> postgresql != null; (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { - name = "libgda-${version}"; - version = "5.2.5"; + pname = "libgda"; + version = "5.2.8"; src = fetchurl { - url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1j4hxhiwr4i8rgbn2ck93y1c2b792sfzlrq7abyjx8h8ik1f9lp3"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2"; }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; }; - }; - configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] ++ (optional (mysqlSupport) "--with-mysql=yes") ++ (optional (postgresSupport) "--with-postgres=yes"); @@ -28,11 +23,17 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ]; - buildInputs = with stdenv.lib; [ gtk3 openssl ] + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ]; + buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Database access library"; homepage = http://www.gnome-db.org/; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 26386e0c42c47..ba62324d586ed 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: stdenv.mkDerivation rec { - version = "0.1.0"; - name = "qmltermwidget-${version}"; + version = "2018-11-24"; + name = "qmltermwidget-unstable-${version}"; src = fetchFromGitHub { repo = "qmltermwidget"; owner = "Swordfish90"; - rev = "v${version}"; - sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; + rev = "48274c75660e28d44af7c195e79accdf1bd44963"; + sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6"; }; buildInputs = [ qtbase qtquick1 qtmultimedia ] diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 7c4e15f856839..78e924e975390 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "alot"; - version = "0.7"; + version = "0.8"; outputs = [ "out" ] ++ lib.optional withManpage "man"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchFromGitHub { owner = "pazz"; repo = "alot"; rev = "${version}"; - sha256 = "1y932smng7qx7ybmqw4qh75b0lv9imfs5ak9fd0qhysij8kpmdhi"; + sha256 = "1isn0p0i2a7dlbrdk5ib01xa1wgi6bi9ka4xl4vj8iw1q4i5fqv9"; }; nativeBuildInputs = lib.optional withManpage sphinx; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix new file mode 100644 index 0000000000000..8b1100cd3f40e --- /dev/null +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest +, testpath +, tornado +}: + +buildPythonPackage rec { + pname = "jeepney"; + version = "0.4"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w1w1rawl9k4lx91w16d19kbmf1349mhy8ph8x3w0qp1blm432b0"; + }; + + propagatedBuildInputs = [ + tornado + ]; + + checkInputs = [ + pytest + testpath + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://gitlab.com/takluyver/jeepney; + description = "Pure Python DBus interface"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index a7767be6dc483..5835fe3196d44 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -1,7 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k +, pytest +, cffi }: buildPythonPackage rec { @@ -13,8 +14,11 @@ buildPythonPackage rec { sha256 = "1zh38gvkqw1jm5105if6rr7ccbgyxr7k2rm5ygb9ab3bq82pyaww"; }; - # Some sort of mysterious failure with lmdb.tool - doCheck = !isPy3k; + checkInputs = [ pytest cffi ]; + checkPhase = '' + export PYTHONPATH=.:$PYTHONPATH + py.test + ''; meta = with stdenv.lib; { description = "Universal Python binding for the LMDB 'Lightning' Database"; diff --git a/pkgs/development/python-modules/neovim_gui/default.nix b/pkgs/development/python-modules/neovim_gui/default.nix deleted file mode 100644 index e6d36a3708903..0000000000000 --- a/pkgs/development/python-modules/neovim_gui/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, neovim -, click -, pygobject3 -, isPy27 -, pkgs -}: - -buildPythonPackage rec { - pname = "neovim-pygui"; - version = "0.1.3"; - disabled = !isPy27; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "python-gui"; - rev = version; - sha256 = "1vpvr3zm3f9sxg1z1cl7f7gi8v1xksjdvxj62qnw65aqj3zqxnkz"; - }; - - propagatedBuildInputs = [ neovim click pygobject3 pkgs.gobject-introspection pkgs.makeWrapper pkgs.gtk3 ]; - - patchPhase = '' - sed -i -e "s|entry_points=entry_points,|entry_points=dict(console_scripts=['pynvim=neovim.ui.cli:main [GUI]']),|" setup.py - ''; - - postInstall = '' - wrapProgram $out/bin/pynvim \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "${pygobject3}/lib/python2.7/site-packages:$PYTHONPATH" - ''; - -} diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 20479093a4712..3811e5082c0fd 100644 --- a/pkgs/development/python-modules/neovim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - pname = "neovim"; - version = "0.3.0"; + pname = "pynvim"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "18x7gi1idsch11hijvy0mm2mk4f42rapz9niax4rnak14x2klqq2"; + sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 98bbef174ae78..c0df4d4a878ed 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage -, dbus-python, cryptography }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }: buildPythonPackage rec { pname = "secretstorage"; - version = "2.3.1"; + version = "3.1.0"; - src = fetchFromGitHub { - owner = "mitya57"; - repo = "secretstorage"; - rev = version; - sha256 = "1sjd2jjbxgkkxyrfwx89x0hsnn39w2cr2qkxbg1iz52znr4sqism"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + pname = "SecretStorage"; + inherit version; + sha256 = "12vxzradibfmznssh7x2zd7qym2hl7wn34fn2yn58pnx6sykrai9"; }; - propagatedBuildInputs = [ dbus-python cryptography ]; + propagatedBuildInputs = [ + cryptography + jeepney + pygobject3 + ]; - doCheck = false; # requires dbus session + # Needs a D-Bus Sesison + doCheck = false; - meta = with stdenv.lib; { - homepage = "https://github.com/mitya57/secretstorage"; + meta = with lib; { + homepage = https://github.com/mitya57/secretstorage; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsdOriginal; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 1f4a28459be4a..9aa1985270ddc 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -5,15 +5,13 @@ buildPythonPackage rec { pname = "Yapsy"; - version = "1.11.223"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "19pjsnqizswnczhlav4lb7zlzs0n73ijrsgksy4374b14jkkkfs5"; + sha256 = "0g1yd8nvhfdasckb929rijmj040x25ycns2b3l5wq53gm4lv537h"; }; - doCheck = false; - meta = with stdenv.lib; { homepage = http://yapsy.sourceforge.net/; description = "Yet another plugin system"; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1b64456fb204d..c31dfb63b3cd4 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -17,7 +17,7 @@ , postBuild ? null , document ? [] , meta ? {} -, groups ? ["default"] +, groups ? null , ignoreCollisions ? false , buildInputs ? [] , ... diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index b8e666a92f9a3..6324f27e9faf4 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -1,5 +1,10 @@ { lib, gemConfig, ... }: -rec { + +let + inherit (lib) attrValues concatMap converge filterAttrs getAttrs + intersectLists; + +in rec { bundlerFiles = { gemfile ? null , lockfile ? null @@ -22,7 +27,19 @@ rec { else gemset; }; - filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset; + filterGemset = { ruby, groups, ... }: gemset: + let + platformGems = filterAttrs (_: platformMatches ruby) gemset; + directlyMatchingGems = filterAttrs (_: groupMatches groups) platformGems; + + expandDependencies = gems: + let + depNames = concatMap (gem: gem.dependencies or []) (attrValues gems); + deps = getAttrs depNames platformGems; + in + gems // deps; + in + converge expandDependencies directlyMatchingGems; platformMatches = {rubyEngine, version, ...}: attrs: ( !(attrs ? "platforms") || @@ -33,10 +50,9 @@ rec { ) attrs.platforms ); - groupMatches = groups: attrs: ( - !(attrs ? "groups") || - builtins.any (gemGroup: builtins.any (group: group == gemGroup) groups) attrs.groups - ); + groupMatches = groups: attrs: + groups == null || !(attrs ? "groups") || + (intersectLists (groups ++ [ "default" ]) attrs.groups) != []; applyGemConfigs = attrs: (if gemConfig ? "${attrs.gemName}" diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 650e1fc39e536..f9e60e3e492ca 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,23 +1,27 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pgcli"; - version = "2.0.0"; + version = "2.0.1"; - src = pythonPackages.fetchPypi { + # Python 2 won't have prompt_toolkit 2.x.x + # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 + disabled = python3Packages.isPy27; + + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "085fna5nc72nfj1gw0m4ia6wzayinqaffmjy3ajldha1727vqwzi"; + sha256 = "149naq3gp1n922vag7vixs0hd114bpbmbmv70k4kzc1q7jz748l2"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ cli-helpers click configobj humanize prompt_toolkit psycopg2 pygments sqlparse pgspecial setproctitle keyring ]; - checkInputs = with pythonPackages; [ pytest mock ]; + checkInputs = with python3Packages; [ pytest mock ]; checkPhase = '' - py.test + pytest ''; meta = with lib; { diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 197a5d756cc25..3e8c0d715d552 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -53,12 +53,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-12-07"; + name = "ale-2018-12-10"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "9226e13b31474ac17d0c25cd27aa55bff21d55c2"; - sha256 = "0x3ihhswcqy3451721f3yfi5m2m09src7yd4r67q9k2gcyldbwj8"; + rev = "2cfa09e02d65cd06649fb1ae5f988b7a110a124d"; + sha256 = "0sbbm6wwdwqbkfxkwbiijnsazdarmr6ahs2ha58s780fhkhvf2lp"; }; }; @@ -344,12 +344,12 @@ }; denite-nvim = buildVimPluginFrom2Nix { - name = "denite-nvim-2018-12-05"; + name = "denite-nvim-2018-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "a59c3e2f50452e0ddd1988e921624f6cfb47807d"; - sha256 = "1m96l3kflywdggypmh832piisaah3958v3ql4s267b9pk1phsgsy"; + rev = "cb1daf74c51b1670ee3914c95f85ba3852525e17"; + sha256 = "02m77q14s4y12r300ndml6nc8xwb8q15838l47j9bh1h8sz5b7al"; }; }; @@ -427,12 +427,12 @@ }; deoplete-nvim = buildVimPluginFrom2Nix { - name = "deoplete-nvim-2018-12-05"; + name = "deoplete-nvim-2018-12-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "a5ac69adb4ca5fae12e2f07a07c934213248779a"; - sha256 = "182ygr2fsbvxm3smp1s1m585vfyk5ivwmwa2wknzqwysz96bhfaf"; + rev = "04159b053ae83933d67225c53c36d98e516fa729"; + sha256 = "1d0r7jfs0b2rc1pmavn0yfqqdq9by6cd404a0vfa44ya05zrz115"; }; }; @@ -457,12 +457,12 @@ }; echodoc-vim = buildVimPluginFrom2Nix { - name = "echodoc-vim-2018-12-05"; + name = "echodoc-vim-2018-12-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "39cc8d6b5645088d3449006cffb202e751c92865"; - sha256 = "1s59jz88pdvz1nca7z5bzvazn2dp4n6xb39hagnbh4rw70s18xnx"; + rev = "2ca26d0a63210d8936ee86b82d409bd98e1b6bf7"; + sha256 = "19cmggxrgbj429fflcz0gamg1779577qm0mykq6kycx0j7zyclbf"; }; }; @@ -580,12 +580,12 @@ }; fzf-vim = buildVimPluginFrom2Nix { - name = "fzf-vim-2018-11-27"; + name = "fzf-vim-2018-12-11"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "95f025ef2dbc8fedf124521904a80c1879acd359"; - sha256 = "0g382ikl9vyxfrwx86nrk4chrn75kwpjx4gbxrjsbxxzxbplhnjc"; + rev = "f0acabf7e837e626c7102c30af890bccf79e33b7"; + sha256 = "0ac1xjrmidagna167i4q5ilplsqiqcaxwslyl37dw9qj75c9arj5"; }; }; @@ -771,12 +771,12 @@ }; julia-vim = buildVimPluginFrom2Nix { - name = "julia-vim-2018-11-23"; + name = "julia-vim-2018-12-11"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e6eca5e4ab8d7b716d768c2746b42bf1f15af82d"; - sha256 = "1wq5wnz5c0s6iqn34913xpk32d3n3cdh3xb01rws5psv6lri2kka"; + rev = "b81e1486d0a46b52e73763ee6e6ea1f28a3573d1"; + sha256 = "0lgjib5rni8rqiv3qkfxj204j6ccqrsnp7d7nij5bhqli3d2hryi"; }; }; @@ -801,12 +801,12 @@ }; lightline-vim = buildVimPluginFrom2Nix { - name = "lightline-vim-2018-11-24"; + name = "lightline-vim-2018-12-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "688240e0ef849cdc8457822658cedf10358c75d6"; - sha256 = "1rv8cj553h7w9y61vswq7s9hfmr5h2vxghqrkcsr6vvn7fy6smiv"; + rev = "1ef44bfa50320347004be77f836e97dc4f54982e"; + sha256 = "0xycmnd811si6c2sxwrw88law9wp5n6akxkqv0211iq9m8k72cp4"; }; }; @@ -991,12 +991,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-12-07"; + name = "neomake-2018-12-12"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "1481dd4fb9effef8831ed57ae2459310621f5df0"; - sha256 = "0y1mw113c58cy54vgfbv6km5g61wpd9v08r131jkbzylhzg2yqyh"; + rev = "2e0b5facc8452b145162b6f45b571b30188d9774"; + sha256 = "180znybxvs9cvlglx6kw5z3chyax7vadlcfj76zh39bzmgim6m7y"; }; }; @@ -1030,6 +1030,16 @@ }; }; + neovim-sensible = buildVimPluginFrom2Nix { + name = "neovim-sensible-2017-09-20"; + src = fetchFromGitHub { + owner = "jeffkreeftmeijer"; + repo = "neovim-sensible"; + rev = "e7ab7544f15e59de2d9a1b42f58e590938e496e7"; + sha256 = "06whnfvmzfdsx9gvkd2nxhx29939gjzibr2xadh54sj8ns646w58"; + }; + }; + neoyank-vim = buildVimPluginFrom2Nix { name = "neoyank-vim-2018-12-03"; src = fetchFromGitHub { @@ -1051,12 +1061,12 @@ }; nerdtree = buildVimPluginFrom2Nix { - name = "nerdtree-2018-12-07"; + name = "nerdtree-2018-12-12"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "c1876da09c38315d7fdea33d9082d1868b5fbd2b"; - sha256 = "1v2w5gf4ggm2bvnl6zhpqxna8c72fssp5bg2z350kncjjq069bks"; + rev = "72c3656799289d4635520c28e17f737066ce19d6"; + sha256 = "1dy77vjj2prn0cl2k3cf7bd240nvh95m6h6lpv0zshjzjap7m1fx"; }; }; @@ -1201,12 +1211,12 @@ }; purescript-vim = buildVimPluginFrom2Nix { - name = "purescript-vim-2018-07-05"; + name = "purescript-vim-2018-12-10"; src = fetchFromGitHub { owner = "raichoo"; repo = "purescript-vim"; - rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; - sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; + rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; + sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; }; }; @@ -1531,12 +1541,12 @@ }; traces-vim = buildVimPluginFrom2Nix { - name = "traces-vim-2018-12-04"; + name = "traces-vim-2018-12-09"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "47bd356e8a5e32b9b0be5d9805b603ee1cbb4242"; - sha256 = "145baj6jsp7j7amcgrmm3607lvgy2z2w6map0s1fcmgykrn89xfz"; + rev = "5152813d9b91692d37db176a9383f147373a7a8a"; + sha256 = "1f07nb4vn1nawcd32qy7wy0vgkd15ysg3f3yh1xd5jbfxixisbss"; }; }; @@ -1821,12 +1831,12 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-12-03"; + name = "vim-airline-2018-12-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "3d9071e6b618280000a021a2517e28cb4b497be4"; - sha256 = "1qhwyaszhgd6vnpa9xmbnrsgs39nc87m0d35a3ccpkjp0q7bpzgq"; + rev = "e3cfd3643b0f4c9650d5eb23912fef12d88e7a60"; + sha256 = "0s7v5wfsqvq94yhgqiqr1nrfya6fvbrb5n0qwnq7shwva94pwwwr"; }; }; @@ -1871,12 +1881,12 @@ }; vim-autoformat = buildVimPluginFrom2Nix { - name = "vim-autoformat-2018-10-22"; + name = "vim-autoformat-2018-12-10"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "db17ccbacb55beea82fdaa9a1cde82f6a928d16d"; - sha256 = "0nnykvbz5hm4cpv9jqk0jb4zzywlwgbybbirf1655rqrqfv126pp"; + rev = "c203080645936e73b2124040bc963386eeb44f5e"; + sha256 = "0gzmmnzzj6hvcz216vgq46mp4lnp95f788pmhh3njq9l8rn28hd9"; }; }; @@ -2221,12 +2231,12 @@ }; vim-ghost = buildVimPluginFrom2Nix { - name = "vim-ghost-2018-11-28"; + name = "vim-ghost-2018-12-12"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "672d1052425cc9dd8f5f56ba31732f0637b95caa"; - sha256 = "14948jyyhddjpx2szs6wbs9sjnxbxvsdnkyf33558by3gn5yc7nw"; + rev = "26209657da7ea040c635b36331793a04694f4921"; + sha256 = "16gg487mxqw58s5np2a9a1kjy6kp5f0fmk60d444ymbjblv6gaix"; }; }; @@ -2271,12 +2281,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-12-07"; + name = "vim-go-2018-12-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ef278b486ad0698b74c53b61b9ebb3752d0384c2"; - sha256 = "0ki5fa6n40818rfscffpb12lzkmqns9yfbbxwipq7sf0bg2slys3"; + rev = "30cdcf3c1e4d0be92115f40ea3197a2effde0c27"; + sha256 = "1yszm8c1hqgs9pbdlff49yc08zg5qwvvy8plzvvd1hp6pir7q5kw"; }; }; @@ -2792,12 +2802,12 @@ }; vim-pathogen = buildVimPluginFrom2Nix { - name = "vim-pathogen-2018-04-05"; + name = "vim-pathogen-2018-12-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "06da921608b971fb47603671bcafdb2843992eb3"; - sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; + rev = "24f5cdd8055787463dd8ca73c80c1424ff06b358"; + sha256 = "0hyn8i3gmx1vismiww7snrmfz95zmfk8j6mbyvn50gwid6wjwk14"; }; }; @@ -2942,12 +2952,12 @@ }; vim-ruby = buildVimPluginFrom2Nix { - name = "vim-ruby-2018-10-02"; + name = "vim-ruby-2018-12-11"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "a85f078d06ed11faf1b243315d67b6f37326686d"; - sha256 = "1d76yjbk9jmh3ci1fbdzsfip0r1npk07vlwibjv4cli8icq5pghz"; + rev = "0e57d862250bb4ce56e30e2c4e10781b8b1776ac"; + sha256 = "18z6170nm1vz4hh52qgiqhj9p7ak3d363rxh0q9si4hc6w56agzx"; }; }; @@ -3402,12 +3412,22 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-12-08"; + name = "vimtex-2018-12-10"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f6fae0c858558344d622cde4e2ed4a58caffb813"; - sha256 = "1pv05c90pcmxiq1553hz6f8g0x6a8b77g1m05i9f6j39acr63nrg"; + rev = "861e7b2fa00a9b0391dd8de0bf63b86dce9eb44a"; + sha256 = "1a1zvr1g8k97s8n3s2sjgi5drjsamj91fc649kgwsjjs880rfjsl"; + }; + }; + + vimux = buildVimPluginFrom2Nix { + name = "vimux-2017-10-24"; + src = fetchFromGitHub { + owner = "benmills"; + repo = "vimux"; + rev = "37f41195e6369ac602a08ec61364906600b771f1"; + sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; }; }; @@ -3523,12 +3543,12 @@ }; youcompleteme = buildVimPluginFrom2Nix { - name = "youcompleteme-2018-12-07"; + name = "youcompleteme-2018-12-12"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "80246aa9a23cab4175c41a514598284efe218c20"; - sha256 = "1s002jq0n4nhaxk42hdgqdgww67f3crx5rj5xns34ifg3y1zagn2"; + rev = "0790dc99b441f3c12fb205faf56054ccf0f4c234"; + sha256 = "0nc629x7gsqqjmdy2psj7x3z1py3hksifwbf3fq9m9kr23zhl6ql"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c369328c8d514..e914a3f432330 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -15,6 +15,7 @@ artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 benekastah/neomake +benmills/vimux bitc/vim-hdevtools bling/vim-bufferline bronson/vim-trailing-whitespace @@ -102,6 +103,7 @@ JazzCore/ctrlp-cmatcher jceb/vim-hier jceb/vim-orgmode jeetsukumaran/vim-buffergator +jeffkreeftmeijer/neovim-sensible jgdavey/tslime.vim jhradilek/vim-docbk jiangmiao/auto-pairs diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 36f5200d43bc6..a24dee07de474 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.60"; + version = "5.5.62"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3"; + sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi"; }; patches = if stdenv.isCygwin then [ @@ -78,5 +78,6 @@ self = stdenv.mkDerivation rec { artistic1 bsd0 bsd2 bsd3 bsdOriginal gpl2 lgpl2 lgpl21 mit publicDomain licenses.zlib ]; + broken = stdenv.isAarch64; }; }; in self diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix new file mode 100644 index 0000000000000..66378e457a26d --- /dev/null +++ b/pkgs/tools/misc/intelmetool/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, zlib, pciutils }: + +stdenv.mkDerivation rec { + name = "intelmetool-${version}"; + version = "4.8.1"; + + src = fetchgit { + url = "https://review.coreboot.org/coreboot.git"; + rev = version; + sha256 = "1gjisy9b7vgzjvy1fwaqhq3589yd59kkylv7apjmg5r2b3dv4zvr"; + fetchSubmodules = false; + }; + + buildInputs = [ zlib pciutils ]; + + buildPhase = '' + make -C util/intelmetool + ''; + + installPhase = '' + mkdir -p $out/bin + cp util/intelmetool/intelmetool $out/bin + ''; + + meta = with stdenv.lib; { + description = "Dump interesting things about Management Engine"; + homepage = https://www.coreboot.org/Nvramtool; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix new file mode 100644 index 0000000000000..d224ad1dcc5d5 --- /dev/null +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "me_cleaner"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "corna"; + repo = pname; + rev = "v${version}"; + sha256 = "1bdj2clm13ir441vn7sv860xsc5gh71ja5lc2wn0gggnff0adxj4"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Tool for partial deblobbing of Intel ME/TXE firmware images"; + longDescription = '' + me_cleaner is a Python script able to modify an Intel ME firmware image + with the final purpose of reducing its ability to interact with the system. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01f94ecaceb8..599f841c45236 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5540,6 +5540,8 @@ in sstp = callPackage ../tools/networking/sstp {}; + strip-nondeterminism = perlPackages.strip-nondeterminism; + structure-synth = callPackage ../tools/graphics/structure-synth { }; su-exec = callPackage ../tools/security/su-exec {}; @@ -7719,6 +7721,8 @@ in lxtask = callPackage ../desktops/lxde/core/lxtask { }; + lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; + kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -7768,6 +7772,8 @@ in maude = callPackage ../development/interpreters/maude { }; + me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; + mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools wrapPython; @@ -10311,6 +10317,8 @@ in ilmbase = callPackage ../development/libraries/ilmbase { }; + intelmetool = callPackage ../tools/misc/intelmetool { }; + imlib = callPackage ../development/libraries/imlib { libpng = libpng12; }; @@ -10760,6 +10768,8 @@ in }); libgap = callPackage ../development/libraries/libgap { }; + libgda = callPackage ../development/libraries/libgda { }; + libgdata = gnome3.libgdata; libgig = callPackage ../development/libraries/libgig { }; @@ -13391,7 +13401,9 @@ in dex-oidc = callPackage ../servers/dex { }; - doh-proxy = callPackage ../servers/dns/doh-proxy { }; + doh-proxy = callPackage ../servers/dns/doh-proxy { + python3Packages = python36Packages; + }; dgraph = callPackage ../servers/dgraph { }; @@ -15271,6 +15283,8 @@ in bgnet = callPackage ../data/documentation/bgnet { }; + bibata-cursors = callPackage ../data/icons/bibata-cursors { }; + brise = callPackage ../data/misc/brise { }; inherit (kdeFrameworks) breeze-icons; @@ -15865,7 +15879,7 @@ in alock = callPackage ../misc/screensavers/alock { }; - inherit (python2Packages) alot; + inherit (python3Packages) alot; alpine = callPackage ../applications/networking/mailreaders/alpine { tcl = tcl-8_5; @@ -18440,6 +18454,7 @@ in notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; + pythonPackages = python3Packages; }; notejot = callPackage ../applications/misc/notejot { }; @@ -19664,8 +19679,6 @@ in neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - neovim-pygui = pythonPackages.neovim_gui; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; vis = callPackage ../applications/editors/vis { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 74e9e60a0f885..26f811bfb3344 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14109,6 +14109,39 @@ let buildInputs = [ TestToolbox ]; }; + strip-nondeterminism = buildPerlPackage rec { + name = "strip-nondeterminism-${version}"; + version = "1.0.0"; + + outputs = [ "out" "dev" ]; # no "devdoc" + + src = pkgs.fetchFromGitLab { + owner = "reproducible-builds"; + repo = "strip-nondeterminism"; + domain = "salsa.debian.org"; + rev = version; + sha256 = "1pwar1fyadqxmvb7x4zyw2iawbi5lsfjcg0ps9n9rdjb6an7vv64"; + }; + + # stray test failure + doCheck = false; + + buildInputs = [ ArchiveZip ArchiveCpio pkgs.file ]; + + perlPostHook = '' + # we don’t need the debhelper script + rm $out/bin/dh_strip_nondeterminism + rm $out/share/man/man1/dh_strip_nondeterminism.1.gz + ''; + + meta = with stdenv.lib; { + description = "A Perl module for stripping bits of non-deterministic information"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; + }; + }; + SubExporter = buildPerlPackage { name = "Sub-Exporter-0.987"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da5fa4dd102f2..949103211ff8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2570,7 +2570,10 @@ in { google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; - gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { + pythonSupport = true; + inherit python; + }); gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; @@ -2706,6 +2709,8 @@ in { jellyfish = callPackage ../development/python-modules/jellyfish { }; + jeepney = callPackage ../development/python-modules/jeepney { }; + j2cli = callPackage ../development/python-modules/j2cli { }; jinja2 = callPackage ../development/python-modules/jinja2 { }; @@ -4637,9 +4642,7 @@ in { trollius = callPackage ../development/python-modules/trollius {}; - neovim = callPackage ../development/python-modules/neovim {}; - - neovim_gui = callPackage ../development/python-modules/neovim_gui { }; + pynvim = callPackage ../development/python-modules/pynvim {}; typogrify = callPackage ../development/python-modules/typogrify { }; |