diff options
Diffstat (limited to 'pkgs')
1868 files changed, 29709 insertions, 13352 deletions
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index ad1ccbf496c..85dfacb2095 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.21"; + version = "1.8.22"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,13 +16,13 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1p4qfxa90l26s9q4hddyb93gdf7vb0sb46z9n26ijiqlxdq3z7v2"; + sha256 = "0ag9qxrf7n0qkccaf6v4jaysivpxvsy5zfzar3mcm65223pqy375"; }; meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = [ maintainers.adisbladis maintainers.lionello ]; + maintainers = with maintainers; [ adisbladis asymmetric lionello ]; }; } diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 62e72592874..58ab367c020 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nano-wallet-${version}"; - version = "16.3"; + version = "18.0"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "1rhq7qzfd8li33pmzcjxrhbbgdklxlcijam62s385f8yqjwy80dz"; + sha256 = "03f9g1x7rs7vic9yzsjxsh5ddx9ys78rssbfghbccfw9qrwylh3y"; fetchSubmodules = true; }; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 591f6ffa86c..19ab52ebc22 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.3.1"; - sha256 = "13y3gczqb0rb6v17j63j1zp11cnykbv9c674hrk1i6jb3y4am4lv"; + version = "2.3.2"; + sha256 = "1063n7lkcfkywi0a06pxkw0wkq3qyq4lr53fv584mlbnh2hj8gpm"; cargoSha256 = "1pj5hzy7k1l9bbw1qpz80vvk89qz4qz4rnnkcvn2rkbmq382gxwy"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index f62e3d5cfdd..b8b67836f06 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.2.8"; - sha256 = "1l2bxra4fkbh8gnph9wnc24ddmzfdclsgcjbx8q6fflhcg6r9hf1"; + version = "2.2.9"; + sha256 = "0n9zk25ni4asfdqc4xh0gqp2446vxacqz7qcrmsngf8swvayvi16"; cargoSha256 = "10lg0vzikzlj927hpn59x1dz9dvhcaqsl8nz14vj2iz42vfkcm7p"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 7383623a5ff..4a6be2cc55f 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ams-lv2-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "blablack"; repo = "ams-lv2"; rev = version; - sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x"; + sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; nativeBuildInputs = [ pkgconfig wafHook ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 19cb55d93c9..68660b5d054 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib gtk3 libmowgli dbus-glib libxml2 - xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 + xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index b7b8a4410b7..53ab4fd6f2f 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix new file mode 100644 index 00000000000..f82ec7a4ea1 --- /dev/null +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -0,0 +1,44 @@ +{ + stdenv, fetchurl, docbook_xsl, + docbook_xml_dtd_45, python, pygments, + libxslt +}: + +stdenv.mkDerivation rec { + version = "6.12.0"; + name = "csound-manual-${version}"; + + src = fetchurl { + url = "https://github.com/csound/manual/archive/${version}.tar.gz"; + sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp"; + }; + + + prePatch = '' + substituteInPlace manual.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ + "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" + ''; + + nativeBuildInputs = [ libxslt.bin ]; + + buildInputs = [ docbook_xsl python pygments ]; + + buildPhase = '' + make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist + ''; + + installPhase = '' + mkdir -p $out/share/doc/csound + cp -r ./html $out/share/doc/csound + ''; + + meta = { + description = "The Csound Canonical Reference Manual"; + homepage = "https://github.com/csound/manual"; + license = stdenv.lib.licenses.fdl12Plus; + maintainers = [ stdenv.lib.maintainers.hlolli ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index e61b9d8b290..c6fb7c67d58 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.defaultIconTheme + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 3eb5806aa4c..192670280cc 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -11,8 +11,8 @@ let sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; }; "2" = { - fluidsynthVersion = "2.0.2"; - sha256 = "02vs5sfsyh1dl7wlcvgs4w3x0qcmsl7vi000qgp99ynwh3wjb274"; + fluidsynthVersion = "2.0.4"; + sha256 = "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0"; }; }; in diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 2544be383e5..9a3ad5e0bc3 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index 0434b00c705..b653ae5ca58 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { pyGtkGlade ]; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ klick ]; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index c40f84348de..0727ab56f7d 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf - gdl gnome3.defaultIconTheme gnome3.anjuta + gdl gnome3.adwaita-icon-theme gnome3.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 03d27177656..82774b61d4c 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchgit, meson, ninja, pkgconfig , python3, gtk3, gst_all_1, libsecret, libsoup , appstream-glib, desktop-file-utils, totem-pl-parser -, gobject-introspection, wrapGAppsHook }: +, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.915"; + version = "0.9.923"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "133qmqb015ghif4d4zh6sf8585fpfgbq00rv6qdj5xn13wziipwh"; + sha256 = "0jgz36lrhigcsr9vs5sp4ngv8rir3zqicygymjv7d61d6pclkx1z"; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = with gst_all_1; [ + gobject-introspection gst-libav gst-plugins-bad gst-plugins-base @@ -35,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly gstreamer gtk3 + hicolor-icon-theme libsecret libsoup totem-pl-parser diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 45006fb8ef6..3e89101e042 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.4"; + version = "3.32.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16b3dkxland4mjzjs2rz5gbqjapzzmap4d1mfhbrj2ch3plmdy7g"; + sha256 = "0vs8x26zcakk6c31sc774h2lcdw3syp236vyymmx1jnfsh1jaqpn"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 87f5f94bb30..d35cefb8841 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline , libiconv, icu, curl -, outputsSupport ? false # outputs screen +, outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen -, clockSupport ? false # clock screen +, clockSupport ? true # clock screen , taglibSupport ? true, taglib ? null # tag editor }: diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index af859702292..f8f08369ab9 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac -, usePulseAudio ? false, libpulseaudio }: +{ config, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +, usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let version = "0.4.1"; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 06398324491..4d9b856499a 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 915b7d0cbb5..421c9eaac37 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5"; }; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = with pythonPackages; [ pyqt5 diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 9e0abac5ce4..9ba225e8c58 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,21 +1,24 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd +, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd , sord, sratom, stdenv, suil }: stdenv.mkDerivation rec { - version = "0.6.7"; - name = "qtractor-${version}"; + pname = "qtractor"; + version = "0.9.4"; src = fetchurl { - url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "05xrzr48b19mghbpbzjqw5fy6pl9140bm5m929lrsi4rq5hp3xgg"; }; + nativeBuildInputs = [ + autoconf automake libtool pkgconfig qttools + ]; buildInputs = - [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH + [ alsaLib dssi libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom + libvorbis lilv lv2 qtbase rubberband serd sord sratom suil ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a1d85ac91e8..d457f25e316 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; - buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index e540016ac81..eab50c90479 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { gtk3 gnome3.libpeas totem-pl-parser - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 012270905cc..4e24f1edf49 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 686b27223a6..303532aca63 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index f22340b6941..64ae9491535 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, spotify, xorg }: +{ stdenv, fetchFromGitHub, spotify, xorg, runtimeShell }: stdenv.mkDerivation rec { name = "spotifywm-unstable-${version}"; version = "2016-11-28"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ spotify ]; installPhase = '' - echo "#!${stdenv.shell}" > spotifywm + echo "#!${runtimeShell}" > spotifywm echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm install -Dm644 spotifywm.so $out/lib/spotifywm.so install -Dm755 spotifywm $out/bin/spotifywm diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 20f6271c7ad..3184f89ced9 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,20 +1,26 @@ { stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }: stdenv.mkDerivation { - name = "squeezelite-git-2016-05-27"; + name = "squeezelite-git-2018-08-14"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e"; - sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b"; + sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh"; }; buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ]; + enableParallelBuilding = true; + installPhase = '' - mkdir -p $out/bin - cp squeezelite $out/bin + runHook preInstall + + install -Dm755 -t $out/bin squeezelite + install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 75f67adf464..49e11aee0a1 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala_0_40, gtk3, libxml2, granite, webkitgtk, clutter-gtk +{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk , clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -20,16 +20,16 @@ stdenv.mkDerivation rec { libxml2 ninja pkgconfig - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + pantheon.vala wrapGAppsHook ]; buildInputs = with gst_all_1; [ clutter-gst clutter-gtk - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + pantheon.elementary-icon-theme gnome3.libgee - granite + pantheon.granite gst-plugins-base gst-plugins-good gstreamer diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cb0aa393380..6c68c705b02 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0fghqkc8pkb7waxclm0qq4nlnsvmv9d3fcj5nnvgbfkjyw032q42"; }; betaVersion = { - version = "3.4.0.13"; # "Android Studio 3.4 Beta 4" - build = "183.5304277"; - sha256Hash = "01x7xba0f5js213wgw0h1vw297vwz5q7dprnilcdydfjxwqsbr8f"; + version = "3.4.0.14"; # "Android Studio 3.4 Beta 5" + build = "183.5310756"; + sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq"; }; latestVersion = { # canary & dev - version = "3.5.0.3"; # "Android Studio 3.5 Canary 4" - build = "183.5290690"; - sha256Hash = "0d1cl78b25pksaj0scv3hxb14bjxk3591zbc0v7dykk1gf4pvxd1"; + version = "3.5.0.5"; # "Android Studio 3.5 Canary 6" + build = "183.5326993"; + sha256Hash = "06d43qw0p6zpy6vmriiihql5vgc6c4darplc2148y616hx0whrql"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 1c2e3a42578..f78f7fbf914 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.defaultIconTheme gtk libxml2 + buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 389608ad824..6ae9eb078e2 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.eclipse.org/; inherit description; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 55bbc778e3a..3fa46fc4d92 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -11,7 +11,14 @@ assert stdenv ? glibc; # http://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions -rec { +let + platform_major = "4"; + platform_minor = "10"; + year = "2018"; + month = "12"; + timestamp = "201812060815"; + +in rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib @@ -21,133 +28,43 @@ rec { ### Eclipse CPP - eclipse-cpp = eclipse-cpp-47; # always point to latest - - eclipse-cpp-47 = buildEclipse { - name = "eclipse-cpp-4.7.0"; + eclipse-cpp = buildEclipse { + name = "eclipse-cpp-${platform_major}.${platform_minor}"; description = "Eclipse IDE for C/C++ Developers, Oxygen release"; src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz; - sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz; - sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a"; - } - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - }; - - eclipse-cpp-37 = buildEclipse { - name = "eclipse-cpp-3.7"; - description = "Eclipse IDE for C/C++ Developers"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz; - sha256 = "14ppc9g9igzvj1pq7jl01vwhzb66nmzbl9wsdl1sf3xnwa9wnqk3"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk.tar.gz; - sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b"; - }; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "1f5yr7cydz4iw8c14yn713d44f1g1wkiqiwmb4ikdfx4l70rc5xxsdxv9b4mhm89b02cqnxdh9p5hivkssmnzg0km3ab5bx9mvzgzx7"; + }; }; - eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30 ### Eclipse Modeling - eclipse-modeling = eclipse-modeling-47; # always point to latest - - eclipse-modeling-47 = buildEclipse { - name = "eclipse-modeling-4.7"; + eclipse-modeling = buildEclipse { + name = "eclipse-modeling-${platform_major}.${platform_minor}"; description = "Eclipse Modeling Tools"; src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz; - sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz; - sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206"; - }; - }; - - eclipse-modeling-36 = buildEclipse { - name = "eclipse-modeling-3.6.2"; - description = "Eclipse Modeling Tools (includes Incubating components)"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz; - sha1 = "e96f5f006298f68476f4a15a2be8589158d5cc61"; - } - else - fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk.tar.gz; - sha1 = "696377895bb26445de39d82a916b7e69edb1d939"; - }; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "18psh1lgqg21dmndyc0yr6rz7piqyk861j9mlhgv9xaq8nz11fb6lil594sk64yyv0qbgi98vp03f1p06zvhgs37k9rjkfjmzl7n97k"; + }; }; - eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30 ### Eclipse Platform - eclipse-platform = eclipse-platform-49; # always point to latest - - eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.3a"; - description = "Eclipse Platform Oxygen"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz; - sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz; - sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c"; - }; - }; - }; - - eclipse-platform-48 = buildEclipse { - name = "eclipse-platform-4.8"; - description = "Eclipse Platform Photon"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz; - sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz; - sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b"; - }; - }; - }; - - eclipse-platform-49 = buildEclipse { - name = "eclipse-platform-4.9"; - description = "Eclipse Platform 2018-09"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz; - sha512 = "875714bb411145c917fccedf2f7c4fd2757640b2debf4a18f775604233abd6f0da893b350cc03da44413d7ec6fae3f773ef08634e632058e4b705e6cda2893eb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk.tar.gz; - sha512 = "758bc0de30fa5c4b76b343ea0325611d87b6928ef5002244f2f1ba2a9fa937de89b2a94ce2c8d33d79344fd574d6e8a72c5d127fe416d785f48600e9e85fce86"; - }; - }; + eclipse-platform = buildEclipse { + name = "eclipse-platform-${platform_major}.${platform_minor}"; + description = "Eclipse Platform ${year}-${month}"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; + sha512 = "2zdvbjk05a00lbcad9v30rcr93j03d2pycdhpwrvrakr8z4yrxs6svamq9s294ry1w3lw04pgsnqklw6zjx6iil1kp51f374lkfpxn7"; + }; }; ### Eclipse Scala SDK - eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest - - eclipse-scala-sdk-441 = buildEclipse { + eclipse-scala-sdk = buildEclipse { name = "eclipse-scala-sdk-4.4.1"; description = "Eclipse IDE for Scala Developers"; src = @@ -165,88 +82,26 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-49; # always point to latest - - eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.3a"; - description = "Eclipse Oxygen Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz; - sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz; - sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a"; - }; - }; - }; - - eclipse-sdk-48 = buildEclipse { - name = "eclipse-sdk-4.8"; - description = "Eclipse Photon Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz; - sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz; - sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917"; - }; - }; - }; - - eclipse-sdk-49 = buildEclipse { - name = "eclipse-sdk-4.9"; - description = "Eclipse 2018-09 Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz; - sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk.tar.gz; - sha512 = "b1861bd99c8e43f1d04247226584246aa7844af5e2da820fe98a51018dbe8ff4c25dbb9fa655f56e103f95c0696f40a65dcce13430c63aa080f786738e70eb8b"; - }; - }; - }; - - eclipse-sdk-37 = buildEclipse { - name = "eclipse-sdk-3.7"; - description = "Eclipse Classic"; - sources = { - "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "0nf4nv7awhp1k8b1hjb7chpjyjrqnyszsjbc4dlk9phpjv3j4wg5"; - }; - "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.7.2-201202080800/eclipse-SDK-3.7.2-linux-gtk.tar.gz; - sha256 = "1isn7i45l9kyn2yx6vm88jl1gnxph8ynank0aaa218cg8kdygk7j"; - }; - }; + eclipse-sdk = buildEclipse { + name = "eclipse-sdk-${platform_major}.${platform_minor}"; + description = "Eclipse ${year}-${month} Classic"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; + sha512 = "1kq14vhzcngfhl8kjs722rshny81gxv6wcgln46x7lnpg2274sb9dprhns62fpq97l0355cmg8mnny6fsd1nqibrw09xq932v86cfm8"; + }; }; - eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30 ### Eclipse Java - eclipse-java = eclipse-java-49; - - eclipse-java-49 = buildEclipse { - name = "eclipse-java-4.9.0"; + eclipse-java = buildEclipse { + name = "eclipse-java-${platform_major}.${platform_minor}"; description = "Eclipse IDE for Java Developers"; src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk-x86_64.tar.gz; - sha512 = "9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5"; - } - else if stdenv.system == "i686-linux" then - fetchurl { - url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk.tar.gz; - sha512 = "24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3"; - } - else throw "Unsupported system: ${stdenv.system}"; + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "2xd5q7kg3aly7jnz2fijn06ljmnnd7ggwwzmndfhqwfzxpyjg1lnlln76pcd6chx7gnwdrl7khg0fs566ddabfjv17c46dj5fpw9y6j"; + }; }; ### Environments diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 8a5991cc7cd..4dc4aebe8fd 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.0.1"; + version = "9.6.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.0/${name}.zip"; - sha256 = "0vdx0j9ci533wnk7y17qjvjyqx38hlrdw67z6pi05vfv3r6ys39x"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.6/${name}/${name}.zip"; + sha256 = "08rk3b1va57jcy4s161fx0xmb8dn47akhhxd2f28hspq6i2jqicm"; }; meta = with stdenv.lib; { @@ -497,12 +497,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.9"; + version = "4.10"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip; - sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip; + sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 091635feda6..b8c61bb97af 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 884d1724ef8..17cf213a799 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -2,28 +2,28 @@ let modules = [ - { name = "icicles.el"; sha256 = "0wxak7wh0rrb3h77ay2vypbb53skcfbrv71xkajhax0w12q6zpaj"; } - { name = "icicles-chg.el"; sha256 = "0qavq9vy566l3qi9n8akrqjcgy8n6k0j8d7vsc7p1jhqvvq812gh"; } - { name = "icicles-cmd1.el"; sha256 = "0lgk6ngl9090iqvvw1c227q7p37mr73cc6ap3ky6b0nv3ql8rkyi"; } - { name = "icicles-cmd2.el"; sha256 = "15swxk7fr7wsqpf26xzbvyk12ikkvfcyh9w8wmnpc38dmpyq79rb"; } + { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; } + { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; } + { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; } + { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; } { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "05v7sc2k2mjm1mbnlkpi01aaxnxnb40540y7g70dg534scjd7w36"; } - { name = "icicles-mac.el"; sha256 = "0nhbwswz6xz7q4g8flszgx12q4gi4nx1d3n4jgz6svr2kk2vmlb4"; } - { name = "icicles-mcmd.el"; sha256 = "05dniz6337v9r15w8r2zad0n2h6jlygzjp7vw75vvq8mds0acmia"; } + { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; } + { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; } + { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; } { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } - { name = "icicles-opt.el"; sha256 = "10n4p999ylkapirs75y5fh33lpiyx42i3ajzl2zjfwyr1zksg1iz"; } - { name = "icicles-var.el"; sha256 = "1r5gb01zg8nf2qryq9saxfpnzlymmppsk7w1g09lac35c87vh8yl"; } + { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; } + { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; } ]; forAll = f: map f modules; in stdenv.mkDerivation rec { - version = "2018-07-02"; + version = "2019-02-22"; name = "icicles-${version}"; - srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); + srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); buildInputs = [ emacs ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; meta = { - homepage = http://www.emacswiki.org/emacs/Icicles; + homepage = https://www.emacswiki.org/emacs/Icicles; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; platforms = emacs.meta.platforms; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index bfc6c26ea09..636e24464f8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -60583,7 +60583,7 @@ owner = "immerrr"; repo = "lua-mode"; rev = "99312b8d6c500ba3067da6d81efcfbbea05a1cbd"; - sha256 = "04m9njcpdmar3njjz4x2qq26xk0k6qprcfzx8whlmvapqf8w19iz"; + sha256 = "1gi8k2yydwm1knq4pgmn6dp92g97av4ncb6acrnz07iba2r34dyn"; }; recipe = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -107584,4 +107584,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 99ecddcb264..a8250ead7b4 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; + maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index d9f0b211f15..852faeb7918 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f268a3a104..6f56ba6cf49 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -118,11 +118,22 @@ stdenv.mkDerivation rec { mv nextstep/Emacs.app $out/Applications ''; + postFixup = + let libPath = lib.makeLibraryPath [ + libXcursor + ]; + in lib.optionalString (withX && toolkit == "lucid") '' + patchelf --set-rpath \ + "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ + "$out/bin/emacs" + patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" + ''; + meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 71d0f9450f2..ff6439c8654 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wrapGAppsHook +{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: let version = "3.30.2"; @@ -21,9 +21,9 @@ in stdenv.mkDerivation { intltool ]; - buildInputs = with gnome3; [ + buildInputs = [ amtk - defaultIconTheme + gnome3.adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix new file mode 100644 index 00000000000..532bb99e7d8 --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: + +let + pname = "kdev-php"; + version = "5.3.1"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; + sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; + }; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; + + meta = with lib; { + maintainers = [ maintainers.aanderse ]; + platforms = platforms.linux; + description = "PHP support for KDevelop"; + homepage = https://www.kdevelop.org; + license = [ licenses.gpl2 ]; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix new file mode 100644 index 00000000000..be27e10f42a --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: + +let + pname = "kdev-python"; + version = "5.3.1"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; + sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; + }; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + "-DPYTHON_EXECUTABLE=${python}/bin/python" + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; + + meta = with lib; { + maintainers = [ maintainers.aanderse ]; + platforms = platforms.linux; + description = "Python support for KDevelop"; + homepage = https://www.kdevelop.org; + license = [ licenses.gpl2 ]; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index a35bd14f310..98154b4a5eb 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -43,6 +43,13 @@ mkDerivation rec { "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" ]; + postPatch = '' + # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged + substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \ + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {' + ''; + postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/editors/kdevelop5/wrapper.nix new file mode 100644 index 00000000000..86d3de9eb39 --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/wrapper.nix @@ -0,0 +1,7 @@ +{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: + +symlinkJoin { + name = "kdevelop-with-plugins"; + + paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); +} diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index a95ced76371..6a3f581c4e8 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) - neovim (0.7.0) - msgpack (~> 1.0) + neovim (0.8.0) + msgpack (~> 1.1) multi_json (~> 1.0) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index af887161ea6..28a53cc590f 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; + sha256 = "07scrdfk7pyn5jgx5m2yajdqpbdv42833vbw568qqag6xp99j3yk"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; } diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index b9fe90be9fb..82bcc403164 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -1,39 +1,36 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3 -, granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3 -, discount, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, meson, ninja, python3 +, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon +, libgee, discount, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "quilter"; - version = "1.6.8"; - - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "07i9pivpddgixn1wzbr15gvzf0n5pklx0gkjjaa35kvj2z8k31x5"; + sha256 = "0dqji6zwpn0k89mpmh10rq59hzrq8kqr30dz1hp06ygk8rlnv2ys"; }; nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ discount - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged - gnome3.libgee - granite gtk3 gtksourceview gtkspell3 + libgee + pantheon.elementary-icon-theme + pantheon.granite webkitgtk ]; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index ef0d98455f2..142b6fbd142 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.10"; + version = "0.9.12"; src = fetchFromGitHub { - sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; + sha256 = "0zlm1jjk91cbrphrilpvxhbm26bbmgy10n7hd0fb1ml8q70q34s3"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d9bca530948..454b7ad554b 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, runtimeShell }: let - version = "2.3.12"; + version = "3.0.6"; plat = { "i386-linux" = "i386"; @@ -9,8 +9,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0q7izk20r14kxn3n4pn92jgnynfnlnylg55brz8n1lqxc0dc3v24"; - "x86_64-linux" = "0myg4qv0vrwh8s9sckb12ld9f86ymx4yypvpy0w5qn1bxk5hbafc"; + "i386-linux" = "0czhlbacjks9x8y2w46nzlvk595psqhqw0vl0bvsq7sz768dk0ni"; + "x86_64-linux" = "0haji9h8rrm9yvqdv6i2y6xdd0yhsssjjj83hmf6cb868lwyigsf"; }.${stdenv.hostPlatform.system}; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share} cp $src $out/share/standardNotes.AppImage - echo "#!/bin/sh" > $out/bin/standardnotes + echo "#!${runtimeShell}" > $out/bin/standardnotes echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage ''; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index cf6802eb9a9..937764f0ab8 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ {buildVersion, x32sha256, x64sha256}: -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash}: @@ -115,7 +115,7 @@ in stdenv.mkDerivation (rec { mkdir -p $out/bin cat > $out/bin/subl <<-EOF - #!/bin/sh + #!${runtimeShell} exec $sublime/sublime_text "\$@" EOF chmod +x $out/bin/subl diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index ba68a5420a8..5f87aad8a87 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromBitbucket, python3 }: +{ stdenv, fetchFromGitHub, python3 }: with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.0.5"; + version = "3.1.2"; - src = fetchFromBitbucket { - owner = "plas"; + src = fetchFromGitHub { + owner = pname; repo = pname; - rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03"; - sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5"; + rev = "v${version}"; + sha256 = "1simqqxm72k5zhavhllkinsyw8ggy6fjs5ppj82g3l5g3919pfna"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,6 +21,7 @@ buildPythonApplication rec { pylint mypy pyperclip + asttokens ]; preInstall = '' diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7ee28adfa47..3b75d08787e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -7,6 +7,7 @@ , vimPlugins , makeWrapper , wrapGAppsHook +, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -157,22 +158,22 @@ in stdenv.mkDerivation rec { rewrap () { rm -f "$out/bin/$1" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" chmod a+x "$out/bin/$1" } - rewrap ex -e - rewrap view -R - rewrap gvim -g - rewrap gex -eg - rewrap gview -Rg - rewrap rvim -Z - rewrap rview -RZ - rewrap rgvim -gZ + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ rewrap rgview -RgZ rewrap evim -y rewrap eview -yR - rewrap vimdiff -d + rewrap vimdiff -d rewrap gvimdiff -gd ''; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 596570092a9..5210af4df7a 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libconfig, - gtkmm2, glibmm, libxml2, libsecret, curl, libzip, - librsvg, gst_all_1, autoreconfHook, makeWrapper, - useUnrar ? false, unrar +{ config, stdenv, fetchFromGitHub, pkgconfig, libconfig +, gtkmm2, glibmm, libxml2, libsecret, curl, libzip +, librsvg, gst_all_1, autoreconfHook, makeWrapper +, useUnrar ? config.ahoviewer.useUnrar or false, unrar }: assert useUnrar -> unrar != null; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 848f132060f..09664889f35 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre}: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "alchemy-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share cp -a . $out/share/alchemy cat >> $out/bin/alchemy << EOF - #!/bin/sh + #!${runtimeShell} cd $out/share/alchemy ${jre}/bin/java -jar Alchemy.jar "$@" EOF diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 2e7435b48bb..0257a109568 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -4,19 +4,19 @@ }: let - gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059"; + gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation rec { name = "antimony-${version}"; - version = "2018-07-17"; + version = "2018-10-20"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl"; + sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4"; }; patches = [ ./paths-fix.patch ]; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 7af7c8986f2..cc08dce906c 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, callPackage, libpng12, imagemagick, - autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }: +{ stdenv, fetchurl, callPackage, libpng12, imagemagick +, autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin +, runtimeShell }: # TODO: Figure out why the resultant binary is somehow linked against # libpng16.so.16 rather than libpng12. @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { # pstoedit-config no longer exists, it was replaced with pkg-config mkdir wrappers cat >wrappers/pstoedit-config <<'EOF' - #!${stdenv.shell} + #!${runtimeShell} # replace --version with --modversion for pkg-config args=''${@/--version/--modversion} exec pkg-config pstoedit "''${args[@]}" diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 7777be91897..962940d076b 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ + libPath = stdenv.lib.makeLibraryPath (with xorg; [ stdenv.cc.cc.lib gdk_pixbuf glib diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index d45d6c3a62e..cf5ecfdd043 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; - buildInputs = with pythonPackages; [ pytest responses ]; + checkInputs = with pythonPackages; [ pytest responses ]; propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; disabled = pythonPackages.pythonOlder "3.3"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 9ef70dff766..6fdc4f741ac 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0qjhlrgr606gc9h96w9piyd13mx63jqfbxxnan41nrh76m8d0dka"; + sha256 = "1vsnxf4as3vyzjfhd8frzb1a8i7wnq7ck5ljx7qxqrnfqvxl1s4z"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix new file mode 100644 index 00000000000..87c161b9aee --- /dev/null +++ b/pkgs/applications/graphics/fondo/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "fondo"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "calo001"; + repo = pname; + rev = version; + sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc"; + }; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gtk3 + json-glib + libgee + libsoup + libunity + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Find the most beautiful wallpapers for your desktop"; + homepage = https://github.com/calo001/fondo; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index e8f831a21c2..e88c9222b87 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, + glib, gtk3, gsettings-desktop-schemas, libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, flex, wrapGAppsHook, shared-mime-info }: @@ -16,10 +17,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; - buildInputs = with gnome3; [ - glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ + glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain - librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme + librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 25095f04d01..1729f3c5cda 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { - name = "inkscape-0.92.3"; + name = "inkscape-0.92.4"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2"; - sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; + sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p"; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 44855d5c8b4..bce2e882698 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; + # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory + enableParallelBuilding = false; # true by default due to qmake + doCheck = false; meta = { diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 9839bb74077..cf13c6fb05e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.5.2"; + version = "5.6.0"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; + sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 03cac9114af..354e9725a43 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas libraw json-glib glib gdk_pixbuf librsvg gnome3.rest - gcr gnome3.defaultIconTheme libgdata + gcr gnome3.adwaita-icon-theme libgdata ]; postPatch = '' diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 94666531c0c..d0f2a48c589 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, unzip, jre }: +{ stdenv, fetchurl, makeDesktopItem, unzip, jre, runtimeShell }: stdenv.mkDerivation rec { name = "swingsane-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let execWrapper = '' - #!/bin/sh + #!${runtimeShell} exec ${jre}/bin/java -jar $out/share/java/swingsane/swingsane-${version}.jar "$@" ''; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 63d35cc5453..b399dd2d228 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool, autoreconfHook, which, defaultIconTheme +, imagemagick, intltool, autoreconfHook, which, gnome3 }: let @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which defaultIconTheme + synfig which gnome3.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index e790ef49acb..5fc7e309f4d 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, hicolor-icon-theme, defaultIconTheme +, hicolor-icon-theme, gnome3 # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; + buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index ed3220d2bf9..891f3586fa5 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, erlang, cl, libGL, libGLU }: +{ fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { name = "wings-2.2.1"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp ebin/* $out/lib/${name}/ebin cp -R textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings - #!/bin/sh + #!${runtimeShell} ${erlang}/bin/erl \ -pa $out/lib/${name}/ebin -run wings_start start_halt "$@" EOF @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 03ffa8af370..ac3d303a7a6 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jre, unzip}: +{ stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { version = "0.9.0"; pname = "zgrviewer"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r target/* "$out/share/java/zvtm/" - echo '#!/bin/sh' > "$out/bin/zgrviewer" + echo '#!${runtimeShell}' > "$out/bin/zgrviewer" echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0..b9b318e75c3 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -124,6 +124,7 @@ let kmbox = callPackage ./kmbox.nix {}; kmime = callPackage ./kmime.nix {}; kmix = callPackage ./kmix.nix {}; + kmplot = callPackage ./kmplot.nix {}; kolourpaint = callPackage ./kolourpaint.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 3b01e497039..6f6acd1e8bb 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.12.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.12.1/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix new file mode 100644 index 00000000000..c0c00f21340 --- /dev/null +++ b/pkgs/applications/kde/kmplot.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools +, kcrash, kguiaddons, ki18n, kparts, kwidgetsaddons, kdbusaddons +}: + +mkDerivation { + name = "kmplot"; + meta = { + license = with lib.licenses; [ gpl2Plus fdl12 ]; + maintainers = [ lib.maintainers.orivej ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcrash kguiaddons ki18n kparts kwidgetsaddons kdbusaddons + ]; +} diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 75e72c0ba18..64179f2e64d 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -3,7 +3,7 @@ , kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n , kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons , kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts -, qtx11extras, qtgraphicaleffects, xorg +, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg }: @@ -19,7 +19,8 @@ kconfig kconfigwidgets kcoreaddons kdeclarative ki18n kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts - qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb + qtx11extras qtgraphicaleffects qtxmlpatterns + xorg.libxkbfile xorg.libxcb ]; enableParallelBuilding = true; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index efe850ab414..cd98d56b86d 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -2,17 +2,17 @@ , lib, extra-cmake-modules, gettext, python , drumstick, fluidsynth , kcoreaddons, kcrash, kdoctools -, qtquickcontrols2, qtsvg, qttools +, qtquickcontrols2, qtsvg, qttools, qtdeclarative }: mkDerivation { name = "minuet"; meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg HaoZeke ]; }; - nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python qtdeclarative ]; propagatedBuildInputs = [ drumstick fluidsynth diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index b691902e133..1efdd3e6123 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-18.12.0.tar.xz"; - sha256 = "1c3frrfkcpr01684c1fkrwxbnzb7ipvwncm0jf5nb4d0waiv8q08"; - name = "akonadi-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz"; + sha256 = "141j1wicfl8lgwdgs8yh0mcs4gw004wz8ck21pz55xc1mi4yh9cx"; + name = "akonadi-18.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-calendar-18.12.0.tar.xz"; - sha256 = "0amp79x3jwib7f0a8ksv96prb1mhfhpp475k09ryz7c054lmj1ys"; - name = "akonadi-calendar-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz"; + sha256 = "108ax9bpng5qp3cbn3f2x096l9jsv0x3d8xckcfvd4a3svgap1ri"; + name = "akonadi-calendar-18.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-calendar-tools-18.12.0.tar.xz"; - sha256 = "0w2ng8lfy3cib49c0warqh0k43q17bfmkq3g4rjkwri9cqdqrahp"; - name = "akonadi-calendar-tools-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz"; + sha256 = "0a54jka0szi3d2dv4kr7s78lbm1sx6a47mccjzc2rp1w2x8dkagl"; + name = "akonadi-calendar-tools-18.12.1.tar.xz"; }; }; akonadiconsole = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadiconsole-18.12.0.tar.xz"; - sha256 = "1qg889g1a1c5iwvwdwz8ygkj59v46yfk5cwpkf8q1jldjdxkrib5"; - name = "akonadiconsole-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz"; + sha256 = "06mhpk66ck37k6bfi83cmnjv39lwvm245m0climh1idfi6mn08wk"; + name = "akonadiconsole-18.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-contacts-18.12.0.tar.xz"; - sha256 = "0cn50nyrahb6pzshd35pc0issgiwg0r7j96xkmaxdigg9agjz9rn"; - name = "akonadi-contacts-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz"; + sha256 = "1lnqq2qalvzq6g4dwfnlgvrz9wpnl4g64is8ylrb6jf4bvfg3kvq"; + name = "akonadi-contacts-18.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-import-wizard-18.12.0.tar.xz"; - sha256 = "1s477z6vb9qqz4q8bwprznn11fjjq0a6xfdmif6x0z30qrddllfd"; - name = "akonadi-import-wizard-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz"; + sha256 = "09r5nspv1l8i1ipjxn5xwi6swkggy10hsa8p5bj0qqclsf17ip5j"; + name = "akonadi-import-wizard-18.12.1.tar.xz"; }; }; akonadi-mime = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-mime-18.12.0.tar.xz"; - sha256 = "1w974gn81gyrp3m5r2l8jx7xrq610mhmmn005wqfl7ac1n3s65ln"; - name = "akonadi-mime-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz"; + sha256 = "0fyxls0qhvqcbhpw17vhr8m4h94s2d69c8bpf45k19f005gbb6dk"; + name = "akonadi-mime-18.12.1.tar.xz"; }; }; akonadi-notes = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-notes-18.12.0.tar.xz"; - sha256 = "0b233nw7jcr4dnlfnnymwrm9my47a4mdmdbp9qsp2rmlzwddplvw"; - name = "akonadi-notes-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz"; + sha256 = "1m2v3qj06pbpdncxcb37131q6xhbsrwp6qv72rmlwlj0cj7xyfl4"; + name = "akonadi-notes-18.12.1.tar.xz"; }; }; akonadi-search = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akonadi-search-18.12.0.tar.xz"; - sha256 = "1kg8q5jkzcc4vndc8l2q7hvkjkdw2v5500pjw8pszwifzmi5klln"; - name = "akonadi-search-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz"; + sha256 = "1wwv92kmk4kwr8dj7y34nb2337s80hwnjblnfz4kl3z3ka782gd6"; + name = "akonadi-search-18.12.1.tar.xz"; }; }; akregator = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/akregator-18.12.0.tar.xz"; - sha256 = "03968pcpvggn19721x89wn7d1n757xdk22f4rvxqq4d6qqh2myhd"; - name = "akregator-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz"; + sha256 = "0zjc6vgf5pdbmj7b3kl15aqkamg5slaxd5n4092pf7nf3v3r74r9"; + name = "akregator-18.12.1.tar.xz"; }; }; analitza = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/analitza-18.12.0.tar.xz"; - sha256 = "0g8iz69cq2gc0qsraaqji8h7z1wcqq1baic4x7158q3xkrc7hg1f"; - name = "analitza-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz"; + sha256 = "0iwlkxcqj62l25ldpa325ymkvhim2mm152h3jqh3z1sc683hc1kv"; + name = "analitza-18.12.1.tar.xz"; }; }; ark = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ark-18.12.0.tar.xz"; - sha256 = "16nmi8a9j4s00m4dnh4l7kcz1vjaqpcq1ilr0iv6wglpn3sycl1g"; - name = "ark-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ark-18.12.1.tar.xz"; + sha256 = "1pcaaq8qdj3w15f0zqfwy7xwknpmb70yc7g4nmj4p48ahq5s2r86"; + name = "ark-18.12.1.tar.xz"; }; }; artikulate = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/artikulate-18.12.0.tar.xz"; - sha256 = "187qwl9adrggbkf6dyw12pmmxxxbjcp2swxbyvmqx10dca2pgbgn"; - name = "artikulate-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz"; + sha256 = "17msfgq83iy5dfl5qkmj4f89aa2gbk7p00f7bwiz2fnlg642wyq1"; + name = "artikulate-18.12.1.tar.xz"; }; }; audiocd-kio = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/audiocd-kio-18.12.0.tar.xz"; - sha256 = "044ksczgc5k6ai1inmxqpibvcigjvxbqpf6n6irgl1jgavmxdpim"; - name = "audiocd-kio-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz"; + sha256 = "0kv03d2w0vf9fpp89ymnkizzyhckz9pjj8fcqwbacb78k6p52g6p"; + name = "audiocd-kio-18.12.1.tar.xz"; }; }; baloo-widgets = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/baloo-widgets-18.12.0.tar.xz"; - sha256 = "1sq70l529dg2ww8pcksnbbmgh1wi1baj69adakqiacxi5v893clg"; - name = "baloo-widgets-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz"; + sha256 = "0axgx1zrbaki20vh9j9bd0h3qvn0ws4cza8smlgvlzx7fkbidmw3"; + name = "baloo-widgets-18.12.1.tar.xz"; }; }; blinken = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/blinken-18.12.0.tar.xz"; - sha256 = "1dnp14g20a7gqy3zcysa7pxrj38zqxhgpyd4nxpdj6lzjgh2p7hx"; - name = "blinken-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz"; + sha256 = "0ka47snqj1xwf8m1qqa1vxgjwm151dzlk22zg07yh987qgc6fbj2"; + name = "blinken-18.12.1.tar.xz"; }; }; bomber = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/bomber-18.12.0.tar.xz"; - sha256 = "1vjvajbra1m4zjbijn1nxj5x66hyv8q65874b3ajshb3lmv7rklj"; - name = "bomber-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz"; + sha256 = "0a5vvb2ka08lyvybr12gm3lfgvfj3r99kqw1prhr9n97w7f8yc1d"; + name = "bomber-18.12.1.tar.xz"; }; }; bovo = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/bovo-18.12.0.tar.xz"; - sha256 = "1fslwk3zbxi16b1m7w7rbf8bgdhflnqrd6k90lpbwvlnxy6839iw"; - name = "bovo-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz"; + sha256 = "19w4xfqx6bxs8fr8vkma57ibl5b1jdqfjax240fg81qyqzkx4xsp"; + name = "bovo-18.12.1.tar.xz"; }; }; calendarsupport = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/calendarsupport-18.12.0.tar.xz"; - sha256 = "180qzjlx0y4cfasmrf06ah8jdckbym1wrbmqlpyzjfy55mkwyf40"; - name = "calendarsupport-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz"; + sha256 = "0hpq85wh94dlmrfabh1k76xdc9xqavfccjnfy20i71q2ml92gx4p"; + name = "calendarsupport-18.12.1.tar.xz"; }; }; cantor = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/cantor-18.12.0.tar.xz"; - sha256 = "0isddvdd8gvaasigyj3njyl7ckcqc8ciqp82awlland3avll6rby"; - name = "cantor-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz"; + sha256 = "132zlpcqkbjdb1vrcy6innf6qmxlqibzpf0bgdi33q797vw63drc"; + name = "cantor-18.12.1.tar.xz"; }; }; cervisia = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/cervisia-18.12.0.tar.xz"; - sha256 = "1r55zjfvlh5by9cv6pzcsbz71igbjr1pvyiyjkdhc36sbaiv0r3x"; - name = "cervisia-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz"; + sha256 = "02ka1crhkb3dka3qp82vs624fz3hcwydm559x5dq0cdbibdmhqx7"; + name = "cervisia-18.12.1.tar.xz"; }; }; dolphin = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/dolphin-18.12.0.tar.xz"; - sha256 = "10mzdk9i5x4kmsrpamm5q9ihy8ymii9w3iaccd7fgw4yy11qlzw3"; - name = "dolphin-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz"; + sha256 = "1d3m2h8czxqmgpd060lnj05f0r4bqirqibvbakrl1sv2xxafz8qq"; + name = "dolphin-18.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz"; - sha256 = "07pkslxhawl03030zjy889zjbym13d94nllg9fxvmd3402y2djiw"; - name = "dolphin-plugins-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz"; + sha256 = "0j2cj91732p2wh0g73xxjghbbivlva4mr91vdjrp6dkc4b2vjxh8"; + name = "dolphin-plugins-18.12.1.tar.xz"; }; }; dragon = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/dragon-18.12.0.tar.xz"; - sha256 = "0j3d8a97ymh9lm6al0vv3abxalfw3wnf689i3mzkg7bdqkaaxz24"; - name = "dragon-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz"; + sha256 = "0ffxpl30xdm5vgrfc6b1k2gzfp3jwakn6my4zq0zfrrlf75hbgkm"; + name = "dragon-18.12.1.tar.xz"; }; }; eventviews = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/eventviews-18.12.0.tar.xz"; - sha256 = "0r3y3z8zzzs1154wqi16kwb7vjijphscsnna76hpxcllw23cnb7v"; - name = "eventviews-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz"; + sha256 = "0qvndqj8jhrn9p1g4d4p3l54d7hz9zzkkg92yfjcajcrnl2i0fn1"; + name = "eventviews-18.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ffmpegthumbs-18.12.0.tar.xz"; - sha256 = "0wwrhj6xblz96g1rpqds4m0savp9n08w1xlwlhrm9xq81kajpw5x"; - name = "ffmpegthumbs-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz"; + sha256 = "0j9vwqgsb9pz8hpacsmm4pxss25q7622fr7gq1n2dxf19f1zwxki"; + name = "ffmpegthumbs-18.12.1.tar.xz"; }; }; filelight = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/filelight-18.12.0.tar.xz"; - sha256 = "1vayrsgs5q1ky34kx5a8fi198b57478w68641xwhxmzwllssd9sx"; - name = "filelight-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz"; + sha256 = "1p9k1ajyjlb001mz8w8jli3ha84z91sc43721xdpngcshz7i8i6f"; + name = "filelight-18.12.1.tar.xz"; }; }; granatier = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/granatier-18.12.0.tar.xz"; - sha256 = "145z4h7vwmg2zlvncp5dijm06m1d0z20hlmlz2zd69nfvs8w1lmz"; - name = "granatier-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz"; + sha256 = "02lmap2axki56d3kfhmx7h6ibqjnx5ga73vsvvx1w4fjikgzm2rn"; + name = "granatier-18.12.1.tar.xz"; }; }; grantlee-editor = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/grantlee-editor-18.12.0.tar.xz"; - sha256 = "0h5hcsnkh8gkqcnn620zs4kni5k8cpr65nbkkxybgxjf3kljapin"; - name = "grantlee-editor-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz"; + sha256 = "0r85wirr4dcvja5cynjb0n51lmlijkffg35czqpjvnf2xv1claj4"; + name = "grantlee-editor-18.12.1.tar.xz"; }; }; grantleetheme = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/grantleetheme-18.12.0.tar.xz"; - sha256 = "1k5q30viyvwx4c8nl5gxk2sqxd9l703n6fnxw5dz5q7hzsxykzzx"; - name = "grantleetheme-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz"; + sha256 = "1c4n27abzpynh6nykfw9z2rhxlmmicvvw0081gsm9h7w1r8n4flc"; + name = "grantleetheme-18.12.1.tar.xz"; }; }; gwenview = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/gwenview-18.12.0.tar.xz"; - sha256 = "1p9g6q5bfaxbk60k91wbjhbv0wwzin5ai3hyasl7rg3c6hisp2rf"; - name = "gwenview-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz"; + sha256 = "01iraiynpsacp8hnmdc9cxlk6qakbbypdck939kcij6j7gm5l2fm"; + name = "gwenview-18.12.1.tar.xz"; }; }; incidenceeditor = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/incidenceeditor-18.12.0.tar.xz"; - sha256 = "0f313zw1n4dgaianmxnmd5d5bqad40izli20ab08lqhv9d03sdkh"; - name = "incidenceeditor-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz"; + sha256 = "1h1da8vg9x450hm9g936rms6n9d5ddqdl7jrwah3khbzihjpkgvz"; + name = "incidenceeditor-18.12.1.tar.xz"; }; }; juk = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/juk-18.12.0.tar.xz"; - sha256 = "1jsxvcqpj87n6yv2v0a7rvmg832ayrk0fknmch04gc8bkb7w52az"; - name = "juk-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/juk-18.12.1.tar.xz"; + sha256 = "14zlpac1z3gaym83d5vmr7vvqwdzxhfscydwb2qv4ng947lrrs1n"; + name = "juk-18.12.1.tar.xz"; }; }; k3b = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/k3b-18.12.0.tar.xz"; - sha256 = "1fmy94cda1nsqv5g4w3bnypx9c8ngrndbzf6l7l2pv5q889p73x1"; - name = "k3b-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz"; + sha256 = "1f5l8jyi30qm225nxp0sahm7lwdk9r2gqzbdrrzhadx6gfm80a4s"; + name = "k3b-18.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kaccounts-integration-18.12.0.tar.xz"; - sha256 = "1wyjd7iv0z8q9adbgnkvwmz4zrhrz3wgkz0lp52i8j0511xby93r"; - name = "kaccounts-integration-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz"; + sha256 = "1mb9rfp7vw9bkndlbwh5ayd9m3znwrl1i6kr0s5872sscmhx2giz"; + name = "kaccounts-integration-18.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kaccounts-providers-18.12.0.tar.xz"; - sha256 = "03kjjshbxgj1mj8vv60rbssn3kdf3gx9kqmgsbbwybxg46277w1r"; - name = "kaccounts-providers-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz"; + sha256 = "0pjk7wsqbgibx8racd4qikv3i1j4iqgnbp81mm5nss7hilrnv1vi"; + name = "kaccounts-providers-18.12.1.tar.xz"; }; }; kaddressbook = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kaddressbook-18.12.0.tar.xz"; - sha256 = "0dfmwn6swa6m11ih52aj2r8zfma6jffy8gsqhaph4xg4ba58nmpj"; - name = "kaddressbook-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz"; + sha256 = "0n4abjcq2iana9xyzkghgrs6h9nr0k2vxqrxghnh5iqahn2766ak"; + name = "kaddressbook-18.12.1.tar.xz"; }; }; kajongg = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kajongg-18.12.0.tar.xz"; - sha256 = "0k9nxcr2fpkrmckzc5fxani4l304fxj7kp80y2nrv1p5cagn2x7l"; - name = "kajongg-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz"; + sha256 = "11c1iyfwqjqihyb3lqvnrb9jsrah0wl1kbrbm2lbmaqf0qnqqr8a"; + name = "kajongg-18.12.1.tar.xz"; }; }; kalarm = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kalarm-18.12.0.tar.xz"; - sha256 = "1cmk6l8450sz3rfdk25p9dn26zcbhcrdwz9v242cpsndyvnl13i2"; - name = "kalarm-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz"; + sha256 = "1z2rf30ad2rlkcc9ki09pkrvdd8b9f60vsjzvsqfgxx8i87z1lil"; + name = "kalarm-18.12.1.tar.xz"; }; }; kalarmcal = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kalarmcal-18.12.0.tar.xz"; - sha256 = "0l90yxfkjwybff80z7zhgx4sbw7xz8nx0acg56avgrkh3230fv3i"; - name = "kalarmcal-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz"; + sha256 = "0wykbg24llympx7m9bkf4aciv6pli359nnnzpli7rh4q58vbnfn7"; + name = "kalarmcal-18.12.1.tar.xz"; }; }; kalgebra = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kalgebra-18.12.0.tar.xz"; - sha256 = "0hc3k4zm50n39nvw6fki6997vzz56fwjkn61q48fkbzd4jvcfqni"; - name = "kalgebra-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz"; + sha256 = "09g4v4f2xlilqrf2aqsz7zbjqnnrndhhlkkwbrypn148gdnxngs4"; + name = "kalgebra-18.12.1.tar.xz"; }; }; kalzium = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kalzium-18.12.0.tar.xz"; - sha256 = "0j3a3r1j4vc0ssdw60lvgkdwmh02zz07xakdgxr5jrys4fix23ci"; - name = "kalzium-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz"; + sha256 = "1c5li3dhrfiw7kpjv6kfby2c2pq22sraqb3vc0s4nz1h9jnjcah7"; + name = "kalzium-18.12.1.tar.xz"; }; }; kamera = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kamera-18.12.0.tar.xz"; - sha256 = "098gg2v8bina5famp2bk0x8dakzz66zd0dxh8vjczjycvzac6hzd"; - name = "kamera-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz"; + sha256 = "177lgyhc5klrpssbk2bsdwmg5hnk92mbjwb7s39kl9h53kw0jmzj"; + name = "kamera-18.12.1.tar.xz"; }; }; kamoso = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kamoso-18.12.0.tar.xz"; - sha256 = "0f4hvbw216xmyavgakvydplcspqcyv1v9bv0pqvwdk1swk1jp0r3"; - name = "kamoso-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz"; + sha256 = "1j467cpga2shvibwx3df4vxksfkp5q1hp6az8kcky6gljcmxy06p"; + name = "kamoso-18.12.1.tar.xz"; }; }; kanagram = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kanagram-18.12.0.tar.xz"; - sha256 = "1xbb04i06qrffb6pxk05ksn8h1n08r9pyaf9nkhrymgv90l62739"; - name = "kanagram-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz"; + sha256 = "0ybn3aal51p29g28daalwmpm85306ivgl8rkxhccq7pzfwaww1bx"; + name = "kanagram-18.12.1.tar.xz"; }; }; kapman = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kapman-18.12.0.tar.xz"; - sha256 = "0shq8bjfixjx9gqid27cgiybx0anwgbm69gsrvlczmragswcqxwi"; - name = "kapman-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz"; + sha256 = "117fkqhn0mg3z14sl64vmkz26rclfrjarf7kvxicvbw0x8s3vsgj"; + name = "kapman-18.12.1.tar.xz"; }; }; kapptemplate = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kapptemplate-18.12.0.tar.xz"; - sha256 = "18q7lxkfim41lhzqwvv4ir2c45fhf9pxxajfwibg9a462b1jxk4a"; - name = "kapptemplate-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz"; + sha256 = "1q52d30zz1ip6x8z56i25ll8hgzd6fp4pckfgr6byh82ymck8kxa"; + name = "kapptemplate-18.12.1.tar.xz"; }; }; kate = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kate-18.12.0.tar.xz"; - sha256 = "15k66vipm1lqcmk73a44niz1279rkab3g23p9jqyvvbw41j1368l"; - name = "kate-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kate-18.12.1.tar.xz"; + sha256 = "0p9j9r2ffqh6p5pdxhk1pi8km1ypdsjs1h0g4ncnzwpvkir1rhk7"; + name = "kate-18.12.1.tar.xz"; }; }; katomic = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/katomic-18.12.0.tar.xz"; - sha256 = "183pgb7pphzmi3lgza4lm5crzf9rs6l2d6fl1xwzvvb3ik77ccqz"; - name = "katomic-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz"; + sha256 = "0pxj8vgx3ijvyznn5gvhv2scwbqhaqc2pmq2897b190vsx9mvkh6"; + name = "katomic-18.12.1.tar.xz"; }; }; kbackup = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kbackup-18.12.0.tar.xz"; - sha256 = "1qwrgrrd408y7ipqfhajqfwcicn7pb32akvbls3rby17b2nwn16x"; - name = "kbackup-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz"; + sha256 = "0x42d7zssddhxdsx7vpvk4630c69pvllpfz40dqk2n3hghx9xvsw"; + name = "kbackup-18.12.1.tar.xz"; }; }; kblackbox = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kblackbox-18.12.0.tar.xz"; - sha256 = "0hx5bd97k1k4hdyal6g7r7y1xk70sf0779vxfqnin1dpzhgnq2dq"; - name = "kblackbox-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz"; + sha256 = "1wlwdfh23h175gsflmfmr63myds9vz3cs5dp8gr2zlxssdhc2s1p"; + name = "kblackbox-18.12.1.tar.xz"; }; }; kblocks = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kblocks-18.12.0.tar.xz"; - sha256 = "0f0mapx67gxiy5s9k60qhgc9sfr21hwy62wzdiw4ssbxfhhqv7fa"; - name = "kblocks-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz"; + sha256 = "1fzsyr8g536k54j3lgqr52a1cmcdmv85z11afhkz2186smnc63pa"; + name = "kblocks-18.12.1.tar.xz"; }; }; kblog = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kblog-18.12.0.tar.xz"; - sha256 = "1slrwablxhsjzl3vj714rzm7rp59vnd9d0ri0k7yvc1ykc4aj8v6"; - name = "kblog-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz"; + sha256 = "0zdqjgan05049md0483l4c27gfwqdzmmx7wv3bziy91kd9bmfv0x"; + name = "kblog-18.12.1.tar.xz"; }; }; kbounce = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kbounce-18.12.0.tar.xz"; - sha256 = "1r5rhlra9p89wn4mmjn81v7lgh78k53xfzhr0sz08dhg7qk2rb48"; - name = "kbounce-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz"; + sha256 = "1209x02jip17n63ilvbi5knz4584k16c6zbrp8rg982qcabny355"; + name = "kbounce-18.12.1.tar.xz"; }; }; kbreakout = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kbreakout-18.12.0.tar.xz"; - sha256 = "0bw84bl2r9am69zv0ik1rhqwcjzazfzwnwjg0zqzzwlyhww0ya5f"; - name = "kbreakout-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz"; + sha256 = "0myh4qncrvm2kd2gwvl7v2078cvv66czl9zsiava8lzq588wddwq"; + name = "kbreakout-18.12.1.tar.xz"; }; }; kbruch = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kbruch-18.12.0.tar.xz"; - sha256 = "156varmig28a3swk099k2c2l0hn8kbr1khz5cd9c9wdy46ln6w8n"; - name = "kbruch-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz"; + sha256 = "0jlq08c6zjmdalhbgh2fy5qghj65l12jn7wvr0j2h0s6fqck1djh"; + name = "kbruch-18.12.1.tar.xz"; }; }; kcachegrind = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcachegrind-18.12.0.tar.xz"; - sha256 = "1jvpn2ly2pn9pnv6zx7i8z0zn91lb2kf6q9linqmpag47qbg0p7y"; - name = "kcachegrind-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz"; + sha256 = "0w7fdsflqmkisap6mr805b6knf83nrjrr6bxi1snrl43ipy5ls29"; + name = "kcachegrind-18.12.1.tar.xz"; }; }; kcalc = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcalc-18.12.0.tar.xz"; - sha256 = "15wdyv5sgnd9amar41k14mgyz8p4d1aba0kw7gphzl7c9gms0y70"; - name = "kcalc-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz"; + sha256 = "0ffafikh53yfwrsaiyxr4qxy01v8lv02y4xvj56qmhi429j9ax93"; + name = "kcalc-18.12.1.tar.xz"; }; }; kcalcore = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcalcore-18.12.0.tar.xz"; - sha256 = "04y7bdrdcbz98waydi9r5hw25mdzy8a0pzzdsmp2ky2lj4shph4h"; - name = "kcalcore-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz"; + sha256 = "1383zmpw8nzx1fs3d55k38f3znbdc7rs21yrka6fmymgh5c3jkki"; + name = "kcalcore-18.12.1.tar.xz"; }; }; kcalutils = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcalutils-18.12.0.tar.xz"; - sha256 = "1w10np6g02f3hh3bn3zksbj335mrzy0a5wg4lk2hny06rakk0hh0"; - name = "kcalutils-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz"; + sha256 = "0w6kc39j3m5db8s47q4wh4wm0szl9vwr455i26d99vv8jay6mbpp"; + name = "kcalutils-18.12.1.tar.xz"; }; }; kcharselect = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcharselect-18.12.0.tar.xz"; - sha256 = "0s4yqylc5jhgl7s3cs8gf8bb4r7n8nhxhl502sbnamss11lx7gqw"; - name = "kcharselect-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz"; + sha256 = "1p4ap7vs1nd9gr4z71h6cx6fz99k1lliz28ibbky9a60wvnlfim6"; + name = "kcharselect-18.12.1.tar.xz"; }; }; kcolorchooser = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcolorchooser-18.12.0.tar.xz"; - sha256 = "0za9isapgmbafmn5v6fwdw1vaafszwnia1iim9k4ga7bs9aakfhb"; - name = "kcolorchooser-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz"; + sha256 = "1lhnnywpfb4v1hwlc8h71lrvb145pc7wcaz7f7wf2kyh5pjkfbzn"; + name = "kcolorchooser-18.12.1.tar.xz"; }; }; kcontacts = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcontacts-18.12.0.tar.xz"; - sha256 = "1drp0rzhjbb9nqqjl9cmwpyqk8dgvnaw42rmn0cwla8l8qas5xs5"; - name = "kcontacts-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz"; + sha256 = "0d32l8hhggcy6dyyps5im74k0psnxrwxa6yni5bmj8m0z7f298ba"; + name = "kcontacts-18.12.1.tar.xz"; }; }; kcron = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kcron-18.12.0.tar.xz"; - sha256 = "02fxsnka3d3456j99nsrgvkxpjd677xl0z7hmqwsr0zx3bx0krk7"; - name = "kcron-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz"; + sha256 = "0211xs7zwii5a93827rsnp1gkay78h2hs49lvdc2kah9ccsh0kzn"; + name = "kcron-18.12.1.tar.xz"; }; }; kdav = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdav-18.12.0.tar.xz"; - sha256 = "0fbw65yiskygbhhagsc48yrhdslg951fd13b6mzwf2ab55fw6vmf"; - name = "kdav-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz"; + sha256 = "0kr07p4gnxyzrgnbj7vkh93wmqwnvv8sc06i2yardr8qp6jhpg77"; + name = "kdav-18.12.1.tar.xz"; }; }; kdebugsettings = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdebugsettings-18.12.0.tar.xz"; - sha256 = "1gdrc1x5bavdi6ljqv5wh1hwvys1r2v00xi555dfyijjryr7kd27"; - name = "kdebugsettings-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz"; + sha256 = "1wbi0f82dwd7a8s6szg0yc2mraiinng9a5wjw8xjacgkyyjpqbr3"; + name = "kdebugsettings-18.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kde-dev-scripts-18.12.0.tar.xz"; - sha256 = "03wmki422lw1r5i51gh17ha3w2gpdjv4ix7bndjakwq315iivlxi"; - name = "kde-dev-scripts-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz"; + sha256 = "1k0xjlwpmdl2qpj4x04q9x299wmva2ds4y2wpayah865knvx91j3"; + name = "kde-dev-scripts-18.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kde-dev-utils-18.12.0.tar.xz"; - sha256 = "0x2ji7jd12b1blww2jz0709yl79pb3slglx7mp4yyfi66c5ngl1q"; - name = "kde-dev-utils-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz"; + sha256 = "06k01z2ljkcsdzz4zsdp8hr3flss552h0jgy25qv7y1izggk05dj"; + name = "kde-dev-utils-18.12.1.tar.xz"; }; }; kdeedu-data = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdeedu-data-18.12.0.tar.xz"; - sha256 = "1p3rjsdhf4hy9468515vkbihkj69s2gpz6fxk3rqvi03ksmpdi5x"; - name = "kdeedu-data-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdeedu-data-18.12.1.tar.xz"; + sha256 = "1pnjydj3g768z5zxwbfwvxvlhdbg9rscr3vd1dw4srs338lp0maq"; + name = "kdeedu-data-18.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdegraphics-mobipocket-18.12.0.tar.xz"; - sha256 = "05gxnbrl4p1s6mccvp0482as4r41rhqsrfd84v57sqyd93mgzsji"; - name = "kdegraphics-mobipocket-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz"; + sha256 = "1bv3981nsy61m8shlwbry9yb37218s2q1k9fas3xgv1260rjmmfq"; + name = "kdegraphics-mobipocket-18.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdegraphics-thumbnailers-18.12.0.tar.xz"; - sha256 = "096acsz560k238sfa54nyjydx5wlc0b92khi4ahmvaqmllzjc9p4"; - name = "kdegraphics-thumbnailers-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz"; + sha256 = "1rz578dz6nr3m23kd4njdcx01nmjgskxlla4zqgd33gg08kppmvj"; + name = "kdegraphics-thumbnailers-18.12.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdenetwork-filesharing-18.12.0.tar.xz"; - sha256 = "183f8fir8rx7jr35gyj074k852s51gjsd2q7hp1bgkj7g5avql4i"; - name = "kdenetwork-filesharing-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz"; + sha256 = "1zxkbcdndbr3sygwpiiw70pxb71hil1x8zj7lgq2yyw968ianah4"; + name = "kdenetwork-filesharing-18.12.1.tar.xz"; }; }; kdenlive = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdenlive-18.12.0.tar.xz"; - sha256 = "0jknpfs7gql527pbj0nb1bxvhxpbk0gnyjx4g6wdhlmk87w2g0wp"; - name = "kdenlive-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz"; + sha256 = "189p0sqlmfkaxsdiy1mh0mmskw6ha4zi64fx99w7wnbid8x52bjf"; + name = "kdenlive-18.12.1.tar.xz"; }; }; kdepim-addons = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdepim-addons-18.12.0.tar.xz"; - sha256 = "0dbys45cn00xism83x2j1ypidg5dp8zv29wx18a4bga4y8mfnrkp"; - name = "kdepim-addons-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz"; + sha256 = "1gz6rqg39vl2arzs64srpr7xn1syxxiznz58gdss40152gz0hlsp"; + name = "kdepim-addons-18.12.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdepim-apps-libs-18.12.0.tar.xz"; - sha256 = "18y3n602b6v1jyl18lvqalasf2v795ln31nn79ih1z4y49j1s67x"; - name = "kdepim-apps-libs-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz"; + sha256 = "06q306m09666jh4cx3w0bif81x424hxlvsf31wjhfzdp737xfq3i"; + name = "kdepim-apps-libs-18.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdepim-runtime-18.12.0.tar.xz"; - sha256 = "0vmwgbbnwipi62aciy52pdd4ygrgx3l87i5g5nspkb03wlb5jl51"; - name = "kdepim-runtime-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz"; + sha256 = "1vb9rqzyjww7lkc3g2aw43ks7is1bg1nx2mbn8wvmc7cgga66nbc"; + name = "kdepim-runtime-18.12.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdesdk-kioslaves-18.12.0.tar.xz"; - sha256 = "0ca9cwxv836jl9crqik9s1v3dgk5z9jhvzxvbcvrbalvs1cyxg8b"; - name = "kdesdk-kioslaves-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz"; + sha256 = "05bds4r70ys4mygmjl5x5hcrygds57mqqmzfv79zq9hcfp2b0g69"; + name = "kdesdk-kioslaves-18.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdesdk-thumbnailers-18.12.0.tar.xz"; - sha256 = "1q57c5i7pnrpd7g1dwrahac9lji9ljqyb60qkj9qx3v3fnr11v7f"; - name = "kdesdk-thumbnailers-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz"; + sha256 = "1584qy2aa8q7zzgf2zxqw7p2h2l2xfgsa2mrmxaa36xaxbglcvkb"; + name = "kdesdk-thumbnailers-18.12.1.tar.xz"; }; }; kdf = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdf-18.12.0.tar.xz"; - sha256 = "1ds4z4adyaazmhbybq2f361qq02a8l73a9g2hwcrh95w0dcisyvp"; - name = "kdf-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz"; + sha256 = "0zr6k8di9fvzmgvh4s8ji81zdynpkg5yrnddlc9mgid0w9czaw11"; + name = "kdf-18.12.1.tar.xz"; }; }; kdialog = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdialog-18.12.0.tar.xz"; - sha256 = "04v2s3wlaihcm4c64kzcxmxs9niw6ghid0vdl4pw8h0ks1s8xz0g"; - name = "kdialog-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz"; + sha256 = "0i4c2kjyp0dix12vxhj078h7vbylcqxgqx10hzwaszx3wlrycwa2"; + name = "kdialog-18.12.1.tar.xz"; }; }; kdiamond = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kdiamond-18.12.0.tar.xz"; - sha256 = "0c11v3c7hxllg15h8mq18jl5lqprwwpnz04rjjggwzz8c4iz2kjs"; - name = "kdiamond-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz"; + sha256 = "0j5g1gh267q528k0947brc8nvgq81690hqp7mrf90wxg8qp4ysm4"; + name = "kdiamond-18.12.1.tar.xz"; }; }; keditbookmarks = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/keditbookmarks-18.12.0.tar.xz"; - sha256 = "1ia69amq6dfidfgxq297xa10f3812spibb00wsv9dj4cp36y89mm"; - name = "keditbookmarks-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz"; + sha256 = "0fnxmgfgnh8d6sg7g7ai53xywa22qv4pn4xxj503rjs4a3fsm3j1"; + name = "keditbookmarks-18.12.1.tar.xz"; }; }; kfind = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kfind-18.12.0.tar.xz"; - sha256 = "0km2f88pw9ynqbxsl3pwfkk120ni0by2rsaldqp2h3a26kyc5gzk"; - name = "kfind-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz"; + sha256 = "1vhi66syjhmc5i64ffgpilyxw9y10qb7633p3gx7vsnbjhvfx45b"; + name = "kfind-18.12.1.tar.xz"; }; }; kfloppy = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kfloppy-18.12.0.tar.xz"; - sha256 = "0ng0d18dnnrdp9xccald0jn8hl40v2kshgmy8pnr4agl20aagh61"; - name = "kfloppy-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz"; + sha256 = "1fx40gb7h0z832qidn635jj7caipxcrzxmrbdfnj8ji2sczs1hyq"; + name = "kfloppy-18.12.1.tar.xz"; }; }; kfourinline = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kfourinline-18.12.0.tar.xz"; - sha256 = "01wjqyg7aw2wi7nrrqri3znb545hr1qcanzibjiakhb2pbx5db3z"; - name = "kfourinline-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz"; + sha256 = "1dwa4nw6998ljbppr4bhwpdg201djk5rjrzjgfs5xv0pynamph0g"; + name = "kfourinline-18.12.1.tar.xz"; }; }; kgeography = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kgeography-18.12.0.tar.xz"; - sha256 = "1fa2333xmxswlfjzl7d3ssl7s2hgwszhqxkdyi9db9lqxq0m3ckv"; - name = "kgeography-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz"; + sha256 = "02xir13p0r67vx3csdra9nza82a25k807cjl3w2pq3dqcg9grrcf"; + name = "kgeography-18.12.1.tar.xz"; }; }; kget = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kget-18.12.0.tar.xz"; - sha256 = "1f3ahslqcicgkhgdpdrvy9ydlsl1hwnnym7fw2v2k07h5mprw8hp"; - name = "kget-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kget-18.12.1.tar.xz"; + sha256 = "0jlpih49rifpqzxzgjc4kv3hv7y42v6pcamyvrmk6q1768lqp7nb"; + name = "kget-18.12.1.tar.xz"; }; }; kgoldrunner = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kgoldrunner-18.12.0.tar.xz"; - sha256 = "0cmcjmfhair649nbfx74qdmsf67lx4j53qkj0xsr7bijv52pi4br"; - name = "kgoldrunner-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz"; + sha256 = "19qdw319lzfhmmmmawdpb0dlkz9k1iz6imkwf1qndfv89b6wklba"; + name = "kgoldrunner-18.12.1.tar.xz"; }; }; kgpg = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kgpg-18.12.0.tar.xz"; - sha256 = "1hlcpgfcwpiyf1xfy62mris60cnws1mcgpni5nvvwdzdi4scad3g"; - name = "kgpg-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz"; + sha256 = "1rar3hj3wc9vpxc81h0ly1mi87m9cdx17j58k9n02q91jqb8892y"; + name = "kgpg-18.12.1.tar.xz"; }; }; khangman = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/khangman-18.12.0.tar.xz"; - sha256 = "0y05jjacnw2h70hjn5jbpnmcj53xgcx8304s39aa8zc1ry9jvsqq"; - name = "khangman-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz"; + sha256 = "10wk0xdrs6pldg8j5bnsbdx835isxrapb1gm9gx4vjj49riq062q"; + name = "khangman-18.12.1.tar.xz"; }; }; khelpcenter = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/khelpcenter-18.12.0.tar.xz"; - sha256 = "0cwxf6m3f6md4y51zpscxh89p9p9jzzsfslxh04y92p9g0l1qvwm"; - name = "khelpcenter-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz"; + sha256 = "143f61ngvljm4046q4allwxhx6fis0hd92xdqk8955xwdf42fq6y"; + name = "khelpcenter-18.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kidentitymanagement-18.12.0.tar.xz"; - sha256 = "1i0amb9m2vc00zaawv2wdyw7gzwz8lfw4bvz0mlnad4nrcmkvjyk"; - name = "kidentitymanagement-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz"; + sha256 = "1pl8yzrhfvkxcxasywzklhpx2477whn662s13c5mp6yhpxyxl5xq"; + name = "kidentitymanagement-18.12.1.tar.xz"; }; }; kig = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kig-18.12.0.tar.xz"; - sha256 = "0zq7z4jj8bsmhjggjh7byjv74ry6caps9pviwqqcsrdrl5357kzi"; - name = "kig-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kig-18.12.1.tar.xz"; + sha256 = "0cc093gwq2cr4ir3rdfkhijjsjvjddw4n7hvrxbshv7pqmnbrjgc"; + name = "kig-18.12.1.tar.xz"; }; }; kigo = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kigo-18.12.0.tar.xz"; - sha256 = "03kl5hn8b2qbbv436rd8slqwr5w4034wz7vvm9z9cmjbpxavls2q"; - name = "kigo-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz"; + sha256 = "07m3p9r59c4qfwpgipb024mzxi4safiidpypm8gmx87vbsqc99f2"; + name = "kigo-18.12.1.tar.xz"; }; }; killbots = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/killbots-18.12.0.tar.xz"; - sha256 = "0w8xl73ir9a3zxvsj3027gdlh7mskns3f0bk4mspirwg761zn1hf"; - name = "killbots-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz"; + sha256 = "12jbvqmi0cx5ma7lai67qamml7qig269vhvjrcvm7jwlg0qx8v43"; + name = "killbots-18.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kimagemapeditor-18.12.0.tar.xz"; - sha256 = "0l17biqkq8jkc2vnnw51a6g13y29rnsfn9dx3afv88bdf2a52x1m"; - name = "kimagemapeditor-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz"; + sha256 = "1mqzd3ja27c4askz9cxfaf6g8wcwlasjka79h4dmvjrw4rkqs4y4"; + name = "kimagemapeditor-18.12.1.tar.xz"; }; }; kimap = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kimap-18.12.0.tar.xz"; - sha256 = "04m6sd36k6w4iiqanxy49v06am11p5xcb253gk99pyfrssb596m5"; - name = "kimap-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz"; + sha256 = "1v1qd91pr4xx0wsvvqlg8pcsbyi0n7c90ki0pz8v8z2vay5fagnm"; + name = "kimap-18.12.1.tar.xz"; }; }; kio-extras = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kio-extras-18.12.0.tar.xz"; - sha256 = "1sbl7m8c4fy63389bv19ck89nzxjpf0l2855sc81fzy3zig89b65"; - name = "kio-extras-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz"; + sha256 = "17y5awdyck2zjrgb9l2s4rdyvp1pqc6jrdyjv5vhchjdkfb91vw3"; + name = "kio-extras-18.12.1.tar.xz"; }; }; kirigami-gallery = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kirigami-gallery-18.12.0.tar.xz"; - sha256 = "008ixa0kvqjjk98aq9mcapxd8d8svkjpz04v4ka64zwks8qyzdrk"; - name = "kirigami-gallery-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kirigami-gallery-18.12.1.tar.xz"; + sha256 = "1wrvhpdg2qk6ri1hjhdbk6w6rzyxamn6hxfl4mjcaip9gamjlbr0"; + name = "kirigami-gallery-18.12.1.tar.xz"; }; }; kiriki = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kiriki-18.12.0.tar.xz"; - sha256 = "098gsl6pj8bdm29qa1w6pnyg7m25m0m2f97f7cwgqi1h4asyz9h8"; - name = "kiriki-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz"; + sha256 = "1sxn7qvhyaaf4681hx1hgv2mmfhn64qn6q0rad9vps69cb1rx7pz"; + name = "kiriki-18.12.1.tar.xz"; }; }; kiten = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kiten-18.12.0.tar.xz"; - sha256 = "1lkaicfc5z59g6gvcgmkdwpfl2i622s26w3pf1w0cmlw1hnspblc"; - name = "kiten-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz"; + sha256 = "1d964cc7bkr1vgsbbnm9c8na2nls3kmfk9wfkrzdgnj2643dl947"; + name = "kiten-18.12.1.tar.xz"; }; }; kitinerary = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kitinerary-18.12.0.tar.xz"; - sha256 = "0q4fhfckvzlcza7r2gddygfn7f3dfj4kl82m644givb4394hjapd"; - name = "kitinerary-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz"; + sha256 = "14bkyi4xj00i8bzjq6z68y67iyylix0c1n8wr1nz0s05pmlg8sws"; + name = "kitinerary-18.12.1.tar.xz"; }; }; kjumpingcube = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kjumpingcube-18.12.0.tar.xz"; - sha256 = "0j022vr1dj06s21cwxhsiv8xb1000l2yz2jz128rnkpr63b8darr"; - name = "kjumpingcube-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz"; + sha256 = "0i7lj2qi3mdvghpxyhwiakivxsd85ahy427d418sdykh7dfmn9ih"; + name = "kjumpingcube-18.12.1.tar.xz"; }; }; kldap = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kldap-18.12.0.tar.xz"; - sha256 = "0359vzfhscqlha2vyaygqpai7qi924ircw290prwrmhn9jqzms5x"; - name = "kldap-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz"; + sha256 = "117w3jk4i77p8a7dvj03kgxqlhgbkmhyl7w282gl38kxyr7z8hbn"; + name = "kldap-18.12.1.tar.xz"; }; }; kleopatra = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kleopatra-18.12.0.tar.xz"; - sha256 = "1j1s7dmg5wadfd8z76i5l81drii0sjdynahkcm8jdz3gvrsd773k"; - name = "kleopatra-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz"; + sha256 = "1njgfigld774r9xyckip118svxrkylh0a5ib5y8976zb0v71m5mj"; + name = "kleopatra-18.12.1.tar.xz"; }; }; klettres = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/klettres-18.12.0.tar.xz"; - sha256 = "0gyd7vnm6mq7wy398h9nrny611pc6v4kksmdbhhsrkagvj4rvywq"; - name = "klettres-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz"; + sha256 = "0xxrkx468wx2f3gb3d77i648xxmy6bq6q0nq121fk2apgdp2dzqk"; + name = "klettres-18.12.1.tar.xz"; }; }; klickety = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/klickety-18.12.0.tar.xz"; - sha256 = "083w9lj6h6yxxk6vgmf72651vb423gakppbi7z7ii5i546miilyn"; - name = "klickety-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz"; + sha256 = "14jvifvm47q0ca7jq7d152l53nswhbwggs0q067n3chmf07g2izy"; + name = "klickety-18.12.1.tar.xz"; }; }; klines = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/klines-18.12.0.tar.xz"; - sha256 = "1v05ssjrb6x81c5nj9c8dpfqj9wr2m4mz9c883pnc5pjbc33fh0x"; - name = "klines-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/klines-18.12.1.tar.xz"; + sha256 = "1bs7vaqs67232msmsrsfi9avbqrzvyjihsakzxpkn976xwql3zxf"; + name = "klines-18.12.1.tar.xz"; }; }; kmag = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmag-18.12.0.tar.xz"; - sha256 = "0micbc4wqi23jc2bpf1kjzy8xafqkd8gp70hg83id7mlncq12pm7"; - name = "kmag-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz"; + sha256 = "1ig9fbnza2xvxvd1adh9riv3zmrdmm0km8jpqjmh124i8g416qpw"; + name = "kmag-18.12.1.tar.xz"; }; }; kmahjongg = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmahjongg-18.12.0.tar.xz"; - sha256 = "1zv4dljkj1i4hxmy1cnyzpnipvdh6dmp6msmivgbsaz7yra1zqlx"; - name = "kmahjongg-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz"; + sha256 = "0ajml6xy4ljmrn5qbvy08mcf5v5jqzmclsbr6811rrxqxb5fqbqd"; + name = "kmahjongg-18.12.1.tar.xz"; }; }; kmail = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmail-18.12.0.tar.xz"; - sha256 = "0ivzl7cpjcavqybbd5jfd9gk7qfvnfrly8gi20lwg97s07cih42x"; - name = "kmail-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz"; + sha256 = "1wakrrlxp3v0k93hx2c8p136a3hd746l8fxks0g3cwvhl1immxw7"; + name = "kmail-18.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmail-account-wizard-18.12.0.tar.xz"; - sha256 = "04q3yrbarqqw5wd8waaacd4kb409y8k6rbwk0lsrr4gvs7b5h4jg"; - name = "kmail-account-wizard-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz"; + sha256 = "0v3lwgk3b30ggv6573r6k5z09lcpfzspp5znnsn4650fgrrzg2j3"; + name = "kmail-account-wizard-18.12.1.tar.xz"; }; }; kmailtransport = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmailtransport-18.12.0.tar.xz"; - sha256 = "0i3rgw4pf143jnkxnds84j8yg7smhgf2c5qkc1vk37i05vg81r76"; - name = "kmailtransport-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz"; + sha256 = "1ybaps485ic2m8nfy63kw6x7f3l2l67lhyy5zsm7rjipbaqgi2vm"; + name = "kmailtransport-18.12.1.tar.xz"; }; }; kmbox = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmbox-18.12.0.tar.xz"; - sha256 = "03krrgzbvvhn0xcmbhx4whk347pxr26gqhnxh7mg82w5pzx7y6gm"; - name = "kmbox-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz"; + sha256 = "0anh25klbgb67ynl9mlcny2mrawsd98mzyffvgsd8xkback684zf"; + name = "kmbox-18.12.1.tar.xz"; }; }; kmime = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmime-18.12.0.tar.xz"; - sha256 = "0kh1v62xxca6i6g48xznqrxfw4wfwqcbv338m0ybqr06w0kgcfr2"; - name = "kmime-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz"; + sha256 = "05kjfqaadkflyh1vabzgbx33vr3c70sm2nkp8r9dsa7kg3wij0n2"; + name = "kmime-18.12.1.tar.xz"; }; }; kmines = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmines-18.12.0.tar.xz"; - sha256 = "0lgzh1pa9g807jdq16k0a9n2akqgad0vgpx1zms6ldnaqvr7mm6w"; - name = "kmines-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz"; + sha256 = "0dq1jirzb6ljhb7wdrrkyxvmlwg84xzhfikcn9v6nmz9f3pbliwi"; + name = "kmines-18.12.1.tar.xz"; }; }; kmix = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmix-18.12.0.tar.xz"; - sha256 = "09m1d62w912ly6r8874b6ccimwdf6i9p2fyfb3pa5axc8d01lca9"; - name = "kmix-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz"; + sha256 = "1ra7jmi5xlq9gbh7csv40sxr20lv8dz659m1jx4ixkzppcj42s73"; + name = "kmix-18.12.1.tar.xz"; }; }; kmousetool = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmousetool-18.12.0.tar.xz"; - sha256 = "00nwk11w7ljn22bfh06l109gw8yhl9vccgwimqhyplq0p8c3cnb0"; - name = "kmousetool-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz"; + sha256 = "07ywyxkm510faaqzywp5rw0lr2x1djhyhkjwyv8l42iw7231bn8x"; + name = "kmousetool-18.12.1.tar.xz"; }; }; kmouth = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmouth-18.12.0.tar.xz"; - sha256 = "0ig1wxaxwjj6qv7k2djdzhlnbbx74yk5f1sk42qx6csprl2bgp39"; - name = "kmouth-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz"; + sha256 = "1g82shlrfm70ddfy2zfv12gv8hwzavz47q4qsyblyzq329kwgww5"; + name = "kmouth-18.12.1.tar.xz"; }; }; kmplot = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kmplot-18.12.0.tar.xz"; - sha256 = "1mn7qrqwhwna9znprhb6fb2h127lcgjkx6m9csi8g11kklj95zi0"; - name = "kmplot-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz"; + sha256 = "0xl913pajyrhadld2ij9y0ai2w558wa60qfx1y1xwsjfm8124qgf"; + name = "kmplot-18.12.1.tar.xz"; }; }; knavalbattle = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/knavalbattle-18.12.0.tar.xz"; - sha256 = "16v4q2hn4d2d8iqj9mim0y8azx4nraja9a6fhym2h5nzqsz253gk"; - name = "knavalbattle-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz"; + sha256 = "1p03c980w4d10mkmvm01imi7vg6cp3wqz0wvw2d5vz47i0jhm2w8"; + name = "knavalbattle-18.12.1.tar.xz"; }; }; knetwalk = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/knetwalk-18.12.0.tar.xz"; - sha256 = "1pgk7wnll793hmjmc0r416vvrgpicyyf88g459a5ybmj28hi5xqi"; - name = "knetwalk-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz"; + sha256 = "0x5794f91b84l4d8hgkqi33rdqa7s1plhprhmbfvsi4grpms6c0c"; + name = "knetwalk-18.12.1.tar.xz"; }; }; knights = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/knights-18.12.0.tar.xz"; - sha256 = "10p994q5rycs3p5yn6r0gn8fjj3m8gsrx2gdvzdavizbsp5xv0qb"; - name = "knights-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/knights-18.12.1.tar.xz"; + sha256 = "17n7zi100q62wjavfr87369yqp2mjxqz0lyqalagjp25d80z18l2"; + name = "knights-18.12.1.tar.xz"; }; }; knotes = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/knotes-18.12.0.tar.xz"; - sha256 = "1r0p5k66gadglm329dcmr6x93wr56z32r03v8zd2r4ffbvp2hvqr"; - name = "knotes-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz"; + sha256 = "12n40znf9vczvbf5xfj4zsxwbj2rdj7l1iasmiiil2md8iyjs6dz"; + name = "knotes-18.12.1.tar.xz"; }; }; kolf = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kolf-18.12.0.tar.xz"; - sha256 = "0j5scf9ynq71z5pcbiqm13a3asz62man5nirjxr9fcj4mb1zirfk"; - name = "kolf-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz"; + sha256 = "072nmvsxm8ky1nz2pp6ri74ms3rql0qqg004mzbbq061dil4k63i"; + name = "kolf-18.12.1.tar.xz"; }; }; kollision = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kollision-18.12.0.tar.xz"; - sha256 = "1zifm52q8yc2l5mqrc7wnddz9a0r1yz4dnk85c9dj2cndk8jz05p"; - name = "kollision-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz"; + sha256 = "0idjjfgj8fk0c0l5i6x80cg20p1rpq6kab8z9rh2izvg1v6h7qvl"; + name = "kollision-18.12.1.tar.xz"; }; }; kolourpaint = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kolourpaint-18.12.0.tar.xz"; - sha256 = "1m0j0bdcrhhk8k1imnz7xm33yi8dcbsx432866ikh31l68i44wgc"; - name = "kolourpaint-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz"; + sha256 = "0h454h5rzk0wki8lbmz57xx3859c27sy9vk1mwawfj963785f2nd"; + name = "kolourpaint-18.12.1.tar.xz"; }; }; kompare = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kompare-18.12.0.tar.xz"; - sha256 = "02f4laclz3vhgbyzfxhi3f79k62z27fwa5qhdwwsvbn1xlgzbpx4"; - name = "kompare-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz"; + sha256 = "099fkxmk7g19l07lf2v3hmqrgfd17fbsv4m5cxdjci8alizw8pp9"; + name = "kompare-18.12.1.tar.xz"; }; }; konqueror = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/konqueror-18.12.0.tar.xz"; - sha256 = "0yzldqi0i1hiw33ppiccn8vpvy5ygf2vf4m3awfcj2376bzz7d4r"; - name = "konqueror-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz"; + sha256 = "08j4x2xi1iv5661gjpcakp2dmdhvhw3jad98kq3xj9989s7phpfy"; + name = "konqueror-18.12.1.tar.xz"; }; }; konquest = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/konquest-18.12.0.tar.xz"; - sha256 = "1w7r1a7ilakz9k0f1z4jrfsjscf9z8l18rdfry5b1h8zz70j5j0z"; - name = "konquest-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz"; + sha256 = "0mlk2vm53nc9dc7ca9ah3ly9qs94md24pi2gmv68pz1ysr51i483"; + name = "konquest-18.12.1.tar.xz"; }; }; konsole = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/konsole-18.12.0.tar.xz"; - sha256 = "04qmldzfb0qjwddz56nv20gffi8z6vhm0vsvqd59q5nhkj9shnr3"; - name = "konsole-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz"; + sha256 = "15w1jizs4q6mivv7qjkf0gkqlz0jnrz7b2i59r3kx2fvwwwl18rg"; + name = "konsole-18.12.1.tar.xz"; }; }; kontact = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kontact-18.12.0.tar.xz"; - sha256 = "0i9hj2rrwa5vzzh7p586d7vkzgk69inq3c7bvvjr6lhy0xrcy9cb"; - name = "kontact-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz"; + sha256 = "0bqn9vh75wpkks1l9hd2bm33k1im356x2091xlnnzs70m4gjxhag"; + name = "kontact-18.12.1.tar.xz"; }; }; kontactinterface = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kontactinterface-18.12.0.tar.xz"; - sha256 = "05kx0jrxh13f42az6p9kj90wyqjl3ansqni9pa06fd1klq0ssncz"; - name = "kontactinterface-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz"; + sha256 = "0khba3wnpwji4mm5n56bcnffd1v9w4a1b1r7lhlz88dqkakqyb61"; + name = "kontactinterface-18.12.1.tar.xz"; }; }; kopete = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kopete-18.12.0.tar.xz"; - sha256 = "1xzriv2zqpf7vzny2k7qn39slx0b6cls8414c757ppd9ai4yh32a"; - name = "kopete-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz"; + sha256 = "12q62nj287qc4gz8q66spk1d0xykrwkphwaxrh2i3sd07bjmyzqs"; + name = "kopete-18.12.1.tar.xz"; }; }; korganizer = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/korganizer-18.12.0.tar.xz"; - sha256 = "0pk8psl90xmb06y0h87ar35kbqr9pjl31l05h01ig32w1vr0rw8c"; - name = "korganizer-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz"; + sha256 = "1g8wjrghzxgx9xhqf98z9xlq5svl2v931ifczsfkvs9d3smx2zsg"; + name = "korganizer-18.12.1.tar.xz"; }; }; kpat = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kpat-18.12.0.tar.xz"; - sha256 = "18q0pa4aijjkgjcg3v1v7ap2nvyavqsgh4s672v74jrxijd353gw"; - name = "kpat-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kpat-18.12.1.tar.xz"; + sha256 = "1ami2bssnjm01k3i6bqqciszablkw6975hac2d8zzvg2bz8g4a2a"; + name = "kpat-18.12.1.tar.xz"; }; }; kpimtextedit = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kpimtextedit-18.12.0.tar.xz"; - sha256 = "0fg3cfh6v2hkhca9yb2kcvc9rq7f94a2wxkyi6cx88r3k3plh212"; - name = "kpimtextedit-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz"; + sha256 = "13ki9gjgakyqcxx4hvs0plqgw0rqx0z95dnyaqv1safqkwrr76hb"; + name = "kpimtextedit-18.12.1.tar.xz"; }; }; kpkpass = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kpkpass-18.12.0.tar.xz"; - sha256 = "07rmjzgkww405f0f16w3fgd5kwz335xbl9gjlc1lkh6lhddmbjc6"; - name = "kpkpass-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz"; + sha256 = "1sw3gpvai71lliq4y1snxrhzi9jhl1vxkimlxl2nmhg951nzd4xx"; + name = "kpkpass-18.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kqtquickcharts-18.12.0.tar.xz"; - sha256 = "01vdg2l48521pgkkx7h1vkgbrjl7gpzzinldk3aa7ki0997rff6h"; - name = "kqtquickcharts-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz"; + sha256 = "0i8qww267q797pxk3k66d09b0dp7ixbxf92p5bsqf7z4p2graayl"; + name = "kqtquickcharts-18.12.1.tar.xz"; }; }; krdc = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/krdc-18.12.0.tar.xz"; - sha256 = "0yvk15grdk82flf7s9zsfgfhrmcy9wvcjhgdqjng2m9hd9sviix4"; - name = "krdc-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz"; + sha256 = "1smdav92rfr92mxk8q7wcmmvrf746vn2xyw36hyszq561ycgwwrx"; + name = "krdc-18.12.1.tar.xz"; }; }; kreversi = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kreversi-18.12.0.tar.xz"; - sha256 = "04mpkpa8lar7l8blrgkz9n5xzq0br15qxxginh3hgp9vcp83njpb"; - name = "kreversi-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz"; + sha256 = "171w76xv9dbhy7pxs9swq7xknrwkjk5ndgq4waj6m5dh0109qmx4"; + name = "kreversi-18.12.1.tar.xz"; }; }; krfb = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/krfb-18.12.0.tar.xz"; - sha256 = "107z3bwq5xb2l4p88qpv9zibjzbgdbhf3d13bp220vnpwkwaxhpm"; - name = "krfb-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz"; + sha256 = "0bhhlp4ask2xqzq9igw0akxr0gb0iilaljwqrcw91fx36sxq46p4"; + name = "krfb-18.12.1.tar.xz"; }; }; kross-interpreters = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kross-interpreters-18.12.0.tar.xz"; - sha256 = "1xr7cb3v40lm2wh78vhzxw3v34g52ngrd1baf4g4yi00y85y42bf"; - name = "kross-interpreters-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz"; + sha256 = "0k57qprmpspp9b8vb124h1whgyskmwd6q7l60vswqizc64xa2src"; + name = "kross-interpreters-18.12.1.tar.xz"; }; }; kruler = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kruler-18.12.0.tar.xz"; - sha256 = "0ms875n8rr19lvvbmq7jjbbgd4l4p4k8fqxhay7wil2mgdpkd087"; - name = "kruler-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz"; + sha256 = "1wfxapw6grx860wa6fyya8fnvlrpmdzsz64fnx64h0mky09j21r6"; + name = "kruler-18.12.1.tar.xz"; }; }; kshisen = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kshisen-18.12.0.tar.xz"; - sha256 = "0bd9wbn343glgsf6qnyqqdhqrkw61lywgnjslsmc4bb1parka8ww"; - name = "kshisen-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz"; + sha256 = "0wz4jfrqqvzz2p5f6hwyj7rpijsnhbzmm2m7jhjrljjl5lfdqd3x"; + name = "kshisen-18.12.1.tar.xz"; }; }; ksirk = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ksirk-18.12.0.tar.xz"; - sha256 = "1nm8y05im0h6vdkdqlbh21ci68dalan7qmjiiwamrzc5dsvh9lwi"; - name = "ksirk-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz"; + sha256 = "108bw284jsff3qgg98vzs93m6dl8wjfkmbrkjgij03w00jb47bqf"; + name = "ksirk-18.12.1.tar.xz"; }; }; ksmtp = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ksmtp-18.12.0.tar.xz"; - sha256 = "1caqqml7q41rk49mxq0wj439h87ln827jvxsbiv11qphkp6041y4"; - name = "ksmtp-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz"; + sha256 = "0zj4gpfz2njrdnfbjy7s9xci0il7qmmzargkszgj9jdzpm5qlaas"; + name = "ksmtp-18.12.1.tar.xz"; }; }; ksnakeduel = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ksnakeduel-18.12.0.tar.xz"; - sha256 = "06acl0bc87fcixkj67l4n4csa060lnaqkh8p3s7r3zccsy660ya4"; - name = "ksnakeduel-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz"; + sha256 = "1l0gfh5vfcfnk3sdl8wsqbc2vcmsdf9frpngfacv4ndm4xc371ql"; + name = "ksnakeduel-18.12.1.tar.xz"; }; }; kspaceduel = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kspaceduel-18.12.0.tar.xz"; - sha256 = "08dbmwbjqy8d0xidxipadndi0lxm1n2h0dxksjk8imsprz5r4j2l"; - name = "kspaceduel-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz"; + sha256 = "01pcnqpzbrnwxavmfpdib78kc44am9in711012j2621cccx2r9cw"; + name = "kspaceduel-18.12.1.tar.xz"; }; }; ksquares = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ksquares-18.12.0.tar.xz"; - sha256 = "0a6kf3arxvakd7mcr6xxasls8gmgc16gsnm0bjvviaxfc9f3wx8x"; - name = "ksquares-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz"; + sha256 = "1gyd7qipp821jzn94yrw4b0d46ays0hs26q17hxnbx07hyfj3kcb"; + name = "ksquares-18.12.1.tar.xz"; }; }; ksudoku = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ksudoku-18.12.0.tar.xz"; - sha256 = "1bm4lx5w4d3drgydqz2wxi3gh2778q8nl3k6ac4pm4iq8amgmgi6"; - name = "ksudoku-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz"; + sha256 = "1cm5r4fkc7ha0c3mbcank9h2fhym7qc8k1q69lpmzrbm9hw2kgrs"; + name = "ksudoku-18.12.1.tar.xz"; }; }; ksystemlog = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ksystemlog-18.12.0.tar.xz"; - sha256 = "0gh83ih9y0ydhm4g2drbcjkqh58g5a1flg1zqxr7rak8kf1pchnm"; - name = "ksystemlog-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz"; + sha256 = "1s5b4j67q6nm7r4b1ibvypsd5z9la7cri7z1r7hzihv4nry8pk5c"; + name = "ksystemlog-18.12.1.tar.xz"; }; }; kteatime = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kteatime-18.12.0.tar.xz"; - sha256 = "1p4a3kahsjgfw9f6mw16bzz1bzk1jnssgvhzqh9ragqyp5qpn3s3"; - name = "kteatime-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz"; + sha256 = "01p4d61d16k2pppf51sz52y0w4qc1dyqnmhjlnr5w75rfmwvvivg"; + name = "kteatime-18.12.1.tar.xz"; }; }; ktimer = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktimer-18.12.0.tar.xz"; - sha256 = "1lv64bk64k7nb2y9qahc45cg3n51qrb4ahk5l9mrbj9q5yvm1acs"; - name = "ktimer-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz"; + sha256 = "0wqkfvbdcnwh1jzn2ac7k4pa8amr51ajhljc95mvps03m9d92rsf"; + name = "ktimer-18.12.1.tar.xz"; }; }; ktnef = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktnef-18.12.0.tar.xz"; - sha256 = "1ca9gga65h9kygfcsr1yvy50ccq3587scml36p740iwrxms8lrcb"; - name = "ktnef-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz"; + sha256 = "0id7hkmgr5zc12zfrj5ydxyhgdrlx4ip1dsw301i27id104fqb69"; + name = "ktnef-18.12.1.tar.xz"; }; }; ktouch = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktouch-18.12.0.tar.xz"; - sha256 = "1221xagypm1j56lx2g4845wrw0w01f2s4x8r3jwr32wzxvi8bxs3"; - name = "ktouch-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz"; + sha256 = "0v3lhxx45l41bw14wi7n4k29d1c9xmacrscjyj84fmy09nlyyaa5"; + name = "ktouch-18.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-accounts-kcm-18.12.0.tar.xz"; - sha256 = "0bx97zalwk78340klgh87rb5fadma8flg6q0bg436j01dsld0s0p"; - name = "ktp-accounts-kcm-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz"; + sha256 = "1aswmp7504kpwlb37rvxx514ac5256h5lhwj9xl479vyxgaazxsn"; + name = "ktp-accounts-kcm-18.12.1.tar.xz"; }; }; ktp-approver = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-approver-18.12.0.tar.xz"; - sha256 = "1cvixdcws126x7wll57dv6w78p3fb06lgd411i9jf7n02sx3l09q"; - name = "ktp-approver-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz"; + sha256 = "1jr5kxlj2229rknxhi5jsgdjgx9n0n5jx7lc4aa2c96kd843n2ah"; + name = "ktp-approver-18.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-auth-handler-18.12.0.tar.xz"; - sha256 = "0zfdq7q1v48vcaj4raz5r6l400xhz7ngjylg3kd7jabarljjv2gs"; - name = "ktp-auth-handler-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz"; + sha256 = "1fwcibz8dh94xaprpyybn0dlh1fyd6rsx9zsx8cyxqhx96fq8v28"; + name = "ktp-auth-handler-18.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-call-ui-18.12.0.tar.xz"; - sha256 = "1q9z6g0djk7mszy48bwrw4mvja15xkcg6x88391sw1lvanps9hmk"; - name = "ktp-call-ui-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz"; + sha256 = "1f63w374d9smz7147lax9zqfvikqhl2hllvnlb03zl49kh13s8h3"; + name = "ktp-call-ui-18.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-common-internals-18.12.0.tar.xz"; - sha256 = "00smq4q4m8hvvfaz0b9iyxxz3dl15qs0is6zbkh4scvxxp54n056"; - name = "ktp-common-internals-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz"; + sha256 = "1frnzsql9mk78bjfc2kpwmsf8nkx1ybhm1snq125kkzayqipvdkp"; + name = "ktp-common-internals-18.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-contact-list-18.12.0.tar.xz"; - sha256 = "0kyllg9f0kj1w00jhk2khmsfdqqixnz8s74jvg5fjw8bbibjbn3y"; - name = "ktp-contact-list-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz"; + sha256 = "13aiy156372qapwddr2i3nf1jkzbj9905rvd55akwpa8sy70m3kw"; + name = "ktp-contact-list-18.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-contact-runner-18.12.0.tar.xz"; - sha256 = "1hpapg3fnmwsgai7jb9kbh5f71hp8qfzphgczcmf6h5151g2l6jj"; - name = "ktp-contact-runner-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz"; + sha256 = "1grpgg3fgyzf97n60jmpjgviz5194awmrl6yfaal7hd1cdkfrs34"; + name = "ktp-contact-runner-18.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-desktop-applets-18.12.0.tar.xz"; - sha256 = "1dfcjjmbplgx7b45q9vklq8kvc0ajclzy6cmyq3maj577747h5xz"; - name = "ktp-desktop-applets-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz"; + sha256 = "0iikcp7rvvrn7189kdzj1i4qzhkgh06gzr8hm49gy29qxqk36ykn"; + name = "ktp-desktop-applets-18.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-filetransfer-handler-18.12.0.tar.xz"; - sha256 = "1dzrzv6nmv6ighiqq8hi9crasnqdbqimg3qdssyryxrqs64m9h29"; - name = "ktp-filetransfer-handler-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz"; + sha256 = "04dnh7yb0jajs79xh1wyq9d48nklvldc7lnk1lp194iz8yydvylx"; + name = "ktp-filetransfer-handler-18.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-kded-module-18.12.0.tar.xz"; - sha256 = "0720yayzz4rwrmplwjpq6bfb86k0jhmxc5k25yqj9fg7n6w2qsx3"; - name = "ktp-kded-module-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz"; + sha256 = "0kmw8pifb4xry3zqpq671rh39ziaka8zx60p5xzs10rl17rmxwzs"; + name = "ktp-kded-module-18.12.1.tar.xz"; }; }; ktp-send-file = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-send-file-18.12.0.tar.xz"; - sha256 = "0jfy8qqm6n5pm2s24pbvxmmcibxxq71gggg4xf0miqkhdvx5b9kw"; - name = "ktp-send-file-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz"; + sha256 = "01i059vsaydw410sv15vzwysgxcy2n9wm3qcnal4fx7wgw5xx163"; + name = "ktp-send-file-18.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktp-text-ui-18.12.0.tar.xz"; - sha256 = "14ln91srqfkk0fgp197wvlqxgagw23x4h94j1v1m51pia0v6226b"; - name = "ktp-text-ui-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz"; + sha256 = "14smhdcvy0v1s1rbkss1g6jyzfm6y1nqjp8a9wcbygbzh88g0bjy"; + name = "ktp-text-ui-18.12.1.tar.xz"; }; }; ktuberling = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/ktuberling-18.12.0.tar.xz"; - sha256 = "0ms20qffd5mwlrxbd8ajb0lx3ny7mhlx25n59w2paq2x313qcsfk"; - name = "ktuberling-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz"; + sha256 = "0h0w2knfs97bzxaja3dkc78fjfymic09b6zid41kxd4mi41lngkk"; + name = "ktuberling-18.12.1.tar.xz"; }; }; kturtle = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kturtle-18.12.0.tar.xz"; - sha256 = "0ik44282gc6rmzsg6xv4fvpx1yzb4y4gv7jmslxgwi6rwc1q0m5v"; - name = "kturtle-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz"; + sha256 = "0b2505gmys2p11ryj7bqr60zgh0ydp16xidhkv6hhykmrmp2bsm1"; + name = "kturtle-18.12.1.tar.xz"; }; }; kubrick = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kubrick-18.12.0.tar.xz"; - sha256 = "0h4jx41wawbifdx7mzqbsx9nfrn2r9rkb01y0d63f5s2835hs2yc"; - name = "kubrick-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz"; + sha256 = "0vq8djk5xc00cz4a2inbw62x9pigxxjcxi92h8qayigi7cf9xrll"; + name = "kubrick-18.12.1.tar.xz"; }; }; kwalletmanager = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kwalletmanager-18.12.0.tar.xz"; - sha256 = "0znbrp1hk7jky9y3p9bc47sqn8mqd54x5j8kw52sg9v4428aag09"; - name = "kwalletmanager-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz"; + sha256 = "1d3kdxc53n2ss73r9ld6rr5w9zhvkglrcbw8whq2hsam79mh0vsn"; + name = "kwalletmanager-18.12.1.tar.xz"; }; }; kwave = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kwave-18.12.0.tar.xz"; - sha256 = "00h5i0iax9hd79pw71wvv4p75rv6z61zpfg2s4n6zqjx8c312rhh"; - name = "kwave-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz"; + sha256 = "150lqffzzyb2ajyg97sprzbm6zq1iq4psl6vics51lw7sybwj4m3"; + name = "kwave-18.12.1.tar.xz"; }; }; kwordquiz = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/kwordquiz-18.12.0.tar.xz"; - sha256 = "0a0i7khsvn68rxwwm3q5h4ymf6j3bdm3sc3q3z74rj3n0s03dnww"; - name = "kwordquiz-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz"; + sha256 = "1da9jjdk2avdmdm16s63h0hk5swml37afwdnsd777ilj2x8a5ndf"; + name = "kwordquiz-18.12.1.tar.xz"; }; }; libgravatar = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libgravatar-18.12.0.tar.xz"; - sha256 = "077qkpsg2v77mzg2q5jw7fr6sss07x5998f9x65pqgqlc9b6h494"; - name = "libgravatar-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz"; + sha256 = "1a7b46zqv5m7c9arfmcxhrcnrkcligz3ryygxv801zfa7277l8j6"; + name = "libgravatar-18.12.1.tar.xz"; }; }; libkcddb = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkcddb-18.12.0.tar.xz"; - sha256 = "15dmbb5cvr9rcaspizrc2laxkwhfrsnlczdns0biq3lysajblwfa"; - name = "libkcddb-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz"; + sha256 = "1k9rbkf12g1hsn23nyhc65zrppkikk8xplm7l321kxpnq2prm155"; + name = "libkcddb-18.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkcompactdisc-18.12.0.tar.xz"; - sha256 = "1jrw16hbp8fn48l70gqxpiy6iwpisk087sixvs3cbn94dmczgpka"; - name = "libkcompactdisc-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz"; + sha256 = "0v7fh9s9qbljgfjyi3bd9w7wp69y4qjg0jj8cmn11snrsd8zzaac"; + name = "libkcompactdisc-18.12.1.tar.xz"; }; }; libkdcraw = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkdcraw-18.12.0.tar.xz"; - sha256 = "0n3b5blda31gf38hyplpb29mp6aa187adgqqyijzhnvvm1mfwa5z"; - name = "libkdcraw-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz"; + sha256 = "1g58cpzqzl6vl62lbrqd8fyscxspqypxq4lyj3d2k9b0b66hjc6c"; + name = "libkdcraw-18.12.1.tar.xz"; }; }; libkdegames = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkdegames-18.12.0.tar.xz"; - sha256 = "01i00n4cjpq1srag5ca8siw6rjc1gwhdzfib6cg3xf9my5sl0hbv"; - name = "libkdegames-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz"; + sha256 = "0iksk5gnl860xcmpaj56wxaamhm9zhjnyszj4nssppssn8kr1r65"; + name = "libkdegames-18.12.1.tar.xz"; }; }; libkdepim = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkdepim-18.12.0.tar.xz"; - sha256 = "188jf33dihrrq0zzmdddg6sx4ck2lp5gj1br4xfsqgrc1qf9z5hd"; - name = "libkdepim-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz"; + sha256 = "1qvzj68p630mzafwyv7f3q1fd615yca7amc0q7kp2cs08fnv67fp"; + name = "libkdepim-18.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkeduvocdocument-18.12.0.tar.xz"; - sha256 = "1fa6pgpcarqabc18bph4lijsx1paf1a1arisrlf5mgkivg2yvy2k"; - name = "libkeduvocdocument-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz"; + sha256 = "0zgl0dw8sb5lffzv580nql04i0n31ma8569wrhh75kg12qb5yd7w"; + name = "libkeduvocdocument-18.12.1.tar.xz"; }; }; libkexiv2 = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkexiv2-18.12.0.tar.xz"; - sha256 = "1x3pxcii60kn8c1bmgrra9h4ahblwwp5vjd6p2wg2f4jkpmjz1ha"; - name = "libkexiv2-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz"; + sha256 = "1jgk14dgf30czsah0mjrs7lsll0s4aks2075pfmvrnsl71vfbsj3"; + name = "libkexiv2-18.12.1.tar.xz"; }; }; libkgapi = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkgapi-18.12.0.tar.xz"; - sha256 = "0d79p7f6gmb8vjbp2nmc5rz9rabj08np96jbqf4wzgcjcxxi64kp"; - name = "libkgapi-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz"; + sha256 = "1g5mzdw4mrlqhi9zby51m1sgkq1gjmkd7smja287kjf7whdx0sn3"; + name = "libkgapi-18.12.1.tar.xz"; }; }; libkgeomap = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkgeomap-18.12.0.tar.xz"; - sha256 = "1pmicj4p3d17i7nj6alns8a24ay0xrs852d1x1xrcdkv7h7y5hvi"; - name = "libkgeomap-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz"; + sha256 = "0ijf71ss8qirrgx45x4wnry049d2bllgnlzm8gll4mj1hv9jhjdz"; + name = "libkgeomap-18.12.1.tar.xz"; }; }; libkipi = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkipi-18.12.0.tar.xz"; - sha256 = "0cfn09x7splycpqwz0fy52lnkpc9dsq6i2j2q3r4fjgpblj9m86h"; - name = "libkipi-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz"; + sha256 = "1372kmqni0vb8bryv0h30pljikabjdq44v1fjpgg81f4v1n4pfxv"; + name = "libkipi-18.12.1.tar.xz"; }; }; libkleo = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkleo-18.12.0.tar.xz"; - sha256 = "14iy3wis79rfri7najbyvx94ym2aa7si8h35rx4977flhc80nzin"; - name = "libkleo-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz"; + sha256 = "1p1bw0wzwg2zccgkqs50j92rzkpvcspjdj85zanmryg568mz9r1x"; + name = "libkleo-18.12.1.tar.xz"; }; }; libkmahjongg = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkmahjongg-18.12.0.tar.xz"; - sha256 = "12pki8hkcv8ihcwwdnhpcz21h4676zra5qwf56aa5cj5qpdgf4gx"; - name = "libkmahjongg-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz"; + sha256 = "1q590f7l10a1zjcg3dv3ns1003xrnr7zlmff03zg3a9zcqj11kwv"; + name = "libkmahjongg-18.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libkomparediff2-18.12.0.tar.xz"; - sha256 = "0xbccawxqk29f2qvr6hcbpan4fhahzksg7bl7jnv8xsv01lbm3rs"; - name = "libkomparediff2-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz"; + sha256 = "0ik6bclbipp01gfy3zfkijvl5m0y3z2dfxr76jvzmi53ypm7g0xn"; + name = "libkomparediff2-18.12.1.tar.xz"; }; }; libksane = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libksane-18.12.0.tar.xz"; - sha256 = "1vdxyik47fij9mm1fs6p9bn0n56wsajzqd5am03nrwkwanva25xj"; - name = "libksane-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz"; + sha256 = "15dgc5dshs6yzv03wvc5xvqfz70gqy51a0r54qzbr5fc9s6pywr8"; + name = "libksane-18.12.1.tar.xz"; }; }; libksieve = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/libksieve-18.12.0.tar.xz"; - sha256 = "1hwasycmfnjzqyxfh0kir1jhx002qci6dclv4cysv1ww33wsyskp"; - name = "libksieve-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz"; + sha256 = "0kcg94bsww3vlc3vpybw20c4iax0bfkamicy7hwyyyzwgx38dvd1"; + name = "libksieve-18.12.1.tar.xz"; }; }; lokalize = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/lokalize-18.12.0.tar.xz"; - sha256 = "07rnx40836xncndqbcvpircvgnaywmwzbkfl16665ciphxrilm6q"; - name = "lokalize-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz"; + sha256 = "1spzi7zbckvxy3izmcqjnslmqf4vgr7zrwa0idmqi4q59dcsgw9g"; + name = "lokalize-18.12.1.tar.xz"; }; }; lskat = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/lskat-18.12.0.tar.xz"; - sha256 = "1cw9z22gvyd9d44sg1qxir923q1ilmmqdgzzrh8wrb5p3m0mn0nz"; - name = "lskat-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz"; + sha256 = "0603lxw1fxz9vpawy59z3qga0f1bvvgv9yqk29b16fmp5hf5qgxm"; + name = "lskat-18.12.1.tar.xz"; }; }; mailcommon = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/mailcommon-18.12.0.tar.xz"; - sha256 = "0aigxd6pkw9xwy8q1kx9vqp17vljrzwv8skq6qmh9fvkjiampw84"; - name = "mailcommon-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz"; + sha256 = "0l1b115vnxfl2ykwnj09ikv7vlfa5bvfzlii6jj2znkmspi9y7r2"; + name = "mailcommon-18.12.1.tar.xz"; }; }; mailimporter = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/mailimporter-18.12.0.tar.xz"; - sha256 = "06nsn7vfgrvfgrmx4qyy21rq4a8bj5vxi4hrfd7377pd1sx58qvi"; - name = "mailimporter-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz"; + sha256 = "1k8gqjabcvafcvsqwclvz58r15k1bpz52wnnnbwcp0y27ab08a98"; + name = "mailimporter-18.12.1.tar.xz"; }; }; marble = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/marble-18.12.0.tar.xz"; - sha256 = "0ljzv2ygpqwz4a387ja280p7cd47bkjv7m40c3yn2yijiladyffv"; - name = "marble-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/marble-18.12.1.tar.xz"; + sha256 = "0hamj04ma9qycfisjv48myxj1427rz7g0lmw7pwanzghg610fgwy"; + name = "marble-18.12.1.tar.xz"; }; }; mbox-importer = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/mbox-importer-18.12.0.tar.xz"; - sha256 = "08rfgf5zcp6vhd78rj2yikmzrgddhdn7cykw9pqfgmhy0nci14sm"; - name = "mbox-importer-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz"; + sha256 = "1h2abj7v6v3rmvsv9bb1wj7sabhh9f35bx1yfk2hhfzf6l4r5f2n"; + name = "mbox-importer-18.12.1.tar.xz"; }; }; messagelib = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/messagelib-18.12.0.tar.xz"; - sha256 = "189bn6lblqq4vr1a2pk99pj3y3xh5q8xxdrg2hrdcc10wmjk9knv"; - name = "messagelib-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz"; + sha256 = "1hfk54w0dhp82fxa4q19d4224pjnw5f8m7ap4gwlrqdj350liqd8"; + name = "messagelib-18.12.1.tar.xz"; }; }; minuet = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/minuet-18.12.0.tar.xz"; - sha256 = "1hma6r3z7k382gpd0wccxdbss1a17gvkb5fvdaii5xm7c9ca63r7"; - name = "minuet-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz"; + sha256 = "160wq3j7vcf1k0ayd8axg37ghj5ymn56g7znaz4gzc8ar1q5nccz"; + name = "minuet-18.12.1.tar.xz"; }; }; okular = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/okular-18.12.0.tar.xz"; - sha256 = "184r6lqsyx1x63zjirn709w0pd81hyh4f5j6m37m5hr6dg8l6mli"; - name = "okular-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/okular-18.12.1.tar.xz"; + sha256 = "1k1srr2434j665v6m89vl7x42361pqxaw45dc5b4bhw8q2xfipyl"; + name = "okular-18.12.1.tar.xz"; }; }; palapeli = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/palapeli-18.12.0.tar.xz"; - sha256 = "09fbsw0id1p81zvd7kfimjx81m3zz36kdvd40jwbsffrqi682iww"; - name = "palapeli-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz"; + sha256 = "0pwflnnnbfxf185m3r4vdw5jpd5jld0wm0qnwk2gl41v2ahb5pqd"; + name = "palapeli-18.12.1.tar.xz"; }; }; parley = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/parley-18.12.0.tar.xz"; - sha256 = "1mnp835g1b7vwz5gnzl78x3s80sw1ps4gsddg4ywrdkjr5b099gk"; - name = "parley-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/parley-18.12.1.tar.xz"; + sha256 = "1yv4m9f4jhc36ffnrxd6rq5117rj163hs6835mkkzja7z13csn6z"; + name = "parley-18.12.1.tar.xz"; }; }; picmi = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/picmi-18.12.0.tar.xz"; - sha256 = "0y6fnh8629zj98ih4cwgy31gknpc6ipn4aqxcjg8hfic8jxnppyp"; - name = "picmi-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz"; + sha256 = "0dmhvxy0g4jjbxk53bz1g1r8vqdzhzbcwg0f1ck85gz7f5g67b7v"; + name = "picmi-18.12.1.tar.xz"; }; }; pimcommon = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/pimcommon-18.12.0.tar.xz"; - sha256 = "1rchq4clw6r08vm6cw9kw52bn7z1nfjmp2lmi0sq3pjfqlxif2zc"; - name = "pimcommon-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz"; + sha256 = "09av3zdr463gjc877ipa5vz84yf4qpj2ixs9x4ajmfmsmb5m6w7z"; + name = "pimcommon-18.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/pim-data-exporter-18.12.0.tar.xz"; - sha256 = "0ywxcd02crwjrqx8ikkc4rgx1z93zvzqadqg3sjh636iz8svv5jc"; - name = "pim-data-exporter-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz"; + sha256 = "111n4l9z3dazz7qhv67k00s88p515r8ai2sm419pbyfdn6wxpzmb"; + name = "pim-data-exporter-18.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/pim-sieve-editor-18.12.0.tar.xz"; - sha256 = "144frbny1pq1viam527b96fxalc9iv5ppqrrvpndqsvjrlsrll45"; - name = "pim-sieve-editor-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz"; + sha256 = "0i0jrmz4cyjcpapga89ixfqx7xg0nyk3r75ymfzw891fyhm7ns67"; + name = "pim-sieve-editor-18.12.1.tar.xz"; }; }; poxml = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/poxml-18.12.0.tar.xz"; - sha256 = "1gnk9rzpa6rgff9xhawizx8cgsw84jqkpkr8aa2ki8zs4s6n9zl6"; - name = "poxml-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz"; + sha256 = "0hrpvpsy3mbyrikj68lr2af9m162w3nzhcpdqgrhsv5ji3j0bpqb"; + name = "poxml-18.12.1.tar.xz"; }; }; print-manager = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/print-manager-18.12.0.tar.xz"; - sha256 = "03jgjj7xfc57bsq3nx3l836pmpqywlchqis9109k5cpygqvgqkr5"; - name = "print-manager-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz"; + sha256 = "01kk592gi2rrqwaxmfd1fycnya0rvjafxxv6lrk3rs0nm4g9phxr"; + name = "print-manager-18.12.1.tar.xz"; }; }; rocs = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/rocs-18.12.0.tar.xz"; - sha256 = "1gg0xg732wb9vzf1c69r5cqqhayxygv2brvbk3gvq6b201hv1q90"; - name = "rocs-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz"; + sha256 = "0d34bv8ya5lrdrbqqlc927x4cdfjwyr8q2xbmx4c1vaw8w29glw9"; + name = "rocs-18.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/signon-kwallet-extension-18.12.0.tar.xz"; - sha256 = "0izmwyv1bw4iqgyhjrsq85xg7m5bp1v9khy5fxh1mhvh52w9zq8s"; - name = "signon-kwallet-extension-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz"; + sha256 = "018vyzd3rspfsqansxfbv4q0izgj7dfpmzjj04x8pffg1w0x902n"; + name = "signon-kwallet-extension-18.12.1.tar.xz"; }; }; spectacle = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/spectacle-18.12.0.tar.xz"; - sha256 = "0nnsv0y28pxxhvf3r76nqgmn0ncixhr8d783mm3i3a3yz1z8a45c"; - name = "spectacle-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz"; + sha256 = "1r9iapwi1lp1p7x0dimblpmsizv1ys9708vdlzrk8q4m8rwn7ld9"; + name = "spectacle-18.12.1.tar.xz"; }; }; step = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/step-18.12.0.tar.xz"; - sha256 = "0gqcwvv2xb321zx7y4bg28haqpzz5h8r7cxn6z4x5qnj6ijkx0zr"; - name = "step-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/step-18.12.1.tar.xz"; + sha256 = "1gn8l09r5rllz1mypsw2wfjhijy0i0bi4lspp271dinms6ryx6p4"; + name = "step-18.12.1.tar.xz"; }; }; svgpart = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/svgpart-18.12.0.tar.xz"; - sha256 = "1nqbbzndbyj9ikgw7fhy52621swb5blzycd5qn9if9ymsi524217"; - name = "svgpart-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz"; + sha256 = "06rvbav94ysifha47lp52pvpc77y33p4zq4yfbmyh1pqkiw5db2s"; + name = "svgpart-18.12.1.tar.xz"; }; }; sweeper = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/sweeper-18.12.0.tar.xz"; - sha256 = "0pq991zxdg1816j8dbhc3vjxj84plif17zpvp3smiscr4n6x209h"; - name = "sweeper-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz"; + sha256 = "0bp0my9gf4n5p7v3g0q390lf9q4lh42mg2zngwadqcvrsi2w4av4"; + name = "sweeper-18.12.1.tar.xz"; }; }; umbrello = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/umbrello-18.12.0.tar.xz"; - sha256 = "15r5wv0k1dwfxp4l2mc4886s17ck390a2mpy1l08jvg93w1cbm3f"; - name = "umbrello-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz"; + sha256 = "12kk04frx8fxcih22nv5c1765wawlf7wpiscaqmzlmrpa611x65r"; + name = "umbrello-18.12.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.12.0"; + version = "18.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.0/src/zeroconf-ioslave-18.12.0.tar.xz"; - sha256 = "1qvmsr88kl1gq3wrn5g4wf4ka24pbbhdy54c8n25bhxd8pv0rd07"; - name = "zeroconf-ioslave-18.12.0.tar.xz"; + url = "${mirror}/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz"; + sha256 = "1gzr50kqlwd2d47yc2k6yz2v0w2gp10c7glhb61jpdzsqy7r7cvp"; + name = "zeroconf-ioslave-18.12.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index ef0b49f8d7b..327272ae39c 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -17,6 +17,8 @@ libXrandr, libGL, xclip, + wayland, + libxkbcommon, # Darwin Frameworks cf-private, AppKit, @@ -40,6 +42,9 @@ let libXrandr libGL libXi + ] ++ lib.optionals stdenv.isLinux [ + wayland + libxkbcommon ]; in buildRustPackage rec { name = "alacritty-${version}"; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 2585b554548..878e62c68cb 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl +{ config, lib, stdenv, fetchurl , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null -, enableLame ? false, lame ? null +, enableLame ? config.sox.enableLame or false, lame ? null , enableLibmad ? true, libmad ? null , enableLibogg ? true, libogg ? null, libvorbis ? null , enableFLAC ? true, flac ? null diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index 2f38307ca1e..2dd151c1a6c 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 1144d515284..4227b4155ac 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: +{ stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip "$src" -d "$out/avrdudess" cat >> "$out/bin/avrdudess" << __EOF__ - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 89bd8ee4b3e..353cf620ee7 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , enableNumpy ? false, makeWrapper }: diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 0a1275cb17a..bde8fab8144 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -69,7 +69,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index fd65fcd2260..e6dafe4d08a 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "calcurse-${version}"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://calcurse.org/files/${name}.tar.gz"; - sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; + sha256 = "0vw2xi6a2lrhrb8n55zq9lv4mzxhby4xdf3hmi1vlfpyrpdwkjzd"; }; buildInputs = [ ncurses gettext python3 ]; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index f2aac4326cb..e48b32a783d 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 7aecc8f823e..e0d284c838e 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 23d76afff0c..e1fcbbfe13c 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { The interface is inspired by htop and shortcut keys are inspired by vim. ''; homepage = https://cointop.sh; - platforms = stdenv.lib.platforms.linux; # cannot test others + platforms = stdenv.lib.platforms.unix; # cannot test others maintainers = [ ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index f8927319a01..0123e0c38d7 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 439b0fc2568..4e620425d5c 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, python, pythonPackages, unzip }: +{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }: # This package uses a precompiled "binary" distribution of CuraByDagoma, # distributed by the editor. @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cat > $out/bin/curabydago <<EOF - #!/bin/sh + #!${runtimeShell} export PYTHONPATH=$PYTHONPATH ${python.out}/bin/python $out/curabydago/cura.py EOF diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index de42f2d9657..c3e29d8a370 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.3.2"; + version = "5.3.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "05ra1bicah588q5n114vd9jqk9qdjix7b0zv5z83cagksb3n52rc"; + sha256 = "0b9a2l8lcw8abilm9a3igbfm52fmix0vzh6kz6kwgmnflp6n9wib"; }; installPhase = '' diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index ca7e332cc28..0716125859b 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,29 +1,17 @@ -{stdenv, fetchpatch, fetchFromGitHub, python3Packages}: +{stdenv, fetchpatch, fetchFromGitHub, python3}: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.6"; name = "ddgr-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1q66kwip5y0kfkfldm1x54plz85mjyvv1xpxjqrs30r2lr0najgf"; + sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c"; }; - buildInputs = [ - (python3Packages.python.withPackages (ps: with ps; [ - requests - ])) - ]; - - patches = [ - (fetchpatch { - sha256 = "1rxr3biq0mk4m0m7dsxr70dhz4fg5siil5x5fy9nymcmhvcm1cdc"; - name = "Fix-zsh-completion.patch"; - url = "https://github.com/jarun/ddgr/commit/10c1a911a3d5cbf3e96357c932b0211d3165c4b8.patch"; - }) - ]; + buildInputs = [ python3 ]; makeFlags = "PREFIX=$(out)"; @@ -40,7 +28,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jarun/ddgr; description = "Search DuckDuckGo from the terminal"; license = licenses.gpl3; - maintainers = with maintainers; [ markus1189 ]; + maintainers = with maintainers; [ ceedubs markus1189 ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c6f83104fb1..5f252d97d86 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,13 +14,13 @@ in python3Packages.buildPythonApplication rec { pname = "electrum"; - version = "3.3.2"; + version = "3.3.4"; src = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; + sha256 = "0yxdpc602jnd14xz3px85ka0b6db98zwbgfi9a3vj8p1k3mmiwaj"; }; propagatedBuildInputs = with python3Packages; [ @@ -53,9 +53,6 @@ python3Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py - # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 45c44880462..a5e4bd74a6e 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - name = "electrum-ltc-${version}"; + pname = "electrum-ltc"; version = "3.1.3.1"; src = fetchurl { @@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec { sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; }; + nativeBuildInputs = with python3Packages; [ pyqt5 ]; + propagatedBuildInputs = with python3Packages; [ pyaes ecdsa diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bf97cff5030..da5cf83c02c 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; patches = [ ./correct-post-install.patch ]; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index eeb269e580c..5152c8aa3f7 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh cat >$out/bin/freemind <<EOF - #! /bin/sh + #! ${stdenv.shell} JAVA_HOME=${jre} $out/nix-support/dist/freemind.sh EOF chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh} diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index f05514f3fc5..739df59b31c 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1hr053z2l5mjgip83fsxnd1rqsp5gwywzagzrgdg243apn1nz0gs"; + sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 99633c69913..e72065fa283 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "15hpm7b09p5qnha0hpp0mgdl2pgsyq2sjcqihk3fsv7arngdbr5q"; + sha256 = "0bl4cmc24iw12zn5mlj5qn141s2k2mzdixbcb92pfng4w2s4dq66"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 0cac0e6fd3f..8432ddee007 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -1,12 +1,12 @@ { stdenv, writeScript, fetchFromGitHub , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite -, enableGlfw ? false, glfw }: +, enableGlfw ? false, glfw, runtimeShell }: let inherit (stdenv.lib) optional makeLibraryPath; wrapperScript = writeScript "glava" '' - #!${stdenv.shell} + #!${runtimeShell} case "$1" in --copy-config) # The binary would symlink it, which won't work in Nix because the diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 154af4efc9b..1cf6f547c30 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -13,7 +13,7 @@ , glib , libsoup , gnome-online-accounts -, rest +, librest , json-glib , gnome-autoar , gspell @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { glib libsoup gnome-online-accounts - rest + librest json-glib gnome-autoar gspell diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index f5420a0c944..724707d0be5 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson/postinstall.sh diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 6c84f3cbd32..1e237923d05 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; preConfigure = '' diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 453d95694eb..9360e220ab6 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; }; - nativeBuildInputs = [ wafHook ]; + nativeBuildInputs = [ wafHook intltool ]; buildInputs = [ - docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme + docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e09e65738e5..7353078600d 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index ef378b2c5ff..1647a09edfd 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ stdenv, runtimeShell }: stdenv.mkDerivation rec { name = "example-unfree-package-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/hello-unfree << EOF - #!/bin/sh + #!${runtimeShell} echo "Hello, you are running an unfree system!" EOF chmod +x $out/bin/hello-unfree diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 6b0926db047..2fd56e3c555 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 026cf9ecc14..1eae8c57fc4 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 22badfc8cdd..8473e997e7a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.50"; + version = "0.54.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1shrw7pxwrz9g5x9bq6k5qvhn3fqmwznadpw7i07msh97p8b3dyn"; + sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index d5c24d69048..d3d300db85b 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,5 +1,23 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "v1.6.8"; + "sha256" = "1xh26j9bji8c4hr05f89kbc4fhqniba00bdcic4gs5xfnp2vj7gk"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + "sha256" = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } { goPackagePath = "github.com/BurntSushi/locker"; fetch = { @@ -9,7 +27,6 @@ sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; }; } - { goPackagePath = "github.com/BurntSushi/toml"; fetch = { @@ -19,7 +36,6 @@ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } - { goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { @@ -29,7 +45,6 @@ sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } - { goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { @@ -39,7 +54,6 @@ sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } - { goPackagePath = "github.com/alecthomas/assert"; fetch = { @@ -49,17 +63,15 @@ sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; }; } - { goPackagePath = "github.com/alecthomas/chroma"; fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "v0.5.0"; - sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; + rev = "v0.6.2"; + sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; }; } - { goPackagePath = "github.com/alecthomas/colour"; fetch = { @@ -69,17 +81,33 @@ sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; }; } - + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.1.15"; + sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; + }; + } { goPackagePath = "github.com/alecthomas/repr"; fetch = { type = "git"; url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + rev = "d37bc2a10ba1"; + sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; }; } - { goPackagePath = "github.com/bep/debounce"; fetch = { @@ -89,7 +117,6 @@ sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; }; } - { goPackagePath = "github.com/bep/gitmap"; fetch = { @@ -99,17 +126,15 @@ sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; }; } - { goPackagePath = "github.com/bep/go-tocss"; fetch = { type = "git"; url = "https://github.com/bep/go-tocss"; - rev = "v0.5.0"; - sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; + rev = "v0.6.0"; + sha256 = "0w5i3ig3bbdrwbrcwzx8xsxhlb8xr17jj3wdcb6klqglg7551yvm"; }; } - { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { @@ -119,7 +144,42 @@ sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } - + { + goPackagePath = "github.com/cheekybits/is"; + fetch = { + type = "git"; + url = "https://github.com/cheekybits/is"; + rev = "68e9c0620927"; + sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } { goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { @@ -129,7 +189,6 @@ sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; }; } - { goPackagePath = "github.com/danwakefield/fnmatch"; fetch = { @@ -139,7 +198,6 @@ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; }; } - { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -149,7 +207,6 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } - { goPackagePath = "github.com/disintegration/imaging"; fetch = { @@ -159,7 +216,6 @@ sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } - { goPackagePath = "github.com/dlclark/regexp2"; fetch = { @@ -169,7 +225,15 @@ sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; }; } - + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } { goPackagePath = "github.com/eknkc/amber"; fetch = { @@ -179,7 +243,6 @@ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } - { goPackagePath = "github.com/fortytw2/leaktest"; fetch = { @@ -189,7 +252,6 @@ sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra"; }; } - { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { @@ -199,7 +261,6 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } - { goPackagePath = "github.com/gobwas/glob"; fetch = { @@ -209,7 +270,6 @@ sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; }; } - { goPackagePath = "github.com/gorilla/websocket"; fetch = { @@ -219,7 +279,6 @@ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } - { goPackagePath = "github.com/hashicorp/go-immutable-radix"; fetch = { @@ -229,7 +288,6 @@ sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; }; } - { goPackagePath = "github.com/hashicorp/go-uuid"; fetch = { @@ -239,7 +297,6 @@ sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy"; }; } - { goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { @@ -249,7 +306,6 @@ sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; } - { goPackagePath = "github.com/hashicorp/hcl"; fetch = { @@ -259,7 +315,6 @@ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; }; } - { goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { @@ -269,7 +324,6 @@ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } - { goPackagePath = "github.com/jdkato/prose"; fetch = { @@ -279,7 +333,6 @@ sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy"; }; } - { goPackagePath = "github.com/kr/pretty"; fetch = { @@ -289,7 +342,6 @@ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; }; } - { goPackagePath = "github.com/kr/pty"; fetch = { @@ -299,7 +351,6 @@ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; }; } - { goPackagePath = "github.com/kr/text"; fetch = { @@ -309,7 +360,6 @@ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; }; } - { goPackagePath = "github.com/kyokomi/emoji"; fetch = { @@ -319,7 +369,6 @@ sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } - { goPackagePath = "github.com/magefile/mage"; fetch = { @@ -329,7 +378,6 @@ sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka"; }; } - { goPackagePath = "github.com/magiconair/properties"; fetch = { @@ -339,17 +387,33 @@ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } - { goPackagePath = "github.com/markbates/inflect"; fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "a12c3aec81a6"; - sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + rev = "v1.0.0"; + sha256 = "072a73ij23mp8vabr8xwga2kj8dimya44ciiy9g4x4r9imm86psw"; + }; + } + { + goPackagePath = "github.com/matryer/try"; + fetch = { + type = "git"; + url = "https://github.com/matryer/try"; + rev = "9ac251b645a2"; + sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; }; } - { goPackagePath = "github.com/mattn/go-isatty"; fetch = { @@ -359,7 +423,6 @@ sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } - { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { @@ -369,7 +432,6 @@ sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } - { goPackagePath = "github.com/miekg/mmark"; fetch = { @@ -379,7 +441,6 @@ sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } - { goPackagePath = "github.com/mitchellh/hashstructure"; fetch = { @@ -389,17 +450,15 @@ sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i"; }; } - { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.0.0"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } - { goPackagePath = "github.com/muesli/smartcrop"; fetch = { @@ -409,7 +468,6 @@ sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; }; } - { goPackagePath = "github.com/nfnt/resize"; fetch = { @@ -419,7 +477,6 @@ sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; }; } - { goPackagePath = "github.com/nicksnyder/go-i18n"; fetch = { @@ -429,7 +486,6 @@ sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; }; } - { goPackagePath = "github.com/olekukonko/tablewriter"; fetch = { @@ -439,7 +495,6 @@ sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; }; } - { goPackagePath = "github.com/pelletier/go-toml"; fetch = { @@ -449,7 +504,6 @@ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } - { goPackagePath = "github.com/pkg/errors"; fetch = { @@ -459,7 +513,6 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } - { goPackagePath = "github.com/pmezard/go-difflib"; fetch = { @@ -469,7 +522,6 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } - { goPackagePath = "github.com/russross/blackfriday"; fetch = { @@ -479,7 +531,6 @@ sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj"; }; } - { goPackagePath = "github.com/sanity-io/litter"; fetch = { @@ -489,7 +540,6 @@ sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r"; }; } - { goPackagePath = "github.com/sergi/go-diff"; fetch = { @@ -499,7 +549,6 @@ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; }; } - { goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { @@ -509,17 +558,15 @@ sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } - { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + rev = "v1.2.1"; + sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; }; } - { goPackagePath = "github.com/spf13/cast"; fetch = { @@ -529,7 +576,6 @@ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; }; } - { goPackagePath = "github.com/spf13/cobra"; fetch = { @@ -539,7 +585,6 @@ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; }; } - { goPackagePath = "github.com/spf13/fsync"; fetch = { @@ -549,7 +594,6 @@ sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; }; } - { goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { @@ -559,7 +603,6 @@ sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; }; } - { goPackagePath = "github.com/spf13/nitro"; fetch = { @@ -569,57 +612,51 @@ sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; }; } - { goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } - { goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "v1.2.0"; - sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; }; } - { goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f2347ac6c9c9"; - sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm"; + rev = "04af85275a5c"; + sha256 = "1al7hgvg34xbajds99ss5wmlndxbzzmz5l0wrg6wchvvfaiwxlx0"; }; } - { goPackagePath = "github.com/tdewolff/minify"; fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "v2.3.6"; - sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; + rev = "v2.3.7"; + sha256 = "1mj1lmd8s0mrg9cfj1ihvsqrbsbpzh3icm0pmayd2r6jp6rbffw6"; }; } - { goPackagePath = "github.com/tdewolff/parse"; fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "fced451e0bed"; - sha256 = "1n6wcapk8xbck2zjxd4l5cgfn1v12rr7znrdpd5y2xp1nc3739c3"; + rev = "v2.3.5"; + sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz"; }; } - { goPackagePath = "github.com/tdewolff/test"; fetch = { @@ -629,17 +666,33 @@ sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; }; } - + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } { goPackagePath = "github.com/wellington/go-libsass"; fetch = { type = "git"; url = "https://github.com/wellington/go-libsass"; - rev = "615eaa47ef79"; - sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; + rev = "c63644206701"; + sha256 = "1ml0fk4wldnjlkmliydnig9f3rpp3cdzwgz331mlqyadvma3c0lf"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; }; } - { goPackagePath = "github.com/yosssi/ace"; fetch = { @@ -649,7 +702,15 @@ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } - + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } { goPackagePath = "golang.org/x/image"; fetch = { @@ -659,7 +720,6 @@ sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } - { goPackagePath = "golang.org/x/net"; fetch = { @@ -669,7 +729,6 @@ sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; }; } - { goPackagePath = "golang.org/x/sync"; fetch = { @@ -679,17 +738,15 @@ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } - { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d0be0721c37e"; - sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; + rev = "b4a75ba826a6"; + sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; }; } - { goPackagePath = "golang.org/x/text"; fetch = { @@ -699,7 +756,6 @@ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } - { goPackagePath = "gopkg.in/check.v1"; fetch = { @@ -709,14 +765,13 @@ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } - { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index ed8573b8850..72a24026a89 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, java }: +{ stdenv, fetchurl, java, runtimeShell }: stdenv.mkDerivation rec { pname = "jbidwatcher"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" - echo > "$out/bin/${pname}" "#!/bin/sh" + echo > "$out/bin/${pname}" "#!${runtimeShell}" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" install -D -m644 ${src} ${jarfile} diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index d6e05056e1c..61eb959a1dd 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -50,6 +50,6 @@ in with python.pkgs; buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 845de8b0388..58b6ae9aae8 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,8 +7,8 @@ with python3Packages; buildPythonApplication rec { + pname = "kitty"; version = "0.13.3"; - name = "kitty-${version}"; format = "other"; src = fetchFromGitHub { @@ -24,7 +24,7 @@ buildPythonApplication rec { wayland-protocols wayland dbus ]; - nativeBuildInputs = [ pkgconfig which sphinx ]; + nativeBuildInputs = [ pkgconfig which sphinx ncurses ]; outputs = [ "out" "terminfo" ]; @@ -36,7 +36,7 @@ buildPythonApplication rec { ]; buildPhase = '' - python3 setup.py linux-package + ${python.interpreter} setup.py linux-package ''; installPhase = '' diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ed3aca996e1..5ae652d750d 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, -libGLU_combined, freetype, xclip }: +libGLU_combined, freetype, xclip, inotify-tools, procps }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -34,11 +34,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -d $out/bin $out/lib + install -d $out/bin install build/llpp $out/bin + install misc/llpp.inotify $out/bin/llpp.inotify + wrapProgram $out/bin/llpp \ - --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ --prefix PATH ":" "${xclip}/bin" + + wrapProgram $out/bin/llpp.inotify \ + --prefix PATH ":" "$out/bin" \ + --prefix PATH ":" "${inotify-tools}/bin" \ + --prefix PATH ":" "${procps}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index cd7bdd1fe7e..6c58dde00d3 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 02541842c36..a2678d6067f 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,4 @@ -{ lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }: +{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }: python36Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; @@ -40,7 +40,7 @@ python36Packages.buildPythonApplication rec { mkdir "$out/bin" cat > "$out/bin/${pname}" <<EOF - #!/bin/sh + #!${runtimeShell} cd "$share" export PYTHONPATH="$PYTHONPATH:$share" export PATH="$PATH:${parted}/bin:${procps}/bin" @@ -50,7 +50,7 @@ python36Packages.buildPythonApplication rec { chmod +x "$out/bin/${pname}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "Multiboot USB creator for Linux live disks"; homepage = http://multibootusb.org/; license = licenses.gpl2; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index d1538261939..c08a21e8797 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://jwilk.net/software/mwic; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 7e5a3a7840d..1cc7f419aa2 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, electron } : +{ stdenv, fetchgit, electron, runtimeShell } : stdenv.mkDerivation rec { name = "nix-tour-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share cp -R * $out/share chmod 0755 $out/share/ -R - echo "#!${stdenv.shell}" > $out/bin/nix-tour + echo "#!${runtimeShell}" > $out/bin/nix-tour echo "cd $out/share/" >> $out/bin/nix-tour echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour chmod 0755 $out/bin/nix-tour diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 9eb5382cde9..c1bdc1bcfef 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "01y2vkw1wakpnpzhzia3d44iir060i8vma3b3ww5wgwg7bfpzs4b"; + sha256 = "0953l4wa4dnsq9aj50anjrww64413dxv25xx3kjwnqz2ag7zdyy7"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses ]; + buildInputs = [ readline ncurses ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index fa5477697db..a732a5ed536 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,36 +1,33 @@ -{ stdenv, fetchFromGitHub, vala_0_40, pkgconfig, meson, ninja, python3, granite -, gtk3, gnome3, gtksourceview, json-glib, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon +, gtk3, gtksourceview, json-glib, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "notejot"; - version = "1.5.4"; - - name = "${pname}-${version}"; + version = "1.5.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1lv4s2mqddi6lz414kqpp4vcwnkjibc0k2xhnczaa1wf3azlxjgf"; + sha256 = "0khf6mwidybfgnq4zmhf3af4w6aicipmi12fvs722fqlf1lrkdmd"; }; nativeBuildInputs = [ - gobject-introspection meson ninja + pantheon.vala pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged gnome3.libgee - granite gtk3 gtksourceview json-glib + pantheon.elementary-icon-theme + pantheon.granite ]; postPatch = '' diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9622689199a..e173f6d0d7d 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -32,14 +32,17 @@ let "flask" "future" "futures" + "monotonic" "pkginfo" "psutil" "pyserial" "python-dateutil" "requests" "rsa" + "sarge" "scandir" "semantic_version" + "watchdog" "websocket-client" "werkzeug" "wrapt" @@ -47,13 +50,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4"; + sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7"; }; propagatedBuildInputs = with py.pkgs; [ @@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec { setup.py ''; - checkPhase = "nosetests"; + checkPhase = '' + HOME=$(mktemp -d) nosetests + ''; meta = with stdenv.lib; { homepage = https://octoprint.org/; diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index fdc4cd5b6d9..c98defee57a 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "openjump-1.3.1"; @@ -17,9 +17,9 @@ stdenv.mkDerivation { s=$out/bin/OpenJump dir=$(echo $out/openjump-*) cat >> $s << EOF - #!/bin/sh + #!${runtimeShell} cd $dir/bin - exec /bin/sh openjump.sh + exec ${stdenv.shell} openjump.sh EOF chmod +x $s ln -s /tmp/openjump.log $dir/bin/jump.log diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 2649c7cbd6a..633c1d82159 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index c31d442d2d6..3cb9bc8c979 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -19,6 +19,7 @@ , pkgsi686Linux , which , curl +, jq }: let @@ -41,6 +42,7 @@ let xterm which curl + jq ]; ld32 = diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 2b902d27a35..703d7862124 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -4,14 +4,13 @@ , libxml2 , pkgconfig , glib -, granite , gtk3 , gnome3 , meson , ninja , gobject-introspection , gsettings-desktop-schemas -, vala_0_40 +, pantheon , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -26,22 +25,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig - meson - ninja + pantheon.vala gettext gobject-introspection libxml2 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + meson + ninja + pkgconfig wrapGAppsHook ]; + buildInputs = [ + pantheon.elementary-icon-theme + pantheon.granite glib - granite - gtk3 - gnome3.defaultIconTheme gnome3.libgee gsettings-desktop-schemas + gtk3 ]; postInstall = '' diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 05b19bbbff9..a3be9cad3ae 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.24.0"; + version = "1.25.1"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw"; + sha256 = "0pfsf17g37d2v1xrsbfdbv460vs7m955h6q51z71rhb840r9812p"; }; # Tests try to access network @@ -41,6 +41,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ jgeerds wedens ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index e99b305b2b3..f4918565f35 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 72a1465a2c8..96049b395ea 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils -, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }: +, meson, ninja, pkgconfig, pantheon, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils +, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }: let @@ -20,9 +20,9 @@ in stdenv.mkDerivation rec { sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ]; - buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ]; + buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index a10b58d00b6..978ac2b7035 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 6d6382faccd..ebb50e685da 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index bf0e964d591..7ca421b49a3 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = with maintainers; [ infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; platforms = platforms.linux; # Cannot test others license = licenses.mit; }; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index dac447edd7d..6a30adb23da 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index b05c8a80399..3599bd0030b 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip }: +{ stdenv, runtimeShell, lib, fetchzip }: stdenv.mkDerivation rec { name = "terminal-notifier-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications cat >$out/bin/terminal-notifier <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/Applications/terminal-notifier.app exec ./Contents/MacOS/terminal-notifier "\$@" EOF diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 1229990b1ab..c057fde95d7 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, runtimeShell }: stdenv.mkDerivation { name = "thinkingrock-binary-2.2.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { /* it would be a really bad idea to put thinkingrock tr executable in PATH! the tr.sh script does use the coreutils tr itself That's why I've renamed the wrapper and called it thinkingrock - However you may not rename the bin/tr script cause it will notice and throw an + However you may not rename the bin/tr script cause it will notice and throw an "java.lang.IllegalArgumentException: Malformed branding token: thinkingrock" exception. I hope that's fine */ @@ -24,15 +24,15 @@ stdenv.mkDerivation { mkdir -p $out/{nix-support/tr-files,bin} cp -r . $out/nix-support/tr-files cat >> $out/bin/thinkingrock << EOF - #!/bin/sh + #!${runtimeShell} exec $out/nix-support/tr-files/bin/tr "$@" EOF chmod +x $out/bin/thinkingrock ''; - + installPhase = ":"; - meta = { + meta = { description = "Task management system"; homepage = http://www.thinkingrock.com.au/; license = "CDDL"; # Common Development and Distribution License diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 4ca7a86e6f7..ca049ba04c9 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A command-line time tracker"; homepage = https://taskwarrior.org/docs/timewarrior; license = licenses.mit; - maintainers = with maintainers; [ mrVanDalo ]; + maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index c6ee7508890..127d9f21d99 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index c295a8fdb68..413f082fb22 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, python3 -, gnome3, vala_0_40, gobject-introspection, wrapGAppsHook -, gtk3, granite -, json-glib, glib, glib-networking, hicolor-icon-theme +, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas +, gnome3, pantheon, gobject-introspection, wrapGAppsHook +, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme }: let @@ -24,12 +23,12 @@ in stdenv.mkDerivation rec { ninja pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + pantheon.vala wrapGAppsHook ]; buildInputs = [ - gtk3 granite json-glib glib glib-networking hicolor-icon-theme - gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas + gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme + libgee gnome3.libsoup gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 5d96918e42d..1eb65098fd5 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4"; + sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb"; }; buildInputs = [ diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index c568a056514..b61864e026a 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vi-like file manager"; maintainers = with maintainers; [ raskin garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = https://vifm.info/; diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index a448d35485a..1feec9e4550 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "vue-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{share/vue,bin} cp ${src} "$out/share/vue/vue.jar" - echo '#!${stdenv.shell}' >> "$out/bin/vue" + echo '#!${runtimeShell}' >> "$out/bin/vue" echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" chmod a+x "$out/bin/vue" ''; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 544c1252ff4..90fa0166154 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index f9267411dda..f5c92592cd1 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8"; + sha256 = "03dv50h68grscxiaxslzv486v1bfi8y81vrjr2gs39svw7bwz5d4"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 0fb2cec2916..d33135ccad7 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.7.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1mlli8sx1f3922ygnwakmi2h3swccz62njxbzxfzbi4hlmvsaz0y"; + sha256 = "1yanyaz6gh5wbccj9mfd39pyrg69gb4jn6sjvx1k63pkjrwr2ap3"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index cb2b682a952..22ababbca3b 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.11.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "0k897lx60gjf464j2ndindxhr6x3l90fv81bcqyglsv47danivlc"; + sha256 = "1s6hz9r0079r9sd1wgd1nm6wn1dmix4smz7174g9a29z2zcqr160"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 7e0369b277d..a2f39faaea7 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -44,6 +44,19 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://www.xpdfreader.com; description = "Viewer for Portable Document Format (PDF) files"; + longDescription = '' + XPDF includes multiple tools for viewing and processing PDF files. + xpdf: PDF viewer (with Graphical Interface) + pdftotext: converts PDF to text + pdftops: converts PDF to PostScript + pdftoppm: converts PDF pages to netpbm (PPM/PGM/PBM) image files + pdftopng: converts PDF pages to PNG image files + pdftohtml: converts PDF to HTML + pdfinfo: extracts PDF metadata + pdfimages: extracts raw images from PDF files + pdffonts: lists fonts used in PDF files + pdfdetach: extracts attached files from PDF files + ''; license = with licenses; [ gpl2 gpl3 ]; platforms = platforms.unix; maintainers = [ maintainers.peti ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ee267c1ec7c..25d2e090580 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-342"; + name = "xterm-344"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1y8ldzl4h1872fxvpvi2zwa9y3d34872vfdvfasap79lpn8208l0"; + sha256 = "1xfdmib8n6gw5s90vbvdhm630k8i2dbprknp4as4mqls27vbiknc"; }; buildInputs = diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index 0794b2b6dbe..d273d27944a 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index dec861009eb..6b3a4f747f4 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonApplication, dateutil, - sqlalchemy, setproctitle, icalendar, pycrypto }: + sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { pname = "yokadi"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2"; - sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17"; + url = "https://yokadi.github.io/download/${pname}-${version}.tar.gz"; + sha256 = "681c8aa52b2e4b5255e1311e76b4b81dcb63ee7f6ca3a47178e684c06baf330f"; }; propagatedBuildInputs = [ @@ -15,7 +15,6 @@ buildPythonApplication rec { sqlalchemy setproctitle icalendar - pycrypto ]; # Yokadi doesn't have any tests diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index e67bebb3710..315df563946 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,4 +1,6 @@ -{ pkgs, useMupdf ? true, synctexSupport ? true }: +{ config, pkgs +, useMupdf ? config.zathura.useMupdf or true +, synctexSupport ? true }: let callPackage = pkgs.newScope self; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index bdf6d0da145..d4afe4ea9e1 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "zola-${version}"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "0as8nrzw9zz10w4xxiibgz8ylghc879b2pwaxnw8sjbji2d9qv63"; + sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9"; }; - cargoSha256 = "0a14hq8d3xjr6yfg5qn5r7npqivm816f1p53bbm826igvpc9hsxa"; + cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 44313fa1ea2..d146cd81782 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.59.35"; + version = "0.60.45"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0z0fmgmfayappncixrnz7g42mcrm907lsvgynbklq2gjcxpsfp8k"; + sha256 = "0c3jfiswbma53lkngndqrcagvhld7q7hqhk9wpm4r6z9y1kskjwy"; }; dontConfigure = true; @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index f31ff05a42b..faa5bc121cb 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow bendlas ]; + maintainers = with maintainers; [ bendlas ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c7917e923d4..4b9a747811f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6f6a69369a0..804702b08d5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1kbcn8yzgrn41d12806bsycnw6xyjbgv4d8nk0y4x2hymg34vc2k"; - sha256bin64 = "0irafrmz9c3s8bdkqkwhj96v090ynvvbs50qzcdmidw8iqh2x1f8"; - version = "73.0.3683.27"; + sha256 = "00vh4vgkg4dc9vw6slgb086420l2sc6sykr15zw29jhnxaa7b1ij"; + sha256bin64 = "0vpwsgz71ykaid240241f7jzsm4d46wad00vvrd4fh9224q4h6ww"; + version = "73.0.3683.56"; }; dev = { - sha256 = "0gyzil473kn7mqpa1dp3pai0x7vk8rw2bkqr3z0p33fx2g7b7y5s"; - sha256bin64 = "1clr6xr08mmzmi71jy5ri4b2cp4qaf5apynbd9gnrp6qiy04rmn2"; - version = "73.0.3683.20"; + sha256 = "1cfy6m1ijqh7b8rlrjym8igpm5i549kz1h3jwbpxn52zy3mlk7jr"; + sha256bin64 = "02bgg20rh50lsz2ay4p7bkjfb18ay01hj0bcbd3g29valddr35p8"; + version = "74.0.3717.0"; }; stable = { - sha256 = "0fxavi4nwfiyb15lqm02vlq6kb8i4ipxnd7hp45bm7jdmhmgbnmj"; - sha256bin64 = "1gz1ga8d3a4q1n6bdb79wv8ldlksvj0mlnrs5k1safwzlv11prsx"; - version = "72.0.3626.96"; + sha256 = "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk"; + sha256bin64 = "1jdj2jp4jvzi5a24dm56ls5kx6xpiiv98yx4si9z19lm5srrji8j"; + version = "72.0.3626.121"; }; } diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index ded2b688815..be1389c2121 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://conkeror.org/; license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = with maintainers; [ astsmtl chaoflow ]; + maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 12a6c64c7ae..5b3e8d727d0 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = with gst_all_1; [ glib-networking + gobject-introspection gst-libav gst-plugins-base gst-plugins-ugly diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2d9692c0528..fab98ad2e2b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , libnotify -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -49,6 +49,7 @@ , gnugrep , gnupg , ffmpeg +, runtimeShell }: let @@ -141,7 +142,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 @@ -191,7 +192,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl; + inherit stdenv name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e5e94559af2..9bba010866a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "65.0"; + version = "65.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ach/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ach/firefox-65.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3bdf982f4646a019f2dc11f5367ab0c23695c9c8fced02927c2d9a862e15f6a1c9c1ef63da3ef6539d802095d0b8b48d6f55a9961a453ddd4a97d828e9372aaa"; + sha512 = "f9853b728990499933b8741103454a8e68b17fa3653917e82cfeb3a66c8221f6d0be5e4aefc230fe2040a2fa10b5eb6f465b1c2099bcec667807e040243bb266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/af/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/af/firefox-65.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "2a010ce94b6f0108cfed973dd9c632691d4d2558ed006184ba9ded8ea89933fcc77d21f82fe3add259409861cb65dd12e48aed592fc932411ddc3226c0085d31"; + sha512 = "1db183c4f5a5628fc084a2d8a049a50f9df14f012dffaf7030c7ba3934df847aeb5089cc11882fefa0cf50d278268e9568a9b06b6cef11295282fecf6966c99b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/an/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/an/firefox-65.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "30f2cd15a3d43c4228aa8b49b44aa4716ce35968cfb63d57141a3c3027e95242f4c724aee50b6d7ffcf77384e101a17cd252beaec75840f59400e0db2c111f95"; + sha512 = "ab56dfd7dab068d7844f24ca839c570cbeaace249ed80b53c1cbde283d89a8e2cabf4d1fca7db626942e5c7296668f21262e7218c85ae1357f48bcd477c811dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ar/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ar/firefox-65.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ad9846180c953ffdb73d519f1090a420deefd8b4bea531038318237ad639258bb05f4d9f88cf23650f1507034ce0700cc9e2bdda4ec02eb6e02c2d795b552cfd"; + sha512 = "4448c98b798851bb8456f2c112c3552968317ebb6c76b324c2a0148866c708d032d43134403832d6fd190f676c46203c84cd57c81b355c9b4ef6ec41ad0f3ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/as/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/as/firefox-65.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a9babea676451cb0f0126711592d3d94f57865c520de370194023157a65d5633d26f63aba9aa71472e40885d67de98a694d0bc4b65f4c1c933e3e4feb0e6be71"; + sha512 = "637184eec62bcbf580943e03384c38effe81e2562ee454c97a416f7084fdc20b53de19979c96ebc3d73792b5d01f15b862b8d42f69b29c4b1ecc91b27216a70a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ast/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ast/firefox-65.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "03bfbb6635c587c356fe622757b2b7f6e3b85fb04c7477857074cc198efa4e97e960e4d3b7c5d60aa9fda8639e605ae00d398899fdb2d05bd5fcf5dc494f4ded"; + sha512 = "9a41f53d4a4176b9158f09aade515dcd525c07e47d58b1814e9e9b698db5c45a5d25d7d5dde3855875d1853609fd55cbd16ab8756600d807f8575022cdb4356e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/az/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/az/firefox-65.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5201abfc1e7333acf0bb8967ba667742dacb2cdb8cab6b3ae60ec3d15cf756a1b48f6bc0904e02d433df5ab80440fe3cdcf4e260c4cd1c1f3da16f51c00c2962"; + sha512 = "8e7b4b17dd122706d194e57db7ca8be4633976d29f8d97c9f6079d062b228cfccdd9566172af8c341f8f95846140c05550184bb1386559ea58fba95d15f35f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/be/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/be/firefox-65.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "68f400d8640620f2af6ccf5a3b8e4fe2c94e7169e1b258d875b693dfecb4dbe070a9bd6a97b9fd668362783b73cc2eb21925bbf0159b41c4df910946bbae3f3d"; + sha512 = "16ffc474db3700184f81e6c4172b638826049656ecb7628ebd8fac3186c63ebf0b0b8b6d483f85c0f9a318e841669b7352f1e327c922996f336517769091e3fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bg/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bg/firefox-65.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "6a7b6997b1efb726dfbda25e7f7eb024013ab1c782912e03e258c4fe72adf26ab926a05f88e62255c682e6352ed88b2158f1bc12ce9c8b91714291783397c379"; + sha512 = "9c566822ed36ac32057e0549c2e68cc436e9a65b49a9f8e099ecca64f649667337bf90e196b4eb0b3e88b3be474f0bbae4c73c821249e83353dc3f4fb7fc08f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bn-BD/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bn-BD/firefox-65.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "1fe6f67067cc27f4d8b13eaa22a8ef2ca23fd3971a3140432ee389327fd97faf97be802add562b2f4ced0fc83f75b8c8c8c707c160e0ce3ec50648735704f9cd"; + sha512 = "9a071ef0998e6130590126b67d529beb6fd70cf4387e84a7638b579e885e0a3fa6d92208f960c22d99250d067e6db1ea774fba02fd79deea0f336b639d55ecfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bn-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bn-IN/firefox-65.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "d5ad4b8673ab8c136e3aaf5c2627c7210d670351744d486a896d40dd1599ee17a5cf90fe2c967d1c70989ac644f180c0efe23fa25f5f76ea4ba4f0ca0f3492c2"; + sha512 = "d0821d3d18e633631fa61384aae77d5ddbc7dd0db66e57d41405446a0ca38914c60aea886a2cf7d22800de239544cf7b67b9d2ba31723db210c4cdfb0730ed12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/br/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/br/firefox-65.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ca1196a2f2875b86c315a32d9c0091d0c72d8e2dd00d788f24000644028dc0d1f5eba7f9b2888353a2c5fbd16273412cf3737d39fd63ffeff7d0c5bfb7829922"; + sha512 = "9ad730f0426bd6f7cb8530f5199f7c62547c3b82f8ce1e6e92b49e9bf5fc01b9bc8588c527f4dcc832d5c0e4f60636c2f53f5e2b16751ec9a34ab8c81a656563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/bs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/bs/firefox-65.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "7fc343375a6f2947d2604d14a764d5cdce77209c6a1770f69cda713fc03662a7e84a6c656d1262148b57c4ec3c9c5172fd910ba424854f35b3b7fe7ce148b699"; + sha512 = "6a7d1d1ce532964185e53b23f736ced1d776d65d06655d402ce56ad91ba835375fa157188b6f387fc61dccbb79ca341e15b8ea0ab1218f8b884401f0c54989d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ca/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ca/firefox-65.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d62cfcfa8c575c905fe904f6819e5f82bc139d91186db956050dd82ed3ce65ca4eb407efab9b26049cb28d806c76d9c2516a176157b26608418f06d66167b13f"; + sha512 = "ce26a6163e5bd9a35e5ae6ec07f9e3309e6575891a75b416c582116e41e0c0724e70bd85300a00812cfd8ac32f6a2c4af6717075c1b88fc9cb7ae25d489664a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cak/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/cak/firefox-65.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b1f4bbdf515d8ba548b0e915a53d212e74d099da64631b8f05f21b9914ca2545b4092291d21b28bfdcba75be6eba02b79cdcd57ea4b39a1c05a856aa73134e5c"; + sha512 = "0e751b138716be6b80a9f5a9321cbb89b0a6bd27381e59e5fd8ac259a6a0947c040606686d4884c51adc6371431ca2f6b424115ff8a0023aa9974547a9402221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/cs/firefox-65.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a98915ea6d8a5e1a374e34b836563ad450a48816d374917562078ade754dfb1cd5cfb6cef73de942fbb1c1c1abe41871ec3b9ff17a3a6a6bb2bb36df3a6c3763"; + sha512 = "43e53539cb2628eefc457add31d3293748abbb857e0494915b54224f60e516137464e078d913ef2de7a06a68563767d2a3936caf651bafe7fca049aa0d75c8a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/cy/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/cy/firefox-65.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "ad1e6640cb799acf17b8e151b26e78a86ce21960f2f8b5baca4890e7da2fe1d4739357058a551c161e31c1685d99d988d9715b6eb6a39d785e9e526f60c65009"; + sha512 = "feb39033055f8f0c1bee933b46ad5a2d56a60c0f64d513bd606432beafe27c53a0580760ce0c0e27c92079e5727ae7844f68752cd0567239cb7d24a18b836635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/da/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/da/firefox-65.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "983fbde10f8ed3971b2ddc8161d6387b56d8c94ef3724f7db2febcb7160d17b20a6cf406e48c3a266d0e1a74f024faf4950f8dee0bd60967ff1c1ec7bde21450"; + sha512 = "4e9873d01621fb514ff4e18b1f9eb263792ea7976fb19ca89bdfcff9511d006537963fae16abf7ee950f5a846816993eacc1b0e86924678b4af2a985b67f24a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/de/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/de/firefox-65.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "59aa726477553aa261fa473b56e610807070999a1b120a3fd82a678ed029fcf2b541a71ec89f1d1a176bd40deda1cd659cc0bc1f486a283f2563a0a0236fe2ea"; + sha512 = "5300f5eb7e373ed692daf8376ef0e2767112aabf02f913778309ee21ae08d2d0d2e39ea6d37c76ae4e005b2c40c45e0902385e19daf024d4866373379d9cca9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/dsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/dsb/firefox-65.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "cc270b9e372b799e6867a93dc1148e9929d67f4fd9a8b2a1fbf4c0c95b23c6f6fa0444efa95dc545c4906b488f44c1a2eee8d9a8b6c6c5a8a3322f1a9c9cf553"; + sha512 = "8dbb65a7383d3eabfdbc6c7b5879439d91adae82349c49ca6e503b4e48595db4fd4e6ac0487cc365b969bca20ed973387dcef80a4d0d21012d865ffd2440e920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/el/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/el/firefox-65.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "170719eb9cac9d1d49be16609e5728bdf9773195196c51c6d4d6c6a1f18f72ab96b4f3124de258186f39a1b1e3a849b5de73d4b5ee48007b22a5e84370d694fc"; + sha512 = "fcd27e62f0759df47bf340bf4179e3ab0030d88ed0fe2b4b15bc9d312ad5ae44eabaa38e7684e13b3e9ec07a7b4e3fb4ec75b2d797c9793121af7a2c9d218063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-CA/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-CA/firefox-65.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "df694bf1dac6656b802285b91ce5fa5fb39e9ae6d4fced3054c7ff3c474aeec8679745f5a820b0975320bfd74108ebac83e5ca33f914c9f0be992295fd7556ed"; + sha512 = "e71448bd1edc8302f411cdf3fbc2e5b4209722828c94fab5a2317b701541df70c2b5bcbc8a5845a519021ddaac7260d673bf6d2d4d0ccc13d06be173c9e95530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-GB/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-GB/firefox-65.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f7953b8c20891907e7cfc45d7399be70b58c66710f6070f18c493b5c668d4576919af7dffbe36172ca3d01d711992749201c66457803fdd7a3068e2d7f6be60e"; + sha512 = "8dc6882d7f33b883a2bc554b2e790fb26283ee1096503ac081fdcfd59d8e21d7420ade1f0e18a4b840473bfa220f757154ca76f04d205f8ef142032306952402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-US/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-US/firefox-65.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "482bc1726399663532000749e600ea5c9c490022696b40d869e851951a9983745b26a7c4ec7f306bf174479e4213103996d075c11e2e1f9a721d392c7c615933"; + sha512 = "e3dc6d07baa53a15254042c546a4ad5f463a180bed6ec14c091627bd9f8863050a58b0e0820b24ab57c35cb3eb02438095a248f8ac7548160e73c841fc48412c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/en-ZA/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/en-ZA/firefox-65.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "bf721a577a1a916779ebf0d8c0f673d0b4d1c0230b776b2045c976ebca96baa4a6856109a837d40f301465d921bbf4622cc4609f31624551cdb056284cb36644"; + sha512 = "6d8f8e9b32e1b9abe5b3bece5d3518e7a2feda818292d2d9f1c543eafd33dabcd19fd5d49e7d21b5b73cfac791b4ec76348f90f87405a1e293c50d5e92f3b27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/eo/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/eo/firefox-65.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ddeb25f719dee34c186fd1831c1fc5166ce17a413325cda1a3be97b4a1a65b302b84bd9162ef91577fdfb7b82180267026039cbb49d0ee434497eb23ace6ab98"; + sha512 = "0fea003c6f04f76ea03d3722c6fe16124a3de5a19c8f10225643989713fbd5489ae74a7dad0006376a72ba88dd0323d44049b9ba785d0439d98fa160611005bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-AR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-AR/firefox-65.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a81f7e9aa65e516632ecbea14dda6ccd65405388dfac801e179ced1caa9a1da4c671ac7a42c3337907af85612eea46730760707d3f12376d504fc2b1c629aceb"; + sha512 = "5c4386c4751f090cc7871fdadfd110f9127261c751350cd1296b1cd93f7586c72cf86555d37d231ed4190c73199281cdb41fed8680ca6b67c90742179e4e7d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-CL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-CL/firefox-65.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "1243a4a02d82fc97bc760197c33c1e4e705ed8c47dd565a725e1c105b22e42b89b19824f7e35e844b4c5c52c78b3fde512a50d3f655ba548144ac2b6d73efa9b"; + sha512 = "c8adb9298f1f122a074d3dd19eb4dc961029c80d28642ba2c6c86c294dbdf274c4a60dafb73e200d2c62e97b8dee5a6c3cec1a51dd2edbee023770cd0fa55e79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-ES/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-ES/firefox-65.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c44b3a7b0fc6a13ffc075b7f282fa0ab1be16f98df872a7a168c3d479fd701d7e14502215ca6e211deb99c1b38bdb38ff0f4068eb978aad8d1f80b682839fd88"; + sha512 = "dcee10166566b10440e180a0ce62ce619d68ecbad4e106a82d516420f873fb4df5d20acfd27ea4e34bed46c7db7b67ccc3d7eef825e3b1f9bc1e714f69799072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/es-MX/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/es-MX/firefox-65.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3b376e854a2498101fea9de4117f970bf41185b9ce74254d64088a58c77d21845c5a4ebee07c923cc6d8e616922b109cce0d25df9e2d47cf3dc62b726480dbfa"; + sha512 = "756f7a42368a4c2d3b4ce533c16aac26944896c2f56f6234e21f837afbe3a5f5104bcabf9e65fd9be472787c2b931ebfeac28dabd3e295a2fb856970a7113791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/et/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/et/firefox-65.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c55706aa897afee00d58741191dc4ef4ef9a0f4296c407770089e488449d95044bd4dc422c3fd79ada093abceea1e649b59a9f5f4e51738617716f497c6753ca"; + sha512 = "dd0e42dc3dcc435c257b9c054fd943c96ceee2eb0e0d203d9ed9673e42eebe3716fb7ee0ee43973f9233462ac614e5696d8b323139e9ef9a02306b04edb89d78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/eu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/eu/firefox-65.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5384aa5496a9e2e40acf0b014ef71e2e06b45bd9968441715cf38f5c9212c35dd1a5fe3bece97168870dce45bb1a91390fc172c2c170307b543d29d2a7ce6220"; + sha512 = "92442103506c85868636e68d2415118c9b61aab6b8161911a9153549367bb3dfff0a269c762d1f64c84c4f08c23ea900903a7a54c725a0914cd602421745df7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fa/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fa/firefox-65.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9b83dad076df5af63d4434dee22730770d94747b29ce13e551653b5d008b3741f33aa9819547527654c9667fc79f47d73633a384174cd92d786a02ffeefd5ef5"; + sha512 = "ec3ffd6a34a2be18920bbd0cac69c160f5929698e5da3ec76d9362d50a178ee8399f418322f29bf86c7207f21e5d7c92fe170782554a68855e71469e751b26a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ff/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ff/firefox-65.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "fbe80240ac2347c05bde0a3240df050034777ee52e129165c5d8b11fac94bf9421c3ce413e9d3dd71643e2710b0328096d602795079bdcacf98bdb1fed8cf318"; + sha512 = "cfc3fc0d7d5994c4cff26eaef8e19ed7316270ddb52e91ef66cd73bd05d53b2ae7b6e10822f2ee69a7b353e3f9cd99ee4ae61d8b4833fe7b2d69e8e7a825968f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fi/firefox-65.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "809ebc16baa79ed287b980e211cd7ca3991057b538f70877f599df9447f1f787f9c0fa4fd4f54d12834ddbe35bd9d1162777ff579cc5703ea907cc70f08c93d9"; + sha512 = "4eb0acb6e7def2df35d96a3c2b54da8fa82f92374f3c8239c521096bdef2a0770e05904cce082d11d156f3fcb1770ad64aa0fae2c692c5933d891ae57b2f313f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fr/firefox-65.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "98a6dada770067be7cf651b7f2d6e6bb57a0358b6ee54af47003a153844d521b15dbff65afd1ee0b05c23ec9e91aaf434d90065a21d3e729b9abc48fe27bb8b2"; + sha512 = "52c789e07bafecc8451fc542cbac58a699351ff4e72feef4ced11016dbc60079255dc29f5cbd3d46996c8caf6fb536134ee569f3a9deab9839d513dfe1343a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/fy-NL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/fy-NL/firefox-65.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2d49ea99934ed637a2e2c90a15c3be55f9470d275af6d1ed9f5868bf3b3eb7c8871728811dba87458c59a843b310f491712d61063b43d36409e8c8d7d5567e75"; + sha512 = "379b60a22aad8e9ed6036f7365fe857ede4c8ebd149a73d103babea55b86314a9d6daa2c327c66f306a85726fa7153c6cb28f012ed1992793237ab33a124d0bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ga-IE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ga-IE/firefox-65.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2a68fee8dcccb45f9f849eb61d54629a1216a247c246565516425e072387a7e1fd9e382c799e32884d681888563c982ef894276e84ac9e537a008fcd39ced893"; + sha512 = "70120f523729356ab0a55a02e3ebe422be6ef7a73d54cfdb7d9268ce21b03d793a8ed703b814ab4b1611c2d10fe3f59d9cb0b0823a2b526ef7dc31dc56506361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gd/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gd/firefox-65.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a97c08e8632147d4b2a30ba63295e1d080e97d561163a4e87240667ca69f9094f98a8ebaeca8aa75b4d344e315ab4e72d605e06b800d4156c38fd1deb83b45b6"; + sha512 = "2758eb96b0976857a201d12a34f57de92124376d58ecaeadf3c6748b02a40460d7bd40d1070aaa8e665f33abd1ae570bcd0e70bf4a5790feae6d997ed1259b92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gl/firefox-65.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "49d4d0afda162e23437f44a5b5ee9a43e1643c0e739bf6b74e662c79b4cd63f7bbbe9c56c73381e0a3756360b03ffef01eb73be1c1b506d20bf4cd4f968b2d47"; + sha512 = "a92d0a372c62d054afd84de8a0c7a35a2d14a7ba4d4083709ff36e703e1efe69529c48b4affeccc48a2b7c98610be607da71a6c706a44d07c85b8ff27bf322fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gn/firefox-65.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "7fc62ff745bc14419ecdc11e0cb880cc28f54cadbdb19980f87162e463eb97911858fb7673c2a9c1026ff6b786c01058c975c53c16644881e2a0b0d604a098ae"; + sha512 = "d02c1f1634c1d0d9edb18cbcbee4e582786d8f9503c276ef64671b86c91c39616f33c66a7e845acfddaa206071d3af5d43cc78d6d7055e13c6b5db151835f4b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/gu-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/gu-IN/firefox-65.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "22a36860d0ed79f36ad804b636cf892c45b7dafe948df151a8a384c6400523617e1a191157f099ee26ae42d06b3ba3ef508f9ab5a4ff6f819f21ecf74f9c3296"; + sha512 = "4e7d9ce0f0ecf451a9a24eb12073d674b5249b554df2892bc710a0175d77a9026618137e8ca77aa029b7d94691fbac2e6b9ed4673443f7e14b6910c6928a762d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/he/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/he/firefox-65.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "2c46bf74a8053337958d37389f1fb457b814d18d27a337bed84d250acdde8c7a445b8dcde8507c1c502a13dea718f1df01895d76b3725e5ebd65290e1e6ce477"; + sha512 = "d4a852d54d5265e8da07ed9434f9dc990076cec88c1a9db601183cdc62a28093799f4fdb05f09306f5a75ccd08ad30ea88c4f7011483daca58f15d9f864d822d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hi-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hi-IN/firefox-65.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ba1724eb10d76c3a70a58c72b5f5a6482fd6f5e7e3b4c04283a03765e75eaba9abbd5c6e2d3e350f36d82909078987a4c1a6073d67e2e56456e1954e291fa3ef"; + sha512 = "459f43e3cf8b4a5e6dca2308d7b2c8e8aba9005ebc6be7f4e6df07f6f43b573f1d1f88a9553935daa6d85f7089301526c9b0b58c7f32daf5be24699cfc4ee973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hr/firefox-65.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5fbe87ccc58b16725c10835ecd54d825f71099ab37eb2e4eca343c6cec5f8caa5f40ce8a5b2c6989c36a10a903378e69543d1b9e157f677032c47362db144d5f"; + sha512 = "b835d360ac80a8e188e76f8f105c63015e2b698d6d2e8d82c294b372adf351d320d5b3465fd834538f6977ea76cb1bfa075dc79f891e4079787aefc629771c60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hsb/firefox-65.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "9bf744b38cac34785f56bc308b2a4024b4973e7f489d4f9f3929fe42aad2872facd967fd35bce452beb40e7c936bf400f1022e0091a375a6c7aaeac2bedeb3a0"; + sha512 = "859d24e084ab5cf552c25d29a08b3385bd99e907d596936b07cba426c39fc12ffb36905cdbbd876f589f37725161e206660bf52ec5baf7d76b896d84c54b6bf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hu/firefox-65.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "11ead0e258d6a81d5a2b8d3bbbfc5cab8bad7d35e7ec853280f7d559650d121b56bbc66ca8a25416100506300b5ef148fde573609c4a922c775abc106ca59f1a"; + sha512 = "14591b0ff0f2d4c819ccc207f95e3a25941eb5a4ea213373c018f0b567e8660abffb09a3edf3516fbcd6f64041cc466d8f80ace6ca552eb71818cdeb7e384cc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/hy-AM/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/hy-AM/firefox-65.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "67a6084fda25da7db2ade9596c6fccbb0cc191a748c8ba089bba68e1c498774a4d309680c8d36b61a49e7bb0795bfbf48d853df1a7846eda65e752d791394079"; + sha512 = "c5f11c0ef58a31258a109ace64ad512734bb48be9513e824f501f5c83c192b959cb7eaf7a3370ccb34e2c930e6938c90d48af4073dcd2e3b370bf715b0864988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ia/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ia/firefox-65.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fc2ba7e0c87c610018bf1c0705c7d263e301c6b0dfe080f44cb0708bff59e955754b4d0ea167eb5066f38a72c44312fecb13d7fcf855ac6125a7f6a833dff176"; + sha512 = "c14eea63bd43d7156173cecbee397553120db5468c7e7cf8dbd989e1dadfafce01f8f8effd942dee45c252dfa38e0d46918cd9138b1679fce03d29b0a1b504ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/id/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/id/firefox-65.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c678461c38462616f731c2d0aab9c56f5963546f434e4ebcd2fb7b48aa94bdf7d4a7f14481cc4a17ebcea1decb767b27dae914fc3bb2503180106fda7adb74d8"; + sha512 = "b107159000a9adcc10fecf2379f9cee80dd822dba4c8702137fac7b159bd24aea69a2b8b0db9db6acca773cecce9307d0e158a327263e35ee2f353782ed0ac10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/is/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/is/firefox-65.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "00e1c27374e5b174ed5bcb335b2b8a0ef8638afbaa707df46952eff48ed94fa9a021af709d8f99169e3ab33c6c763af0673b3a33c30881e09bb12b541dce575a"; + sha512 = "788f7e3bcdb419ded54fe81a16654aaba7b1901e3bf2edcad663daa46c31ac0581d051ded58626d002184378d32efc74161574c5ba91991e51331be346c13cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/it/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/it/firefox-65.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "19d34371b514f718a6710aa9d00ed1c1b61db770b7974b50702e3a1845cb0e23a9606a3e5714d1dd4dbc13315508b266d1ac9b2876a3fd5311762462aea48b82"; + sha512 = "87ec9dfee79b511d02f3ceb1d66ed6cb802e1e3e08c7a78785437af3c4af883b4d157840f0951e8bf7a90c04aa3ebfa462d7425ebcc3273e472c501a1074c05e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ja/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ja/firefox-65.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a909971593687b5b20f614ca51e6e3f37f4fa8bf9464cf714473950ec1f73912f3c3f1bb79410698511f38e86f743705d6cb8a60be6d9e2266464bc301785537"; + sha512 = "724ffcdfa355341db0c083f35c94fa8157fed7899d87f66314251c6c9ea354ff46b479b195b1ec6181ade5ec9d513e0f7a8343c90df783d43ddaed90731bf299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ka/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ka/firefox-65.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8eeeebb0fc993caf80c088d96e2e31e579edfcca5225f622e3b0a592318308f2578998668638594a6f32cb0a984d4cf534532ae2a9418e32cc750df3c33c5361"; + sha512 = "646e7c34d99184eec939ae7a55b42a7c5018d679d1b2f72b2a6dc3e8360e4b6e5770711e3fdca5c93a7014e2b92adffb415f6f7ed39a518cde67de963c75b92a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kab/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/kab/firefox-65.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cbb17638c972bda6fe83460dcd5d320c03888527b56b7d49e929f6ccb0edcc54251aa0a45162457a09929b7640c588aa210cd969ea43c1f9dbd68fc0ab60c55d"; + sha512 = "d090c138f5a9353e6739cc8bf21c3bd1bef4048a2331ff8f33f5b8fe1578028e770933caa8a0fc923f6d8f1138ab606eae1bfe5fcb164e69260405e5ff2051ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/kk/firefox-65.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d3306176c90902b4b2739ff52cbad140bcbb6cc0ae39e9f820781490a35a69428c2cc3b0204c23832bca62833523ba0975d39b3c30d8504301fe64cf7a5af969"; + sha512 = "db271af0ea767d20aa21060c96a448141440e09f247bae771c405edff460aa22319dbfbba6055a1f5255d4828cda669ce96d563d83bfac3c4e7d8fccab8d9dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/km/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/km/firefox-65.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f36fab6bdade43429941dd43da65a961dfe006001ed8d7a53041e6bdec0d668edbe09d96e383e76fe8d107e87122abda704b9aa14f7d6fa060bcdb283f30643d"; + sha512 = "3a7b5bbd8bd2fffe5b820db930f383969e1db1b567bcf4a92d29646add140cc3e941852e5e5f12527935a16ebc6e7474d3408f5b2b274b50aba8b27b075b368c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/kn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/kn/firefox-65.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "89c40234a72938d441704c4b03af679085294f20cb0065863fab92ab03446b01b7afa3d004a5b3330439682b6f9b44ac078fec3906b5f99b4a07427419442dd9"; + sha512 = "2a2951c3df5641d641f7ee760db6d4a3c7fd2dde0d096300a8c9662facdafe5e39db2cdfc06b716a5af7acfd31571112b6fd615755ddddca01ee0984bd9067c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ko/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ko/firefox-65.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "17d890cd0ebffcc24eb8b7abb4c9e29063bf8b784e0c603f4b69e3988aaf7c77cf864efc19d9774d94ad9a9610bad27a1adde53efe41240dbaad2b6a8d0ab1bd"; + sha512 = "2f870b939ed6f796b8e156030149585338d305ce2f957771b95c0ca6dacf72ff88dc8e21b903c4f48b6a89ba05c0b652314879da1c1db683be4f26648eb36fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lij/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/lij/firefox-65.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "31265524009f12d22551c5d52cf158a3f7ae0068d10cc744ba18ea3c90e1835d2119951fe11d736809369ab4358f6415e9da7103eddfa90e415c1d721980100a"; + sha512 = "4be3638df349fa2c9b40f3e8af9a58158c6eccbc7255cac19f193a224cc6e1ae9ec4976dd54180e74712e95f290bd3474935e629398d159b39601060551e7b19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lt/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/lt/firefox-65.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fd5c8a9cc4cfc5cd9e6539f0482c2dfb413a287811860a6658533865bf71b1d3c60c92c615fe588b982d2f021682776474b1420865eba66bac16cf3495747642"; + sha512 = "faea90c5ef3a206c0b36b3e7549bc95f5b46f4e7903113103699b1d8a3c1ba9765c2fc20dd3e8bab9a86b20a67f8d821d6b462db41a80cb241a8419dc2d53461"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/lv/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/lv/firefox-65.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6dc4c5caf27b7ab2191f1e2ca4b22b7ed87b7387759139e4688da174d3382af2cc971fb5735fdbce400c53ff8d9bf294512b173920e2c4a62cb5fdb4e6ceec3b"; + sha512 = "43d995dc5494e33f0d9d6144f0abf6e9a6e1558412ff62e32e1377adac1e3512908f27395c17e1e75616802b5ec5547ffa785c750f4f3498ba9bd910d6444dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mai/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/mai/firefox-65.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "afea8c98a60408823d246c4d09d2b9a0ba4c974b02e2e9088e91872d9d4da98d82924c6f486a32274e8a8f99572ee563756c9c9f0596c1d72913a9536c8261e8"; + sha512 = "8550cc53fc836e93d567a2901468c3cb5f940a3a29f4f4d8648981c819273462b77ad2fbd9c8078a74b9c4c31700220bdbded7bfbe1d731ab108a37670db077e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/mk/firefox-65.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2d5cec8d0917694c3bac304454aa1770940310f9bfbf6ec233214989577e1f83c1f81326fbebf77fbcd880b3b03c3fb1928a0078925ac343c4b51ff72c481cee"; + sha512 = "55418cc75c8f965949fac5532478a70b406d3a7aaf21ae1e7a027a191fe052a4f75e8871ac2335434fa444e8a3994ae77152d3ce56d08a851a8af304566cadc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ml/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ml/firefox-65.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "86585195d41312e5a990a388c14de87fda05c75c3cee02f0af40367a9cda9ec1034f21c4627da5c2fec020850ed94dcbafcbdb0f52302862ab23e8218e715c08"; + sha512 = "e64280160c8709ccb15bc92d0b1a4594a4bf1f1bc324eb5ec2a1abfabac6eb523e0c832f5bdfe6da027cf7f77d9a90c3c1a15a2b8f2117cfd26cac12ac9c30a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/mr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/mr/firefox-65.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "f996ec4bd929311cfe481e45813deb1a6fb8667564ed2d63d0d4d2a814ee9f8c5671fce760fade3d6d9ac76e33772e09b5f1ac80e6afb1e4edd4c22c5cc69942"; + sha512 = "2b4aa35a251ba21883f3a54dbee092e7ffacae4fd1eb9f0aadafece9871c837193ba201c1f5e32227a7609ad646fd08fea3c3ee8795eb093fc34c16dc460092c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ms/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ms/firefox-65.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "da9b9b272dc5d33910cf014005b19db7a17fb7306c55cbf77030b1cbac9d9dadebf0ab64845b232c9f9afdd7a47d85b52db9264021e45f5a172dcc2b74c32459"; + sha512 = "32b5db1d6bb9c9a22b725f5d9a4e257ab885bfc11625f4b0329dd167039fae51405d1f41813b40d3faee8ce56c2dd8a2219eed92757d9742d8c89a01bdc4f704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/my/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/my/firefox-65.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "70c33d409656fb6e9b0c3fd5af1c9411ae6084339bc2c9eac55bd2e9d5d8e0811630e9f3ac5556b816c6fc3518657073f6786134299f5cdd9b3dc0f2c11792a7"; + sha512 = "9af2dabe0a0c745b199af599b1d5ddeca52c1b7dd89a0cd4fd7a2e4770974a56bf1ac831fc4ea8df2cfa5fadb06a8fa24188e9ea2ed8124219c7621a3565c819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nb-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/nb-NO/firefox-65.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8dcf198e0b120fa5a10e661c83b604a85333699a6a524b340f736e5cfe21ed9a96c9b009db625db0160c9a79c65b62b28a8a44957c07b05b6e576a0280beca84"; + sha512 = "d9ec1330d92994bfe52d9561c1ad0221a1e71e5e1314cd41948bccf03f5176216b96eae7445eadb51f19e685baf2cb1b1a6bd22916c87d1da922f1b7f585019b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ne-NP/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ne-NP/firefox-65.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "fede145ef4f444a28d3d10339134b9dfbdfa8bc5be8a8c390c64ff797e5b38d24cc8a242f64d86b0091b4015a75fbd9589627aa0038da534600a9c68d06dae6d"; + sha512 = "f9cf43d7ddf7d7e6aaa80739beb7519c0fc9ceb1e9a05086d001a1cc968c27c82ccd27eb15f7f0083bf110abeda847cef15ebdbfd8685402f5db1be608ee29fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/nl/firefox-65.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c128881c182fd29eddde5047623902c3943cc9100add237dbc8f289a1476acd6cb45f82b8e88adfa21ec2e25f111d4dd3ed772c4cd711aad1a4b040e36a9da5b"; + sha512 = "229b35ea9660dfbcbde47c208248a4c2b54cd322dffab9c7c86a7899b879ca58ed7058a2e21f1e384f89871419d4416cb8c7e66b62b0df3ad90a52644efba10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/nn-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/nn-NO/firefox-65.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "48c706cde9c4f2f521d0e2b1d4ee6a8eb47f5afea1cea8e7424aae816f81d156a1fc08d0e315b5fbb47d9a44d329c458333b333b6c63467460d4e97c49ede199"; + sha512 = "d5175fa614e2874e6c6be16f80afadeecaef63f58af252a2cd24e6a4cdd07c5f1209c1b540254757e0b108020554fb16997eafa315f79acd20c589b74a465454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/oc/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/oc/firefox-65.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "88f91a0ef6dc1a234ee2e3ed4bb32bc12feb4dd368805bc837b8bd3f049ebccff535f6f02d2806276d43ba471620a274a51e35edfa8f195e043e85930bd44821"; + sha512 = "3aec5e9302d7feb57138af5f8ac2a151986ac4cf73e49fcf887b54f0f3863b3a0f0f12c399408ae4bda857f3dc7e08fada5da631a9c071d41e80f18cb01ad440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/or/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/or/firefox-65.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "13c5f6c63bac0acc226e92207ba8c8c6ab06e0c99135965fc9ffec46f2a6867136a42ec488bfad411412a761dd7cbaccc08062376197217eb1d640028ced18bb"; + sha512 = "de32f800e461d76480619cb254c96fd288f959270dad06c580ef8385fc3662a1f81a28c1adb14b6f367d4ddf64b413d69223dca6300f8fd2f2fe07369c8f6960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pa-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pa-IN/firefox-65.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "89222f8b28198b53dcffcdcc58e5331b6bd6e099cb4b860b1f4a7804486c741109164f11e0950456b2ab61a4be8db8a81eb67ae3655ae361801835951cbb1890"; + sha512 = "26e53ca9a8047c2032398824986e8bf1d25530493404ad530225d5bf39f0f311d2824a14f0a5e72f77d1964837896a533db02a95b6af1f61f6649aa5f5df3d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pl/firefox-65.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "780c81135a0e1c2e843518e6690b9e5ea472d90b985bd51588f8bbdf1f920bc07af75d8f294c5b30b627b48319fc89316667fa55e94a8531d5af65369af3e633"; + sha512 = "b2dfb9fb2cdd01be8baddadc7227d077275e6bb0df4314b9694b70885b6b27d5cfc303b2429dc22117a8e45a8d8d27e97941a13a5456a09ab2413ac41290c713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pt-BR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pt-BR/firefox-65.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "213c00695d9b40bb35a02c1ad006da9f42551af1554324df8524318956b9c46f6cb772e6bf7d90c883f97df6be78d527af1601eee42bfc8a5014e46c44af3af5"; + sha512 = "9a0de29b1d33e5e34811ed03c5343cc64b68fc265b0e2c530860a0fd0aed02d88e69eff56503d9688b41fa3667eff36ebeeb0db5e72434c6eb15d0bfab21a2e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/pt-PT/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/pt-PT/firefox-65.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "56ee6d56f036925be13282db7edd518524b499810ba31289d287d7b6e3e5355cc1b944d1ecca7aab9d37ab55141fe94c3af3f23f175b2136f2ad3c099f201f67"; + sha512 = "9aa8c09805ab86cdd759d4f3760133c64ca76aaf3879189e91f69769b834384d8be05a1f77d8d0afabd5960d1a001ada23cc49af24aaf18dd10d6a0f33689f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/rm/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/rm/firefox-65.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "33821af846c772f6601429a983365f4f79b3fc2df2cd20cb23f61219f544a4520fde8c4e5ec1b4474336c52a2063cfce6660928b0d0aa6336db41055f562c8e6"; + sha512 = "2042e7d66450cdcc4b3d3e07dc44503535668b24e694238b8bf0f8242f9dc41d4742fac125c2c0c85f140e12d1afe191ef1fc50dd3b5bb278204b5ce25d92b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ro/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ro/firefox-65.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bdf7a957ba453a1f50ca1831ec30c2ad3d2620e506ac6b5575304235764593ff9b545719a45f4c1143dc5e4a6e91c6024531be28bfe74904beb2f61f29db7b7e"; + sha512 = "9b28ad45768b8fc128bfa0c10e565616a824a97bbfa4b0706117b65c22e131f825eedf3acfe92965e457f9fe5e02a05ccb7135316f2fb1ecd5a95948d94ef8fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ru/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ru/firefox-65.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f77d8516b50dbe597ceb21cc5e643bd0b701718a2a88013338981cc8b7855e601884154fdd3ecc2b1edcd8b19e396d05979039ec7060f70f786aa263d9044a4d"; + sha512 = "b106e94e42edbf521aca7813ea3347afea8df9c1109f3869d2efa3fddbee9b9718eec882dfe34f5b9caf5b55bf0c6eb5cf5985ab6ae60fa3d22f7575d37e72eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/si/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/si/firefox-65.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ff747f4502626af21eaf008080477b1f19c4a2c6f6303ad96c65eb597b12e10bf1519bcdb09b79775b9e0247b521d73ab390f4930c3b2b174362b705dc65bdd2"; + sha512 = "3d5c02029bfd16d94611cf86bb23e519d892f30eac5ba0f64045839ca1eeeb3b92c5dfa640fb5b132f2a16c4cac81db989c6d89283e20ec63b444285f85aa72f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sk/firefox-65.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ebf11e1a59e06b7394abc671deb59677c4850f9060d8f2c5381cf72c1f7e59079b669b9748bcd13af5b936f7bc49b9f4cbb798f402f47cff48c8631ae77b5c77"; + sha512 = "b15c2dc19cee03213c89a50ec2405a3dad2d18003fd10a2427d8e00d230b13408c62aaa9b41378ca7272d9a9337b303649fffb9654f36fb0bfaca17ff54129ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sl/firefox-65.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b31834f097a8089adebb0f60f70803b74d65e824ef63c71a5db57ae1e25efec86e3e31fded1dfdf94f688817c0367c0c3118f15bf8fb01a0de8dd4992f689327"; + sha512 = "bd49129a77c5dad5467f0e0af2c64678afb305d8d37e43d956d66038b305f179a8a290c798a3ac675791a9d318b76f7b39da04dbd3b46a93f4ad49847434f746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/son/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/son/firefox-65.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c706f1c88cde86e2d66ba8ceedae19ef0d8fedd4dadce72df47b827b8ee8a0cd9da6c05951021b70e0329b2356ab63c35640065a61f5dc85ac2feefe612acc3d"; + sha512 = "e8b54d425f4e589a16a4432c57fab9712961432f02d41f93dc0ec8715e81859361c1db8ba8239cc3f0371f16ca60ba90d4307c5b8c5f77bc222982e03dbf1459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sq/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sq/firefox-65.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "ca15bb1c507726920c1d1c554da2c0644c388858e02b6d85407a589d6027391c1145b01bb18cb1bef1cddcec987d5445056b51cb21584e5d9ce41b9540198ce0"; + sha512 = "ab56c45406a753bd207e442677e84bf78768d0e99f2478ce85146427ce986f709fd228ee75eef1e82b1b0a15572a08128b1e069c5182a06beaed82afb3f5996d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sr/firefox-65.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "256b7b6526a9a80faf9bc754c65d2552572595c53322dd5a9b9ee04e923d2bdc42762990cc86b5cd9505d30952d311a9082bffbc90bb8e1538f93e43fdc36655"; + sha512 = "81b012abc78bfd115305e177690d9bf1128ee82100c1c0a52abf96addd8dd2e5ac43cd37e4734e830585fcc57a15c28dea7fca34f029140caa172b3a314312ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/sv-SE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/sv-SE/firefox-65.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "66295fecef20013a4499f0641d0da2e691cfbe166a5c03734fdbf364717fa8c2b6434a86f2bae48485aa42aa74aa802f743a37c5d9c60218298449d7a8529341"; + sha512 = "eb5d0367686ab57303ad0809b1f4254ca00a7fd4096a2b989609d72a0c913817f15da8047fc4144e565610b3fb65e77981c08ae8cf2f6b70af8d3d1e6ab2b681"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ta/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ta/firefox-65.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a021bcf2be37488d6c03ada0f7e8662fc57163d64c51aa17b72bc0e23c56d0be1dccb7f1699735908455ff23d62988f6541cb265050612ffe3782129f0a7d65d"; + sha512 = "6f295b7c238dd7be10cc8369a0d864aa6df6e80ca0ac02c112188c7d5401b914b450ee2a6c27c50ec16c762b21f6fe0fb2db6da98c064b54709c32fa638e2b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/te/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/te/firefox-65.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "140d7b57909bc2f1eb34c88c8283b66183aed6647bea6164582ae45fc9a54c43b18a7455b60df37a2f7ef6028c92668810cb98d4a1bf3d9e6006a85ed2dc391a"; + sha512 = "52c4e3f37109bfa334001d887a0fec4d10f68c4b8d656358c3f9b0ac3b2c016fb6af7db63014319c1e83245fc6adf3dff2b1e7bedbc439a5079943768c4b7e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/th/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/th/firefox-65.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ef73b5976507930a1290b2e7b09c90da219dd376f6e838fd821992cfd1973e4e0c1a21b6da523b050acfb303d8bc28bf29c15e517f36096a88888498a243f7e2"; + sha512 = "9f7329d3a5daa37bdd4561a46e44d80a9ee440b524f2a593836f2d8fa6b0ff4e9b8caade42dfae49d4c0a18a77fd94a2d12c4a2b4d06a8a248cca9fa6cc096d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/tr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/tr/firefox-65.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "00bfe75ff631f08452e3ecec45df2623a15c69ac1e3985b1765f61ba34a7e4ba1bffd62e3f004da83d101a1f78900938472203f3a3d0df3c694ce24e17bf55e8"; + sha512 = "f12aaf0932af544b72b0f5fe98c994940b247fb6ac1750f3018a641bd02a60e85a557a64b14ec0154e7f8bc78d6b20fdcdcc41e2df5de8d8887caa66fabeebc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/uk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/uk/firefox-65.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "8cab20c1a4cc960d15899d165ce0340e8f347155ce131d449dba8cc21bc9c882f8209b109330409eeab5ea149926eba6d0a2eb3a6689f98e4b99af1b4f7d6313"; + sha512 = "9dbb0a7d34692881a2adea48927dc30299e8165ae240fbbe4b45dd25e1266bcd3ac92b686ccaefdeff44667037053ffe38c65aa5c26840fe05ee5f1f31d300cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/ur/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/ur/firefox-65.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2265739a66dfd03ce0187decdc5472c2d773590314815e07f445e934ea8dddaea38c3fa44b7d05dd16bb21a0f6034ceaac5e7d277176503836165c6da04d4c8e"; + sha512 = "0d95db751ba90eafaf500577571710664a576a8314bea2d913c21c534d8e66f9fa7febaa1f25bc870c65ba551a601fde2bd24732e31f0279f7812ef799359f89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/uz/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/uz/firefox-65.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "226ed729da52643b6ba1728e761e69e6f6cd6949f394a18e67bd8b11558d87f15e7ff8a7c6e73eaa402c6839b1a78c34de8fa6a9a10b4f6d52b2a3e44cbad099"; + sha512 = "20a72a684afe12fff4f917e0b4f64fda015972dcf9eebbe710ca2b08e0c460c95f8a2392f71f5d88ebfb45e9c8d55b88e50459c7f4773601660172dceef8acdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/vi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/vi/firefox-65.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ed82e87e9afb51d1a4ca78905cc672279877b3dd221e97df245b9ba30e77ee01e48111efbb6b1a21c652802339efdcd979d9d3372fcc18490e86c46e87a7f3fc"; + sha512 = "6b633da4795fee729a6ad1cec0773430b717642ca17af514c70c76cd867bf7619413c81742dd03fbbbcf16c74ed330bff850088ae5f0ee60538b4b14664ed6a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/xh/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/xh/firefox-65.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e3554422c28e6e571cf77b2db704f447e0120429d859150a5f1061dbcffc0227e9f1909bbd38aadee61bbc090f6316192948970531fab9388e15d92d581ae27a"; + sha512 = "06754a3151e2ed3d44973e1352577234711b4a48917c32270f537ff1c504ce5f494c57c7bc2610e2bfb5f7489dca8954545485b2b436c190be90f6c6cfd384e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/zh-CN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/zh-CN/firefox-65.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3ec0e98f1b346a9a79c04e86f260f7fafd6fb4f3e71cd5c9de0f8a6f4854c5a67fe694cd2a10deae5f6e4b4e48da320b71b3b925413d6def030b00c7ba3bf60a"; + sha512 = "b821661db136549c2653321e60d78438e2e28b2fface6c456dd6a587b8344f720aae13c21684109c058d3273a9c522bcaffca32e9a8e424b544276c407869a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-x86_64/zh-TW/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-x86_64/zh-TW/firefox-65.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "84cd355bbf75a2d51f7014ad0d407664a5daf5bc5594e9f7a5e1b5cd1c3b5abc91e8acfa8b8972fea94c49149d6227320861d8e2751ae644893167c210360784"; + sha512 = "edd2b9c4e343ea7eda411c7fb2d13fbacc0d06e4d2821dd09dacf17cfd5a0bc948073cb1e7cdcc1a6298c18e3b12fc1bce04e95de48f44ec2c97c5cf638bd0a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ach/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ach/firefox-65.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a0aaa0d89be1c32f1f211e813bf42c3cdc1aa21f0980b2a13463227141f92293e05d144cf861b28dd66bf296b39f3c939c951c6997aaa9ab1c984e1adaf5422e"; + sha512 = "2cf4bb119fa3c8ea4bdf06646bfe423f8b78ba78bbcc4b3d2e659aaa5a1ef6ff10e25b2241f70dfb680c63f8964f6f32912aaf5f5124ecfc31eac804681b01e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/af/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/af/firefox-65.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4a2d43d08a608a7f91370bed59a57a80359e7cfbf71141a1c960fa035a93fcfa2b2f06711dc2523a9d4aae85f9d23a886930922c9ecd717c45afee17a68317f9"; + sha512 = "7d6ba5912a022dbb2e567897d4ba544c55dfea0aae4cad5c6b3b9a9a09c7a96f2deab479817c64b9ac489e5bafaa38358e5129dd7e89cfc649b37ad04258899b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/an/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/an/firefox-65.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "94cb4579e466e44c134308d9e8bc87fdeffc69f149a31e39d8e185aa86d14932bd41920a6106011a5420bd89b0d639d6fc7416caa53e701373d69a52eac4ceb4"; + sha512 = "b31b10f893c7c481fd198a905cf6b1785819be1642a51eebfa1eefa9719ead33638e46cb80847c6beb6c6d26db3fe2d78ce32e80076883ba03d497d779a539d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ar/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ar/firefox-65.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "953c47a4585da68f7385f1de7e788fbd0f025434f6f7fee3cc4f8ecb2fa5ef4d711b856fad368fd58b9a655a74e178b29cf5e40403571e36fabebae22d825071"; + sha512 = "8392022e368d7dd3b298fd611a87d0b3184bdbd86d66cbd7b90da728a8bff76bec924f360a5bbef078f1e1863cad1f6e33891740a0c991ea59a14995f42b7083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/as/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/as/firefox-65.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "27008ad76e1a6dc3165a65fa4f3ec6570b21ed17761878bd51c6eb2d0f9592f482ac2ae77c85dde2794ac2398a87bf7b6857d241ba6f70507e322a47b5ba879c"; + sha512 = "4d784986c66cea77b6d3934de48b53ef7c4e1b9d006b8e345204d2fd5d4513f2a9460f8ee990a5b64d2e87830d5f3fa4c39c25f8b4d4dc4a193666315e416907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ast/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ast/firefox-65.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a6ad5ec3380bc571d4b9bf486d07933996ef12d0fe18030e0decc9b30a3a1827c4ef41d48bb576ac18b5f498e3286aeb8facfc15e76f763bfba5756a4dee34e5"; + sha512 = "9fb264076f32676095f073760bf0159772959250db8cf0bb9b17f4e43fddf856450813723138c776bbdb971edf747ae509923c6852c6ae67c1267a2a555c55b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/az/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/az/firefox-65.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d78e00aca8eadbf3008ee89d10495a2dc462598bf3b7a508c4147c97c77861b60681ceb8238c9b22d65498d177b0c230584cf2b9a3d9f0da31a6197254b64c56"; + sha512 = "ab2146095b2ec9abdea36c7d195f10f19a08d9048ba36908c9dbfcfde7ed50f99145eefa4c144791e8b3af740fdcf7099b87affa49ab95f0def752fc3c420d09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/be/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/be/firefox-65.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2585be70036521dd83f68f6f4fb4cf19713c2ff26a4f6907ff01dd0a8216127037f754041637608f715ef14cfbfe7271b4e0632dc26e351b50c00e8eb08358c8"; + sha512 = "3728b7e679c7c45b99a627cf7890d6e25d5706050f09806bf4f00e1241182afbe1af31e40023ce121221992700107d505c34a0ecd6f196d62a332b7294953fb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bg/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bg/firefox-65.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "54d4b4096c679f10f7fcea13302eac7119e4a02f693a8c4880bebc5e4fd331ddef7f66ed67a7585f47f302274e977df237b25c2e0c41bae244e18a4d32f2f0ca"; + sha512 = "185fa90fcaac84a2aa3b6e88db7d487bbfc1f9ff76d7194f49d2e0cb5d1cae5ae4bec8b425133d570675a34d6b18c65813b503b925ba24c1367fbbc95cdc5302"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bn-BD/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bn-BD/firefox-65.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "9564b72566f535061c5ce2d7acffeaa049e8021adc6dce964c035c55cc5d118565dad54c933db771757429bcb81412a71421cbd52ec2f939bc47957f3e05d623"; + sha512 = "12c914e036850915af83d2c3a87a624d7868377ecb8b8fbe3e7ff7fcc3971e1c42b5414090f5231a94520cc69b10b5eeb99ec47793bb1217fd617fb23dfa5833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bn-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bn-IN/firefox-65.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e43676d023a668d215f39b084007812514ff663063b3a16fec72aa79e801a2463d93b292924687341be96101c58954465762dd68a4f44bb18c5f322f59beee3f"; + sha512 = "a0478e32cc60539a3da86ab01bfc3236b54936663fe446d9d520a80644d08880d04b331464a78b80a0772895ca577e5c7c12477a61eda50a77460a599fdf6520"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/br/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/br/firefox-65.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a1321fd5a1940f50eb7dc98feb6ca2795ff6710b8de7874d0726465b66ca5e1c668ec32da3f946511a21e96db8a3851cafd3ff8fe395accd68a3fe730069c6a5"; + sha512 = "a8953022563c976ed1b75d18f3dc62516b2a15b34c85b87c22279d783a61b6980ff1bd241afc062511568b2e1b397a6fe6e27dc602ee2bf5f2be6abed2269316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/bs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/bs/firefox-65.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c3dec84a9a667046d0509e4c09f8a17209753969c6d0d6aae56fb718f53c700a7d360759a0f04aaa1a575961e1fc70136478ae652b8e6d845f1b5df61c8b4dfa"; + sha512 = "740b97e9e259707c13461181f51853ac1f5c392e645d5e9b9c9ff3e3133957b033ec9dbf2dfe016d5ebbff258dbf8a0eca2c3c03172c7391169af7d2662749ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ca/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ca/firefox-65.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "6cebac4c11740848e36dfbb1237816aa1c9c7a698423c7d73e268c74a7407e10107ff8cc8802fcc0bae8c327b4ee6e559067fb78c81866de753ea781fcc10cde"; + sha512 = "2f50f8b15b0d68e069ebd34723215ed0b602f977f3858b63914cbdcb8e9fd8a67444b3bfb20dec375e6268132fc83e6608766ad6c331ae4cf54702d8b18528cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cak/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/cak/firefox-65.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "af6623230ae20f3dd7915cb395a200dbc7a5a7358bfd634e4428f978da46ac245b2c8faf0b6f2c0655b377f4472d67b8ce8bd6383cb1993dfcb407604f916413"; + sha512 = "f17206396704de2fe60ed793e77691c36e9c95e8fa1944b9754684303742721a0916ce2e124569321fb65b2a305e14aa1d3b01450cb85af7b8d5c6485c4387ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cs/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/cs/firefox-65.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "854636af5f2a07f2c9cf86549c59f76df6d338f44c02970ed8024519fd8d7ed4e8f2746f62f009fe7cf8d72dc8a57fbb9b62fe8cb3f7f9218e8ef7f47f674730"; + sha512 = "9f2f1d9c7946cf73745f0d421d994a8ae80cf8288717396b7d3208127e2c01ac652e15dec55fef61147b08d411b67e25f39013079856f4af7ac4df1185006fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/cy/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/cy/firefox-65.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "6ec88891cce5878022e377da336010c8818271a4cc543341d2c0585a76184d5ea80f0712bc6a9fa18008670603103136da3195ddb2f7be6d94b4940e3307cb9d"; + sha512 = "b54bddaea5e428c831e643f16a3b069b82196c5dc586f8c554545c64c493ac94e30841062d4c0bde59f392188aab9c53591f7a43d2e185c4398baf6c938cf590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/da/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/da/firefox-65.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d6db78a1e930304bf3629a02637cc2ae375d486654fdc4ed9e4d995049aaae402c9781ac72c6764084df3c87247fa8ba0ded438dc44955e84d90735733e84e89"; + sha512 = "6fec82f8d2be71709f6d8ee48d1343797cd261ff444e915444838d492a8e2336aab13139c2bc4e60f82c72093f9330f6de4b33f0585900c001c1a02d8f3fb97e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/de/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/de/firefox-65.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5e5a817987239c402d141cc7d42a334355b00facc68be1b89c2ca271dc1e9d79de5953dbc1da49254c1c03fc8afbd02cb1258cd2a238007ccb69601c860137b9"; + sha512 = "3ef922f039856a46a9e3647775315f0e91d007ec34cba95bfd70c813b1f983402267994469d147dc9a5b18dc5fd3edc1afa4c8eb90f644948776ba9cfabecee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/dsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/dsb/firefox-65.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6eda625b31d0ee8f7a245b6a0e769a4a35fff4352d1b33c668a0187708db892a317150d8744d65912f265cc68d72e981f6f26b781782a18f3c7691f746f0cb3c"; + sha512 = "56b66537704492890779c130ac88bc54bb8708cfdfedf946d3c940fb6bd4a309a9fd3751ced2778da7fd7b83fe3b7605129aa54ac0f9699fec742ed42a77ce67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/el/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/el/firefox-65.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d9cbd4b31b216ae65c6cbcb633965fed19010d5b26fb7f1e35c5459cd1bf31b1ceab572056b00bbfd72b5a0d2f126fa3ebc2bf05acd7216e1470370075f6eb0b"; + sha512 = "58c4280f87c6f47b458d6cbce70400cfdd6f4786526e926e56e90e5a2099dae2ac651bbd7678221271fbd3a9d29b3dadbc780e12775741da96ee9edaee7831ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-CA/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-CA/firefox-65.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "b69b7033af141d38377d76202683a5ce362cd8f52f7d01d8d04482908279029a9fe4fb7129e4ccf409eab1eb081d24764a9ae1519796612ac524857a3fc37499"; + sha512 = "6cf531ae9fed2eea5aa5e7285ef17023ffa203017ab19a85043c514856d14cd3344e5d16ad8e29e27a05c5e760d80f93aba16c29a7611116d1cf6e33759954d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-GB/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-GB/firefox-65.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "3eaa085b84924d24c3e4726fc2e7084cae6a90dbc784d157b7f94b50fd49b02e49d736ae49330a2795938487842a4a8e128ee95d876e73cfdd1ec3c959205bf8"; + sha512 = "b254123edb635c0630baf0781f1f0b9fd98c0141bb25af7acf94bc5a23eaa1bd2398a014e929e2b1abb8ef4f7250a518f11021be892a4ea3913777030f421e49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-US/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-US/firefox-65.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d7d8d14d25e4864fe3707d4d2ba7895556b92e2f375b237c73aa011afd952d3163e8492db8ec150337bdcb440c935917b3586240b44c9a5beeecbde545ec2821"; + sha512 = "41b7b2013b76dafc977c4d583e5094f2a7b10e27bea63dacb5e29e31bf323332965cfaa3ea23e4c75c6001b76f93bfe417b4567afa908e218d1c8ea6662b0651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/en-ZA/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/en-ZA/firefox-65.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "ea47abb33631e7d32288a9610d1c9d86f6414867206ad4923d23e8bd2107105a786570e1ef0f253a2ffb90fdbd890c033dcef0302a2a3145d77af51a0f11c0d0"; + sha512 = "628bbc34b70ef97fafb7783dc0fbe3232617de448e2b40d616a7fad34bbf484dcb405c73b850083807b833ef3ffecfc255bd21fef82b859328dd22bd08d92ff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/eo/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/eo/firefox-65.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a656bddeab181d503342d0015ab1feaca887894c3335a39f1b4fb3f53c6dbed4ed7ba867e51b478ed651e86e152c7135fbd4419a451a35a5e8c11c82887ea1f4"; + sha512 = "5069085f1948e55701955ace57b2803a8051ca8abf48c97aa43a9c4c693d711014176de7839b4e3594151c1dc47d49f0891a90882a6849bd92ca47c662c5e0c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-AR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-AR/firefox-65.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "404ef7313904ccd11b8f4885bbf13f3f9c2123fc3789bf983ee225cbee9542b796e700bee82dbb7b32b11f3222e1ac9a39b8a0712a6746e6557eabf7979740db"; + sha512 = "09ac4e045b054c9208c2de854078351a8ebbd426b0099cfa14edab26d147c33240bd0f987e5193150a6a10fedc9e32bd854f94c0d362ceab9ec7242529a4ec7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-CL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-CL/firefox-65.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "88b89da9b2d529cf7be8c9fa464fb17717e3f40f8b77bb47843957731aae4e59dd63f691af8fe863d74cb2db6e1fc9e66b514920dd50cedbb6e2a1646ce92df8"; + sha512 = "ff978bb6b1aff04f49d0ee6dde1b469b6f5f506c2212334de1e67c0d4ae78aa96dacfca680efc0f08ad1fe0f9c6e9836d9e3e95feb9af98652479d0d705adc17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-ES/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-ES/firefox-65.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "33444d60e3366d9875b22b2e99fa8ec674446f78a122c3b0719373a7abc55848bdadcb9f800ef1790531c9b76993ecd80d473dadd838867870f105b5b36a0d7e"; + sha512 = "faeea7da93774a1bdb8e8af888b1ea4d8fd3373f43cfbec489559f1030d6e037db1d2bde5283824b55cc7fc0ad9c05636d16beb8249f1058ba89832ad4f8f638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/es-MX/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/es-MX/firefox-65.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f7d1e5a691a8e629e11059a9bc367c1e91c525a0ed69d88bfbecc3aeb22ebe668c1bb20f307f2256d3782f804490a77ce45cd2a8f55cb547e314b327973b8d74"; + sha512 = "2f92d439bb3ef70d11eff857d3a77b9a123bf3361e7db2258d9a2b8bcc1b3277f4a8825db8771c9214ccf347e35b7d9d2d667258f329c36f38f1ba8844948eb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/et/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/et/firefox-65.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2399846600fe912de3b057a18b857f688ffd39692b9db5d2a7f70cd31dd35d8c1e09f4b73f058ce61808e22a61033963ed97e029a5170662043f684985e1a82d"; + sha512 = "7c35b814d91a310151a6e4e3958b9d0f243e4a49ee66ee2e66d3c8240c820426bc50d9ed33fe86fb8a2cbd18e54d01d4f51b8e453be97168ccdc7f82840b02d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/eu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/eu/firefox-65.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ffcce3c779c0f139bc47eb1b9782436db17977c6e3b340d0996d228a746d843a1927cdbebbe11955d659b1d39ca285e357e6e41cde09652dd762192dac641ffd"; + sha512 = "3c525a897873d354dd6e6d3180c84f41f98b5b707036467e1b0ee2be49179457238844ccb3b3aca37393c042d7ba42fc7a68c2514316ab2d70291f2776882a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fa/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fa/firefox-65.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a875e2a656a375f4ccd370078c73e72f8c6a1cf629db277b18928af35be74e10724f7bed1846d418266dd8cba1808a54108aa2a14acbe49a60b8c6d2ec6cd9f5"; + sha512 = "c3b5c4353474fa6300ab91948dfbae69a452f873e441139e2d3c0f221119ec9471ac34df1d8c7d9b3ced6aa494db8d35504ef150672afa47370c04b2cf393e86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ff/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ff/firefox-65.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "da41d26230041bcebda837d8d4c871f199b1ccdf6d872fb8024bcc4caafa57c2e409977d7c99b443eed8e2ea003210bb6564d8cd3666775cfa88336122b82b74"; + sha512 = "da475aef7a7915bf9e3710163b5c4923091d98c904c5f5527ba1398e57bd7946613e71339550986c7dca26d0b6830ee35beb0fa085b9df3de88492daa76c5706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fi/firefox-65.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "bbb3feeb706693a9f9f9733f9fd3b02aa8114b313af2a40ca00e22a30e8046aec58f91a0d47d6b3b83bec33f118dcf5f0b9f097560f32324ea9deed23b673ea0"; + sha512 = "82a47919d917d3d614b87b1d5975a15c328f37f44b64dee4689c16df2b24d2c8414a4966a918f5d45443d0d1074574c60a55ce75dc018ebf03a3e1184b39918e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fr/firefox-65.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "877f704b152b18163d4dd4962b634b9ac3e8bc218ec8e6a53ae6c13991a06c84727c20012e820213a3698257f53d6007c992e7cf9885503358a46d236a8b18d6"; + sha512 = "359d6edb4551e372ba9c5fe8d41e5fe6b1fade343394a3b78bb12b4bc04a0467c52e1abf615b5618942e82b8cab888d1cdbcd8c912641a3be8361ad17b7b034f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/fy-NL/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/fy-NL/firefox-65.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "494c5ae227db4c468e5b66fdc480ae0d9adb25f28d76ebd94fb630c096eded631e44af6efd5586aecd5ebdf62f1ed307086f9bf7af0395ca6cb599a2eb9d77d0"; + sha512 = "c11429298425aca937f2a17c7e5d3694af6e30ab86f830fcbd4589115a4d1404590bdcacca2d55fffd36dfef8e2c07299045a66268f504107361ba4f36f0c78c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ga-IE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ga-IE/firefox-65.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3e9e921fbaac835dc8745d3e3b46914fa79f64e65d412a39b659ede44ff9810298c8240966440e82a949191ace2207b7e7684530d930d0d1913913a320419c81"; + sha512 = "8455bc4817e172c778068ef7eb9933add0ac885cbc2a814799ceaa8f742873d60f679082946b29eb17139f7a83b22918d1ddf9a0412bc7b04e1385520174d5cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gd/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gd/firefox-65.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b71e3a6f1f060b3132034c435b54a735f8fff377646420b408482cd6dc5440957782aa530285f8bf7d51c56d5df8532cd0fdd826fd8f1faa06ad0badb48fd35f"; + sha512 = "475b39cc16099f22844ac42acf4908934150ebca132377b5fe3bfb8af7a3e5e57f3bd5ace7973884bca07e4b16678b74728bd7301056e74e6328bd1ee60c4bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gl/firefox-65.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ba2dfa015a3de26750c8b59f3bac8ae395bb36435b4b00b0f30a6a09012c36986c6ab0a7a33d74def2e3cc89c04d34d0d9b65e830502f59b7028fcccdbb43519"; + sha512 = "233587a44b26fdfb728ff6102c56f2cfdb91167283029f8eb41956cfd0bbe6388770b47c5a20d61ab4a5745b9cdf33d425f0455675cdf101ab7a0e500524f22f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gn/firefox-65.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "24735e13619217c444d6ef5e89f765baaec014a56a5929b0cf4df1d5401a673965bc058d440d80cfef9efb0112cee600ea8e0e030c2f5c40ad738e0c8243a6fc"; + sha512 = "ba00d9399e9ffcf42a9ee0e1f326b69471e23a6e15724e8ce1153385c1d01ca1d3a100a728367b9b7046d956bb18bfd0b78bf5066712ec6c132f9e31de0030f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/gu-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/gu-IN/firefox-65.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e32a73588df2630bdb6e36186eddc7920e5866d1293f9bd7b8a4ecdb9a2d504e4a46810856a731bcdf5bd7852ce6193694330804a58daf82029a9070d2d58542"; + sha512 = "e25ece6adaf47b357be37eed29b75f80294b4b5e99bb3b3bb528c2bf3faa92125cd26f60825bf3006f96f6c7c8f1f8f8f2555e58b4d8c0a7e675cb4d8f940b48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/he/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/he/firefox-65.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "467c77c045760b7de01d0bc25c36527c0cebefb627346359f8b1fbc67d0678d31fdb3339998a596bf183e12378124479b171bcb4b6b8f2f7d10e3215f17e7f42"; + sha512 = "75a797b2091e91b33714023273eff77d1327037d184b00feb5f0579f33ababf5e51960926b1b016331008c9d152263115e86b0c1184124a93b55376637676bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hi-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hi-IN/firefox-65.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d879dc631888b32ae06b5f99f1adbdde32e76a5bc3150bffe8f326d0728acf2d9d1b8443657194f2d5c26819017365be6af5525ca9d1b4324eff57b43eb77790"; + sha512 = "7cc281969b23652509ec3b622896b2e0090168e1d9b40fc4554bb4496e6db2164ad2b10e028bddba803fd3bf8c468902ed0b641ecfa93493a660fcf9c31350da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hr/firefox-65.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "dec69bf3795f99a070ad268e62414d7ae63f8c747a205289600c4ec4feda63aeffa6398802cddf6787fd17e735f376ca4842457ff45a9cb72c912a2b3cdc6cfe"; + sha512 = "86eaff0c5dd24464641c635e0287c1b7f807264defa33a4731ec66ef5a26045f1bce6b5fee0268f0bb8bcd3b6f8e2a4fb8a589889b61ddd2cc9e484144c97b9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hsb/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hsb/firefox-65.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "120247d2c6bbf44a453a9afcd9175a41c2ba2b927286b33f749f51b6ef4aaa993f6a6d4662ad1eff56ae736ca91d742ce64260de12b493c9dbfc52621dc81b3b"; + sha512 = "6b09444c0b7c97aa7738f091db78cf2ba4ff73aba581a4e3aa9f84785525d01b97d3045627efba3ad0b6a3817cedf718b5f75c150c0ff99f7e029ab17fa4e8e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hu/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hu/firefox-65.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fb9579d7abaab1208ec5a8a8172d57801789eac83445413cd2133c5785515ebec01824dcb76685d5c8507048025c4f9a16fe7f47233a4c5dbb0bd76fe74b6484"; + sha512 = "bdce28957e11019117231e9c47e615da082f43859aa39de9c7e0e12e70d25ca1ac6ebb660db687a80a07e56931b178b07826e417bbed85f4d949a5e43e3bcf55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/hy-AM/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/hy-AM/firefox-65.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "28f4436f9a977edd4b30519b98c1842724323df3fe638979839a87153400e806e22d73c9203eb0a2191bfaf4a389d6ea26bd81d498963aae59c926375a61cfa4"; + sha512 = "9f79f5f9b19a8eca929c86e882015daebc892a71d60db28c3656d47abfe5b9919a5838dffc25f1144d390f3b5bfcb15dc230129f021468bfa73a269159e09e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ia/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ia/firefox-65.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "1bb69219eb12abe2d731d600dfe35511cde083de13d2277868970a52a77a558d5dedac074a45f3bed3d01e18e2b7c5695d4831638ad194217f977efdc38f3e6b"; + sha512 = "4a1de2a8f3adebd03ba066701ef92fb4b77913f2e881c3fe0a2f62977642317bfab73f083393028e2d335e005698ba04dcaa4e3ea0742a6d96f4b6fa55b125f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/id/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/id/firefox-65.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "87698f7d5ce9f074b2dbcdce00fe864f36621107df7422e053b0db6ae76947238784f7ca0a045517800d3a936e065cca3e74e6bd9cd04a265d7eac3cf2e0ce4e"; + sha512 = "c29b87e448765bd1073ca54a507c38abb6fd3780d98200de4b63c224073df2229a9d1e1e5494afaf3b6b591b0521efaaa197da9a134103094fbedd38f9e019df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/is/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/is/firefox-65.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b1ef9f02c286a0ca274367394f72b980b9c59d45e4c629611c3c7dc55677e90bf9f44003038740b22d660e5e950c489acc18ef7317e67f211c629f0b86017264"; + sha512 = "ae28a51d0f6ed7eab333bac1c780e18d3c68036984dfd87613a807822a07879ca0ddbd83c4b745a887c1d67228f542b363db7f9a51968b3cc9412e7bb6f21e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/it/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/it/firefox-65.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "8507dba0adcf5ecee9224e0b8cc20b5f57ce1392affde80486a3389e04b1cb1543208cbaf151b56ed26e6124af863365805a242c6d1106842fee8547363ba11e"; + sha512 = "0fbc4de6977212bf316fd31130abc18354965c430802c42431eeea5ea3ac146d17acaa65e5b37b4fec0ec6237766f710f3c9e57870c60fde3b015fc7eb6024e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ja/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ja/firefox-65.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ea41d66d37174c936b56a3bb86d707657814eba1e99daff7be915a4ce53e35ee64d7ce6c2da0d640fd101b7cb79ea41bb49b4dac144d8741b9f217a2a042f85f"; + sha512 = "d79530f80bf872aaa53abaff3bd8ab134f0b05610e0b03545016b35b375dba5e9b8fba929964a7ec8fbfc0bc0500075112db6d7d5e3780a876c34ee45db4b268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ka/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ka/firefox-65.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "793cfb78a809f8e7acefba260197665980b8b5aef599d9a3a2dceb4e8dc83034c98ed04561abf9e4e6740859ce07f647e544d2bb4244b505ba248c8af3147403"; + sha512 = "cdf6e3bd125a0cda7819f98dac0af463ffbd826bd8b4deb0cef3f232c8e8e9d80fe2dd940b912db7ea4e04eb54e7cbc93ae1a31502a20def9efc393d67cdf9c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kab/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/kab/firefox-65.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "50ce6f27b5ca77048600db7d1f50c04a363dbf5118dc23b06395ec2fee401a205725aaa99dac3b21b5660fabca3ed3bff2a996a15ccbca4d35e73553f46a97a9"; + sha512 = "738b850e92b9ec6ac23f6b0621f9a81c4d9dd79229270cfe6313f71051a7eea2e738cef6b871e4795dd045a79e1b03084042ebc1d90ff7941e24bd913abf3c90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/kk/firefox-65.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8b5de334b237751201679b8d54f2de5ee384182395cfec120bc2eddaf443e0fd896c1594e92e2ba71943f2020fefe44b691e2286fe9ed1c21d3fc9e11c763300"; + sha512 = "f66911c4b350f7e469eef17c803d07c6c905391127bde2c8ef6a2591c9092da798a2fbd18541627362e608abb83e9fc3758e474033bedafb0e75d1b23055ec68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/km/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/km/firefox-65.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "1a64f732f2c19858cba7e109beb86726d1e51dd2a2b5a09aa380fc515041aada110eb90649c4c6ece5aa8a5857072968f4a2d43f3484dc2e311c61eeb4fb49ee"; + sha512 = "28c0dc6cc942b7833ebba96931961bfd16fc5a5d7aba1c311db327c621b2ecb246f745ff59acfe6bf2cba6d5fe511d001656f25db6aa38739b0f92c473f09452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/kn/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/kn/firefox-65.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "149029ae8bd3a81151a17c00b7166e02e22bb9f737bae1150ed8f3fbc28becf19234a1a874ca0aa6400e1b0eb75f14465546ec7e0c5bf09b8c434a5ed9f651da"; + sha512 = "66c71467634d4bb32149841035d2227510cc1c67e4fab5c4c11db980068236a5e7b7d40c0927108b8d67597cc66ef5dd44b56e315e2dfcc2b275f42260eec99c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ko/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ko/firefox-65.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f7433f3da565969ae1e92ffb4d2fb48a2b513214b08e611de2b8cb3efadf16fc6af871b470916b0611d10eb616fec09e37648c98366ec0f6211693a9f3434df2"; + sha512 = "8a36baa9d9d3666633e986bd8cff1e48efcf1f5c6b68ef44bf6d8963d108e7448d0822fc57a080a520408010dbe277ed31fe2bf6ed0ce755acae2b8759e90ab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lij/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/lij/firefox-65.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6b20b466ae15b9484c427a65388d099073eabd54f938c75eeaa886ba5db73bd1f91ba207308941b2229ee38f8dee4201599d1c11e228ef6a2e13ba0d74f7c427"; + sha512 = "c3e63189717a28f66cb6847c5aa5cc141e859b62bdda44961e9eca029ca421ac03dcc5088141f967e05b1feb80e619b0c6fd55e12e9a3a2375d209242a83213a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lt/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/lt/firefox-65.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "61a85a29003930d8deca7ba76269f437ccb47680ce8ae12b9c9913e79d6c6e6594297f890eb5a5e641610a38c1016a1947a866b8f79ca83ff316e925df8a8bd6"; + sha512 = "197fa46065d0944c6807769cae3548bc43954a7ee1644218e6ba0cbaba40abe64053cbfc50d757b673329602990246603f8936d6ed6c286830845dfc4717f19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/lv/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/lv/firefox-65.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "21ca42042d0695c9a7c5c5b5866b1fb54e65f76543f42c45efd0436fba73f5989894e0d7b67e496b101674fe3e7f0c1c374c903c9b6bcf9f9a1c6730c5c865a8"; + sha512 = "939fac5ddbd33e444b03b539beeca76819a45522c823a99b926cce1a024cb3fe65cb6cc178b0ff5f4dda950513819dc19d363af6d53177e377b3209f70a3b3a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mai/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/mai/firefox-65.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7108acddbab96033cf9cf822d93f0ef3c3ba46e75ebe09f5f1d211b7c5cce12fdf7e7bcf06621b1bbde3478441893fae8ff919a0952d76fc0f8e482a2bcd811a"; + sha512 = "b9ee674712bc6954e2f02609e4cea04a8fa9cd7aa10042431acf18f9f2f4cbe8ce0ae98de96bc1af99fb6ec838539ed5e23127ed1b0ba406b69bcdd47995d706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/mk/firefox-65.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6e0c7a12413d351ff5cc95ce56df95e6f1bc4ae320db45dd988d0dd488f525820c62387aa43003744e3cf4040f91497d4f36b4bbe4a636f1a2d010d0a9479d32"; + sha512 = "402b063500a6233e262d75555fbcb71d3076883f5080980a01bb7545496e9adf397803c260a107a3384d7631727a2dd1d10e671f93cd3408f82b441b7d34e203"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ml/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ml/firefox-65.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "03e6525cc76cc4a1f2333dbb67a3f29976d3d9068d73054711f561bdad0a8da9d14abc3f79df596696ff2c28fb51147010b7351052f3b3a8d0913b94e17b022c"; + sha512 = "19990cc41390d20ad39c0fd6bd81eb40487bc7346b4a33c5aa292d90113be7763d606417fdbb3a7879b41f90399cd3e5cc0c13caf2f953d743a655ee3de2c12b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/mr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/mr/firefox-65.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "43ef1fa19c05096b3465f985ebcd91e7581a29a380574cfa763269ab6c7f760241645d18e9475757069b7680e696be17c2e92028874c57c31b8bc2d1fc5d8be6"; + sha512 = "8d07b3f8725c7bd663d20ed84620d949b370d58c95958df79977206347e3e32d58112865e6008b948c4a41efbea046260f00d5fdcf8eeb2187113f0f3977c9e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ms/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ms/firefox-65.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ad84ff57cd2a3048862f8572c3084c2fdacf04dfd080f4679cbe5b6cd1efd9535d4fc8298aa1225067f5a3e79a9d512d933e9257d1db2df0875dab8d9259352d"; + sha512 = "e2b409e47a639717ca764c3993c2f8d993deda328c6b663f9e18ad791261a749d5d7da7ee42d76f22ecf71f4bcfd1c3d2a32f645def4bad5a91e3ddee8d31d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/my/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/my/firefox-65.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f6b51ce2a6f67193d3410bcf5210fba114d2b4a626bf2cc98930143679cb72e00657ae44116295d3fae92aaa63dbf5393a52b8d2123d024089c5efd0737200da"; + sha512 = "2124ac6ef5b1cc0644f09dd328afd51657c20847fa6efc7df2455ddcca2f122589beae86ae528d0443bfac7b0abb2d67156a67adbf8c377376d8619bc49dc0cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nb-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/nb-NO/firefox-65.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "8b416187023963128779f06cfd28db4a7bd6bed7b7bdaadc8396c51acf0964c8a1e1230082c9528e0f3ce2ff54a84383daa36e72bdacb6bf5768214b7a497edf"; + sha512 = "3a6e82a8b1a7967449ceb5f145b732d7b3eb1f74043cb4808a74ada4c1f1867d220b43bf7b6dd8bf7b9ce950c0f6ab53d3140dbaea5c8b9be23661c6af11f0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ne-NP/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ne-NP/firefox-65.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "0fec4f2b6b6944a29ef2ff0ca30c4d770d2a956564b697fcfb7a72517c488a252d990a31e9dea6ba36d9b5ee9c38f39dc8446edf2ec7caf946244bff3f1d18b8"; + sha512 = "e500aca0da755266b001dbedab47e5a1ba3c937f18a24cc3daf6e44b3130cb6d9cd350b413ca34e0d469b1567a802d3b2e2bcc3e2989ae52012270b5c070822a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/nl/firefox-65.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7fb3c8c0e441ec55c9a79ba13ac1f7d17ce3612ae6f6ba7e23a31bc2d854fc41abd38a4caa1991b9b45fd58bc2d8386c2875adfcbf40b07cbc8bf0641a4b8b10"; + sha512 = "3846cb62c54ab4835eb9c7162bf67706d1beec912a757ad7b5fee4f99cafbac51bf9809ef0681ea41f71c5761d942e0225cd3f75b5db0227a692438404f8dabe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/nn-NO/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/nn-NO/firefox-65.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "744f32b81f4a4287abc812ebe7209082c4c2f8637c0a135a9ce83377903e97e3d938037827283160a141ab89b51060313bac82fb93af8f24c71b3aabdce9a293"; + sha512 = "1e886f4f478944bb2e7d2d20d96bd23a2c06e4c0ac1de2e627aaf8207235f94ebfae6179fe52536290c0e84a485ed2abf7a8349ae430b46e4d99dce10bae3938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/oc/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/oc/firefox-65.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "2722d769575b28e581da820a3a6bf8b407a1c4018d97c2e7315b15642f4165efcc44860710141c50829a8d5d57429e9fc47565852ea9c2c018504f3a4f11739e"; + sha512 = "77c97eab7181f13d4ad8cfaccf0a17c365e1459d7a49ba69feb39c512237397e785d01578482600008be69f273258828790628f6d7f27c3e1540b92f087b5091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/or/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/or/firefox-65.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3f757e2d19540ac963cf14d884079fc648f1ea4c1281c86ff342971fab250c4ec09708c54ce0fef7eb343db057bc6bf5e15971e70123212d8a1a90bdaebcde8d"; + sha512 = "ec9cdce4bddfb5a3d0146f0d4a93a2ca0393581b15a74eb6e2bce2821f98ce099cf0c9f1236f0a2fcb78379b05f722becae27c69da0932ae9838b5235bc098de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pa-IN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pa-IN/firefox-65.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "35bd0bc1938d6fec372356721236afa3d1a794bda57eb11d7bc86601951825a143c1ff028ad6f0b4cd50e068a5a233a08108d71035abf2cd69213b3af794849f"; + sha512 = "926744b4b6596fabbe5108070a8811ed08e8a2e44a24a87602167e9579d1252ee8af2239f2ad38985bc7a5630c9e620688c1519fcc65b037db2ae2b68394bb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pl/firefox-65.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "34c91e7c2434a233a6f458b28806ac110e4382a1f685d485a2f338d66e27ec362b0424a107c8bb17dbd22ba58c0a1bded15e1bbe5ee1de76a460aaf2dce9334c"; + sha512 = "5dfdd109a63b12a68bd1bb0f12a124b3c0826fd632ca2a9bcdd8940473ee0a42619ff662b9c99b4e2d0ab703d1dbac88ec76a1154784571450d8dca59a97477b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pt-BR/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pt-BR/firefox-65.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "09e247ab05f9c02bb2ede75cc46e321a518629dfe2395be8536af77601a91d4acd1df4c1a34b54193aeaf24b0cda54582ed204258e9754126dc021e04066fe7f"; + sha512 = "eca892c2cda97e754ac060ad2e88eac96de5beec780cc6701135aa6ac5da302a0a07d4d7a8f9eb7ce94aba2e94f8979fc9fdba5906c8bfffb5b214c5c9a00458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/pt-PT/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/pt-PT/firefox-65.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3ac57c58851403af43cc01010cf8e55b734b5d1d2db60c3b6457dfc1def483d6918ccb0eb6cdc3c4a552ed8cc5975b8534bac3e644a5f7d08fb9f2b168c7c3b4"; + sha512 = "e768e680f61c5d53474ad1bd3bbd5955cb20837048b4b0cf93bf30263a0fdd3b706d36f74f7c321fb79dd64287a8fe1440678c909ea8d26d92060e6c91d9d634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/rm/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/rm/firefox-65.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b73742b939435bbb8d2a0d307abff82f777ba015b808eb2e7e6789ca93d33f658ed2e550ce917f5318ffd9ee72d92b2a47b43e564a4a79f0293560555a69cf76"; + sha512 = "70a86d99e075656c5a4286cfca9a3c64ecc316a97f2d6735066bc2a17eeec028b1355407fe8e9328a58d6e10fdf71fe30e68feb0dff6125e9ed54c4afa90aa15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ro/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ro/firefox-65.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e53fbee87ed143d5f2f7c4190b648dfebf44881beac3ee866fbac2bb8170d08c2333b8ed634696c08dd18d26acc5bbf80b5dbe9544c5a6da48175acf4708d408"; + sha512 = "d0ca0a38493323c2a68d9145ae230137fc7767f3efaa237a6a4f254d4a7acdb66bf7bbc729ba2be040096d4da7c51bd716ddd677eb0d5cfd06c4033f69c2cc25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ru/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ru/firefox-65.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "9a05d119cebb97b022ac038c36dbfd6ecf13054027b419ad37d07d6b6cb84e4bdf77c651603f88da62d116a046dec77e43c333ee370514ddcb63d53b1754c00c"; + sha512 = "a01b2db8278a15aa826aafece46b42c3ac2b784dd763901d11826dc59b4083e5e888c21b3ddc95e4264e8dbc1bae4c87c6a5768ec69b86bd174b1c1f40ee976a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/si/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/si/firefox-65.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fe70747cdf4329fd860a05ad8f69e452dce9a8a0a4e65c9ab84348b870a628746de1a74f66db42caa15da7ac5d34b071aba6095aacaa818859b041052f8b4df4"; + sha512 = "b44c1371e349995753a9a393ab9f1dcd6784854005bdf78c4c06650cfb8525544c8e3790affa0dc329989ba4c4e14887b836903b458351be073df44eae20ab7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sk/firefox-65.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8c76b164b6c2e9431dd23131a46fc613e24896cc2d02d67dde78ad4f7d2dce4baa1e08bb9120c02a243743231a54eeea68e10f2d0e1c44442e53533482afde13"; + sha512 = "552bda0818ff1a71a1f3e92b308a2aa878ffd217612dc3b98efd58855532f5f1acbae6a69e54999d200bba5fffa8729ca000f91c75eac78158c4dac46ce6597a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sl/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sl/firefox-65.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "26ed90dc4b5e1dcff81301eeb75fd6729b0a94ad0993b438867b8ae4287a03c20efbc425b8130c948bba46e71c654e6aa410a28a20fd407ca922b77f166e0feb"; + sha512 = "7feea9e50311ba00e7e94c04b6ab080721c2183ca3806b1fa5a4d9cbef131d18a1b26ab8796c311c98cf8a9032ee7a77b86a4a8b902fe319fccda5ffb15a7ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/son/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/son/firefox-65.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "11809822767088ab739e47b6774374d619384e4ee2a69690fa5624a6168c0a3fa763b85b573a1bbbd0b97f50c5738999307d91880cde14a4fb3c6ae17b484224"; + sha512 = "a63e189b71a8c648ce105094e8e568814d22ee2d9159434844adff845ef8478ca965f032f5929ed143b70fae58b22bc9d5733e2d1102933887cec364b6130053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sq/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sq/firefox-65.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "22f699cc9a59332582149087418596dd8e6b138b1c7010344f4471396b3a69ebede79d924dfe5e025d82054f20f240356d4232e284d33f8805e4891bc7b30459"; + sha512 = "88885c52ed7cfd802de8743fee04583e67cae8b9fc550ff857943adbf608408d0f8320cd1c75216b1c0f919fa4a0d7203da7957c160d02d3ef4982389e03d1c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sr/firefox-65.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b2431890e7cdf5e1563387d9c566beb3c083d81a0f11c5c1843788b7bceec927cc55bda1a92f605210aaf2960ab4bd0fd42e4d558749b5623eb7f3fab0d7800d"; + sha512 = "cf58c2724181499ec5ea4f55d0f9f8a42bd5322d0f80631dc3c76dbeaaa587a5b8d3b46f7e2bb85f312530f7f3cba717bf97edba17954dcc1cbd61346b5c9bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/sv-SE/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/sv-SE/firefox-65.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c2b7399f1b6f75440a725289df834af2defc77c773ba73f0b330689244167abcc32190e185ade9dd3c8340f6a06fa2e026c0d4c426e90471a75cb1e79b45a086"; + sha512 = "7935e8bd4678de9a5be1a126e3c659e64a556144252befc3b76736483bfc256cf1781c0848be5e2744291753766d85f050073ced0c029b968cf0d17d6a5b845d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ta/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ta/firefox-65.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b29e0db021afcfb246f980a2f5afb434c52be5324985877d2ee547a097d17ec77a7ea3e2ac9c2dc558236090954b1cba4a0fcaa10698da1425dbd5e31406aa4d"; + sha512 = "6674fb96ab6cb16f20bf366014b48743423bef5b0c81a8804457679d951576c91283d1485dca513c9549bd7df38f3489bc5447d37852ab1a007804adde77f1cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/te/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/te/firefox-65.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "709ae0eeec912c6349bd2b41a5cd10bd58ee5279e50e70623be93d0fef1655c5e0ff74df47d60c6ecae5883c5b6102ad0a4d61924cd848973fbc10bbe112c18e"; + sha512 = "e4eeae5c22eca77d3d50ce3938ae6e1faf7d038a8739a8104827f90e648527c87a4f9ed11d23d078b9ca162b5f19d109f8c6f31eb60a5dd7458d884cd95ba63e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/th/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/th/firefox-65.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "032fb59d5a502d593c1ee5f05d51d0d2a88bd3dd081857e27c9d429ae337b37252a0f0bc0c261adc71b8b2b57aa7b4321ed8ce3bac04eeefabcf97ccec4b2f78"; + sha512 = "f74865112284bd0a45b08c7982a6d70351b21628bed386081baaf525b765bcd25d889b194a3a032752ad9c79b7f2ed3e491a97da318c600b116e735f2d0468b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/tr/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/tr/firefox-65.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3ace64d030e0012f9acd06e242c52408f6b8407f65834d34b203910a18c459c6dd8a23e80d4b11b4d4792edb2ff71769c75e90ff919e80d7da71a2341115e571"; + sha512 = "9de57aa1d84ca0b1e4e3e2a25e503a1bde99f0d3a86fe0dec4391146e45ab17215752e96293047445398a65e0829ed9041182d5a7849382ac6a9d92713178685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/uk/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/uk/firefox-65.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "730b747ccdb0b31738e2272f9763b9aad992e241dfee8d067122886b625a5b7f83d53fdcb8052a00ee68ac76512c8ab97097a640cbad0f308dcec1f4cd040503"; + sha512 = "534ff926aa034821381b8bcfbad9ea70604e37145cb8044f0aeeb5206c8e864d42158e8f65c0ca573abc6c9412431fcad97b7b81a2078a6ef9c5c24d44e9024a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/ur/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/ur/firefox-65.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d10f6a9f708f27c7d935f190332c7db7d789f72a005a6474e127e6061a1e49776734c6e1a90e84213d8734c2ba1ec39063cafd5518ba482dd82bac323034b883"; + sha512 = "27daf1e7164f5078d07096a007759525b5d0dae832738dd7601eee9fa1ef6a53e54919b080b9cc7ae888582b8fb4deb5faf844366846e24e73ed5686eed5fadf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/uz/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/uz/firefox-65.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "223fa76b020c0cb9aa9fc59344b0cb103088f2ae0c3fc8037f8a6c3055898312638769b51e98107864850b1286d11e711d4225b5bf570e0fb3f7c59ee740b197"; + sha512 = "fd88f7f92aa0896f44f8e879ce83a874a0554f66ad5ceb9a67f4541531fae916c2ed01157adfaf618b152c51e53056be638d3c460975ca8551c34b649217c94b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/vi/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/vi/firefox-65.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e3d1a93bea5f9b7b02e43a54f36544e0e7f6cf5553c5d3e42ff5227396eb66e62570917c5a6317fa21da3510251efc9d3d3524bc64f19fcae590825c75ce6896"; + sha512 = "5aff724ddea005bdbeeae23094fc7035058ce0064f01689ffc6d769b7bde5c9d74db25fb68da8c5a64002c0fb7eb35fd0f55455a16b9723ca586f24a2c1cc141"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/xh/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/xh/firefox-65.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "661183377c558e2355b9ce220f73807818d25b82e9bfc05c013cd58bd35234d73d979a42542b16c46b1c3c3efac0d9524ca28bb9874ad9c969b24c2a96d601e9"; + sha512 = "d513238017581d22d34d0b4a29c1f0a7b19c390e1bdfbf1179171437debc8a52055259eabc00e0ce57b7584629b01b22f063799fac4e304e3eae229c620f6fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/zh-CN/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/zh-CN/firefox-65.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "227ce1a00441fd3e5914143b00c2815544f989cc918e978700133c1232170a145fc2f0ce139989f3b9857387928439282f44bb735f4ee8dc7ed881fd006dfc62"; + sha512 = "9e55a33ebc04d333018160707352d9bfe24b6fef6b264009058e0ac49b9389586014f74311d00120f0827ba42a070b8699ef4a5f627b1f7996b102a8a16cf0c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/65.0/linux-i686/zh-TW/firefox-65.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/65.0.2/linux-i686/zh-TW/firefox-65.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "211b738aaeb0716ab60cf2923be9a4cf6bc38f8536a32c05cf713f987249ed3a735fc6ce07689fd8181230039a4b2e2a367b72743730672856fe4b02e41444cd"; + sha512 = "e91388f5ce47c36776ef425a11fea05356581c2064d271b17a82aa1c934b2073662317c6b597d0798287a2cf57cda8ba1a2c72617d36c020c4b20c435eb4ef00"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index ee022e329f9..97163ffa762 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -8,6 +8,7 @@ , gnugrep , curl , gnupg +, runtimeShell , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl @@ -18,7 +19,7 @@ let channel != "release"; in writeScript "update-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin set -eux pushd ${basePath} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 09c1e5dd8f8..15764e05d85 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -10,10 +10,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "65.0.1"; + ffversion = "65.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2crb46l5r0rwmzr1m8cn9f6xgajwcvansnplqg4kg91rf6x8q0zqzfnmyli9ccsbqvh7bqd31dmy14gwjskasqc4v103x9hchzshxnc"; + sha512 = "2qai7krlc5whsbnwbn67d63lbm7j8mnx8nq0cw44j9nf5gnqx80afqcs08705xlf0n350xa5iif6b9m4nw0jwikps25cirwavrra348"; }; patches = [ @@ -67,10 +67,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.5.1esr"; + ffversion = "60.5.2esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0fvjw5zd8a9ki0a8phavi6xxfxbck21vj0k8415c5sxv48fwhqdhlnv3wx7riss4rjy9dylhr5xpa99dj9q98z735r8fxb7s3x3vrjz"; + sha512 = "36yzxf0ac5kf8y0z7v14dryw29zn06nm2g8brzrm1ggbsbasmki5cb9kkmvcpxs8w2h26ldnjnybzlnwx14002rd0xbhf6hzjpfbrsv"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 07ae2c040e6..b03720f988a 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -8,13 +8,14 @@ , gnugrep , curl , attrPath +, runtimeShell , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , versionSuffix ? "" , versionKey ? "version" }: writeScript "update-${attrPath}" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc3a1ed844a..90df5c40395 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -131,7 +131,7 @@ let --set GDK_BACKEND "wayland" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' '' } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 6043744f296..b0ae61c761d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index f55d129df21..60e9c603e29 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,6 +1,7 @@ -{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper -,help2man, lua5, luafilesystem, luajit, sqlite -,webkitgtk, gtk3, gst_all_1, glib-networking}: +{ stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook +, help2man, lua5, luafilesystem, luajit, sqlite +, webkitgtk, gtk3, gst_all_1, glib-networking +}: let lualibs = [luafilesystem]; @@ -11,51 +12,56 @@ let luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); in stdenv.mkDerivation rec { + pname = "luakit"; + version = "2.1"; - name = "luakit-${version}"; - version = "2017.08.10"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; - rev = "${version}"; - sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; + rev = version; + sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa"; }; - nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper]; + nativeBuildInputs = [ + pkgconfig help2man wrapGAppsHook + ]; - buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3 + buildInputs = [ + webkitgtk lua5 luafilesystem luajit sqlite gtk3 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 glib-networking # TLS support ]; - postPatch = - #Kind of ugly seds here. There must be a better solution. - '' - patchShebangs ./build-utils - sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua; - sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua; - sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua; + preBuild = '' + # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found + # TODO: why is not this the default? + LUA_PATH=?.lua ''; - buildPhase = '' - make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1 - ''; + makeFlags = [ + "DEVELOPMENT_PATHS=0" + "USE_LUAJIT=1" + "INSTALLDIR=${placeholder "out"}" + "PREFIX=${placeholder "out"}" + "USE_GTK3=1" + "XDGPREFIX=${placeholder "out"}/etc/xdg" + ]; - installPhase = let + preFixup = let luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; in '' - make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install - wrapProgram $out/bin/luakit \ - --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ - --set LUA_PATH '${luaKitPath};${luaPath};' \ + gappsWrapperArgs+=( + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" + --set LUA_PATH '${luaKitPath};${luaPath};' --set LUA_CPATH '${luaCPath};' + ) ''; meta = with stdenv.lib; { description = "Fast, small, webkit based browser framework extensible in Lua"; - homepage = "http://luakit.org"; + homepage = http://luakit.org; license = licenses.gpl3; platforms = platforms.linux; # Only tested linux }; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 290810198ad..13120903383 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr +{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas , gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) gnome3.libpeas + (libsoup.override { gnomeSupport = true; }) libpeas glib-networking ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1be4f1c4c52..2f8f020dd9b 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.5.2"; + version = "1.6.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0ki19mynq91aih3kxhipnay3jmn56s7p6rilws0gq0k98li6a4my"; + sha256 = "1pkbzhd5syn7m8q0i7zlxjdgd693z0gj0h22nkc48zjkn214w236"; }; # Needs tox @@ -53,7 +53,13 @@ in python3Packages.buildPythonApplication rec { pyreadability pykeepass stem ]; + patches = [ + ./fix-restart.patch + ]; + postPatch = '' + substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" + sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch new file mode 100644 index 00000000000..56f6bcebf28 --- /dev/null +++ b/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch @@ -0,0 +1,29 @@ +diff --git a/qutebrowser/app.py b/qutebrowser/app.py +index 2b6896b76..ee05f379d 100644 +--- a/qutebrowser/app.py ++++ b/qutebrowser/app.py +@@ -555,22 +555,8 @@ class Quitter: + args: The commandline as a list of strings. + cwd: The current working directory as a string. + """ +- if os.path.basename(sys.argv[0]) == 'qutebrowser': +- # Launched via launcher script +- args = [sys.argv[0]] +- cwd = None +- elif hasattr(sys, 'frozen'): +- args = [sys.executable] +- cwd = os.path.abspath(os.path.dirname(sys.executable)) +- else: +- args = [sys.executable, '-m', 'qutebrowser'] +- cwd = os.path.join( +- os.path.abspath(os.path.dirname(qutebrowser.__file__)), '..') +- if not os.path.isdir(cwd): +- # Probably running from a python egg. Let's fallback to +- # cwd=None and see if that works out. +- # See https://github.com/qutebrowser/qutebrowser/issues/323 +- cwd = None ++ args = ['@qutebrowser@'] ++ cwd = None + + # Add all open pages so they get reopened. + page_args = [] diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index cdee8111b54..3c127387600 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -39,7 +39,7 @@ # Wrapper runtime , coreutils , glibcLocales -, defaultIconTheme +, gnome3 , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - defaultIconTheme + gnome3.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ad145583d49..a90fd74eced 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.3.1440.41-1"; + version = "2.3.1440.57-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0wrq7c0sw1b41bshwgzji4pwl0raj0l5h2r7gkcg952rcn0wl9bs"; + sha256 = "0q8kdhsgk7ppc6cckzfk730ab136qqfdk8zrxkindjpzvl1lmmlv"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index b303bf2188b..4839ec1a2c8 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "72.0.3626.96"; + version = "72.0.3626.121"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "2hawkyydcd0b6ipfigkf5n6c1ha1vknaqd4mgw381pi0ayq8skxbjazqabfcg9gcj84cnksi8j4dylfcrbgrmlnmc479fix0m0xx7cl"; + sha512 = "2bcwgv75cmv92i89vhwd253hcgzgjxjpxr9zp46wfcw5hbiya1xx95p01wsny0blnwv76s9n7n41z3r7fkv6mnv1zb2mnb2lrzvmghb"; }; buildInputs = [ ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 3f019d17702..98d4e25ef87 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -1,48 +1,68 @@ -{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: +{ +stdenv +, makeWrapper +, makeDesktopItem +, fetchurl +, jre +}: let - desktopItem = makeDesktopItem { - categories = "Network;Development;WebDevelopment;Java;"; - desktopName = "Charles"; - exec = "charles %F"; - genericName = "Web Debugging Proxy"; - icon = "charles-proxy"; - mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; - name = "Charles"; - startupNotify = "true"; - }; - -in stdenv.mkDerivation rec { - name = "charles-${version}"; - version = "4.2.7"; - - src = fetchurl { - url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; - sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; - }; + generic = { version, sha256, ... }@attrs: + let + desktopItem = makeDesktopItem { + categories = "Network;Development;WebDevelopment;Java;"; + desktopName = "Charles"; + exec = "charles %F"; + genericName = "Web Debugging Proxy"; + icon = "charles-proxy"; + mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + name = "Charles"; + startupNotify = "true"; + }; + + attrs' = builtins.removeAttrs attrs ["version" "sha256"]; + in stdenv.mkDerivation rec { + name = "charles-${version}"; + inherit version; + + src = fetchurl { + url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + inherit sha256; + }; + buildInputs = [ makeWrapper ]; - buildInputs = [ makeWrapper ]; + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/charles \ + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" - installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ - --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + for fn in lib/*.jar; do + install -D -m644 $fn $out/share/java/$(basename $fn) + done - for fn in lib/*.jar; do - install -D -m644 $fn $out/share/java/$(basename $fn) - done + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + mkdir -p $out/share/icons + cp -r icon $out/share/icons/hicolor + ''; - mkdir -p $out/share/icons - cp -r icon $out/share/icons/hicolor - ''; + meta = with stdenv.lib; { + description = "Web Debugging Proxy"; + homepage = https://www.charlesproxy.com/; + maintainers = [ maintainers.kalbasit ]; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + }; - meta = with stdenv.lib; { - description = "Web Debugging Proxy"; - homepage = https://www.charlesproxy.com/; - maintainers = [ maintainers.kalbasit ]; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; +in rec { + charles4 = (generic { + version = "4.2.7"; + sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd"; + }); + charles3 = (generic { + version = "3.12.3"; + sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; + }); } + diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index 6a83ac34f3f..cd0ef728f83 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "heptio-ark-${version}"; - version = "0.9.6"; + version = "0.10.0"; goPackagePath = "github.com/heptio/ark"; @@ -10,10 +10,10 @@ buildGoPackage rec { rev = "v${version}"; owner = "heptio"; repo = "ark"; - sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz"; + sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/generate"; + postInstall = "rm $bin/bin/issue-template-gen"; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 597c2c18309..ffae170a199 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1fcp27c501ql4v7fl7rl5qyjlw1awk139rwwm0jqdpgh3sd22l2z"; + sha256 = "1q3dc416fr9nzy64pl7rydahygnird0vpk9yflssw7v9gx84m6x9"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 6ac232ee5bf..9e991b25fc2 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kubetail-${version}"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = "${version}"; - sha256 = "0fd3xmhn20wmbwxdqs49nvwhl6vc3ipns83j558zir8x4fgq0yrr"; + sha256 = "159162dazcr0gsq9mkwb7sf4psqq5iqqgavy2mc8qnpswdlq3pfc"; }; installPhase = '' diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index de11a116533..bb10349470f 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.30.0"; + version = "1.31.0"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.14.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0p7g7r4m3brssy2znw7pd60aph6m6absqy23x88c07n5n4mv9wj8"; + sha256 = "0v5hngfz393yi3x4c328g5bjazw02jr59ljqh6ws0j6wzxzm8jxf"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; @@ -28,9 +28,6 @@ in buildGoPackage rec { subPackages = [ "cmd/minishift" ]; postPatch = '' - substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \ - --replace 'nil, diff' 'diff' - # minishift downloads openshift if not found therefore set the cache to /nix/store/... substituteInPlace pkg/minishift/cache/oc_caching.go \ --replace 'filepath.Join(oc.MinishiftCacheDir, OC_CACHE_DIR, oc.OpenShiftVersion, runtime.GOOS)' '"${openshift}/bin"' \ diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 765d1684499..9e55c2f8a0f 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.nomadproject.io/; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem pradeepchhetri ]; }; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index f730329d072..652d4e58f67 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -83,6 +83,6 @@ in buildGoPackage rec { license = licenses.asl20; homepage = http://www.openshift.org; maintainers = with maintainers; [offline bachp moretea]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix index bb179606b36..052797db2f3 100644 --- a/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 113d6a2e5f4..34ebc84cea2 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -20,6 +20,6 @@ buildGoPackage rec { homepage = https://github.com/odeke-em/drive; description = "Google Drive client for the commandline"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index a7cfc605824..1e25db0a381 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,44 +1,33 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 +{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas +, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: stdenv.mkDerivation rec { pname = "feedreader"; - version = "2.6.2"; + version = "2.8.2"; src = fetchFromGitHub { owner = "jangernert"; repo = pname; rev = "v${version}"; - sha256 = "1x5milynfa27zyv2jkzyi7ikkszrvzki1hlzv8c2wvcmw60jqb8n"; + sha256 = "1qm7scrz8xm68zizcfn13ll4ksdd004fahki7gbwqagsr1fg62y8"; }; - patches = [ - # See: https://github.com/jangernert/FeedReader/pull/842 - (fetchpatch { - url = "https://github.com/jangernert/FeedReader/commit/f4ce70932c4ddc91783309708402c7c42d627455.patch"; - sha256 = "076fpjn973xg2m35lc6z4h7g5x8nb08sghg94glsqa8wh1ig2311"; - }) - ]; - nativeBuildInputs = [ - meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils - python3 glibcLocales wrapGAppsHook + meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + libxml2 python3 wrapGAppsHook ]; buildInputs = [ - curl glib json-glib libnotify libsecret sqlite gumbo - ] ++ (with gnome3; [ - gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts - gsettings-desktop-schemas - ]) ++ (with gst_all_1; [ + curl glib json-glib libnotify libsecret sqlite gumbo gtk3 + libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas + gnome3.gnome-online-accounts + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); - # vcs_tag function fails with UnicodeDecodeError - LC_ALL = "en_US.UTF-8"; - postPatch = '' patchShebangs meson_post_install.py ''; @@ -47,7 +36,7 @@ stdenv.mkDerivation rec { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo worldofpeace ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index bd17e86d898..25ec5d29613 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite -, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 +, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "taxi"; @@ -15,18 +15,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + pantheon.vala gobject-introspection meson ninja pkgconfig python3 - vala wrapGAppsHook ]; buildInputs = [ - gnome3.libgee - granite + pantheon.granite + libgee gtk3 libsecret libsoup diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index f39fac2605a..d5ef1d7beaa 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://github.com/prasmussen/gdrive; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.rzetterberg ]; }; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index fcaa1b2c1e8..80f98e23231 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.12"; + stableVersion = "2.1.14"; previewVersion = "2.2.0a1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "19kk1nc8h6ljczhizkgszw6xma31p0fmh6vkygpmrfwb8975d1s6"; - serverSrcHash = "1rs3l33jf33y02xri0b7chy02cjzd8v7l20ccjw2in8mw08mpc99"; + guiSrcHash = "1k4g1sd9s6nc3rsc918chnkr515qik4hfd4z5lw065bp3lshf48b"; + serverSrcHash = "0npm9p52jk04g9cmflsfph4dkj6373mfyvd3hff1caqmjalnfxg4"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 8daa5d166c5..8207c2cecfa 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,9 +1,9 @@ { stable, branch, version, sha256Hash }: -{ stdenv, python36, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub, fetchpatch }: let - python = if stable then python36.override { + python = if stable then python3.override { packageOverrides = self: super: { async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { version = "2.0.1"; @@ -31,7 +31,7 @@ let ++ stdenv.lib.optional (pythonOlder "3.5") typing; }); }; - } else python36; + } else python3; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -44,9 +44,14 @@ in python.pkgs.buildPythonPackage { sha256 = sha256Hash; }; + postPatch = '' + # "typing" is only required for Python 3.4 and breaks Python 3.7: + sed -iE "s/.*typing.*//" requirements.txt + ''; + propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict - jinja2 psutil zipstream raven jsonschema typing + jinja2 psutil zipstream raven jsonschema (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) ] ++ stdenv.lib.optional (!stable) python.pkgs.distro; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index fd3bda35fd4..8eea9a84cb4 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -3,11 +3,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "0r073nv2hmkc00s0paa538by160mh511nidmxqzghkcyb4lx6gdb"; + sha256 = "1nfqdhnnnh5g552d8klv61j98arr84b3fbhvynv6y1mxfp5candm"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 1e88456e6b2..86fb3d7de2c 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }: + cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { name = "coyim-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 0ee051a87fb..6e57ae85ef5 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup +, libnotify, libsoup, libgee , libgcrypt , epoxy , at-spi2-core @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { gobject-introspection glib-networking glib - gnome3.libgee - gnome3.defaultIconTheme + libgee + gnome3.adwaita-icon-theme sqlite gdk_pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 18d593bbdec..0fea8f0574b 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool evolution-data-server gnome-doc-utils avahi libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite - gnome3.libsoup glib gnome3.defaultIconTheme boost + gnome3.libsoup glib gnome3.adwaita-icon-theme boost autoreconfHook pkgconfig libxml2 unixODBC db nspr nss zlib libsecret libXrandr which libxslt libtasn1 gmp nettle makeWrapper ] diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cf4e6358dff..8c1af783602 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, defaultIconTheme +, python3, gtk3, gobject-introspection, gnome3 # Test dependencies , xvfb_run, dbus @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { ''; buildInputs = [ - gobject-introspection gtk3 defaultIconTheme + gobject-introspection gtk3 gnome3.adwaita-icon-theme ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ++ lib.optional enableSecrets libsecret ++ lib.optional enableSpelling gspell diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 109893850de..e8c28dc3e53 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchurl, gnome2, gtk2, pango, atk, cairo, gdk_pixbuf, glib, +{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }: let - rpath = lib.makeLibraryPath [ + rpath = stdenv.lib.makeLibraryPath [ alsaLib atk cairo @@ -15,7 +15,7 @@ let gdk_pixbuf glib gnome2.GConf - gtk2 + gtk3 pango libX11 libXScrnSaver @@ -38,44 +38,51 @@ let in stdenv.mkDerivation rec { name = "mattermost-desktop-${version}"; - version = "4.1.2"; + version = "4.2.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; - sha256 = "16dn6870bs1nfl2082ym9gwvmqb3i5sli48qprap80p7riph6k9s"; + sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; - sha256 = "145zb1l37fa2slfrrlprlwzcc5km3plxs374yhgix25mlg2afkqr"; + sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + installPhase = '' - mkdir -p $out - cp -R . $out + mkdir -p $out/share/mattermost-desktop + cp -R . $out/share/mattermost-desktop - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${rpath}:$out $out/mattermost-desktop + mkdir -p "$out/bin" + ln -s $out/share/mattermost-desktop/mattermost-desktop \ + $out/bin/mattermost-desktop - patchShebangs $out/create_desktop_file.sh - $out/create_desktop_file.sh + patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh + $out/share/mattermost-desktop/create_desktop_file.sh + rm $out/share/mattermost-desktop/create_desktop_file.sh + mkdir -p $out/share/applications + mv Mattermost.desktop $out/share/applications/Mattermost.desktop - mkdir -p $out/{bin,share/applications} - cp Mattermost.desktop $out/share/applications/Mattermost.desktop - ln -s $out/mattermost-desktop $out/bin/mattermost-desktop + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/share/mattermost-desktop" \ + $out/share/mattermost-desktop/mattermost-desktop ''; - meta = { + meta = with stdenv.lib; { description = "Mattermost Desktop client"; homepage = https://about.mattermost.com/; - license = lib.licenses.asl20; - platforms = [ - "x86_64-linux" "i686-linux" - ]; + license = licenses.asl20; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joko ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 150c47b9b50..cff1bcc56b9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { postPatch = '' # we do all patching from update.sh in preAutoreconf - echo "#!/bin/sh" > update.sh + echo "#!${stdenv.shell}" > update.sh ''; preAutoreconf = '' diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index ae2f6f10304..e131e4c7a3c 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, stabber, expat, libmesode +, autoconf-archive , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , notifySupport ? true, libnotify ? null, gdk_pixbuf ? null @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook autoconf-archive glibcLocales pkgconfig + ]; buildInputs = [ expect readline libuuid glib openssl expat ncurses libotr @@ -58,12 +61,6 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - NIX_CFLAGS_COMPILE = [ ] - ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ]; - - LDFLAGS = [ ] - ++ optionals pythonPluginSupport [ "-L${python}/lib" "-l${python.libPrefix}" ]; - meta = { description = "A console based XMPP client"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 668f466cf97..51561fa2233 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.21.2"; + version = "1.22.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0nr9d4z9c451nbzhjz3a1szx490rw1r01qf84xw72z7d7awn25ci"; + sha256 = "1j5kh0fvbl3nnxdpnwvamrnxfwbp6nzbij39b2lc5wp1m1yaaky5"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 49e5a12d447..f510e0e783e 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.32.0.44"; + version = "8.34.0.78"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -56,7 +56,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "0yzh4bmv8mrfp0ml9nhcpcy0lhi8jp1fnmnxy0krvnphkp8750c7"; + sha256 = "1986nvdw1cpj06rq76hjsif0j4z5g2k01v73r4c4n43q7dgzl5z0"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix index 3e9ebf3fe93..2b744c61ccb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchgit, bash, libconfig, libevent, openssl, - readline, zlib, lua5_2, python, pkgconfig, jansson +{ stdenv, fetchgit, bash, libconfig, libevent, openssl +, readline, zlib, lua5_2, python, pkgconfig, jansson +, runtimeShell }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli <<EOF - #!${bash}/bin/sh + #!${runtimeShell} $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" EOF chmod +x $out/bin/telegram-cli diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 1e7da4c119b..97f04eea2d7 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index d5dc3282a1c..93bde0b05c9 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -43,7 +43,7 @@ let xorg.libxcb ]; - version = "3.5.2881"; + version = "3.6.2885"; plat = { "i686-linux" = "i386"; @@ -51,8 +51,8 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d"; - "x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i"; + "i686-linux" = "1lj2gjv69z94dj7b4zjhls420fs5zzxkdlwv25p2gp4lkv0v6l98"; + "x86_64-linux" = "1dl88fpy8v3aprzdp1nnwg08sy7yiljqjnpnl3rw0h5nix6xmv9v"; }.${stdenv.hostPlatform.system}; in @@ -60,7 +60,7 @@ in name = "wire-desktop-${version}"; src = fetchurl { - url = "https://wire-app.wire.com/linux/debian/pool/main/wire_${version}_${plat}.deb"; + url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_${plat}.deb"; inherit sha256; }; @@ -103,9 +103,9 @@ in meta = with stdenv.lib; { description = "A modern, secure messenger"; - homepage = https://wire.com/; - license = licenses.gpl3; + homepage = https://wire.com/; + license = licenses.gpl3; maintainers = with maintainers; [ worldofpeace ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index deb76544eaa..a0513f7dfb1 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-cluster-${version}"; - version = "0.7.0"; + version = "0.8.0"; rev = "v${version}"; goPackagePath = "github.com/ipfs/ipfs-cluster"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "19ljx4q9msrv5wwyd85l01l320lhwgma5z3b756ldgj9fs8p9ph6"; + sha256 = "0vqj6h885dy0d3zabris8f5sbqdwm5ljhpf8z466pwm7qx8m5afn"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "ipfs-cluster"; inherit rev; - sha256 = "1zqy4zzi33z16fny1dnhqa8z7czrggvbxdxs750gxzbnd9vqzda1"; + sha256 = "0q5j825hzsrlfv3y79376l6pd2d3hiczymw3w9nqh955rphjg7ci"; }; nativeBuildInputs = [ gx-go ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index d52d8b6b31e..6bdade7198a 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -10,6 +10,7 @@ , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] +, fetchpatch }: let @@ -27,14 +28,22 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.3"; + version = "2.4"; name = "weechat-${version}"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0mi4pfnyny0vqc35r0scn6yy21y790a5iwq8ms7kch7b7z11jn9w"; + sha256 = "1z80y5fbrb56wdcx9njrf203r8282wnn3piw3yffk5lvhklsz9k1"; }; + patches = [ + (fetchpatch { + url = https://github.com/weechat/weechat/commit/6a9937f08ad2c14aeb0a847ffb99e652d47d8251.patch; + sha256 = "1blhgxwqs65dvpw3ppxszxrsg02rx7qck1w71h61ljinyjzri3bp"; + excludes = [ "ChangeLog.adoc" ]; + }) + ]; + outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index faf069cebf1..81073222c2b 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, runCommand, writeScriptBin, buildEnv -, pythonPackages, perlPackages +, pythonPackages, perlPackages, runtimeShell }: weechat: @@ -60,7 +60,7 @@ let in "${scripts};${init}"; mkWeechat = bin: (writeScriptBin bin '' - #!${stdenv.shell} + #!${runtimeShell} export WEECHAT_EXTRA_LIBDIR=${pluginsDir} ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 006684ecc10..41f3a271a69 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable +, gtkmm3, libpeas, gsettings-desktop-schemas , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; @@ -21,10 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas - python3 python3Packages.pygobject3 - notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme - glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); + buildInputs = [ + gtkmm3 gmime3 webkitgtk libsass libpeas + python3 python3Packages.pygobject3 + notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + glib-networking protobuf + ] ++ (if vim == null then [] else [ vim ]); postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 47a104b252c..34361e1dab9 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, wrapGAppsHook, autoreconfHook +{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 @@ -10,7 +10,7 @@ # gdata requires libgdata # geolocation requires libchamplain , enableLdap ? false -, enableNetworkManager ? false +, enableNetworkManager ? config.networking.networkmanager.enable or false , enablePgp ? true , enablePluginArchive ? false , enablePluginFancy ? false diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 2b62db069bc..6c39dc78e57 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer + gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ + gettext wrapGAppsHook ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 86f945f369a..6356fcfc209 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.4"; + version = "0.5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,11 +10,15 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp"; + sha256 = "0fyvydafpz7vmwgn7hc4drm9sb7367smrd07wfyizpas0gmxw2j8"; }; makeFlags = "PREFIX=$(out)"; + postInstall = '' + install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze + ''; + meta = with stdenv.lib; { homepage = https://github.com/chneukirchen/mblaze; description = "Unix utilities to deal with Maildir"; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index 6e2e8d58c67..88e573f6cf4 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, unzip, jre }: +{ stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }: let version = "1.9"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { mv $dir/${uname}/* $dir rmdir $dir/${uname} cat <<_EOF > $out/bin/msgviewer - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${stdenv.lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@" _EOF chmod 755 $out/bin/msgviewer diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 3afabb8bafb..dde0d480391 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "08w7lbhj5ba2zkjcd0cxkgfiy9y82yhg731xjg9i9292kz1x8p6s"; + sha256 = "0h8rmcc62n1pagm7mjjccd5fxyhhi4vbvp8m88digkdf5z0g8hm5"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a8c322b42b8..0da451ed51e 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell }: let muttWrapper = writeScript "mutt" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' echo "" diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 106be4fddc4..b6d552d96d5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28.1"; + version = "0.28.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi"; + sha256 = "0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5"; }; nativeBuildInputs = [ pkgconfig ]; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ]; + maintainers = with maintainers; [ flokli garbas the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ed798ee9233..7f32e45f5d3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -30,7 +30,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui -, defaultIconTheme +, gnome3 , libGLU_combined , nspr , nss @@ -41,6 +41,7 @@ , gnused , gnugrep , gnupg +, runtimeShell }: # imports `version` and `sources` @@ -117,7 +118,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 defaultIconTheme ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; @@ -159,7 +160,7 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg; + inherit name stdenv writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1baa173010a..9769a5e8ca6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,585 @@ { - version = "60.5.1"; + version = "60.5.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ar/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ar/thunderbird-60.5.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "42bba29f92dd86f1dbbb0ffd2e13c464b62b418c387f83167e82f9a2d6f4953329bb3cc772dc1d2dac10471c1ca1004f17f0923160485802fb8676677ac73912"; + sha512 = "ebb79e23a3f67c6d365c95d4570d5d278731231839cf4ba8ae2231aa68eb28ef08165bf025798d5311f5fd28a66dc90a1fe52ec52e4e1eb21084c1d613c3c3e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ast/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ast/thunderbird-60.5.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "3e15886ac06c83d33d33dd49afd4256ae52ccaf17a9b5cab69fde9ea4598803a4e8b8048f1132d7f07d6fc15ae65e272ce1ded92adfbffca0c9ca28d56904483"; + sha512 = "d3eb72f40f5fedc2e3c6f3b3472a8d90d74e1c6599e6dded49f20c1b3e99efcdd724c09645354d0ee531b2bb9f5750742c6c97f5323b23803b59a0f93f2fe98c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/be/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/be/thunderbird-60.5.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "f1ce8a443ee22e6ef9aeddd609408c75f66fd162cdc68dc8bdc70c301e5937d1ab6c3bdc021646e36e7d6c39b284d74742049a1eb0f9349c3d3c11b2b49a90fc"; + sha512 = "b895b42343a9abc291b0cbaca4d1a190d7472f9206b3161cfa93d97489846682be44c923e92b27fb7e84e3dcda9d727ff8130eea731bdfd28273a691a38b3f00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/bg/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/bg/thunderbird-60.5.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "be7c25bcb9688c4f90e6496b1c8a1ec3e58753aa4d9eb63e84863013a4ff7dae92e3d9e299c509191bd8336deb94d30ebcb44ea39b881e5bd974427d8cc2de72"; + sha512 = "ba2b1c0666466d89ff01dba6fae809b7515d026b3d34de4f27c0bc6230f722739822da1d65f4a9c1ada66ecdff8b50f8aa6164c4ff0bb3d8a1c11c355e441cbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/br/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/br/thunderbird-60.5.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ed4ac8a3ad7b1b6b4b553b52b1b00c8590872bac407ecb539f3f8f3f94579af85ace6196525a93e1f726ec8ac9a72c873d438737a09401673970e923ddd0dc02"; + sha512 = "79937d514822bcf5f2882c4f71e277d6450adce04cd490001bf2535850689ff8691a715030132c805b85406d3aac0d4bbdc78c7f77398db43e1fedeaea2ebd81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ca/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ca/thunderbird-60.5.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "74303a6784bf8cd6a40c3dc548476f67bc1bfbee163999c873635af7df712139a216e5047c61ff3613391f10b1ede6b7d1520e9e30b9d100f731607a5314e56f"; + sha512 = "f1948d481fff6cad4ab0ba48c40c3e317c3cd9a68972d7c94fd4d92fabcc0becc8bebaf4e5517016af26125334695fc6b7be17ccf26fd291cd5a679e95b632b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/cs/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/cs/thunderbird-60.5.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "cd3a2f34c084c6e8bb628a73979940d5c0a37608173faee08cbba289af283eb2f9b6db494beceb72ccbc235f2ddf71b2bd966f9935d90efebe6042d463a50dbf"; + sha512 = "9210fda93564133c67db5f6a10783a65e34fe0a2e8dbdb7f30fda60b4b839525530081376dc88482bbe5aff37580f0d837010e21d076994520e36a7c6ea27721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/cy/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/cy/thunderbird-60.5.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d0fc024e76e496fc159e70efc7e50416375c8666ee07ec858c15de9013b8e4ccf4fdac33ba5b2969c76e7a0e8ed4474377528ca46ed5701b17deef3940b971fa"; + sha512 = "29c35ffd5e33627ee4f3c9574b1dbe4e8addac509afbd4186f5e47284071711dc0bf74e550aa0896f39fb4fbefc72a8475b665685121fddbbbd870d020e5913d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/da/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/da/thunderbird-60.5.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "700e73df23ac5e3d193d147f317c55a6a356b8a87b2bd35816946a8c9a4ffeab857f0c9461a8a0e2568827bab92cad388010a540e0959d14fb1fb36d5d7b683c"; + sha512 = "e64c03f083325750020f5502ae4bdbd3b6e20a0fb9cd1163c87c2b7baabbd576dffb06b24d79c76a81d40744e6dc4064dff6d316d8e2a216a4a4e9e546f11aed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/de/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/de/thunderbird-60.5.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "bf3bd905e89680a2ed6f123d45f9fb554ef1b1d93d9048aa0680f2d9a0d2c882f8100ab45f0b9d16fd0411b3c93e884561bc37680019c4a1cc90d5014144d199"; + sha512 = "d2727f56906e742c77365655422f0e53ca822702c13b496181889dc778502f922900c76178259797300dd3a440128103e7e6f48be1316a85f41edccb7a9c291f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/dsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/dsb/thunderbird-60.5.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "58d016161ff90489ec090cb5f62593f22a29bf87bfee689f9a5489f9ca711d1a08199e48fa7624af324e051b96bf4cb1fea8c25f0cac5a13e2120067966a8133"; + sha512 = "19eb975d0c97168e0106baec96ca8a645bf42f7f5993e11f0e4e2c6bd797808a98b70cc643872e3f03c8f8fa644cfb46210bbcd96d91a5f5f8bb4443f49befdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/el/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/el/thunderbird-60.5.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8edb85baac50532067832341fc15fb01d6ad5338c1298293926aca2f3bb604623de495f95dde78a1d31b669cefec7c62b870f3d324e1d18787bf9a4b17483436"; + sha512 = "10cdb6888830d88bde779d402140dcfcc68c5d6d1fe77a8a0014bd230314af28b5a04a93f36a15e32d6cedbc6c06f9cedd447d1ef120bf0e332b71e8bd67930b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/en-GB/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/en-GB/thunderbird-60.5.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "39d7b7996d46cbba174780ccd31e86b8f168d5c7af9f3753ffd6c6b6050aa72d6863c5287db3f7f9c30fe80a4f20ce8a9918b9f37471d8520682ea4c34bbcc16"; + sha512 = "09c8fb67e8d8c914be78d7af15e9cfc292fba45d87a8e95c83c38ee271c9004155a8d2826aaa880716e997ef4e6edeeab32b447b673c1ec6684d796d53e872f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/en-US/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/en-US/thunderbird-60.5.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "99588bd58ef55ff7f9b8b248bc0cbe04707e0f94ccd248f0dd7caa4c1f21945e694deee3b41258c818c33cf845d9a38854a6ded5e225332752942da7dd0bfdc9"; + sha512 = "89efb313ef9246590e38bec044682c0a472741be3dcb7addb982ae09072d0f63652e4bda632d76f0340417b7a4bbed4631e009300d896c0e06af7626ef2fe526"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/es-AR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/es-AR/thunderbird-60.5.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e0e28a36de8eb088c4f56044198175fe87968fb977cfe515aad3abf28b9846f76c575a03670a9a618cf46f9906c0086f5a671fd4440b3aa4614bfae0799743ba"; + sha512 = "df915675422bd60d59f1e427c8a7fd68c20b3feb70e7a15a3d280ef3c98a40edae7663a266e5df3fb1045f63c480584a862dbe9c20bb4a208bc2baec2ab9255d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/es-ES/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/es-ES/thunderbird-60.5.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "846ca3ff9847106cfa23a74ca3add2d7a12e5b192734ce0f2a027fff037e8ef8344b60fbf36ac678f20dc2292f7d4cc44b80fdd644af6ba839f2648fa996cafd"; + sha512 = "449e0e5d02bbad21569a45b61d16f5a8ccee853b1e6716b24e66744f1e6688bdd9adf240e06b2e40b71306759795bda150d8fff201c2b91466df06a66f55e484"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/et/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/et/thunderbird-60.5.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9a5c4616a40df5c35629cfecb1086f43b7a159ba4c966b52022e2f7a6b9d3437a0b933cbf3b857b708b349e2dada43dc82cdbeb2824a9b3c49fd466bd1dde89d"; + sha512 = "09f0e6dcbc99e9d39f253225db3d6f370414c3120b5ef0fcb3258ea3779117f4f41c6481aedda00ec7006993c3b05e14b0aaaf7b9a805046717ba29054803a70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/eu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/eu/thunderbird-60.5.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "72950cf78c2016f6c7679c6d4a45c39a3b325c491de0def38758556f945867d8299678abdf1de052e5a18079753a820b7329935ea373b0c5cf32063efe953471"; + sha512 = "fd2097d6fbee4ccaa85744af1676b7ab8097315d9f52dbe0b60d2e620d1bcd052f9eabb9eff5791654a5b87a8d4e6b170318ef8dd68d666d4861c5bede1fc879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fi/thunderbird-60.5.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ba815c3de1a894cf616c2172528c045aeb4768c237abc6c11234c8e6d10aa80b7578e2c9e562957bf6e5f757c0fb5fedf65a905a2c49836e08fe18029bef5065"; + sha512 = "2c7ac9136d7d44f8870f5b5555f21405ddf6f243cbd346c985f71ca12bebc05c81a25ccc7050919704d9101643accc50c3fa8a5c6f93a6f97c96e91adcc07833"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fr/thunderbird-60.5.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3da8f0eed4096f64ac297feb87e902a943ac025d8db66ba48a56456d450fc6bf4f00c729b4b72bdde4688991a1a6eafe8f71f91859bf3d3b0db80b9953035d42"; + sha512 = "303dc437b230d5991c4ca33afdec531c2c5b2b67d02b4f9ee923c2b4ec434d0765a8fd670cc2978226eb7a25982ddb4a14f91c0829aa97d822f7927421313170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/fy-NL/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fy-NL/thunderbird-60.5.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b49c4b191651d8f22e23c7ba1a7a4bf28613162bcbe9926dab9ac42a9c4a96e26bfa74bcd6ca5e0fe8c43070559990f885300c71cb3638eb96efdcb307f9b513"; + sha512 = "040d1112d135ff81aaf86964eafd235f6d9cb793049e5cbb68d9d183555eb2b08af257046de373a1bdc76e0113e372369cc1c0ba26381204cc089f2a7c752977"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ga-IE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ga-IE/thunderbird-60.5.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "fe360cbd6e9b4cec554f0f9e72501707aeb7b52c9dd783c028b447d79a0172c6b42ca52593e5a6251c4090fddbf15ed21d2ae97f055c2a1d77efc60e5c63eb80"; + sha512 = "aa9eaaabbae45d554a31a5ec9940f7dad5c1ad46d34438f6cbdce5573a12d019c014bb4e9013e3efd73b68ffc699b5bda8721901b78af83dc370c71d588ca1db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/gd/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/gd/thunderbird-60.5.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "29b6589c431ea3f5e229a2868220ddf2ec4a9146cca6cfe02cb471eeddf193d8795c1944582047cb58036be97a83a1dc87797623bf46fe856f7bf6f52d2a73c0"; + sha512 = "479601e5d4b346d9c69daf2673b12a8e74e5f4ee924b0deaea7a6ff56c92ff5aa3ada825ebd75bbcf6e115455e032e50d1e7cfefe51f9bd059d499a023b514eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/gl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/gl/thunderbird-60.5.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "60cc4f02e9e67fb774eaa21ed6c4525b0bcf3ea59c52934b043921b690405d53185336acd3c47a34f03efc2585b29384764614c6bd24359a32f5294872208fb4"; + sha512 = "fc6b5c061bf402f46c255befe2ce6a752d2ede4af5ba303e1e88ce935553ff4bc3defa5a4b54a10a8b6a3888044300f9472e0390ce71e43b256be0e549a61f60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/he/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/he/thunderbird-60.5.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5f0252d6e36de08da28520b72b2d43539652c8e38b12db525e69c8cc459244e7304904d334730728e1887fcaeeefc45ffa8998a59d07e32cc219d9b437dbedb4"; + sha512 = "f942b69831af29e4024c3b5250e6eee3cd5cc19863f960bc477f90e75e55bce7098fba1155452d67dc2f5a957c1fdcef049a0b4e0cd8867b540d34b6c17ac6c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hr/thunderbird-60.5.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "fb986a942ea25800f2eba0f98fa14f1fca71d7fbe55040d4ecf70013be413cd3afb6c323e35a76b085daa6ff2defb062e2d27c8590231ab5b0d87125a8f3d1f9"; + sha512 = "dd0cd07f20e8b28581ce34c3481a8aebad31099392151b5cfb5503b3cfbb6b69a595a4c58702a4f359d860f325cf1feb73ac13456f743410e63b2471587e45c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hsb/thunderbird-60.5.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "f7ce5acaaeb88a1322d78e9d66378dbde4a628fecf1e196efaf42ccc6ca02d99192dd3b8271399d288cdf74233f7c42df5e4a2a6e44d22d5c177c876d857e4be"; + sha512 = "7a18f221a0d41fc52a4efa63ad85bc41e3d7789f8e5d82ff60f2163ec4e9a0da420f795a2be4e4d05c35589cf26460b01f660d03b83039cd46684fde3f980668"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hu/thunderbird-60.5.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9319cf8f6e297bcd8d263bd6528adf6eb63560469509482d0c9bb24488c91865d97084ce6fdf2aefcca4585d64c83991438021bfcacf26861eb5db42cd6bdd9e"; + sha512 = "9a8206e613c8989f1288936853070b0e719294aabbd2454ceff0ea8f2fca36ead7aa51a0b7b1134b4d75854d77f64cc809d4a12e6e2216e30f7d67ff41c8db6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/hy-AM/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hy-AM/thunderbird-60.5.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ca4efc6abea252c4637966718fe7ce7015325edefd4209216de3fcd501b86744349be48fb19ae21a8bccb98848cad8604afcd48518a7a42016a999adac5b0c0d"; + sha512 = "1166b2380d09ae62dbe73713e9ae978f613997326cfac04b7c30abe94e51637a5ac4ac23be75d2cbdcdc60e1997b58bd8c07c35e13987be89b439cae4edc04ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/id/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/id/thunderbird-60.5.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "deec3df7b9a25e450000976fb03389d06befa0429ed4970327f9265d6576b3a914646c192bf857c47cc1881a0e71ad3b52f98c6e66cbbdc43103715cd983f118"; + sha512 = "34006d900389d1cb5f29ef379e5aee0177df74f22e43a42f99520821c04fe5c33cda7ab8b77665091403b889ea54537561eea14532290fd096efb4f7f8ca3615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/is/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/is/thunderbird-60.5.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "1d88b0917f636a48af360003d57f30b9e4eca4d6ed026184a475f980abe7f1ad011306dc542ac124fbc1787f386421ef1fcc1937e06432daed92b835fe4a7865"; + sha512 = "e8b96762eae43a50b73b7faec2647d13612dfacc4c58687461ce2ac08e14c54bcce138c82378ec7a71660dde3bb9d96a29f78f304f51ede8751d97f32b9a4151"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/it/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/it/thunderbird-60.5.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2a4028b462dd764e20f14cb97667466d548482ca28d621e4e830b8aa29ccace76389f0bd9892b5ad4fb54908bc83a7975a0dde1129ee54d7331fbf0682fc445e"; + sha512 = "42182a88f948f57a9c8efb347b6178bc14c6d5bc13b3814cd9f187c84c47aa897d904495443d1d8800837d66e8c3bc4a266df4a08ff1a31ac136f0860a563423"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ja/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ja/thunderbird-60.5.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "89568859a275424d00581bc596172fd8c5fe562c01087d9d63b734874e91f5933d80123d66fabb34a09f11638a5552200ce32ce13a4eb5464af380332687381e"; + sha512 = "dbc4ccf655ded43805192ae65c67467002645fc527c935c4e15871173c7bf975681df66ba1e21ff823cefddc551e3680d50dcda9fd2a072234977c83dcbe31c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/kab/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/kab/thunderbird-60.5.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d20004efd3285670ee253d519cf1cc0d6f0fb6f3b95b0c4b96e56a9bd1d8c6183accaa1989b1038fd69683fd2aa3f5ea68a545a965c6c4d9a194eae2941d7d55"; + sha512 = "cf4fc5243334b8ad84e007606cf836c12d0c51aaffb02d97eff8a248fcbd5644a82767b8e129d1643e0efc03525db65b6ed7cefe8a53e0680c9984fe2a13f472"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/kk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/kk/thunderbird-60.5.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9d3963346b80e8877a5edc49a76dd0b2d26737ff887a3f2847df8e9ca359966575beea15b9390c1086c1a31690f0d70a60726eeecace1bd0f9490f2fe5d99c96"; + sha512 = "a2be7803b84d9bc9ad5be834226e314a980c60d5079339beba9de6e296c9b26c02ab0fb6e06398061588df005b9dec4e19a6eb55a1f7f51ad7ecc61fe17a9b50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ko/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ko/thunderbird-60.5.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3d7b645f5fa84bb6d22bbcd5d4d963f56613836e3da1396188645c82c5b3519723bfd041f9f3b74b7da966c6700a0ce8071662683791583ef09ba252a053c5e2"; + sha512 = "a0b0a2a4818c61b838c22f55c8950a826be819c22e17e38548e18b189e5bf9743eb3832eba176087c291ff12349415d12c3c83416b24d38d148973e2219f6daf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/lt/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/lt/thunderbird-60.5.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c8efa6c786c9075c8abcc9c544ece1dd25b299bac3444ff510858c32c9ab7e162104bad236edebb7b56b4a1fcedc9c1794acb2c2b907398d3244439750cc0d04"; + sha512 = "0b2635edecfa8517a967fb298f91e77861e8af2a6dead50a451ce23e36c26ba8b0aa4c9339828008178d5b3c3f36fb2a13d91f48446a507eeed8824fb162c578"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ms/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ms/thunderbird-60.5.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "42bfcc826317bb07bc54fc2c14b27f784faa05fe17c5ca1a5e7724a47490488856172a595aaa4f56b01ff6f702c3eeb6715da5e48df2af67832d2b4bdb979e1b"; + sha512 = "3671774abf19d63fb5141c28f4d3a35608db59eb75530e6f78337122a42a78a467fbd0a0cd33402286cb3ebd43ce777b202ca704ddbf0ea7a4ed52981ea1c01b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nb-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nb-NO/thunderbird-60.5.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a4b21d7fb17a73f9e75a7d4d9e21ab87d276200e346f3078a70ebbd2e270a73120ca34d1c15c8e06416a57aa4a3cdc4c72dcdda0892abc657a9aa089dc25f04d"; + sha512 = "cf1052a4c0a48d2f2c2b2a63a36266b7f33c572f5bc8d5fa0c6be94c5f4e5a71dfb19fb8971282bbccdc2c5366255bc46e0c549acfdb98b5b769af0b392496c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nl/thunderbird-60.5.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9847949b60ad60848dcd200acd4b4b4de32f9f605740c9fe24dbaa79f6e17de2ca5f2d50a70cbe2b823cd25ab9e1221a475be6ac87ba0124b0ad2c6ecf87a30a"; + sha512 = "8448a26d8e80d042f59d4bf617a60915b656d2477ca0e214b954104ff7a2d1a7751881c09f262d32046f9e9f3bece7e591dba689bf6b09b21b318e76de9cbffd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/nn-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nn-NO/thunderbird-60.5.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "38b0c5f3d48e5ac17e76b6ab018913a3af2470b59cb82e21dd044104ae84fe0354fd212210bf36cea0c13b9d500ba6ce41c6d55da6f22a71d0b9e9ae4ee45448"; + sha512 = "c6a2c15d4e2470c9c0cbd984f8928b4eef88f356bdd16a24e4698bca7005a381001667e6ed357c22047c748a7fe0a6647402763c9c90c026306c23bd8b2dc3f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pl/thunderbird-60.5.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2d7952a4cc934da58697dc2ae8067a6ecc3dc1112ab32e9592c8837919c55487a9e4c84ead5520bdcd551d5dc656cb9b1a913913f8e0f2b2b79c07e4889f46cd"; + sha512 = "d8a5e014e95074e68678c2fa2f4ecf0151495891d496dbb9c89fbfb9a2fd9e168af8751c214d612789dbf179817ffed4e0fbe27b8d8b15a1fe5a5bfa1710ca50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pt-BR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pt-BR/thunderbird-60.5.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e26d527c462e4682375ca21827a8d4decfea599af0e8e0dd399de0e511f9ca0d41584847067f787f5df0e9956b65c0f9da5edd68e9edfbe4283e5fa3ec6d019d"; + sha512 = "913c164af6d714b9a99c8c28b52eac4fae702fd0626bb3c232d556c6047c809834c390946b4c9cfc52894bc8da7d0fbe794055642f3570f8bf7bab5b1de00977"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/pt-PT/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pt-PT/thunderbird-60.5.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "815769609ee977104f0819099233c4d8ef0a7ad87219e09dab564d1a6b98534e26fd0f6f07458d762cbd03e1a74f152fb4bb4707430c06e3b6322c4f23b17673"; + sha512 = "ed84b2dc5bc16bc79d9ad14ddf22d03c0b23c78a42e3cf447c4e456bb643ce23ef890399114bf47229f0a496d56617ba65ee71282bce5bb5f085eebda0e3b5ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/rm/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/rm/thunderbird-60.5.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8e0bd0cf42206ccfe5de8e4a5a3632b67603e88acbf72f7b4154d1a4d220458e1d6aa57877da728d9677b6fbcb88ce8c71ec1fe7a153a3db82267533a2f15634"; + sha512 = "b41c15cc2758f3a90c8e96ee20abfbd20f747bce5e40eb0301faec23e512e2a39c4d69b18356fbe72c6b8de3a83e79dc18be20a20c77f33d03bfaf7584cb86d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ro/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ro/thunderbird-60.5.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "046706f9701bed310895bb39704e6852a4323efe25425355cfb816033814682b5150880fb77e72361bb4893f52be08598ba29323fbf25242dece1ffdf4fba570"; + sha512 = "b100178b0ddf33e5568180f7d3f64755a2722ed8693bfb92391bfa9a8c0a2f3b88534bd0bdecd3eb823cf25c5b17ea0d80a9a3f007b805d512a6f4b29321ae17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/ru/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ru/thunderbird-60.5.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "3e348bfe2fa4fd8a27f5aa5e7d32b320577cbf5b64975392dc8a9fadbd5ce1ca2927b4a9563b7a3b578df80d6b0636c032380a1da6d750d165a20df5bc898d7d"; + sha512 = "486b51a55c5dcac73ffc92a763dabdb4a428f7b23c7f4d3fd3e44ef814f26d4987f4cb794431d372d07453a9e3beaf3b985e22fce0d2d45cad7f75f0b32c5875"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/si/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/si/thunderbird-60.5.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "378a9ccdb98cbc0df37663880a141080ab1f312d17b9ddcfc3ab7102c55bc130f46b79a84ebcad0fc0844b1f511bf910db644b9aa2ceaeaf0191d079cbf9ac43"; + sha512 = "edc25ee0903b52f6f5bde6bd81519e0cd76597fa5b93880312a1e251dae03ceff5166dfa137478805619b4776d4c00f9be6144c72dda2b4301794d38c1fe7c10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sk/thunderbird-60.5.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c0c3e097f4b23cd3c2d184bf03a4e8027003a0c143b09e89dec457df372b239f7d045aeea0b3e106c1ea60b9100103c17d82e611011488275c735e25b632c0b6"; + sha512 = "fe383eda44cac66ffee31ac2dcd0afd1e5d864ca32f14114bd3be4ed9d59ce45b4cffda40aa15f5276b682110205c71f28ccc5a29222194782f0ec9ce4262f65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sl/thunderbird-60.5.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "af5cdbbe141e5e913d5dbee9afd02d1aa452683655224091ea4956f4caa28a92ba1a3bf4d7325011181e11f377aeb0990be30c0409e3839b693040b9f0154ca8"; + sha512 = "be543501922ef4b0e6205f25846a5ff07009566f018a880b38ca5525d601d107a1b0589fba4502711e4bf187f2e47445ece5c2f2b3b4523f887e865edef8816a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sq/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sq/thunderbird-60.5.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3cc134a77f4235c09ba95ea60e40db7a0be5b3663dd655ecf8cd8e490804e9c22d467783348bec53c4e73f9521e063e6b6e55ea5508ecd7687536bf1bf173ec7"; + sha512 = "1a26c71d2466ff93aa8814f0138e597f9b05e6c80ef712c6d91d17dd793529274b30dca8c9a864cfe5d5e959594cc5905e6aa6ec9503264b3e25e6dc240cda50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sr/thunderbird-60.5.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f0ecea0810eb21b78c099d5cfac3c9825114fabc608a52244d3394b8af1e296bb76f5b8656d164faf80d770c2be84ad74f0cbb8a71029fe6fbd0a1da4c193444"; + sha512 = "6e61edd11aee58cde3e50f94d0053140289927239627e53b79a68d81d8ae4eb3adddf6fbaa92c71584a8cdb9b352f32ea64b1d118abee64be9ec5bd5ade6ab03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/sv-SE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sv-SE/thunderbird-60.5.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a0676f15038b5aa4323dd0a5c4769b55da3450b72982bd0a08b24a1c07ec27c5c267042508109111e6aab181904680072aceda154af0363ccac1f572215100d7"; + sha512 = "c85b14d0d69675290734896c2fa188fa2ebd291aefbc006c88f6a8b0929c3a0fdc88728af8f7a584155988e44ac18cc18468d05b38c0a3be45d0d9225a3ae8f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/tr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/tr/thunderbird-60.5.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "02be00e15e625119621eda8c8204cedc13bc6a71ed020bca4d2fa4f0c2267150638ea01b88adab61b6ce76e91ea6e197e3ab981f85a253b253f652ceb74f6dba"; + sha512 = "03440acea9928ebab312dd9411aa01f4928bb379acd377b2999c9c11b0a39aa5045cbb396b4a76bbfe0c0161b1e1bb75bbbacca1b370dcc84a12a22925189642"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/uk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/uk/thunderbird-60.5.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3a785b5569bf9d5c95cd3b8bbf7d8c07b0e994a2bc239a755106cb21e51032a29039f0fa5a1395a803fda106b2bd2b8a7d802acc48c406fee698f2d7c2c3cf37"; + sha512 = "7f55c44695a62c9b889b2867dcf8c8b42e057afb9b94bd44912ad3da617c18f4064f41a05e2582b24acd982cb3c667d081dee4f012cfbe096f06d795dabe456e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/vi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/vi/thunderbird-60.5.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc684e3f3d9614a386e1f2dfe6fe7b3880be13335b567c27ef7c593dae97b6d4d2d272a14747de77d09b5ef9ffb2d860e2cd1b2f4a833a9f570c1d56a2548fd0"; + sha512 = "316cc05da31325eab8299496660d0c3785ee4bee9939ef4c4ee4cb19688fea79131d1b47ffde3fe1154a9b90048bdd584ef584a0044c66d104eae6aae98f5913"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/zh-CN/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/zh-CN/thunderbird-60.5.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "748c1fedb6b1caa3f6037c1554af8870ebd8ade3b242f5a7561c8085b70f13aa4452e0ad61ba5d9430455246468f21edb92d2651f36dfb466529feebba662c66"; + sha512 = "99d7524b51e9d43b129903e9c4339d9db7e18541973e5813b491b4866e94ae51373a8b3e23aca41681bf097905e93dc888590cc208d40bacc907546b0f6f5106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-x86_64/zh-TW/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/zh-TW/thunderbird-60.5.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bb25cbdd2ff483c20d3fed558567c82aaba2eefff5919bf7f513d25e44f1918377e17c65028642436f7c5f178249a5fa389235268e3b2b1ff00a85275ea8ab2f"; + sha512 = "235cd4de682d65ceae05aa2ed9f7971cc85aa01cb60e6bcd85de7da24d878d5d98a4e2f5386a9ee30263eb51da7cd50e9bfdd44136bddbcb7b001af0a79da34a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ar/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ar/thunderbird-60.5.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1976c20e7c5686ccc96da87ef5afe3dfb8d5fd5a9a0a24322fad8c09fcca7cf2613c2a029792799d417b6d1ef88d79e15697cfc41d7c7656f17685cfc4593c12"; + sha512 = "a9356c983c9ecacc5f381c51709c41a529cb792eb2cfbe62bd55fa190ba6f53a417c5e7f1ee13ca57b71cb781cc7d1485d794cb1486a2f74d06e17dd3a59ccb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ast/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ast/thunderbird-60.5.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7327b5cfc0331811e932e1748c01e3365c02bc0e2a1a59620f066b5e02aa55b97b7d0d62f7c45d920f0d9fcfbb30684d8ea504ae404494e19173cfe5dd3ada52"; + sha512 = "627cbc249e56351c527b33571a43f5b28c7c2267ce83466d74a66c231349a6677f423eb817a86fed84b3e214a274c87af5284164d39fdc74f04610bc289771c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/be/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/be/thunderbird-60.5.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7188c82333bae58b88ff4dbaff493161dcaa0f515d26d7bc15984556265d11efb526a0597d84e6db95d2a65384745a4229945f3f82d26e62d853bb8faba7ee11"; + sha512 = "a3d96e1ac59aa7144cdc50d7064ece222e401f8d6e6a2d7b60b2731510f934b8eb3c686ac53f6ff96915e14ff3b3cec38d7b01b4c549490d314aaa6a40bba365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/bg/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/bg/thunderbird-60.5.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "979c588c3a6bee2c712310879ef2f971731f2bae504d5631d30ce53fe201bd22ba0d5dce0a4b2758c994f6ddecf3a3d4c04b3c173f575d39579fa8961d60b28e"; + sha512 = "c39fd5d4dab48ce85bb4d524f210b17e1bf16d7b576639055d4f949e7ee549db3c681fb3579cc3722882753c401ce0a0dc97182767dbce57785a474105521345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/br/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/br/thunderbird-60.5.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fe36fb26ab14c7da712a077199ac24c22e7d8a892f35246e76579a70062476dce362fdc13911332b8a017d57a51e580227a5ab774ee1b8156711ce432e1c958b"; + sha512 = "b5e1a4c7fb6c12ea41d5e5c1cc7a6214e822012fe318e2777ebcd89b2502018c5af0758b704dc3cb1b0487a759222393a4cc4f57a491f5d9ee1f71522a8d242b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ca/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ca/thunderbird-60.5.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2a3ae6a3e3297abed7d1202c55019dcfcc71658345cf0e35ebdab765ab9d35408450e5d7121fb5767409f6923e07ada832221785546a417ae390bc1c8b376cc0"; + sha512 = "0004d9792dcd2d0ae211083d6dc87019e362a6e10390a29dd8d9ef567a0282b0fcedfd95c4e91c857c25361673e2f3c429b3afd19f35714925a7252e15fc4231"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/cs/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/cs/thunderbird-60.5.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5195590d7687e942c6a46e11c3493d00c0e4362cc9dc1e4fef5427ff18161f48caff02f700c862da00753d8b9b7929505d1626a1f33b40c56b0ebd965cf00d04"; + sha512 = "c7428593007a117f44e9891e2cab7d352a64f9f53487478671bb062d7dfc623b65f15749b994c298afebd4776afae4619f36da513866607cdc1160896748918d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/cy/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/cy/thunderbird-60.5.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "311b612736dcb1b70934f0df4f8fa6b58f01530abb41944eb7cd135b353839af39ee40ee8a8e3f337d1e5d0e2bde706d9c3454019e37ec09e1780b07f040adbe"; + sha512 = "6c768a2e5ff27988f7e52c9f38f543b40f3111c6e944e573e8dda4791253cb9f4f25d2dafd8d0c63d2120e7bd331315cc3ebcdf6381cbae0d4700564d7a54d11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/da/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/da/thunderbird-60.5.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6bc22359bac0a2d16a25eaf4d0d43fd08922870a36c437f5476d945f2c2988b749e46210b61c1b78952a907d10d1c5604a55585d08a4b1808bf59ee32cd6f816"; + sha512 = "e4bdab9dbdd1c4d2db731dad1e42c3e9839e6d2c8b9f92ae88ae76d6b838ff5d328f43c73c03a2a2e3998bf7f667d59f02016f676d3d23f1ca2d2fec105ed0db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/de/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/de/thunderbird-60.5.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9e88dd66eeea5f77720698d163108e1205dd05c15b6170a7dc8a66c39d85aa58ab07f5f8a55e5db3660056bcdc697500cd64ca720893a54d9737bd34ce099ac8"; + sha512 = "df0dc702eee0a658e2756fee0f3d26a43a8c2e5defca1e1a7a4cb34909af0e6a88f73f880fd06d0fb336b740b2d25174386d615434b1e4dd85c91416d08c2e2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/dsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/dsb/thunderbird-60.5.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "d94f8ed0d637cdc444459d5e79d9f753d290ed0fea0557a0e53603ff1f1d861b9c436219b000783be67acc0bc1ea5d226e024faa8ddd73b259a10807705996bc"; + sha512 = "0ba2bb386d9408b86041a87414e1c84ebae07f9ca357ad9aeb76aab195b16b90ba8313bcfa3b386b232a10ab295e183d4c1eda37ec4448b02abc1566ffc29b74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/el/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/el/thunderbird-60.5.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e632ded7de7e269af5e8dc2dc14c17dce3b15fdd33c00423ecc51e5067a98fc694d600022ae9d0126630c9c9d6768f805dd6bb6492d658524f37ecf5a27dcba7"; + sha512 = "66b8ccf62e7e8bc3964ad18a21437acce9980b1378b05bc943fc579f8c3f201972ac7dfb3ce25dcfdfeda88008b6c273fa4a748e3b73d8500ace905ebc3cc816"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/en-GB/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/en-GB/thunderbird-60.5.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "00b958aa333c0ecf1048051be9c9767949a2c21e52005134ced1e2f25ff1dc4a15b73225fe0fcf7297dbbedbd0a02a75262c100e2f59ee8fac6403e8bcabf6b8"; + sha512 = "ce8cccda4e620f712a78b477a37815404acd55580a977a7bb71cd349e64e28747935231cd5dec048e9d31fc1cf198a4579308f9a320220c282427913f323ecfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/en-US/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/en-US/thunderbird-60.5.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "150f6674dd95932c713c275eb24194197ae52cb4ac08aac49c1c6302e3734cd3de5580878b8d73c2dfdcc18df311654920914d9562ca85f580d560c372f5807e"; + sha512 = "50b50e2df00fc2a71c555105806b2134ba9f7e09601e9194334ac2e89e53fb940065e604b56c22a8aeb97ec6f30fa8cda6881347a53acd22270b38767c3b00ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/es-AR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/es-AR/thunderbird-60.5.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "eafefac3a5626c713d39f032ffd11cf65b733dad78f6157a0c83e55b0103301066d825d1cc47017101f8b09e757ef92f30654adea538a00f9e0f0d60b1248c72"; + sha512 = "e3d0708a89548a36712fddaeec6e7e2a15a255b29fb63e05efeb279e1748dd41034f9d568013ddae50484300b536ddcc08cb37d013b1d4beb52e7ca0fa47a924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/es-ES/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/es-ES/thunderbird-60.5.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "3dbc541e002c2954e427327eb20bafaf126e157449c4f68f2cab2781097faa5a15c73a07bf27c9a841c02842f028bef3f43618781e9b29a1cb86bdb533c2c91e"; + sha512 = "b34202bff1054718cc068f21c2d4cad9cf1cfdaedd5802a1c1a9f897e75e7cba1b2b63d4bfc9e3849468f69728308c2c1ebb716b19468de054149c8c5e614c7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/et/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/et/thunderbird-60.5.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3ab361983dd178f1fbeb97a79dcb4fd13841d1556821a732e29543071b5d8de054da7488cdbb4fd12b80e2b9c7409c0fe177d9677b0d2333ad49d1dfc6fb03e1"; + sha512 = "023343885b09835dc7a924407724aafbc6e833d668d4066aee0971abe93ecc53deab16b0d3a0e0527d159f62c1fcb1243615736cd68404537587b57173c52573"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/eu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/eu/thunderbird-60.5.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e17f1e2248eb6a48e74780b1a908427656af1cf7f9b3cc3a1c3539c80dcb870126e90908b419b56c1cba7e445431b3802ba8e19a5516fc704c383a31c1ffbd5d"; + sha512 = "b5db0e61be652f851cb4e729abaec04cd2295f5b769cbae82da9a13521b145e3af7bcdec0d595e82200840eb0e9e8d3b321c9e2bca7e504ecc45b4a438494e7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fi/thunderbird-60.5.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3e054a95162fb3469ae4cbcccd8c285058fedc661b63cbc43d94359341d971a86f69cfcad307ead734ce22d62c8235a817f943ad111a13e5d7af445bfd905431"; + sha512 = "cfcd1cfc0b49b94acf2c4b65064badf4f48d85f6833b4ba6bb3b9da21a41815ca9c544899ca5282a96b3e498ff948037fd6e97755b9bd4f994e67341ddb46aa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fr/thunderbird-60.5.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "61a3766fdedfd5dc45c203616c7c99c2d72d172d3e9577234d9539e841fce33c495518460262a2ba4c636ed9495a734d13e7ecbf193edbf5ddd81a767e03f8dd"; + sha512 = "853d0b8d8cee1d036adc8784ffb750acebf4499adc41c770436e1499622e3a6dd4c79c64a088c2e80e7ae33b158f696c5d7b055e920379f0c39e574ef04b208e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/fy-NL/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fy-NL/thunderbird-60.5.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3068d8570dada0655f5429064903cb9218fe82e472978f269a91600dfff7a322a3cb3dae9dd24183c7a7ea0184fe520ec32bded34ec640ad3fff7d721b96c69a"; + sha512 = "5556f9faa896595e1e3bf6b57fbd9e15cf66240b1483ffe0d4af2b58481892dbd2ba542e143b322a00cb8c3a25a54c5c6d35ab2a3eee0e20acfcb805706b9ed5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ga-IE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ga-IE/thunderbird-60.5.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ed51255886ccef985c9f684fc7a5f1ba902f8ad256673e4348ac3b5e67445f470e8f62fb5281ff63c4976c92b8f6461f4ed1f5da920e7911b2bfc36d7c86b716"; + sha512 = "db7df726276180585e203b375f19adeec45bc7241f2f9804626cb4ded86714234c16ee39ca96e29b23caa9400100adbcc34d7610323b5c5c96b301fe80746f20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/gd/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/gd/thunderbird-60.5.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4a0daf723de4828687c9dd0b037a8aa9d0acecfbcd72e21b50b737fab5dc8c4689cb8574f8093c1f468f6c52b3f4f05ec0106fb48e005a533fe4f81d94345542"; + sha512 = "5a5a2b058ce97d7860601a5e41edae6d4c61f4b533c3822aaf20a31a996fadb4da73c505cc83d42f53f4544c5dd95f03ca175950a8354ffafdbf8910c436a43d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/gl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/gl/thunderbird-60.5.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "046e04f0d9a1c8d1666d81d4fb26a479ad84a243365dc8df50034df3a7e504244eeac7cc0710d81edb122faf022ed94665d77af70fb01ff43be0c7d1dd056e2f"; + sha512 = "6d757d6634bed978f71031fee24299015b1d9b1cba5166a29cb6a57dbddd93a2ce1ac002766cd4f705ebd3448b9f1e1360e88658d1e90225e04dd9533cc7fc41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/he/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/he/thunderbird-60.5.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "aa6be15596e35530ea8bcef9739d462b1836d5d7d11e540e307e08034458efd0bd890d61dd72aafa4ee93c8295e2f08181f498579fd01e686205a28152488290"; + sha512 = "790b99eab94e6bf70fe935c4794413ff6fe1020a1baa73a66cb9b27dd630dd712266104b94eef23b17161fde4484037264b114cb367bd7db2c3fd213b6b0655a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hr/thunderbird-60.5.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "28ce82024616656b4a81a2ff82be23a243306c4209f2522bef63b2b4e1315c3dd007a73c20065972d3ef05938411489b4cd2a63d1e79c7fdeac4e7d752ad4675"; + sha512 = "b6e7649321d2f8976f71bb685cd6f29ad47a890139ea4d9ab509677e462a43cb27410c8516d7d1fa65e7273a2c006ae44ccc4e9cb93275970926661502bbba90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hsb/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hsb/thunderbird-60.5.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "70c9095d1e8d63df6aa1544d4fdbf2642679cdbc20ca610de2e66bc15c6013287d079c65b93d4a04566d116b160f0e82136e2d9706083a96aea6045eff74e240"; + sha512 = "6c957a26ee1b17ed8a9087187fabb228028c2b6d472cb7d5e28c66724a8b34a7e6c74bbdb625041db9f4ddcf754c574b9d6b803cdb6b0445bb82077b93de35ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hu/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hu/thunderbird-60.5.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "fe965925e424ba1023443c5a77e362f1c8880c04a2801c8956ee9873a3027eb1bdc61cbdb2d016781df6388a853a754827c70a2aa200917c854fb04865da7495"; + sha512 = "a8f920c0b3691b36586d9a756d68a2e61d54e0195cf602dff5803cf79a0c13aef90db60a608b9d0defefde4e2e8778b316dc2fe38647fdb9406f74b6c316fb9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/hy-AM/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hy-AM/thunderbird-60.5.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "b2f47f578df59beb27200421229b147d83a1cb6caebf6796ea8edf52a0ea6890386d48ad53ada738fa9e6b7a5232851d52c4c656f740d4735dd550c47d3a781f"; + sha512 = "bd24605ba4a7eaa399e56cf244aab6a6f3c1158a7733bb99a4f57c3028acb648562adba1b7b4885b89a4142d023bd5be5d483fa4ba47378b8de300893e1e9ef6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/id/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/id/thunderbird-60.5.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ac1719151c4f729bb66f4e2654b5159de27c6d22a6776f24615938e769a01036273ba551fe38fd0ed4560fb853427be0c65c387f76ad3c01aca144e90b7e9c48"; + sha512 = "0c66a067811907292ec54f1673c912b5bb4564e5493108121c628b277f91410b0fd6b579e073d8937588606be34ca2c9c317d4f46bdf5aaf0f839ce9704a9d20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/is/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/is/thunderbird-60.5.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e28e6a3691cbdfd1b03e88afe747cc51aceffb7a0014fc9c86c7403ee96d3d12f9bd6f49ed4916d8ff281d1913ee39ad9b41851f8cc285f8834db9c50545c4c4"; + sha512 = "9b9e85ac15437a3b7871f0842996e5c85386e9594fb4399ecfd3f599318155abd24929ec8be1ed0034ad24539415aa26d74cb1a1edc06368b71464cab28ed8b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/it/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/it/thunderbird-60.5.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b1ae4c0952871bfbaf673793e02a9c3c283be87523e421ed97502a36377f1388b15ab77370b757daf411714803fcedbad1c8a4aa21241cedca394429ecad5990"; + sha512 = "07c6fa4027816e1e6d58799d746543890f5eda26fc92179daa2d7b5c7762f5a5b3bb4e6aad784097ec4e013c5012e975289651a77fd78af711dc7c0516344297"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ja/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ja/thunderbird-60.5.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b6b1d702f446aaf50b83fdc5019d7130613cca4f9c9be363701c897f33cdfd4c794c147e7e3ff85b61da54125458a2da4f84aeef76b4f8abf4fd3faeff4301bc"; + sha512 = "c64e1719914fc50b110a800395e404b0aa356cf8b7deaede6315da122b8cec01a69c530ffce232e3ef130068b6df94a1210b9655403e167ffe6e42d59b2456f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/kab/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/kab/thunderbird-60.5.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9b0c45f7478bd2ec0668d0c4238b2f8229da7d12f4d6e56d65c22323bb54a6ac55d18acee22b13caf63bda73bf097a039b2aa85bd96befa2169845706083fd55"; + sha512 = "b0067c1d698a5a032122609fc9df96966c33c78b71611fba43762b9f14944c9b1be52e7d16d71cdf323330e3a473f0822a75b8d5ccb4756ce86e3c6cf5d47c3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/kk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/kk/thunderbird-60.5.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "12fa4f57e1b0579ead0c7f7f223fe9328898ae999b8949e0dc1f20142eabbfaad03c16a53966d2c0966d9db44133c001f56c97c10a6f4a5acb51e6e30b922f78"; + sha512 = "7e0e9a5f7bdb609687c4e8a87c581a9c33b242c80f71fecfce0a0737a8cf70b4d864e6e8bc8ddf0d6bfe5212b4a5f44a7c11cc586348bf2c1325a177f04bc62d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ko/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ko/thunderbird-60.5.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a6979bf472fdca68df1067ca8341353561741e27afbad18a96ad6e810313f54a8ac5f96c58955ab4d5fa6f4b4ec468d6e711139073f35e9bac45de81555b345e"; + sha512 = "45ecc21470e10df9d6b6eb9eb91729384c4aab20f4bdb3ab9659d30e0447441c26b9daa86b670d458ff90c8a7120333a5398caccafd4000a88fb219244bd5bca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/lt/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/lt/thunderbird-60.5.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "47ea6c107bfbd196ec6ca5fafa0c856ac86bf16872ccf259afeec384f5f2157c9a7263bb2177ef79c876ba9f3a33209cb6ef7ceee0bae8877f0272e1a8fd4a9e"; + sha512 = "6b47400b6260b172d9e40ac0c3f8cf94b02f31273acc18b9befa1c602188f6d8e0c46fefcb9b4faaa2513bd5c586559bf9fd6f5c03c1d4ff895c78e14c5a593a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ms/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ms/thunderbird-60.5.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fda7fd25d3d72dee67e0e51c1d2c50ea66e1c574cb0b22c4c8476a7252a61209d5dd7ff5c5e918c9dc959064d048c75339fed5215a5bff53e4954f6ef56aeb14"; + sha512 = "037c6d52bca81ddc54389546dcbf9422e3dc5872477f49e4a681a2dd75b6b7456ff2477b0b6e2e88d8b9e899ca9569751809a4ab5cfae8f8d8e7a5c13cd10bbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nb-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nb-NO/thunderbird-60.5.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0940d7d24612f7e526a2c4d21c7d23a2a6577c5599abd98e73be338cc7b9c1efa33af69d644e62e1e903443b8458786899052bd176bb7e99ce44f4ed846cc532"; + sha512 = "ebdb9cd19d874cee39a27f2f44e23d877c304cc44b3cbb9849237d08077a5e8890d444671efddb4ba0633f89ff6348a7195e96f8041025f39fd4773ad8a04a56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nl/thunderbird-60.5.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9af66d8294797aa2586b7520e20f88110c7fd807ba4e27ff62fe70308f8f5ea94dcf2d17b9a2fb8e19f10961e470736932b785ba936656582fd4a48071afb43f"; + sha512 = "251ccf641a7e6f724cbdee55eec09f6ef0a2b77b3c12c483e1b159840f039df0820c583ecc0ff5831d48582df7716f9c29678f1be81b6cdc39480dc2fc870d65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/nn-NO/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nn-NO/thunderbird-60.5.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "94240443b68053b4ffb7a256362a6183f43b6241ebfe479ce41b14b5bb9e1973a1c027f73baff35be9b448490cb0bedcf2b458049d84cac2082eb196ae5fbbd9"; + sha512 = "e4b12c33bb86fef90f699a2c8aa3bf66d140f77e3bcae5012fa005f47cecf978ca5b5051c7826b56f65cd8501413e649bbd73c01cddfadf97e3635a19a0f3406"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pl/thunderbird-60.5.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3af095626b358f4e9074554539b8e204a47108bccb02a90e9f07c78285a05ca2c64d8a2e06935090d8de4ba50765546d7cf9e55cbab8cc3d3eca674569df3d8c"; + sha512 = "c9d8fcf4a468fae3849fdd4c02e054bde1407f3007743744defc09a0d56de5796b46e8ea27247bad3e9ec8f3d588f8871390ef3568c2b27a4fc12d795474b739"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pt-BR/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pt-BR/thunderbird-60.5.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "cc5357923dcee1979760a889dd53512e3bb63db085349ecae02f4909353a2518799cb24bc36de6ed35853e8317d71672539a52998a62f968ff4c4e484cdd0489"; + sha512 = "0cdaf41470e28eb15d66da46ba2d3841f62fa11235b91b3b054e3ee7906e1952feb8f447ffef4195a6b49f7224af316731607945646d1157f6674b50d8c7e7fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/pt-PT/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pt-PT/thunderbird-60.5.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a9fd7ffcb7633f17b183a12b4d290822e480f59e01c8e3fcc2e6fea0cf051c73396c2a5e41dd5d897e98a8199aeb4dbff737f06b748c57690541abefa42bd283"; + sha512 = "bdf0af0eca14e74518d43246f515aa3e5ead284502a27d4b6dbf9e69a2657e55484793859682b807f0b9f2e7ae6d2c084a239f276524829b923ed6eaa4d63457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/rm/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/rm/thunderbird-60.5.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5cc3f2fc6f84ebdaa298e96b0a56d0d6b0ea87a1df68eca17c558cf603296e83e7644d90e29183107eef1cd045084730f4311c603f546a29a495c7a443ddcc30"; + sha512 = "4db1bcf38a6525e5507f02c07ee1bb877f81b4643df25eddf0c6b85a6fca5a4e892affb397caa0b5fbebdc5a044bc1eecf5d8755420e8e032906e81a1fcb68c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ro/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ro/thunderbird-60.5.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ed57227fac6e43ddf68837de7252fa8f57df399122653a533e2e5826a8fc48abe0bd1ec4f1c213473b9764d69b65ec905963554aa3b05676ae0cd87e64ff9f8e"; + sha512 = "21a2dcf1a70657afaa49e3825fc6c544bd123c50c753ab2af52474daf80f7c01dafdff95a6c84a48f3f4b09d019acf6cf84958ef81fd12b5616fe4f7c44517c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/ru/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ru/thunderbird-60.5.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "9f520da05a7968e632fd262cef964ac65e3e1afc0e70b279af667cff144784adde796862b5d4a66d64826bea70e2d4a76fab69c1fb5181d9038f9d2a4f81cd31"; + sha512 = "427b84004ea0a93c1eb55fdf3c46d4fc1560cd5b9284294b91ffc1f48581acfca4931fb90b2ec67f8f41763e47505be9e677e30ff009f1607b910272bd2aa481"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/si/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/si/thunderbird-60.5.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1a9d8a911bea3ff6e13e02ce3b26271dd9b0755b5ff78982b82ea00fed6e760b067a3a8733c3397fa1bde300f44c7078c37638e79ac18bdef08c820a6dded86b"; + sha512 = "adb6bb5a5ea5aa26cd8edce2eccfce86c1f05bfedd784dd8b6438d5f9bc9b21b6fd1e9d544f0d72ca4c09b502843426b1db3a9faa51c795d1da7342263a68acf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sk/thunderbird-60.5.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "0220c4ff8a2dbdbfba5dbb381983a4394f0ec4d246407d7d70d035bf13b8b9d220a73d1f10782c9612ae5521865761ac169cc96d19e4a903b785dfebf762760b"; + sha512 = "8e5774e339f29d4db96541227f0cbac8aa43940f8db803b1c3d0037e870ebabe0e35e931866206c45ceca60df940342e837f5a341fe297d1d77094a68ff087c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sl/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sl/thunderbird-60.5.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "3eaca0ba175d97478171269c6027fc7e67780e97dc9a15dc966c8d22c7ac26984f041ba2f94470d4cfc2988f13af29d9afc7940339f3bbd3ea3ed0712855a916"; + sha512 = "5bc6c3afe167b81e67236e2ce405c784ea6b3eccefbe64169df9c5846ac352b786e7cbb5a130134bc00bf711577425dcc228e44028b907517c870110392de9c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sq/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sq/thunderbird-60.5.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "006b17fdc8201c493e77465ece97373fb23fdcc6d79ee9b9d88c544f338b88dbe51c1bc9f27fc41052c1838eacb604abe04c7b43ead49a0ee02b6591a74dd410"; + sha512 = "056cb05dbd7a8eaf482fe70cd48182d821724d531f482fa39f220b74da4ac3ffdd01ca25b3a31589081254b8be2868bb0bbe24d28fd02f817d64521136e9b652"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sr/thunderbird-60.5.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4908bb89bf199ef0e8767ddba6defe78c42ecbdfeac5c040811d1cd2b445407a0365cfeaff39cee5610a15194878d1700da194efdb6de570188ba7e5f77197da"; + sha512 = "76a3b4c6d620a3d2309d1075d9a85e3603ab60bb9bfdfe6b538662b5281a4e2458d6e6ecbc977dadd7f7a2c9c78691277d5ca336c54beb2cb3f653ff4fe4e6c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/sv-SE/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sv-SE/thunderbird-60.5.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c149b2a11dac65d98c64fa4b548573587ddf540c7de925d983cc9da63a9f55cc9138988adb32fd189a25f6f5baec85542fe8663eada1f7e16dd80e50069795fa"; + sha512 = "3519106ffd79c84ed2609675104889010ea3dad76ca2b3db5cb2729c99927ffa9d457e714e73862b01d0c88c52ccdd986ab15844e9bb3b8de2de0eb6f0e29b96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/tr/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/tr/thunderbird-60.5.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "dc45e7cf29f2b3798c83ccabc9d110bf622e0920ca7bee8bb6cd9a4d793fe7df5e7f78677b11c00e43714111bfc2ea2a74a8446026612afb0d54e58fd4e97797"; + sha512 = "782825d4bb3f0073a2e417ec86e7ad27f7d84e482e6fd0435941cd2ecad4f930329362a1b1be32a99379e98d2dd4f43bc7bc4a80b0c38692c9f1e5436c6e3131"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/uk/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/uk/thunderbird-60.5.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c1d04517a50c0882cb442221e71e171993015a36e597361708f858989ca1b538c8a48c6f40637a382879e394c471157e05543494095560d1c5d60a4d31d56398"; + sha512 = "9246e616b9c87383064697f8f9b17304768a85ef6e1f8bcf83d07cbf0990dac3c20b5add194f85f3a58021fc2f707004e8b348ca41a3052cad27f7ba117539d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/vi/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/vi/thunderbird-60.5.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "186869df9def5f892851496c5a8f3784d5f0ed5a845d8330906c1242c5c856dc284ada045a802f83d1841007eb6aa9ea7098e3ca5d8d17ca85530890e2b3f13e"; + sha512 = "2601517a8a04bfc8068f03295c357f3980228fcb53e54d90a3aca190f94546ba8a4712e763c93faeffab036ad623e1e3cda4bf16d22774a3f95ed2869a4f00b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/zh-CN/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/zh-CN/thunderbird-60.5.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8cd3250b0eef5018dc5129bcf4d1dae9acb2226fab784e66f63f6224cc197d7863338ba134f0523f1e17dce53f0db5cb23206ad98c8e754766f6f51ef15ac33e"; + sha512 = "8ca48799b44edaec1d35bc690433c5a6790daa907cc64f67c1e350ce24bb4422ac04657f68898c6e3f40737b32a74b139e715c2e4dc33d4b179eac2d7e04c7de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.1/linux-i686/zh-TW/thunderbird-60.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/zh-TW/thunderbird-60.5.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "bde2b2bed5a1498fef39ea1da0c260a9876fd672282ccac6cc983973fd2a1d8cdc889e4439c4b9acc4b9016bf13d892e2dc387c3a9fa8166cabcdcee8fe9cf8b"; + sha512 = "716c6392918f8fc6e6c1046b7454acc84484bc39a723dc659cc1e3919f04fcce628783685f63110370b38f64d60771e40425eeef1ecbb4b83ad999e29d8bede4"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 99a76d434b8..ae0db67920d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -5,7 +5,7 @@ , hunspell, libevent, libstartup_notification , icu, libpng, jemalloc , autoconf213, which, m4 -, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell , cargo, rustc, llvmPackages , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true @@ -24,11 +24,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "60.5.1"; + version = "60.5.2"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1y8r96rzp1rv6ycn98l2c1bpa26gszhbijhrwk6llw8aq33xhx9dpqpbgfsnrsbn4a5ff14h8m9g82snqysrzb7ldd2i5lbas0pryys"; + sha512 = "3q7h9jbxz7p7dh2dskmcqikpgd8czbmxknij063w02bh9lyffv6rasszl8pwz21mcylb9zzqjn29xl99g51sjx81555bdr38l8mjg55"; }; # from firefox, but without sound libraries @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { hunspell libevent libstartup_notification /* cairo */ icu libpng jemalloc ] - ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; + ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; @@ -193,6 +193,6 @@ in stdenv.mkDerivation rec { passthru.updateScript = import ./../../browsers/firefox/update.nix { attrPath = "thunderbird"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; - inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; + inherit stdenv writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell; }; } diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index c142661fd03..6b85dbfa3cc 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.4.3"; + version = "2.5.3.11470"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk"; + sha256 = "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"; }; - patches = [ ./find-sql.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch deleted file mode 100644 index 44dea6414e9..00000000000 --- a/pkgs/applications/networking/owncloud-client/find-sql.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/cmake/modules/QtVersionAbstraction.cmake ---- b/cmake/modules/QtVersionAbstraction.cmake -*************** -*** 8,13 **** ---- 8,14 ---- - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Xml REQUIRED) -+ find_package(Qt5Sql REQUIRED) - find_package(Qt5Concurrent REQUIRED) - if(UNIT_TESTING) - find_package(Qt5Test REQUIRED) diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix new file mode 100644 index 00000000000..d20b07a8d3b --- /dev/null +++ b/pkgs/applications/networking/ping/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, glib +, gtk3 +, gtksourceview +, hicolor-icon-theme +, json-glib +, libsoup +, libgee +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "ping"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "jeremyvaartjes"; + repo = "ping"; + rev = version; + sha256 = "1h9cdy2jxa2ffykjg89j21hazls32z9yyv3g0x07x3vizzl5xcij"; + }; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gtksourceview + hicolor-icon-theme + json-glib + libgee + libsoup + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "A helpful tool that lets you debug what part of your API is causing you issues"; + homepage = https://github.com/jeremyvaartjes/ping; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 3e74fbfb66a..7557f04dc58 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.1.0-1"; + version = "1.1.1-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -12,9 +12,9 @@ let ''; desktopItem = makeDesktopItem { - name = "Desktop-Bridge"; - exec = "Desktop-Bridge"; - icon = "desktop-bridge"; + name = "protonmail-bridge"; + exec = "protonmail-bridge"; + icon = "protonmail-bridge"; comment = stdenv.lib.replaceStrings ["\n"] [" "] description; desktopName = "ProtonMail Bridge"; genericName = "ProtonMail Bridge for Linux"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb"; + sha256 = "148syyz92yqxp2fw18fhflhmdrakxz7cc30va7h0pwysz97gni2p"; }; nativeBuildInputs = [ makeWrapper ]; @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,lib,share/applications} mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} - cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib - cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + cp -r usr/lib/protonmail/bridge/protonmail-bridge{,.sh} $out/lib + cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg cp ${desktopItem}/share/applications/* $out/share/applications - ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge + ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge ''; postFixup = let @@ -66,9 +66,9 @@ in stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ - $out/lib/Desktop-Bridge + $out/lib/protonmail-bridge - wrapProgram $out/lib/Desktop-Bridge \ + wrapProgram $out/lib/protonmail-bridge \ --set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \ --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index c2ae02e0149..bd4ea2d9238 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,20 +6,20 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. -, hicolor-icon-theme, adwaita-icon-theme +, hicolor-icon-theme, gnome3 }: with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1ld5ik2g4b95z9pynmwx8mqhblbfzr7a0v35pms89ig4ck1kvr5r"; + sha256 = "09mizr9igf22kk26rdx5masai8ghd2nbqryvswkybvia2s6lccrs"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme json-glib + openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index af01b89dc76..c4b434dcaa4 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "rclone-${version}"; - version = "1.45"; + pname = "rclone"; + version = "1.46"; goPackagePath = "github.com/ncw/rclone"; subPackages = [ "." ]; @@ -11,11 +11,19 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26"; + sha256 = "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia"; }; outputs = [ "bin" "out" "man" ]; + # https://github.com/ncw/rclone/issues/2964 + patches = [ + (fetchpatch { + url = "https://github.com/ncw/rclone/commit/1c1a8ef24bea9332c6c450379ed3c5d953e07508.patch"; + sha256 = "0mq74z78lc3dhama303k712xkzz9q6p7zqlbwbl04bndqlkny03k"; + }) + ]; + postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 ''; diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix index c5b329b5f0a..46649c06911 100644 --- a/pkgs/applications/networking/transporter/default.nix +++ b/pkgs/applications/networking/transporter/default.nix @@ -3,9 +3,9 @@ , meson , ninja , pkgconfig -, granite -, vala_0_40 +, gtk3 , python3 +, pantheon , gnome3 , libxml2 , gettext @@ -31,24 +31,22 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib desktop-file-utils + pantheon.vala gettext gobject-introspection # For setup hook libxml2 meson ninja pkgconfig - vala_0_40 python3 wrapGAppsHook ]; - buildInputs = with gnome3; [ - defaultIconTheme # If I omit this there's no icons in KDE - glib - granite - gsettings-desktop-schemas + buildInputs = [ + pantheon.elementary-icon-theme + gnome3.libgee + pantheon.granite gtk3 - libgee magic-wormhole ]; @@ -59,8 +57,8 @@ in stdenv.mkDerivation rec { ''; postPatch = '' - chmod +x ./meson/post_install.py - patchShebangs ./meson/post_install.py + chmod +x meson/post_install.py + patchShebangs meson/post_install.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3dba90f964f..74a1b571406 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3 -, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk -, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 +, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib +, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook +, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "meteo"; - version = "0.8.5"; - - name = "${pname}-${version}"; + version = "0.9.6"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n"; + sha256 = "1786s5637hc3dnnkf5vr2ngfiq73dyvx8187gx7qkh7cr8xrl50w"; }; nativeBuildInputs = [ appstream desktop-file-utils - gobject-introspection meson ninja pkgconfig @@ -28,13 +26,11 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter - clutter-gtk - gnome3.geocode-glib + geocode-glib gtk3 + hicolor-icon-theme json-glib libappindicator - libchamplain libsoup webkitgtk ]; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 2f736dd5856..472f6c13c56 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4"; + sha256 = "1ac2csl5jr56vahnxdynlvrhwlvcc1gqxvyifckc6cn5aj7ygd30"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 8dd127715ae..6808a81bec1 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, iconTheme +, boost, libxslt, goffice, wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 74a56b1f6ca..51e2c55ea7d 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3 +{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, python3, gtk3 , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + pantheon.vala wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + pantheon.elementary-icon-theme gnome3.libgee - granite + pantheon.granite gtk3 json-glib libsoup diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index cfd7a4eda20..9eec315217c 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 04b2072967a..63199945f2b 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, vala_0_40, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, granite, gnome3 +{ stdenv, fetchFromGitHub, fetchpatch, pantheon, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + pantheon.vala wrapGAppsHook ]; - buildInputs = with gnome3; [ + buildInputs = [ + pantheon.elementary-icon-theme + pantheon.granite glib - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged - granite + gnome3.libgee gtk3 html2text - libgee poppler python2 sqlite diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 6f0fcca480a..e33a0b202da 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.9"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "115r99l6xfliafgkpcf0mndqrvijix5mflg2i56s7xwqr3ch8z9k"; + sha256 = "145995nzgr06qsn619zap0xqa8ckfrp5azga41smyszq97pd01sj"; }; doCheck = false; @@ -32,6 +32,6 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e42777bdd00..87aaf85d950 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.defaultIconTheme + goffice gtk3 gnome3.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 7c07082b304..f901123065f 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "A personnal accounting application."; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 12b5aef898d..f93b7f42c68 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b60874e7c3c..5853face10c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -277,7 +277,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index ff8823e3d9c..64b12263e9a 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, epoxy, gpgme +, gnome3, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false @@ -272,7 +272,7 @@ in stdenv.mkDerivation rec { mdds bluez5 libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme gettext + libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; nativeBuildInputs = [ wrapGAppsHook gdb ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 9c4c22dabe9..892ebcee99f 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -32,6 +32,7 @@ , autorunLinkHandler ? true # Update script , writeScript +, runtimeShell }: let @@ -130,7 +131,7 @@ stdenv.mkDerivation { dontStrip = true; dontPatchElf = true; - updateScript = import ./update.nix { inherit stdenv writeScript; }; + updateScript = import ./update.nix { inherit stdenv writeScript runtimeShell; }; meta = with stdenv.lib; { homepage = http://www.mendeley.com; diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix index 147c95b8e7b..c174e7dc668 100644 --- a/pkgs/applications/office/mendeley/update.nix +++ b/pkgs/applications/office/mendeley/update.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScript }: +{ stdenv, writeScript, runtimeShell }: writeScript "update-mendeley" '' - #!${stdenv.shell} + #!${runtimeShell} function follow() { local URL=$1 while true; do diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 9f4ed80e6d8..ad621303d7d 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, patchelf, coreutils, pcsclite -, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }: +, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl +, runtimeShell }: let libPath = stdenv.lib.makeLibraryPath [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { mkdir "$out/bin" cat > $out/bin/moneyplex <<EOF - #!${stdenv.shell} + #!${runtimeShell} if [ -z "\$XDG_DATA_HOME" ]; then MDIR=\$HOME/.local/share/moneyplex diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix new file mode 100644 index 00000000000..2dee39a0ad3 --- /dev/null +++ b/pkgs/applications/office/notes-up/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook +, withPantheon ? false }: + +stdenv.mkDerivation rec { + pname = "notes-up"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "Philip-Scott"; + repo = "Notes-up"; + rev = version; + sha256 = "06fzdb823kkami0jch9ccblsvw3x7zd1d4xz8fv3giscl3f36x4q"; + }; + + nativeBuildInputs = [ + cmake + ninja + pantheon.vala + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + discount + glib + gtk3 + gtksourceview3 + gtkspell3 + libgee + pantheon.granite + sqlite + webkitgtk + ]; + + # Whether to build with contractor support (Pantheon specific) + cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ]; + + meta = with stdenv.lib; { + description = "Markdown notes editor and manager designed for elementary OS" + + stdenv.lib.optionalString withPantheon " - built with Contractor support"; + homepage = https://github.com/Philip-Scott/Notes-up; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index a48b6e1e116..401d3be3128 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { inherit (python3Packages.paperwork-backend) version src; - name = "paperwork-${version}"; + pname = "paperwork"; sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' - themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)" + themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)" sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py sed -i -e 's,sys\.prefix,"",g' \ @@ -46,9 +46,9 @@ python3Packages.buildPythonApplication rec { paths = lib.collect lib.isDerivation aspellDicts; }}/lib/aspell"; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]); buildInputs = [ - gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg + gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg ]; # A few parts of chkdeps need to have a display and a dbus session, so we not diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index ad571cd8b18..b317838f672 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { description = "Quick access to Zotero references"; homepage = http://www.cogsci.nl/software/qnotero; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index a32ad677c25..c7e39180ae2 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -4,7 +4,6 @@ , libxml2 , pkgconfig , gtk3 -, granite , gnome3 , gobject-introspection , json-glib @@ -13,7 +12,7 @@ , libgudev , libevdev , libsoup -, vala_0_40 +, pantheon , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -30,19 +29,19 @@ stdenv.mkDerivation rec { USER = "nix-build-user"; nativeBuildInputs = [ - pkgconfig - wrapGAppsHook - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake - ninja gettext - libxml2 gobject-introspection # For setup hook + libxml2 + ninja + pkgconfig + pantheon.vala + wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + pantheon.elementary-icon-theme + pantheon.granite gnome3.libgee - granite gtk3 json-glib libevdev diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 833cb7fc56a..4422aaa2b44 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ atk gtk3 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gtkspell3 goocanvas2 ]; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 8efe9b368a0..be5ac7a2f2b 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Text-based word processor"; homepage = https://cowlark.com/wordgrinder; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index a3e2bdd4d1e..48027c194da 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python2Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.69"; + version = "0.69.1"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1j04l1914iw87b0jd3r1czrh0q491fdgbqbi0biacxiri5q0i6a1"; + sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq"; }; propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index acc35131e2d..4ed278ebd67 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190201"; + version = "20190206"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "1ag3qzdq39zhpagviq9gpwk4y3h11z0j40nccsnhlq8h8bxpvwlf"; + sha256 = "16agynxjl2b6y9ly2fl1imgy51k4fqnzn1w6bah2gnmifssxfny3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 29f6c608560..41ddb671a36 100644 --- a/pkgs/applications/misc/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }: stdenv.mkDerivation rec { - name = "dump1090-${version}"; + pname = "dump1090"; version = "2014-10-31"; src = fetchFromGitHub { owner = "MalcolmRobb"; - repo = "dump1090"; + repo = pname; rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe"; sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy"; }; diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index 239d392c374..87674e6084b 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.8"; + version = "4.0.8.04"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1yy9z6mchs7r3x108z5rp0h6a18zjqrn9zq5x72qwqh1byjnfwc8"; + sha256 = "09wazaa18zfsl4pscpzjqzj9wi4kdi6325rhaf5rl3668nlig4sm"; }; buildInputs = [ diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 57e1e219b9a..63bc0911d25 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , xorgproto, motif, libX11, libXt, libXpm, bison -, flex, automake, autoconf, libtool +, flex, automake, autoconf, libtool, runtimeShell }: stdenv.mkDerivation rec { @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { ''; allianceInstaller = '' - #!${stdenv.shell} + #!${runtimeShell} cp -v -r -n --no-preserve=mode $out/etc/* /etc/ > /etc/alliance-install.log ''; allianceUnInstaller = '' - #!${stdenv.shell} + #!${runtimeShell} awk '{print \$3}' /etc/alliance-install.log | xargs rm awk '{print \$3}' /etc/alliance-install.log | xargs rmdir rm /etc/alliance-install.log diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index d5720440f7c..69b111562ab 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig , openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi -, libxcb, cups, xkeyboardconfig +, libxcb, cups, xkeyboardconfig, runtimeShell }: let @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 794430ebbe8..234b7474997 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,17 +1,20 @@ -{ fetchurl, stdenv, ocamlPackages }: +{ fetchurl, stdenv, which, dune, ocamlPackages }: stdenv.mkDerivation rec { name = "alt-ergo-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "106zfgisq6qxr7dlk8z7gi68ly7qff4frn8wab2g8z2nkkwla92w"; + sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz"; }; - buildInputs = with ocamlPackages; - [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex psmt2-frontend menhir num ]; + buildInputs = [ dune which ] ++ (with ocamlPackages; [ + ocaml findlib camlzip lablgtk menhir num ocplib-simplex psmt2-frontend seq zarith + ]); + + preConfigure = "patchShebangs ./configure"; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix new file mode 100644 index 00000000000..b6ebce68193 --- /dev/null +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -0,0 +1,27 @@ +{ stdenv, pkgs, fetchzip }: + +stdenv.mkDerivation rec { + name = "clprover-${version}"; + version = "1.0.3"; + + src = fetchzip { + url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip"; + sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s"; + stripRoot = false; + }; + + installPhase = '' + mkdir $out + cp -r bin $out/bin + mkdir -p $out/share/clprover + cp -r examples $out/share/clprover/examples + ''; + + meta = with stdenv.lib; { + description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; + homepage = http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/; + license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3 + maintainers = with maintainers; [ mgttlinger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 18af6f0a618..c6b7b918eac 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cryptominisat-${version}"; - version = "5.6.6"; + version = "5.6.8"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5"; + sha256 = "0csimmy1nvkfcsxjra9bm4mlcyxa3ac8zarm88zfb7640ca0d0wv"; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 91be7dca117..099e2102c51 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, num, camlp5 }: +{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }: let load_num = @@ -11,7 +11,7 @@ let start_script = '' - #!/bin/sh + #!${runtimeShell} cd $out/lib/hol_light exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index d3950349711..46b29e3dd27 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/${name}" cp *.p "$out/share/${name}" - echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover + echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover ''; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index a3834dc70b6..dcea9c27acb 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openjdk}: +{stdenv, fetchurl, openjdk, runtimeShell}: stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" - echo "#!${stdenv.shell}" > "$out/bin/leo3" + echo "#!${runtimeShell}" > "$out/bin/leo3" echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index c22c15b3a4b..a3b369ad54a 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37842/why3-1.1.1.tar.gz; - sha256 = "065ix1ill009bxg7w27s8wq47vn03vbr63hsaa79arv31d96izny"; + url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz; + sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348"; }; buildInputs = (with ocamlPackages; [ diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index cd9cf6dafd1..c0536b36cfe 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ config, stdenv , callPackage , lib , fetchurl , unzip -, licenseAccepted ? false +, licenseAccepted ? config.sc2-headless.accept_license or false }: if !licenseAccepted then throw '' @@ -33,8 +33,9 @@ in stdenv.mkDerivation rec { cp -r . "$out" rm -r $out/Libs - cp -r "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ - "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* "$out"/Maps/ + cp -ur "${maps.minigames}"/* "${maps.melee}"/* "${maps.ladder2017season1}"/* "${maps.ladder2017season2}"/* "${maps.ladder2017season3}"/* \ + "${maps.ladder2017season4}"/* "${maps.ladder2018season1}"/* "${maps.ladder2018season2}"/* \ + "${maps.ladder2018season3}"/* "${maps.ladder2018season4}"/* "${maps.ladder2019season1}"/* "$out"/Maps/ ''; preFixup = '' diff --git a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix index 228bafe3f7c..b4ff9fc1821 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/maps.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/maps.nix @@ -1,7 +1,7 @@ -{ fetchzip +{ fetchzip, unzip }: let - fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-P iagreetotheeula"; }); + fetchzip' = args: (fetchzip args).overrideAttrs (old: { UNZIP = "-j -P iagreetotheeula"; }); in { minigames = fetchzip { @@ -12,37 +12,52 @@ in melee = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip"; - sha256 = "0w050yah5rybx3m5zvpr09jv01r0xsazpyrc76338b2sd8pdxv3y"; + sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i"; stripRoot = false; }; ladder2017season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip"; - sha256 = "194p0mb0bh63sjy84q21x4v5pb6d7hidivfi28aalr2gkwhwqfvh"; + sha256 = "0ngg4g74s2ryhylny93fm8yq9rlrhphwnjg2s6f3qr85a2b3zdpd"; stripRoot = false; }; ladder2017season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip"; - sha256 = "1pvp7zi16326x3l45mk7s959ggnkg2j1w9rfmaxxa8mawr9c6i39"; + sha256 = "01kycnvqagql9pkjkcgngfcnry2pc4kcygdkk511m0qr34909za5"; stripRoot = false; }; ladder2017season3 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3_Updated.zip"; - sha256 = "1sjskfp6spmh7l2za1z55v7binx005qxw3w11xdvjpn20cyhkh8a"; + sha256 = "0wix3lwmbyxfgh8ldg0n66i21p0dbavk2dxjngz79rx708m8qvld"; stripRoot = false; }; ladder2017season4 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season4.zip"; - sha256 = "1zf4mfq6r1ylf8bmd0qpv134dcrfgrsi4afxfqwnf39ijdq4z26g"; + sha256 = "1sidnmk2rc9j5fd3a4623pvaika1mm1rwhznb2qklsqsq1x2qckp"; stripRoot = false; }; ladder2018season1 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season1.zip"; - sha256 = "0p51xj98qg816qm9ywv9zar5llqvqs6bcyns6d5fp2j39fg08v6f"; + sha256 = "0mp0ilcq0gmd7ahahc5i8c7bdr3ivk6skx0b2cgb1z89l5d76irq"; stripRoot = false; }; ladder2018season2 = fetchzip' { url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season2_Updated.zip"; - sha256 = "1wjn6vpbymjvjxqf10h7az34fnmhb5dpi878nsydlax25v9lgzqx"; + sha256 = "176rs848cx5src7qbr6dnn81bv1i86i381fidk3v81q9bxlmc2rv"; + stripRoot = false; + }; + ladder2018season3 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season3.zip"; + sha256 = "1r3wv4w53g9zq6073ajgv74prbdsd1x3zfpyhv1kpxbffyr0x0zp"; + stripRoot = false; + }; + ladder2018season4 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2018Season4.zip"; + sha256 = "0k47rr6pzxbanlqnhliwywkvf0w04c8hxmbanksbz6aj5wpkcn1s"; + stripRoot = false; + }; + ladder2019season1 = fetchzip' { + url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2019Season1.zip"; + sha256 = "1dlk9zza8h70lbjvg2ykc5wr9vsvvdk02szwrkgdw26mkssl2rg9"; stripRoot = false; }; } diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4e8829f7e31..9ee56041ed3 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand +{ config, stdenv, lib, runCommand , fetchFromGitHub , fetchurl , cmake @@ -13,8 +13,8 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy -, cudaSupport ? stdenv.isLinux, cudatoolkit -, cudnnSupport ? false, cudnn ? null +, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudnnSupport ? cudaSupport, cudnn ? null , ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null , substituteAll diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index fe5c77be8b2..4bf922c4e16 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 694c621db00..76e5071908f 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.1.3"; in +let version = "4.1.5"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0padylvicyhcm4vqkizpknjfw8qxh39scw3mj5xbs9bs8c442kmx"; + sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 990d3f1a5d5..061f48bb3d9 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, cmake +{ config, stdenv, lib, fetchurl, bash, cmake , opencv, gtest, openblas, liblapack, perl -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 4afaa5194db..aef18abaedf 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,12 +1,12 @@ { stdenv , fetchFromGitHub -, fetchpatch , pkgconfig , gtk3 -, granite +, pantheon , gnome3 +, gtksourceview +, libgee , cmake -, vala_0_40 , libqalculate , gobject-introspection , wrapGAppsHook }: @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - pkgconfig - wrapGAppsHook - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged cmake + pantheon.vala gobject-introspection # for setup-hook + pkgconfig + wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged - gnome3.gtksourceview - gnome3.libgee + pantheon.elementary-icon-theme + gtksourceview + libgee gnome3.libsoup - granite + pantheon.granite gtk3 libqalculate ]; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b9d0a9ef448..7302b5e337d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , fetchpatch +, runtimeShell }: # This file is responsible for fetching the sage source and adding necessary patches. @@ -121,7 +122,7 @@ stdenv.mkDerivation rec { -e 's/sage-python23/python/g' \ -i {} \; - echo '#!${stdenv.shell} + echo '#!${runtimeShell} python "$@"' > build/bin/sage-python23 # Do not use sage-env-config (generated by ./configure). diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 67cdaa4055a..d9de12d4576 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; }; - buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; + buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 71def712db6..417d5544d6c 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,22 +1,44 @@ { stdenv, python3, makeDesktopItem }: -python3.pkgs.buildPythonApplication rec { +let + + spyder-kernels = with python3.pkgs; buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + ]; + + # No tests + doCheck = false; + + meta = { + description = "Jupyter kernels for Spyder's console"; + homepage = https://github.com/spyder-ide/spyder-kernels; + license = stdenv.lib.licenses.mit; + }; + }; + +in python3.pkgs.buildPythonApplication rec { pname = "spyder"; - version = "3.2.8"; + version = "3.3.3"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; + sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; }; - # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? - postPatch = '' - sed -i -e '/pyqt5/d' setup.py - ''; - propagatedBuildInputs = with python3.pkgs; [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle + jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels ]; # There is no test for spyder diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 7c41a60a725..6301acdf134 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index cf58731b46c..d0f79600e8c 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.7"; + version = "2.8"; src = fetchurl { urls = @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "0g032502lx4l1lvkczh8v7g0i90vbyriw0lmvi3mwjfp668ka91c"; + sha256 = "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e7199543ad7..0797d75a837 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,8 @@ let git-hub = callPackage ./git-hub { }; + git-ignore = callPackage ./git-ignore { }; + git-imerge = callPackage ./git-imerge { }; git-octopus = callPackage ./git-octopus { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 7a47ed9a992..2d171df8bf2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec { buildInputs = [ git graphviz ]; + checkInputs = [ git ]; + postFixup = '' wrapProgram $out/bin/git-big-picture \ --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 9c362276383..473f0b1c450 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -49,6 +49,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ Profpatsch ]; + maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index ba126bb476c..ded9bcc2ffd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "git-hub-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { - sha256 = "1lizjyi8vac1p1anbnh6qrr176rwxp5yjc1787asw437sackkwza"; + sha256 = "03mz64lzicbxxz9b202kqs5ysf82sgb7lw967wkjdy2wbpqk8j0z"; rev = "v${version}"; repo = "git-hub"; owner = "sociomantic-tsunami"; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix new file mode 100644 index 00000000000..9edcf4c3ac4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "git-ignore-${version}"; + version = "0.2.0"; + + cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d"; + + src = fetchFromGitHub { + owner = "sondr3"; + repo = "git-ignore"; + rev = "v${version}"; + sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with stdenv.lib; { + description = "Quickly and easily fetch .gitignore templates from gitignore.io"; + homepage = https://github.com/sondr3/git-ignore; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.sondr3 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 8ae600ed360..9f18beda7f9 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux, git, glibcLocales }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, Security, utillinux }: buildGoPackage rec { pname = "hub"; - version = "2.9.0"; + version = "2.10.0"; goPackagePath = "github.com/github/hub"; @@ -13,12 +13,11 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0yxpr606xx23l8823hjqj16cvjjrwb28c7z08ml1pkfvaf7w4n81"; + sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27"; }; - nativeBuildInputs = [ groff ronn utillinux glibcLocales ]; - buildInputs = [ ruby ] ++ - stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ groff utillinux ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; postPatch = '' patchShebangs . @@ -30,7 +29,8 @@ buildGoPackage rec { install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub" install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" - PATH=$PATH:${git}/bin LC_ALL=en_US.utf-8 make man-pages + LC_ALL=C.UTF8 \ + make man-pages cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ ''; diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index 331b020d8ca..b5edd256256 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,11 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { - pname = "pre_commit"; - version = "1.11.1"; + pname = "pre-commit"; + version = "1.14.2"; src = fetchPypi { - inherit pname version; - sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w"; + inherit version; + pname = "pre_commit"; + sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc"; }; propagatedBuildInputs = [ @@ -17,7 +18,9 @@ with python3Packages; buildPythonApplication rec { six toml virtualenv - ]; + importlib-metadata + ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources + ++ stdenv.lib.optional (pythonOlder "3.2") futures; # Tests fail due to a missing windll dependency doCheck = false; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 36631449096..54b7272b0d4 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1r13l7h4146729lwif45bkzn36sgg6an0qbhgvj8w3zp035c00k3"; + sha256 = "0q33xn2l2ii8vd3hxr0f6ipk8mv2ahb3p8fzdzylhgg9w15snvsr"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 664ef62be54..b27ade204ed 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,8 +1,8 @@ { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome2, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus -, dpkg, makeDesktopItem, openssl +, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme }: with stdenv.lib; @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg"; + sha256 = "0zbnw2x15688hjdj10kpp2ipka3j7b2p945a4mzwlsc8a245ljgb"; }; libPath = makeLibraryPath [ @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { comment = "Graphical Git client from Axosoft"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ dpkg gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ]; unpackCmd = '' mkdir out @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { rm -rf bin/gitkraken share/lintian cp -av share bin $out/ popd + ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken ''; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index b5a5a9feb76..3298bc16751 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.4", - "repo_hash": "0qq9snykdlpkpbznwpkv0n7bz1rsgz4z7lcjl4xkjxkf2gkf8pxp", - "deb_hash": "1j76jya0ydyg7v3vcdfjmcr5ir23yzdwmg9fxlirvgh74py7q85c", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.4-ce.0_amd64.deb/download.deb", + "version": "11.7.5", + "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", + "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.4", + "rev": "v11.7.5", "passthru": { "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.1" + "GITLAB_WORKHORSE_VERSION": "8.0.2" } }, "ee": { - "version": "11.7.4", - "repo_hash": "0riqww094ylbbwb9mhjpsqhrdpxlcf6rc5p796p7x7f46p31mcjb", - "deb_hash": "02hnhhyrm4a3lgwnl399byka2dr5q3pjirki447373270ca93h5i", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.4-ee.0_amd64.deb/download.deb", + "version": "11.7.5", + "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", + "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.4-ee", + "rev": "v11.7.5-ee", "passthru": { "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.1" + "GITLAB_WORKHORSE_VERSION": "8.0.2" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 96ea361a254..ad3b11f3b2c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1aslcadag1q2rdirf9m0dl5vfaz8v3yy1232mvyjyvy1wb51pf4q"; + sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 6456dd75b52..83f26fa08fc 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { intltool itstool libxml2 gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; checkInputs = [ xvfb_run python3.pkgs.pytest dbus ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 67baa98d21e..fc4c18f5eb7 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.8.2"; + version = "4.9"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "1cpx8nf6vcqz92kx6b5c4900pcay8zb89gvy8y33prh5rywjq83c"; + sha256 = "01ig0464cvy9d87rn274g39frxr0p5q4lxf1xn5k3m24grf0qq0g"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile index 3fd176007ab..babcfe75ed7 100644 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile @@ -14,6 +14,7 @@ gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") gem "i18n", "~> 0.7.0" +gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] @@ -33,7 +34,7 @@ end platforms :mri, :mingw, :x64_mingw do # Optional gem for exporting the gantt to a PNG file, not supported with jruby group :rmagick do - gem "rmagick", ">= 2.14.0" + gem "rmagick", "~> 2.16.0" end # Optional Markdown support, not for JRuby diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock index 8c569ddb322..26df0e1506a 100644 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock @@ -60,7 +60,7 @@ GEM ffi (~> 1.0, >= 1.0.11) concurrent-ruby (1.1.4) crass (1.0.4) - css_parser (1.6.0) + css_parser (1.7.0) addressable csv (3.0.4) docile (1.1.5) @@ -70,7 +70,7 @@ GEM activesupport (>= 4.2.0) htmlentities (4.3.4) i18n (0.7.0) - json (2.1.0) + json (2.2.0) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -191,7 +191,7 @@ DEPENDENCIES rbpdf (~> 1.19.6) redcarpet (~> 3.4.0) request_store (= 1.0.5) - rmagick (>= 2.14.0) + rmagick (~> 2.16.0) roadie-rails (~> 1.3.0) rouge (~> 3.3.0) ruby-openid (~> 2.3.0) diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix index ba9f96f5a30..04adc31a886 100644 --- a/pkgs/applications/version-management/redmine/4.x/default.nix +++ b/pkgs/applications/version-management/redmine/4.x/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.0.1"; + version = "4.0.2"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "1zzn9rkh7x1h9f2shcc8qhb693hp0hpah0z53i6gfgg5p8k5hns1"; + sha256 = "0v00f6m7si0ca0bmh6h7mx8yz1pl4zql2c8abavya57j97mi8182"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix index ce21a58b556..afda745241e 100644 --- a/pkgs/applications/version-management/redmine/4.x/gemset.nix +++ b/pkgs/applications/version-management/redmine/4.x/gemset.nix @@ -152,10 +152,10 @@ dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; csv = { source = { @@ -217,10 +217,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 8f457449e7e..15662f56015 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -21,6 +21,7 @@ gem "mail", "~> 2.6.4" gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8") gem "i18n", "~> 0.7.0" gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" +gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" # Request at least rails-html-sanitizer 1.0.3 because of security advisories gem "rails-html-sanitizer", ">= 1.0.3" @@ -43,7 +44,7 @@ end platforms :mri, :mingw, :x64_mingw do # Optional gem for exporting the gantt to a PNG file, not supported with jruby group :rmagick do - gem "rmagick", ">= 2.14.0" + gem "rmagick", "~> 2.16.0" end # Optional Markdown support, not for JRuby diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 8bc8a03e790..eb3e0ee73bb 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -53,7 +53,7 @@ GEM coderay (1.1.2) concurrent-ruby (1.1.4) crass (1.0.4) - css_parser (1.6.0) + css_parser (1.7.0) addressable docile (1.1.5) erubis (2.7.0) @@ -120,7 +120,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) - rbpdf (1.19.7) + rbpdf (1.19.8) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) @@ -191,7 +191,7 @@ DEPENDENCIES rdoc (~> 4.3) redcarpet (~> 3.4.0) request_store (= 1.0.5) - rmagick (>= 2.14.0) + rmagick (~> 2.16.0) roadie (~> 3.2.1) roadie-rails (~> 1.1.1) ruby-openid (~> 2.3.0) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 02ae5da0f3f..ab0b113bf87 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "3.4.8"; + version = "3.4.9"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,7 +15,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${name}.tar.gz"; - sha256 = "1d8bj3hx2nlyvsqbx7zbslb4dgwgyxidj4jzh4n2ki0i7vgw0x5m"; + sha256 = "1f7sgyka21cjkvmdqkkwrx1hn0b38yq4b7283vw858fccp0l2vy2"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 0a231c99579..bdf1b55a732 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -142,10 +142,10 @@ dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvf8mc8gnz4aizfijplv3594998h2j44ydakpzsdmkivs07v61"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; docile = { source = { @@ -430,10 +430,10 @@ dependencies = ["htmlentities" "rbpdf-font"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i00mmc028p7hnpwlx9r6zdwwz589kd9ns6qpxmgl6f620n1fvs2"; + sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; type = "gem"; }; - version = "1.19.7"; + version = "1.19.8"; }; rbpdf-font = { source = { diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 21382091801..153c6d78a7b 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, lib, makeWrapper +, substituteAll , jre , gtk2, glib , libXtst @@ -21,7 +22,10 @@ stdenv.mkDerivation rec { buildCommand = let pkg_path = "$out/${name}"; bin_path = "$out/bin"; - install_freedesktop_items = ./install_freedesktop_items.sh; + install_freedesktop_items = substituteAll { + inherit (stdenv) shell; + src = ./install_freedesktop_items.sh; + }; runtime_paths = lib.makeBinPath [ jre #git mercurial subversion # the paths are requested in configuration diff --git a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh index 66fb0cf8f95..2ff14dcf099 100755 --- a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh +++ b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ inBinDir=$1 out=$2 diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 1054a2c06cf..20d3922138b 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "src-${version}"; - version = "1.22"; + version = "1.24"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "0xvfg3aikr2jh09vjvxsha7day5br88chvirncr59ad40da1fils"; + sha256 = "0n9j2mywbm8c7mc5b3m7dvn6gff88wwwaygk4y1jivpg1f6s3k3l"; }; buildInputs = [ python rcs git makeWrapper ]; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index a329321b70c..344c47eb934 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' - #!${stdenv.shell} + #!${runtimeShell} # wrapper script for dvd-slideshow programs export PATH=${binPath}:$PATH diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 07474c5e52c..77ee2bc10f8 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -3,7 +3,7 @@ # Derivation patches HandBrake to use Nix closure dependencies. # -{ stdenv, lib, fetchurl, callPackage, +{ stdenv, lib, fetchurl, # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, # Processing, video codecs, containers @@ -29,12 +29,12 @@ }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "handbrake-${version}"; + pname = "handbrake"; + version = "1.2.2"; src = fetchurl { url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi"; + sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 05105b64af7..24a1f07fb0d 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -18,7 +18,7 @@ , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp -, libplist, p11-kit, zlib +, libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -40,21 +40,18 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i assert vdpauSupport -> libvdpau != null; # TODO for Kodi 18.0 -# - cmake is no longer in project/cmake -# - maybe we can remove auto{conf,make} and libtool from inputs # - check if dbus support PR has been merged and add dbus as a buildInput -# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches) let - kodiReleaseDate = "20171115"; - kodiVersion = "17.6"; - rel = "Krypton"; + kodiReleaseDate = "20190129"; + kodiVersion = "18.0"; + rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "1pwmmbry7dajwdpmc1mdygjvxna4kl38h32d71g10yf3mdm5wmz3"; + sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg"; }; kodiDependency = { name, version, rev, sha256, ... } @attrs: @@ -72,9 +69,9 @@ let ffmpeg = kodiDependency rec { name = "FFmpeg"; - version = "3.1.11"; - rev = "${version}-${rel}-17.5"; # TODO: change 17.5 back to ${kodiVersion} - sha256 = "0nc4sb6v1g3l11v9h5l9n44a8r40186rcbp2xg5c7vg6wcpjid13"; + version = "4.0.3"; + rev = "${version}-${rel}-RC5"; + sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; @@ -86,29 +83,29 @@ let # we should be able to build these externally and have kodi reference them as buildInputs. # Doesn't work ATM though so we just use them for the src - libdvdcss = kodiDependency { + libdvdcss = kodiDependency rec { name = "libdvdcss"; - version = "20160215"; - rev = "2f12236bc1c92f73c21e973363f79eb300de603f"; - sha256 = "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd"; + version = "1.4.2"; + rev = "${version}-${rel}-Beta-5"; + sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; buildInputs = [ libdvdread ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; - libdvdnav = kodiDependency { + libdvdnav = kodiDependency rec { name = "libdvdnav"; - version = "20170217"; - rev = "981488f7f27554b103cca10c1fbeba027396c94a"; - sha256 = "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8"; + version = "6.0.0"; + rev = "${version}-${rel}-Alpha-3"; + sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; buildInputs = [ libdvdread ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; - libdvdread = kodiDependency { + libdvdread = kodiDependency rec { name = "libdvdread"; - version = "20160221"; - rev = "17d99db97e7b8f23077b342369d3c22a6250affd"; - sha256 = "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl"; + version = "6.0.0"; + rev = "${version}-${rel}-Alpha-3"; + sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; }; @@ -136,7 +133,7 @@ in stdenv.mkDerivation rec { libgcrypt libgpgerror libunistring libcrossguid cwiid libplist bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp - ffmpeg + ffmpeg flatbuffers fmt fstrcmp rapidjson # libdvdcss libdvdnav libdvdread ] ++ lib.optional dbusSupport dbus @@ -176,14 +173,10 @@ in stdenv.mkDerivation rec { doCheck = false; postPatch = '' - substituteInPlace xbmc/linux/LinuxTimezone.cpp \ + substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' ''; - preConfigure = '' - cd project/cmake - ''; - postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ @@ -209,6 +202,6 @@ in stdenv.mkDerivation rec { homepage = https://kodi.tv/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg ]; + maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; }; } diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 196852933a9..91fd7eab126 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,13 +1,15 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip -, cmake, kodiPlain, libcec_platform, tinyxml +, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib -, python2Packages }: +, python2Packages, expat, glib, nspr, nss, openssl +, libssh, libarchive, lzma, bzip2, lz4, lzo }: with stdenv.lib; let self = rec { pluginDir = "/share/kodi/addons"; + rel = "Leia"; kodi = kodiPlain; @@ -54,6 +56,8 @@ let self = rec { dontStrip = true; + extraRuntimeDependencies = [ ]; + installPhase = '' ${if isNull sourceDir then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} @@ -64,7 +68,8 @@ let self = rec { ''; } // args)); - mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args: + mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], + extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: toKodiPlugin (stdenv.mkDerivation (rec { name = "kodi-plugin-${plugin}-${version}"; @@ -73,6 +78,8 @@ let self = rec { buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs; + inherit extraRuntimeDependencies; + # disables check ensuring install prefix is that of kodi cmakeFlags = [ "-DOVERRIDE_PATHS=1" @@ -84,6 +91,7 @@ let self = rec { installPhase = let n = namespace; in '' make install ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} + ${extraInstallPhase} ''; } // args)); @@ -212,14 +220,14 @@ let self = rec { joystick = mkKodiABIPlugin rec { namespace = "peripheral.joystick"; - version = "1.3.2"; + version = "1.4.7"; plugin = namespace; src = fetchFromGitHub { - owner = "kodi-game"; + owner = "xbmc"; repo = namespace; - rev = "96171dd32899553ffe8fc775fca66e8df5ff5cf1"; - sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh"; + rev = "v${version}"; + sha256 = "03gsp4kg41s3n4ib4wsv7m3krfipgwc2z07i4mnd5zvg0c4xrmap"; }; meta = { @@ -282,14 +290,14 @@ let self = rec { steam-controller = mkKodiABIPlugin rec { namespace = "peripheral.steamcontroller"; - version = "0.9.0"; + version = "0.10.0"; plugin = namespace; src = fetchFromGitHub { owner = "kodi-game"; repo = namespace; - rev = "76f640fad4f68118f4fab6c4c3338d13daca7074"; - sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh"; + rev = "ea345392ab5aa4485f3a48d2037fa8a8e8ab82de"; + sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279"; }; extraBuildInputs = [ libusb ]; @@ -355,13 +363,13 @@ let self = rec { plugin = "pvr-hts"; namespace = "pvr.hts"; - version = "3.4.16"; + version = "4.4.14"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; - rev = "b39e4e9870d68841279cbc7d7214f3ad9b27f330"; - sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx"; + rev = "${version}-${rel}"; + sha256 = "1bcwcwd2yjhw85yk6lyhf0iqiclrsz7r7vpbxgc650fwqbb146gr"; }; meta = { @@ -377,13 +385,13 @@ let self = rec { plugin = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "2.4.7"; + version = "3.5.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; - rev = "60d89d16dd953d38947e8a6da2f8bb84a0f764ef"; - sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy"; + rev = "${version}-${rel}"; + sha256 = "1zrkvfn0im2qmvqm93pa3cg8xkxv61sxlj8nsz4r5z9v9nhqadf6"; }; meta = { @@ -401,13 +409,13 @@ let self = rec { plugin = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "2.4.14"; + version = "3.5.7"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; - rev = "2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8"; - sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; + rev = "${version}-${rel}"; + sha256 = "17znib7c491h2ii4gagxradh0jyvgga0d548gbk4yjj2nc9qqc6d"; }; meta = { @@ -418,20 +426,20 @@ let self = rec { license = licenses.gpl2Plus; }; - extraBuildInputs = [ zlib ]; + extraBuildInputs = [ zlib rapidxml ]; }; osmc-skin = mkKodiPlugin rec { plugin = "osmc-skin"; namespace = "skin.osmc"; - version = "17.0.4"; + version = "18.0.0"; src = fetchFromGitHub { owner = "osmc"; repo = namespace; - rev = "a9268937f49286bab9fb49de430b8aafd7a60a9e"; - sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v"; + rev = "40a6c318641e2cbeac58fb0e7dde9c2beac737a0"; + sha256 = "1l7hyfj5zvjxjdm94y325bmy1naak455b9l8952sb0gllzrcwj6s"; }; meta = { @@ -470,4 +478,76 @@ let self = rec { }; }); + inputstream-adaptive = mkKodiABIPlugin rec { + + plugin = "inputstream-adaptive"; + namespace = "inputstream.adaptive"; + version = "2.3.12"; + + src = fetchFromGitHub { + owner = "peak3d"; + repo = "inputstream.adaptive"; + rev = "${version}"; + sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; + }; + + extraBuildInputs = [ expat ]; + + extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; + + extraInstallPhase = let n = namespace; in '' + ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so + ''; + + meta = { + homepage = https://github.com/peak3d/inputstream.adaptive; + description = "Kodi inputstream addon for several manifest types"; + platforms = platforms.all; + maintainers = with maintainers; [ sephalon ]; + }; + }; + + vfs-sftp = mkKodiABIPlugin rec { + namespace = "vfs.sftp"; + version = "1.0.1"; + plugin = namespace; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "1l9igrl168s91c15v9klyaaz226ik3xlbzjk2f1346fvzmp87g9v"; + }; + + meta = with stdenv.lib; { + description = "SFTP Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ openssl libssh zlib ]; + }; + + vfs-libarchive = mkKodiABIPlugin rec { + namespace = "vfs.libarchive"; + version = "1.0.5"; + plugin = namespace; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8"; + }; + + meta = with stdenv.lib; { + description = "LibArchive Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + }; + + extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; + }; }; in self diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index d0dc9274a10..b4365eed949 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -14,7 +14,10 @@ buildEnv { do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ - --prefix KODI_HOME : $out/share/kodi + --prefix KODI_HOME : $out/share/kodi \ + --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath + (stdenv.lib.concatMap + (plugin: plugin.extraRuntimeDependencies) plugins)}" done ''; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 34efffc21d7..cceed556f97 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = https://mediathekview.de/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow moredread ]; + maintainers = with maintainers; [ moredread ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ffbaa9fffdf..66fc1645e9a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs, mujs , lua, libuchardet, libiconv ? null, darwin -, waylandSupport ? false +, waylandSupport ? stdenv.isLinux , wayland ? null , wayland-protocols ? null , libxkbcommon ? null @@ -24,30 +24,30 @@ , vulkan-headers ? null , vulkan-loader ? null -, alsaSupport ? true, alsaLib ? null -, bluraySupport ? true, libbluray ? null -, bs2bSupport ? true, libbs2b ? null -, cacaSupport ? true, libcaca ? null -, cmsSupport ? true, lcms2 ? null -, drmSupport ? true, libdrm ? null -, dvdnavSupport ? true, libdvdnav ? null -, dvdreadSupport ? true, libdvdread ? null -, libpngSupport ? true, libpng ? null -, pulseSupport ? true, libpulseaudio ? null -, rubberbandSupport ? true, rubberband ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, sdl2Support ? true, SDL2 ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vaapiSupport ? true, libva ? null -, vdpauSupport ? true, libvdpau ? null -, xineramaSupport ? true, libXinerama ? null -, xvSupport ? true, libXv ? null -, youtubeSupport ? true, youtube-dl ? null -, archiveSupport ? false, libarchive ? null -, jackaudioSupport ? false, libjack2 ? null -, openalSupport ? false, openalSoft ? null -, vapoursynthSupport ? false, vapoursynth ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null +, bluraySupport ? true, libbluray ? null +, bs2bSupport ? true, libbs2b ? null +, cacaSupport ? true, libcaca ? null +, cmsSupport ? true, lcms2 ? null +, drmSupport ? stdenv.isLinux, libdrm ? null +, dvdnavSupport ? stdenv.isLinux, libdvdnav ? null +, dvdreadSupport ? stdenv.isLinux, libdvdread ? null +, libpngSupport ? true, libpng ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, rubberbandSupport ? stdenv.isLinux, rubberband ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, sdl2Support ? true, SDL2 ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vaapiSupport ? stdenv.isLinux, libva ? null +, vdpauSupport ? true, libvdpau ? null +, xineramaSupport ? stdenv.isLinux, libXinerama ? null +, xvSupport ? stdenv.isLinux, libXv ? null +, youtubeSupport ? true, youtube-dl ? null +, archiveSupport ? false, libarchive ? null +, jackaudioSupport ? false, libjack2 ? null +, openalSupport ? false, openalSoft ? null +, vapoursynthSupport ? false, vapoursynth ? null }: with stdenv.lib; @@ -92,7 +92,7 @@ let "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0j7sbn3w6bgslvwwh5v9527w3gi2sd08kskrgxamx693y0b0i3ia"; }; - luaEnv = lua.withPackages(ps: with ps; [ luasocket]); + luaEnv = lua.withPackages(ps: with ps; [ luasocket ]); in stdenv.mkDerivation rec { name = "mpv-${version}"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 579d5566f13..7211f9ff3d1 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ config, stdenv , fetchFromGitHub , fetchpatch , cmake @@ -26,9 +26,9 @@ , swig , python3 -, alsaSupport ? false +, alsaSupport ? stdenv.isLinux , alsaLib -, pulseaudioSupport ? false +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio }: diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 2cd4f19ca93..6e0b7412558 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 2dd76b36d05..812004bd119 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.4.0"; + version = "2.4.1"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; - sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; + url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${name}-Source.tar.gz"; + sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 6042f490dfa..1671c3f14d0 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -9,7 +9,7 @@ , libX11 , libXtst , wrapGAppsHook -, defaultIconTheme +, gnome3 , hicolor-icon-theme }: buildPythonApplication rec { @@ -39,7 +39,7 @@ buildPythonApplication rec { ]; buildInputs = [ - defaultIconTheme + gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 4af9c32fed6..8e1934487cb 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.23.1"; + version = "1.23.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "15jijx3md70b9xw8818xjm70nr9pc27p7v7is0yi6agf8scvvqkq"; + sha256 = "1x2jlh7z2znvyz2pqcpn0gigfiqnx8s59pc7xlvy9ryd76g9w1zz"; }; # lots of networking and other fails diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix index 4499fff4dc8..9419939d1c7 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0x63m37vjyp57900x09gfvw02cwg85b33918x7fjj9x37wgmi5qf"; + sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 711838b2944..ab971fe64c9 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; homepage = "https://github.com/aws/amazon-ecs-agent"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index e1696fc15a5..778006a40f0 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.13.0"; + version = "0.15.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,8 +9,8 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "1wdcy4vmnx216jnza7bz6czlqpsjrnpqfsb5d322ld4gzbylm718"; - jailer-bin = fetchbin "jailer" "0k0sc5138bh35ciim2l78ma9g5x18dw098f2ar5y31ybr8i4q60y"; + firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0"; + jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3"; in stdenv.mkDerivation { name = "firecracker-${version}"; diff --git a/pkgs/applications/virtualization/nvidia-docker/config.toml b/pkgs/applications/virtualization/nvidia-docker/config.toml new file mode 100644 index 00000000000..bbd166995f3 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/config.toml @@ -0,0 +1,13 @@ +disable-require = false +#swarm-resource = "DOCKER_RESOURCE_GPU" + +[nvidia-container-cli] +#root = "/run/nvidia/driver" +#path = "/usr/bin/nvidia-container-cli" +environment = [] +#debug = "/var/log/nvidia-container-runtime-hook.log" +ldcache = "/tmp/ld.so.cache" +load-kmods = true +#no-cgroups = false +#user = "root:video" +ldconfig = "@@glibcbin@/bin/ldconfig" diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix new file mode 100644 index 00000000000..3e79ff84882 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -0,0 +1,84 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper +, buildGoPackage, runc, libelf, libcap, libseccomp, glibc }: + +with lib; let + + glibc-ldconf = glibc.overrideAttrs (oldAttrs: { + # ldconfig needs help reading libraries that have been patchelf-ed, as the + # .dynstr section is no longer in the first LOAD segment. See also + # https://sourceware.org/bugzilla/show_bug.cgi?id=23964 and + # https://github.com/NixOS/patchelf/issues/44 + patches = oldAttrs.patches ++ [ (fetchpatch { + name = "ldconfig-patchelf.patch"; + url = "https://sourceware.org/bugzilla/attachment.cgi?id=11444"; + sha256 = "0nzzmq7pli37iyjrgcmvcy92piiwjybpw245ds7q43pbgdm7lc3s"; + })]; + }); + + libnvidia-container = callPackage ./libnvc.nix { }; + + nvidia-container-runtime = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-container-runtime"; + rev = "runtime-v2.0.0"; + sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a"; + }; + + nvidia-container-runtime-hook = buildGoPackage rec { + name = "nvidia-container-runtime-hook-${version}"; + version = "1.4.0"; + + goPackagePath = "nvidia-container-runtime-hook"; + + src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook"; + }; + + nvidia-runc = runc.overrideAttrs (oldAttrs: rec { + name = "nvidia-runc"; + version = "1.0.0-rc6"; + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "runc"; + rev = "v${version}"; + sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; + }; + patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ]; + }); + +in stdenv.mkDerivation rec { + name = "nvidia-docker-${version}"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-docker"; + rev = "v${version}"; + sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir bin + cp nvidia-docker bin + cp ${libnvidia-container}/bin/nvidia-container-cli bin + cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin + cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime + ''; + + installPhase = '' + mkdir -p $out/{bin,etc} + cp -r bin $out + wrapProgram $out/bin/nvidia-container-cli \ + --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib + cp ${./config.toml} $out/etc/config.toml + substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc-ldconf} + ''; + + meta = { + homepage = https://github.com/NVIDIA/nvidia-docker; + description = "NVIDIA container runtime for Docker"; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch new file mode 100644 index 00000000000..043c1efade8 --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -0,0 +1,130 @@ +diff --git a/src/ldcache.c b/src/ldcache.c +index 38bab05..e1abc89 100644 +--- a/src/ldcache.c ++++ b/src/ldcache.c +@@ -108,40 +108,27 @@ ldcache_close(struct ldcache *ctx) + + int + ldcache_resolve(struct ldcache *ctx, uint32_t arch, const char *root, const char * const libs[], +- char *paths[], size_t size, ldcache_select_fn select, void *select_ctx) ++ char *paths[], size_t size, const char* version) + { + char path[PATH_MAX]; +- struct header_libc6 *h; +- int override; ++ char dir[PATH_MAX]; ++ char lib[PATH_MAX]; + +- h = (struct header_libc6 *)ctx->ptr; + memset(paths, 0, size * sizeof(*paths)); + +- for (uint32_t i = 0; i < h->nlibs; ++i) { +- int32_t flags = h->libs[i].flags; +- char *key = (char *)ctx->ptr + h->libs[i].key; +- char *value = (char *)ctx->ptr + h->libs[i].value; +- +- if (!(flags & LD_ELF) || (flags & LD_ARCH_MASK) != arch) ++ for (size_t j = 0; j < size; ++j) { ++ snprintf(dir, 100, "/run/opengl-driver%s/lib", ++ arch == LD_I386_LIB32 ? "-32" : ""); ++ if (!strncmp(libs[j], "libvdpau_nvidia.so", 100)) ++ strcat(dir, "/vdpau"); ++ snprintf(lib, 100, "%s/%s.%s", dir, libs[j], version); ++ if (path_resolve_full(ctx->err, path, "/", lib) < 0) ++ return (-1); ++ if (!file_exists(ctx->err, path)) + continue; +- +- for (size_t j = 0; j < size; ++j) { +- if (!str_has_prefix(key, libs[j])) +- continue; +- if (path_resolve(ctx->err, path, root, value) < 0) +- return (-1); +- if (paths[j] != NULL && str_equal(paths[j], path)) +- continue; +- if ((override = select(ctx->err, select_ctx, root, paths[j], path)) < 0) +- return (-1); +- if (override) { +- free(paths[j]); +- paths[j] = xstrdup(ctx->err, path); +- if (paths[j] == NULL) +- return (-1); +- } +- break; +- } ++ paths[j] = xstrdup(ctx->err, path); ++ if (paths[j] == NULL) ++ return (-1); + } + return (0); + } +diff --git a/src/ldcache.h b/src/ldcache.h +index 33d78dd..2b087db 100644 +--- a/src/ldcache.h ++++ b/src/ldcache.h +@@ -50,6 +50,6 @@ void ldcache_init(struct ldcache *, struct error *, const char *); + int ldcache_open(struct ldcache *); + int ldcache_close(struct ldcache *); + int ldcache_resolve(struct ldcache *, uint32_t, const char *, const char * const [], +- char *[], size_t, ldcache_select_fn, void *); ++ char *[], size_t, const char*); + + #endif /* HEADER_LDCACHE_H */ +diff --git a/src/nvc_info.c b/src/nvc_info.c +index cc96542..3fe7612 100644 +--- a/src/nvc_info.c ++++ b/src/nvc_info.c +@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * + if (path_resolve_full(err, path, root, ldcache) < 0) + return (-1); + ldcache_init(&ld, err, path); +- if (ldcache_open(&ld) < 0) +- return (-1); + + info->nlibs = size; + info->libs = array_new(err, size); + if (info->libs == NULL) + goto fail; + if (ldcache_resolve(&ld, LIB_ARCH, root, libs, +- info->libs, info->nlibs, select_libraries, info) < 0) ++ info->libs, info->nlibs, info->nvrm_version) < 0) + goto fail; + + info->nlibs32 = size; +@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * + if (info->libs32 == NULL) + goto fail; + if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, +- info->libs32, info->nlibs32, select_libraries, info) < 0) ++ info->libs32, info->nlibs32, info->nvrm_version) < 0) + goto fail; + rv = 0; + + fail: +- if (ldcache_close(&ld) < 0) +- return (-1); + return (rv); + } + +@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r + char path[PATH_MAX]; + int rv = -1; + +- if ((env = secure_getenv("PATH")) == NULL) { ++ if ((env = "/run/nvidia-docker/bin:/run/nvidia-docker/extras/bin") == NULL) { + error_setx(err, "environment variable PATH not found"); + return (-1); + } +diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c +index d41a24d..65b7878 100644 +--- a/src/nvc_ldcache.c ++++ b/src/nvc_ldcache.c +@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) + if (validate_args(ctx, cnt != NULL) < 0) + return (-1); + +- argv = (char * []){cnt->cfg.ldconfig, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; ++ argv = (char * []){cnt->cfg.ldconfig, "-f", "/tmp/ld.so.conf.nvidia-host", "-C", "/tmp/ld.so.cache.nvidia-host", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL}; + if (*argv[0] == '@') { + /* + * We treat this path specially to be relative to the host filesystem. diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix new file mode 100644 index 00000000000..46b8e3ba43c --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: + +with lib; let + + modp-ver = "396.51"; + + nvidia-modprobe = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-modprobe"; + rev = modp-ver; + sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk"; + }; + +in stdenv.mkDerivation rec { + name = "libnvidia-container-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "libnvidia-container"; + rev = "v${version}"; + sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; + }; + + # locations of nvidia-driver libraries are not resolved via ldconfig which + # doesn't get used on NixOS. Additional support binaries like nvidia-smi are + # not resolved via the environment PATH but via the derivation output path. + patches = [ ./libnvc-ldconfig-and-path-fixes.patch ]; + + makeFlags = [ + "WITH_LIBELF=yes" + "prefix=$(out)" + ]; + + postPatch = '' + sed -i 's/^REVISION :=.*/REVISION = ${src.rev}/' mk/common.mk + sed -i 's/^COMPILER :=.*/COMPILER = $(CC)/' mk/common.mk + + mkdir -p deps/src/nvidia-modprobe-${modp-ver} + cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} + chmod -R u+w deps/src + touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp + ''; + + buildInputs = [ libelf libcap libseccomp ]; + + meta = { + homepage = https://github.com/NVIDIA/libnvidia-container; + description = "NVIDIA container runtime library"; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a43e1733f06..0668400d28c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, + pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] - ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ ./recognize_nixos.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 91934a3610b..26307f3f38d 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtk3 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8304dd15597..bd148733bc5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,9 +19,10 @@ with stdenv.lib; let python = python2; buildType = "release"; - # Remember to change the extpackRev and version in extpack.nix as well. - main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m"; - version = "5.2.22"; + # Remember to change the extpackRev and version in extpack.nix and + # guest-additions/default.nix as well. + main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd"; + version = "5.2.26"; in stdenv.mkDerivation { name = "virtualbox-${version}"; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d2c513e899a..96b4c7a8fbb 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -2,7 +2,7 @@ with lib; -let version = "5.2.22"; +let version = "5.2.26"; in fetchurl rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; @@ -10,7 +10,7 @@ fetchurl rec { sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. - let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef"; + let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 259f2b268fe..ccfedd1b2e1 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603"; + sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 29fd257620c..8dc2dffc6b6 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -86,14 +86,14 @@ stdenv.mkDerivation (rec { # Fake git: just print what it wants and die cat > fake-bin/wget << EOF - #!/bin/sh -e + #!${stdenv.shell} -e echo ===== FAKE WGET: Not fetching \$* [ -e \$3 ] EOF # Fake git: just print what it wants and die cat > fake-bin/git << EOF - #!/bin/sh + #!${stdenv.shell} echo ===== FAKE GIT: Not cloning \$* [ -e \$3 ] EOF @@ -109,7 +109,7 @@ stdenv.mkDerivation (rec { # (prefetched stuff has lots of files) find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g' find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \ - | xargs sed -i 's@/bin/bash@/bin/sh@g' + | xargs sed -i 's@/bin/bash@${stdenv.shell}@g' # Get prefetched stuff ${withXenfiles (name: x: '' diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 03652c749de..7cb423123dc 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1ywjhqxvggfdfd3cfki0vvlsli8lhqlziwfrj5vd57c6yisc2fyy"; + sha256 = "17cfvbrvzwwr9r72xgpn144k45xavzi0hnl2qqp9lhxflvirac0c"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 1fed92764c1..b44aa73bc5a 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -3,7 +3,7 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2018-04-11"; + version = "unstable-2019-02-10"; pname = "i3pystatus"; disabled = !python3Packages.isPy3k; @@ -11,8 +11,8 @@ python3Packages.buildPythonApplication rec { { owner = "enkore"; repo = "i3pystatus"; - rev = "3efbd56bb7a851f16173ec6f0eef472b6e96c7cc"; - sha256 = "0r4mc23chxlaym7jcjnflw7mn5nbw3q8q4ix0nim7lh98yfndd3b"; + rev = "bcd8f12b18d491029fdd5bd0f433b4500fcdc68e"; + sha256 = "0gw6sla73cid6gwxn2n4zmsg2svq5flf9zxly6x2rfljizgf0720"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ @@ -44,4 +44,3 @@ python3Packages.buildPythonApplication rec { maintainers = [ maintainers.igsha ]; }; } - diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix index 155b26e0987..a887016782e 100644 --- a/pkgs/applications/window-managers/sway/beta.nix +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-rc3"; + version = "1.0-rc4"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1ixwc1bg725x68qr84s8a5i4rlzc4svc52jgdw1yl5bgr6l1k5zc"; + sha256 = "1f0mvf48dvsivdd850r1gd2h90cbn62qflwiff6x2addn868bvxa"; }; postPatch = '' @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; mesonFlags = [ - "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" - "-Dtray=enabled" + "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dtray=enabled" ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled"; meta = with stdenv.lib; { @@ -45,6 +44,6 @@ stdenv.mkDerivation rec { homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date. + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 57f00887103..f7ccda27389 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport, xorg +, desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate , libxfce4util, xfce4-panel diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix new file mode 100644 index 00000000000..ef7da72fda9 --- /dev/null +++ b/pkgs/build-support/appimage/default.nix @@ -0,0 +1,176 @@ +{ pkgs, stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }: + +rec { + # Both extraction functions could be unified, but then + # it would depend on libmagic to correctly identify ISO 9660s + + extractType1 = { name, src }: stdenv.mkDerivation { + name = "${name}-extracted"; + inherit src; + + nativeBuildInputs = [ libarchive ]; + buildCommand = '' + mkdir $out + bsdtar -x -C $out -f $src + ''; + }; + + extractType2 = { name, src }: stdenv.mkDerivation { + name = "${name}-extracted"; + inherit src; + + nativeBuildInputs = [ patchelf ]; + buildCommand = '' + install $src ./appimage + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ + ./appimage + + ./appimage --appimage-extract + + cp -rv squashfs-root $out + ''; + }; + + wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // { + inherit name; + + targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; + + runScript = writeScript "run" '' + #!${stdenv.shell} + + export APPDIR=${src} + export APPIMAGE_SILENT_INSTALL=1 + cd $APPDIR + exec ./AppRun "$@" + ''; + }); + + wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + inherit name extraPkgs; + src = extractType1 { inherit name src; }; + }; + + wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage { + inherit name extraPkgs; + src = extractType2 { inherit name src; }; + }; + + defaultFhsEnvArgs = { + name = "appimage-env"; + + # Most of the packages were taken from the Steam chroot + targetPkgs = pkgs: with pkgs; [ + gtk3 + bashInteractive + gnome3.zenity + python2 + xorg.xrandr + which + perl + xdg_utils + iana-etc + krb5 + ]; + + multiPkgs = pkgs: with pkgs; [ + desktop-file-utils + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL + + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + libdrm + xorg.xkeyboardconfig + xorg.libpciaccess + + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + udev + dbus-glib + libav + atk + at-spi2-atk + libudev0-shim + networkmanager098 + + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + alsaLib + ]; + }; +} diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 03ba54525bf..98d43c01ba0 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -53,6 +53,7 @@ let /**/ if libc == null then null else if targetPlatform.libc == "musl" then "${libc_lib}/lib/ld-musl-*" else if targetPlatform.libc == "bionic" then "/system/bin/linker" + else if targetPlatform.libc == "nblibc" then "${libc_lib}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". @@ -187,7 +188,8 @@ stdenv.mkDerivation { else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" else if targetPlatform.isAvr then "avr" - else throw "unknown emulation for platform: " + targetPlatform.config; + else if targetPlatform.isAlpha then "alpha" + else throw "unknown emulation for platform: ${targetPlatform.config}"; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); strictDeps = true; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 931b68c6329..f39f4e65e45 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -33,7 +33,9 @@ in stdenv.mkDerivation (fBuildAttrs // { # sandbox enabled. Code here # https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124 # - USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget + # On macOS Bazel will use the system installed Xcode or CLT toolchain instead of the one in the PATH unless we pass BAZEL_USE_CPP_ONLY_TOOLCHAIN + # + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget runHook postBuild ''; @@ -90,7 +92,42 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild - bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget + # Bazel sandboxes the execution of the tools it invokes, so even though we are + # calling the correct nix wrappers, the values of the environment variables + # the wrappers are expecting will not be set. So instead of relying on the + # wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt` + # and related flags. + # + copts=() + host_copts=() + for flag in $NIX_CFLAGS_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_CXXSTDLIB_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + linkopts=() + host_linkopts=() + for flag in $NIX_LD_FLAGS; do + linkopts+=( "--linkopt=$flag" ) + host_linkopts+=( "--host_linkopt=$flag" ) + done + + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + USER=homeless-shelter \ + bazel \ + --output_base="$bazelOut" \ + --output_user_root="$bazelUserRoot" \ + build \ + -j $NIX_BUILD_CORES \ + "''${copts[@]}" \ + "''${host_copts[@]}" \ + "''${linkopts[@]}" \ + "''${host_linkopts[@]}" \ + $bazelFlags \ + $bazelTarget runHook postBuild ''; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 23568f51b23..c0f741b6288 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -196,4 +196,5 @@ in stdenv.mkDerivation { ${if isMultiBuild then extraBuildCommandsMulti else ""} ''; preferLocalBuild = true; + allowSubstitutes = false; } diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 678f5a3fe9e..b699d762d29 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -26,6 +26,13 @@ sub isInPathsToLink { return 0; } +# Similar to `lib.isStorePath` +sub isStorePath { + my $path = shift; + my $storePath = "@storeDir@"; + + return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath; +} # For each activated package, determine what symlinks to create. @@ -84,6 +91,11 @@ sub checkCollision { sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; + # The store path must not be a file + if (-f $target && isStorePath $target) { + die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!"; + } + # Urgh, hacky... return if $relName eq "/propagated-build-inputs" || diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 41a1e67ef42..7f2427777f9 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -2,7 +2,7 @@ # a fork of the buildEnv in the Nix distribution. Most changes should # eventually be merged back into the Nix distribution. -{ buildPackages, runCommand, lib }: +{ buildPackages, runCommand, lib, substituteAll }: lib.makeOverridable ({ name @@ -43,6 +43,13 @@ lib.makeOverridable , meta ? {} }: +let + builder = substituteAll { + src = ./builder.pl; + inherit (builtins) storeDir; + }; +in + runCommand name rec { inherit manifest ignoreCollisions checkCollisionContents passthru @@ -63,10 +70,11 @@ runCommand name priority = drv.meta.priority or 5; }) paths); preferLocalBuild = true; + allowSubstitutes = false; # XXX: The size is somewhat arbitrary passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; } '' - ${buildPackages.perl}/bin/perl -w ${./builder.pl} + ${buildPackages.perl}/bin/perl -w ${builder} eval "$postBuild" '') diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index c3618113047..f05b9fb2255 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -13,6 +13,7 @@ , extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} +, libcxx ? null }: with stdenvNoCC.lib; @@ -44,8 +45,11 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; + default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) then + "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)" + else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) then + "-isystem ${libcxx}/include/c++/v1" + else ""; # The "infix salt" is a arbitrary string added in the middle of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used @@ -256,9 +260,9 @@ stdenv.mkDerivation { echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags - '' - - + optionalString propagateDoc '' + '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' + echo " -L${libcxx}/lib" >> $out/nix-support/cc-ldflags + '' + optionalString propagateDoc '' ## ## Man page and info support ## @@ -287,6 +291,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector pic" '' + + optionalString targetPlatform.isNetBSD '' + hardening_unsupported_flags+=" stackprotector fortify" + '' + + optionalString (targetPlatform.libc == "newlib") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 28f2802a5bc..24795a724ec 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { exportReferencesGraph.closure = rootPaths; + preferLocalBuild = true; + PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin"; builder = builtins.toFile "builder" diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index f59900ab759..011ff368509 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -22,7 +22,9 @@ referencesByPopularity, writeScript, writeText, - closureInfo + closureInfo, + substituteAll, + runtimeShell }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -118,7 +120,7 @@ rec { export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d if [[ ! -f /etc/passwd ]]; then - echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd + echo "root:x:0:0::/root:${runtimeShell}" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi if [[ ! -f /etc/group ]]; then @@ -260,7 +262,7 @@ rec { # things like `ls` or `echo` will be missing. shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e export PATH=${coreutils}/bin:/bin ${text} @@ -279,6 +281,13 @@ rec { # of room for extension maxLayers ? 24 }: + let + storePathToLayer = substituteAll + { inherit (stdenv) shell; + isExecutable = true; + src = ./store-path-to-layer.sh; + }; + in runCommand "${name}-granular-docker-layers" { inherit maxLayers; paths = referencesByPopularity closure; @@ -298,9 +307,9 @@ rec { # following head and tail call lines, double-check that your # code behaves properly when the number of layers equals: # maxLayers-1, maxLayers, and maxLayers+1 - head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${./store-path-to-layer.sh} + head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${storePathToLayer} if [ $(cat $paths | wc -l) -ge $maxLayers ]; then - tail -n+$maxLayers $paths | xargs ${./store-path-to-layer.sh} $maxLayers + tail -n+$maxLayers $paths | xargs ${storePathToLayer} $maxLayers fi echo "Finished building layer '$name'" diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 194ce3b39b1..68433d1471d 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, subversion, glibcLocales, sshSupport ? false, openssh ? null}: +{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: {url, rev ? "HEAD", md5 ? "", sha256 ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null , preferLocalBuild ? true }: diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix index 48297e583af..acc95eaf993 100644 --- a/pkgs/build-support/nix-prefetch-github/default.nix +++ b/pkgs/build-support/nix-prefetch-github/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-prefetch-github"; - version = "1.3"; + version = "2.2"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; - rev = "${version}"; - sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6"; + rev = "v${version}"; + sha256 = "1m1d1fzacvwprfvhxih1hzr1m0y1jjxiznf8p8b3bi5a41yzvrrl"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 5ab24132290..2d24d5bd704 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation ( mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF - #!${stdenv.shell} + #!${pkgs.runtimeShell} export JAVA_HOME=$jre $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@ EOF diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 252a0ff521f..0978f7e1756 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -8,11 +8,11 @@ let deps = makeDeps dependencies; - rustcOpts = - lib.lists.foldl' (opts: opt: opts + " " + opt) - (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=1"] ++ extraRustcOpts); - rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + rustcOpts = + lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); + rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; # Some platforms have different names for rustc. rustPlatform = diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 7630c6471dc..9f499e4f5e7 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,9 +1,28 @@ { lib, stdenv, echo_build_heading, noisily, makeDeps }: -{ build, buildDependencies, colors, completeBuildDeps, completeDeps, crateAuthors, crateFeatures, crateName, crateVersion, extraLinkFlags, libName, libPath, release, target_os, verbose, workspace_member }: +{ build +, buildDependencies +, colors +, completeBuildDeps +, completeDeps +, crateAuthors +, crateDescription +, crateFeatures +, crateName +, crateVersion +, extraLinkFlags +, extraRustcOpts +, libName +, libPath +, release +, target_os +, verbose +, workspace_member }: let version_ = lib.splitString "-" crateVersion; versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; version = lib.splitString "." (lib.head version_); - rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2"); + rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) + (if release then "-C opt-level=3" else "-C debuginfo=2") + (["-C codegen-units=1"] ++ extraRustcOpts); buildDeps = makeDeps buildDependencies; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; @@ -51,6 +70,7 @@ in '' export CARGO_PKG_NAME=${crateName} export CARGO_PKG_VERSION=${crateVersion} export CARGO_PKG_AUTHORS="${authors}" + export CARGO_PKG_DESCRIPTION="${crateDescription}" export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name} export CARGO_CFG_TARGET_OS=${target_os} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index dbb2f1b80cc..81e8a7ca0af 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -71,7 +71,7 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr processedAttrs = [ "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" "buildDependencies" "dependencies" "features" - "crateName" "version" "build" "authors" "colors" + "crateName" "version" "build" "authors" "colors" "edition" ]; extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; buildInputs_ = buildInputs; @@ -129,6 +129,7 @@ stdenv.mkDerivation (rec { build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; + crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else @@ -136,13 +137,15 @@ stdenv.mkDerivation (rec { (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); + edition = crate.edition or null; + extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); + configurePhase = configureCrate { - inherit crateName buildDependencies completeDeps completeBuildDeps + inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures libName build workspace_member release libPath crateVersion - extraLinkFlags + extraLinkFlags extraRustcOpts crateAuthors verbose colors target_os; }; - extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_; buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index dd44fed623e..ef69f90c366 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,12 +1,12 @@ -# Generated by carnix 0.9.1: carnix generate-nix +# Generated by carnix 0.9.8: carnix generate-nix { lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: with buildRustCrateHelpers; let inherit (lib.lists) fold; inherit (lib.attrsets) recursiveUpdate; in -let crates = cratesIO; in rec { - carnix = crates.crates.carnix."0.9.2" deps; + crates = cratesIO; + carnix = crates.crates.carnix."0.9.8" deps; __all = [ (carnix {}) ]; deps.aho_corasick."0.6.8" = { memchr = "2.1.0"; @@ -42,7 +42,7 @@ rec { arrayvec = "0.4.7"; constant_time_eq = "0.1.3"; }; - deps.carnix."0.9.2" = { + deps.carnix."0.9.8" = { clap = "2.32.0"; dirs = "1.0.4"; env_logger = "0.5.13"; @@ -56,6 +56,7 @@ rec { serde_json = "1.0.32"; tempdir = "0.3.7"; toml = "0.4.8"; + url = "1.7.2"; }; deps.cc."1.0.25" = {}; deps.cfg_if."0.1.6" = {}; @@ -103,6 +104,11 @@ rec { deps.humantime."1.1.1" = { quick_error = "1.2.2"; }; + deps.idna."0.1.5" = { + matches = "0.1.8"; + unicode_bidi = "0.3.4"; + unicode_normalization = "0.1.7"; + }; deps.itertools."0.7.8" = { either = "1.5.0"; }; @@ -114,6 +120,7 @@ rec { deps.log."0.4.5" = { cfg_if = "0.1.6"; }; + deps.matches."0.1.8" = {}; deps.memchr."1.0.2" = { libc = "0.2.43"; }; @@ -126,6 +133,7 @@ rec { deps.nom."3.2.1" = { memchr = "1.0.2"; }; + deps.percent_encoding."1.0.1" = {}; deps.proc_macro2."0.4.20" = { unicode_xid = "0.1.0"; }; @@ -209,8 +217,17 @@ rec { serde = "1.0.80"; }; deps.ucd_util."0.1.1" = {}; + deps.unicode_bidi."0.3.4" = { + matches = "0.1.8"; + }; + deps.unicode_normalization."0.1.7" = {}; deps.unicode_width."0.1.5" = {}; deps.unicode_xid."0.1.0" = {}; + deps.url."1.7.2" = { + idna = "0.1.5"; + matches = "0.1.8"; + percent_encoding = "1.0.1"; + }; deps.utf8_ranges."1.0.1" = {}; deps.vec_map."0.8.1" = {}; deps.version_check."0.1.5" = {}; diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix index f312cd6e490..3521f0997bd 100644 --- a/pkgs/build-support/rust/crates-io.nix +++ b/pkgs/build-support/rust/crates-io.nix @@ -338,6 +338,65 @@ rec { # end +# carnix-0.9.1 + + crates.carnix."0.9.1" = deps: { features?(features_.carnix."0.9.1" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.1"; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "0dn292d4mjlxif0kclrljzff8rm35cd9d92vycjbzklyhz5d62wi"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.1"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.1"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.1"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.1"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.1"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.1"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.1"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.1"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.1"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.1"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.1"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.1"."toml"}" deps) + ]); + }; + features_.carnix."0.9.1" = deps: f: updateFeatures f (rec { + carnix."0.9.1".default = (f.carnix."0.9.1".default or true); + clap."${deps.carnix."0.9.1".clap}".default = true; + dirs."${deps.carnix."0.9.1".dirs}".default = true; + env_logger."${deps.carnix."0.9.1".env_logger}".default = true; + error_chain."${deps.carnix."0.9.1".error_chain}".default = true; + itertools."${deps.carnix."0.9.1".itertools}".default = true; + log."${deps.carnix."0.9.1".log}".default = true; + nom."${deps.carnix."0.9.1".nom}".default = true; + regex."${deps.carnix."0.9.1".regex}".default = true; + serde."${deps.carnix."0.9.1".serde}".default = true; + serde_derive."${deps.carnix."0.9.1".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.1".serde_json}".default = true; + tempdir."${deps.carnix."0.9.1".tempdir}".default = true; + toml."${deps.carnix."0.9.1".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.1"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.1"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.1"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.1"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.1"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.1"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.1"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.1"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.1"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.1"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.1"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.1"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.1"."toml"}" deps) + ]; + + +# end # carnix-0.9.2 crates.carnix."0.9.2" = deps: { features?(features_.carnix."0.9.2" deps {}) }: buildRustCrate { @@ -397,6 +456,68 @@ rec { # end +# carnix-0.9.8 + + crates.carnix."0.9.8" = deps: { features?(features_.carnix."0.9.8" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.9.8"; + authors = [ "pe@pijul.org <pe@pijul.org>" ]; + sha256 = "0c2k98qjm1yyx5wl0wqs0rrjczp6h62ri1x8a99442clxsyvp4n9"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.9.8"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.9.8"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.9.8"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.9.8"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.9.8"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.9.8"."log"}" deps) + (crates."nom"."${deps."carnix"."0.9.8"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.9.8"."regex"}" deps) + (crates."serde"."${deps."carnix"."0.9.8"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.9.8"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.9.8"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.9.8"."toml"}" deps) + (crates."url"."${deps."carnix"."0.9.8"."url"}" deps) + ]); + }; + features_.carnix."0.9.8" = deps: f: updateFeatures f (rec { + carnix."0.9.8".default = (f.carnix."0.9.8".default or true); + clap."${deps.carnix."0.9.8".clap}".default = true; + dirs."${deps.carnix."0.9.8".dirs}".default = true; + env_logger."${deps.carnix."0.9.8".env_logger}".default = true; + error_chain."${deps.carnix."0.9.8".error_chain}".default = true; + itertools."${deps.carnix."0.9.8".itertools}".default = true; + log."${deps.carnix."0.9.8".log}".default = true; + nom."${deps.carnix."0.9.8".nom}".default = true; + regex."${deps.carnix."0.9.8".regex}".default = true; + serde."${deps.carnix."0.9.8".serde}".default = true; + serde_derive."${deps.carnix."0.9.8".serde_derive}".default = true; + serde_json."${deps.carnix."0.9.8".serde_json}".default = true; + tempdir."${deps.carnix."0.9.8".tempdir}".default = true; + toml."${deps.carnix."0.9.8".toml}".default = true; + url."${deps.carnix."0.9.8".url}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.9.8"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.9.8"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.9.8"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.9.8"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.9.8"."itertools"}" deps) + (features_.log."${deps."carnix"."0.9.8"."log"}" deps) + (features_.nom."${deps."carnix"."0.9.8"."nom"}" deps) + (features_.regex."${deps."carnix"."0.9.8"."regex"}" deps) + (features_.serde."${deps."carnix"."0.9.8"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.9.8"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.9.8"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.9.8"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.9.8"."toml"}" deps) + (features_.url."${deps."carnix"."0.9.8"."url"}" deps) + ]; + + +# end # cc-1.0.25 crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate { @@ -802,6 +923,32 @@ rec { # end +# idna-0.1.5 + + crates.idna."0.1.5" = deps: { features?(features_.idna."0.1.5" deps {}) }: buildRustCrate { + crateName = "idna"; + version = "0.1.5"; + authors = [ "The rust-url developers" ]; + sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."idna"."0.1.5"."matches"}" deps) + (crates."unicode_bidi"."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (crates."unicode_normalization"."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]); + }; + features_.idna."0.1.5" = deps: f: updateFeatures f (rec { + idna."0.1.5".default = (f.idna."0.1.5".default or true); + matches."${deps.idna."0.1.5".matches}".default = true; + unicode_bidi."${deps.idna."0.1.5".unicode_bidi}".default = true; + unicode_normalization."${deps.idna."0.1.5".unicode_normalization}".default = true; + }) [ + (features_.matches."${deps."idna"."0.1.5"."matches"}" deps) + (features_.unicode_bidi."${deps."idna"."0.1.5"."unicode_bidi"}" deps) + (features_.unicode_normalization."${deps."idna"."0.1.5"."unicode_normalization"}" deps) + ]; + + +# end # itertools-0.7.8 crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate { @@ -927,6 +1074,21 @@ rec { # end +# matches-0.1.8 + + crates.matches."0.1.8" = deps: { features?(features_.matches."0.1.8" deps {}) }: buildRustCrate { + crateName = "matches"; + version = "0.1.8"; + authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; + sha256 = "03hl636fg6xggy0a26200xs74amk3k9n0908rga2szn68agyz3cv"; + libPath = "lib.rs"; + }; + features_.matches."0.1.8" = deps: f: updateFeatures f (rec { + matches."0.1.8".default = (f.matches."0.1.8".default or true); + }) []; + + +# end # memchr-1.0.2 crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate { @@ -1094,6 +1256,21 @@ rec { # end +# percent-encoding-1.0.1 + + crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { + crateName = "percent-encoding"; + version = "1.0.1"; + authors = [ "The rust-url developers" ]; + sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; + libPath = "lib.rs"; + }; + features_.percent_encoding."1.0.1" = deps: f: updateFeatures f (rec { + percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); + }) []; + + +# end # proc-macro2-0.4.20 crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate { @@ -1850,6 +2027,56 @@ rec { # end +# unicode-bidi-0.3.4 + + crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { + crateName = "unicode-bidi"; + version = "0.3.4"; + authors = [ "The Servo Project Developers" ]; + sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; + libName = "unicode_bidi"; + dependencies = mapFeatures features ([ + (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]); + features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); + }; + features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { + matches."${deps.unicode_bidi."0.3.4".matches}".default = true; + unicode_bidi = fold recursiveUpdate {} [ + { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } + { "0.3.4".flame = + (f.unicode_bidi."0.3.4".flame or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".flamer = + (f.unicode_bidi."0.3.4".flamer or false) || + (f.unicode_bidi."0.3.4".flame_it or false) || + (unicode_bidi."0.3.4"."flame_it" or false); } + { "0.3.4".serde = + (f.unicode_bidi."0.3.4".serde or false) || + (f.unicode_bidi."0.3.4".with_serde or false) || + (unicode_bidi."0.3.4"."with_serde" or false); } + ]; + }) [ + (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) + ]; + + +# end +# unicode-normalization-0.1.7 + + crates.unicode_normalization."0.1.7" = deps: { features?(features_.unicode_normalization."0.1.7" deps {}) }: buildRustCrate { + crateName = "unicode-normalization"; + version = "0.1.7"; + authors = [ "kwantam <kwantam@gmail.com>" ]; + sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs"; + }; + features_.unicode_normalization."0.1.7" = deps: f: updateFeatures f (rec { + unicode_normalization."0.1.7".default = (f.unicode_normalization."0.1.7".default or true); + }) []; + + +# end # unicode-width-0.1.5 crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { @@ -1880,6 +2107,43 @@ rec { # end +# url-1.7.2 + + crates.url."1.7.2" = deps: { features?(features_.url."1.7.2" deps {}) }: buildRustCrate { + crateName = "url"; + version = "1.7.2"; + authors = [ "The rust-url developers" ]; + sha256 = "0qzrjzd9r1niv7037x4cgnv98fs1vj0k18lpxx890ipc47x5gc09"; + dependencies = mapFeatures features ([ + (crates."idna"."${deps."url"."1.7.2"."idna"}" deps) + (crates."matches"."${deps."url"."1.7.2"."matches"}" deps) + (crates."percent_encoding"."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]); + features = mkFeatures (features."url"."1.7.2" or {}); + }; + features_.url."1.7.2" = deps: f: updateFeatures f (rec { + idna."${deps.url."1.7.2".idna}".default = true; + matches."${deps.url."1.7.2".matches}".default = true; + percent_encoding."${deps.url."1.7.2".percent_encoding}".default = true; + url = fold recursiveUpdate {} [ + { "1.7.2".default = (f.url."1.7.2".default or true); } + { "1.7.2".encoding = + (f.url."1.7.2".encoding or false) || + (f.url."1.7.2".query_encoding or false) || + (url."1.7.2"."query_encoding" or false); } + { "1.7.2".heapsize = + (f.url."1.7.2".heapsize or false) || + (f.url."1.7.2".heap_size or false) || + (url."1.7.2"."heap_size" or false); } + ]; + }) [ + (features_.idna."${deps."url"."1.7.2"."idna"}" deps) + (features_.matches."${deps."url"."1.7.2"."matches"}" deps) + (features_.percent_encoding."${deps."url"."1.7.2"."percent_encoding"}" deps) + ]; + + +# end # utf8-ranges-1.0.1 crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate { diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 1b36f5f555d..af2ff0cc966 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -23,7 +23,14 @@ fixDarwinDylibNames() { for fn in "$@"; do if [ -L "$fn" ]; then continue; fi echo "$fn: fixing dylib" - install_name_tool -id "$fn" "${flags[@]}" "$fn" + int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1) + result=$? + if [ "$result" -ne 0 ] && + ! grep "shared library stub file and can't be changed" <<< "$out" + then + echo "$int_out" >&2 + exit "$result" + fi done } diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 25ac12996cc..b5ceb4a13d8 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -36,16 +36,40 @@ wrapGAppsHook() { done if [[ -z "$dontWrapGApps" ]]; then + targetDirsThatExist=() + targetDirsRealPath=() + + # wrap binaries targetDirs=( "${prefix}/bin" "${prefix}/libexec" ) for targetDir in "${targetDirs[@]}"; do if [[ -d "${targetDir}" ]]; then - find -L "${targetDir}" -type f -executable -print0 \ + targetDirsThatExist+=("${targetDir}") + targetDirsRealPath+=("$(realpath "${targetDir}")/") + find "${targetDir}" -type f -executable -print0 \ | while IFS= read -r -d '' file; do - echo "Wrapping program ${file}" + echo "Wrapping program '${file}'" wrapProgram "${file}" "${gappsWrapperArgs[@]}" done fi done + + # wrap links to binaries that point outside targetDirs + # Note: links to binaries within targetDirs do not need + # to be wrapped as the binaries have already been wrapped + if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then + find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 \ + | while IFS= read -r -d '' linkPath; do + linkPathReal=$(realpath "${linkPath}") + for targetPath in "${targetDirsRealPath[@]}"; do + if [[ "$linkPathReal" == "$targetPath"* ]]; then + echo "Not wrapping link: '$linkPath' (already wrapped)" + continue 2 + fi + done + echo "Wrapping link: '$linkPath'" + wrapProgram "${linkPath}" "${gappsWrapperArgs[@]}" + done + fi fi } diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 4206b0f33ff..3fc10c8b0b4 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -8,12 +8,13 @@ , vmTools , gawk , utillinux +, runtimeShell , e2fsprogs }: rec { shellScript = name: text: writeScript name '' - #!${stdenv.shell} + #!${runtimeShell} set -e ${text} ''; diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 51921fdfbdc..e4712a5ef22 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeScript, file }: +{ stdenv, callPackage, cleanPackaging, fetchurl, writeScript, file }: let lib = stdenv.lib; in { # : string @@ -19,6 +19,10 @@ in { # mostly for moving and deleting files from the build directory # : lines , postInstall + # packages with setup hooks that should be run + # (see definition of `makeSetupHook`) + # : list drv +, setupHooks ? [] # : list Maintainer , maintainers ? [] @@ -50,25 +54,6 @@ let "README.*" ]; - globWith = stdenv.lib.concatMapStringsSep "\n"; - rmNoise = globWith (f: - ''rm -rf ${f}'') commonNoiseFiles; - mvMeta = globWith - (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') - commonMetaFiles; - - # Move & remove actions, taking the package doc directory - commonFileActions = writeScript "common-file-actions.sh" '' - #!${stdenv.shell} - set -e - DOCDIR="$1" - shopt -s globstar extglob nullglob - ${rmNoise} - mkdir -p "$DOCDIR" - ${mvMeta} - ''; - - in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -82,6 +67,8 @@ in stdenv.mkDerivation { dontDisableStatic = true; enableParallelBuilding = true; + nativeBuildInputs = setupHooks; + configureFlags = configureFlags ++ [ "--enable-absolute-paths" (if stdenv.isDarwin @@ -99,21 +86,16 @@ in stdenv.mkDerivation { # TODO(Profpatsch): ensure that there is always a $doc output! postInstall = '' echo "Cleaning & moving common files" - mkdir -p $doc/share/doc/${pname} - ${commonFileActions} $doc/share/doc/${pname} + ${cleanPackaging.commonFileActions { + noiseFiles = commonNoiseFiles; + docFiles = commonMetaFiles; + }} $doc/share/doc/${pname} ${postInstall} ''; postFixup = '' - echo "Checking for remaining source files" - rem=$(find -mindepth 1 -xtype f -print0 \ - | tee $TMP/remaining-files) - if [[ "$rem" != "" ]]; then - echo "ERROR: These files should be either moved or deleted:" - cat $TMP/remaining-files | xargs -0 ${file}/bin/file - exit 1 - fi + ${cleanPackaging.checkForRemainingFiles} ''; meta = { diff --git a/pkgs/build-support/skaware/clean-packaging.nix b/pkgs/build-support/skaware/clean-packaging.nix new file mode 100644 index 00000000000..16bae04b21e --- /dev/null +++ b/pkgs/build-support/skaware/clean-packaging.nix @@ -0,0 +1,53 @@ +# set of utilities that assure the cwd of a build +# is completely clean after the build, meaning all +# files were either discarded or moved to outputs. +# This ensures nothing is forgotten and new files +# are correctly handled on update. +{ stdenv, file, writeScript }: + +let + globWith = stdenv.lib.concatMapStringsSep "\n"; + rmNoise = noiseGlobs: globWith (f: + ''rm -rf ${f}'') noiseGlobs; + mvDoc = docGlobs: globWith + (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') + docGlobs; + + # Shell script that implements common move & remove actions + # $1 is the doc directory (will be created). + # Best used in conjunction with checkForRemainingFiles + commonFileActions = + { # list of fileglobs that are removed from the source dir + noiseFiles + # files that are moved to the doc directory ($1) + # TODO(Profpatsch): allow to set target dir with + # { glob = …; to = "html" } (relative to docdir) + , docFiles }: + writeScript "common-file-actions.sh" '' + #!${stdenv.shell} + set -e + DOCDIR="$1" + shopt -s globstar extglob nullglob + ${rmNoise noiseFiles} + mkdir -p "$DOCDIR" + ${mvDoc docFiles} + ''; + + # Shell script to check whether the build directory is empty. + # If there are still files remaining, exit 1 with a helpful + # listing of all remaining files and their types. + checkForRemainingFiles = writeScript "check-for-remaining-files.sh" '' + #!${stdenv.shell} + echo "Checking for remaining source files" + rem=$(find -mindepth 1 -xtype f -print0 \ + | tee $TMP/remaining-files) + if [[ "$rem" != "" ]]; then + echo "ERROR: These files should be either moved or deleted:" + cat $TMP/remaining-files | xargs -0 ${file}/bin/file + exit 1 + fi + ''; + +in { + inherit commonFileActions checkForRemainingFiles; +} diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index aa600a76650..66feb695c41 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -22,4 +22,5 @@ stdenv.mkDerivation ({ eval "$postInstall" ''; preferLocalBuild = true; + allowSubstitutes = false; } // args) diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7fd46f95f99..57b160bbe90 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({ builder = ./substitute-all.sh; inherit (args) src; preferLocalBuild = true; + allowSubstitutes = false; } // args) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 454ef8912b3..58bc7147ede 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, stdenvNoCC, lndir }: +{ lib, stdenv, stdenvNoCC, lndir, runtimeShell }: let @@ -15,12 +15,12 @@ rec { /* Run the shell command `buildCommand' to produce a store path named * `name'. The attributes in `env' are added to the environment * prior to running the command. By default `runCommand' runs using - * stdenv with no compiler environment. `runCommandCC` + * stdenv with no compiler environment. `runCommandCC` * * Examples: * runCommand "name" {envVariable = true;} ''echo hello'' * runCommandNoCC "name" {envVariable = true;} ''echo hello'' # equivalent to prior - * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; + * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; */ runCommand = runCommandNoCC; runCommandNoCC = runCommand' stdenvNoCC; @@ -145,11 +145,11 @@ rec { executable = true; destination = "/bin/${name}"; text = '' - #!${stdenv.shell} + #!${runtimeShell} ${text} ''; checkPhase = '' - ${stdenv.shell} -n $out/bin/${name} + ${runtimeShell} -n $out/bin/${name} ''; }; @@ -215,7 +215,7 @@ rec { * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; * * # wrotes a setup hook where @bash@ myscript.sh is substituted for the - * # bash interpreter. + * # bash interpreter. * myhellohookSub = makeSetupHook { * deps = [ hello ]; * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; @@ -278,7 +278,7 @@ rec { * packages that cannot be built automatically. * * Examples: - * + * * requireFile { * name = "my-file"; * url = "http://example.com/download/"; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3612be1120c..de6a5e3b62f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -164,7 +164,7 @@ rec { # Set up automatic kernel module loading. export MODULE_DIR=${kernel}/lib/modules/ ${coreutils}/bin/cat <<EOF > /run/modprobe - #! /bin/sh + #! ${bash}/bin/sh export MODULE_DIR=$MODULE_DIR exec ${kmod}/bin/modprobe "\$@" EOF diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index e000308bed8..08b93aaf117 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,5 +1,6 @@ { stdenv, writeScript, vmTools, makeInitrd , samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip +, runtimeShell }: { sshKey @@ -74,7 +75,7 @@ let loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; initScript = writeScript "init.sh" ('' - #!${stdenv.shell} + #!${runtimeShell} ${coreutils}/bin/cp -L "${sshKey}" /ssh.key ${coreutils}/bin/chmod 600 /ssh.key '' + (if installMode then '' diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix new file mode 100644 index 00000000000..bad78e3433e --- /dev/null +++ b/pkgs/data/fonts/creep/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, fontforge }: + +stdenv.mkDerivation rec { + pname = "creep"; + version = "0.31"; + + src = fetchFromGitHub { + owner = "romeovs"; + repo = pname; + rev = version; + sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; + }; + + nativeBuildInputs = [ fontforge ]; + + dontBuild = true; + + installPhase = '' + install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf" + ''; + + meta = with stdenv.lib; { + description = "A pretty sweet 4px wide pixel font"; + homepage = https://github.com/romeovs/creep; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/data/fonts/font-awesome-4/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix deleted file mode 100644 index 34548b97244..00000000000 --- a/pkgs/data/fonts/font-awesome-4/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchzip }: - -let - version = "4.7.0"; -in fetchzip rec { - name = "font-awesome-${version}"; - - url = "https://github.com/FortAwesome/Font-Awesome/archive/v${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Font-Awesome-${version}/fonts/fontawesome-webfont.ttf -d $out/share/fonts/truetype - ''; - - sha256 = "0w8y7gxbqiy444phg4jl89kc5hq3jffbkhab8p110qy9jx8s106s"; - - meta = with stdenv.lib; { - description = "Font Awesome - TTF font"; - longDescription = '' - Font Awesome gives you scalable vector icons that can instantly be customized. - This package includes only the TTF font. For full CSS etc. see the project website. - ''; - homepage = http://fortawesome.github.io/Font-Awesome/; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau ]; - }; -} diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index c1eda7e6a56..595a1c0d37f 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.6.3"; + version = "5.7.2"; in fetchzip rec { name = "font-awesome-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6"; + sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix new file mode 100644 index 00000000000..e61e582d742 --- /dev/null +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip rec { + name = "undefined-medium-1.0"; + + url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0v3p1g9f1c0d6b9lhrvm1grzivm7ddk7dvn96zl5hdzr2y60y1rw"; + + meta = with stdenv.lib; { + homepage = https://undefined-medium.com/; + description = "A pixel grid-based monospace typeface"; + longDescription = '' + undefined medium is a free and open-source pixel grid-based + monospace typeface suitable for programming, writing, and + whatever else you can think of … it’s pretty undefined. + ''; + license = licenses.ofl; + maintainers = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix new file mode 100644 index 00000000000..026bb2d2244 --- /dev/null +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchzip}: + +fetchzip { + name = "yanone-kaffeesatz-2004"; + + url = https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; + + meta = { + description = "The free font classic"; + maintainers = with stdenv.lib.maintainers; [ mt-caret ]; + platforms = with stdenv.lib.platforms; all; + homepage = https://yanone.de/fonts/kaffeesatz/; + license = stdenv.lib.licenses.ofl; + }; +} diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix deleted file mode 100644 index 68ece44116e..00000000000 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3 }: - -stdenv.mkDerivation rec { - name = "elementary-icon-theme-${version}"; - version = "5.0.2"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = "icons"; - rev = version; - sha256 = "12j582f0kggv2lp935r75xg7q26zpl0f05s11xcs4qxazhj1ly2r"; - }; - - nativeBuildInputs = [ meson ninja python3 gtk3 ]; - - # Disable installing gimp and inkscape palette files - mesonFlags = [ - "-Dpalettes=false" - ]; - - postPatch = '' - chmod +x meson/symlink.py - patchShebangs . - sed -i volumeicon/meson.build -e "s,'/','$out'," - ''; - - postFixup = '' - gtk-update-icon-cache $out/share/icons/elementary - ''; - - meta = with stdenv.lib; { - description = "Icons from the Elementary Project"; - homepage = https://github.com/elementary/icons; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ simonvandel ]; - }; -} diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 07d2b5ecf02..c15e0f4e551 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, elementary-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ meson ninja python3 gtk3 elementary-icon-theme ]; + nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; postPatch = '' patchShebangs meson/post_install.py diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 4ad03627870..98a98cfa7c8 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "18asihcv41jlysb2ynbvbk6fn0lnj7ckaz1nyx1w25a7nk413dnm"; + sha256 = "10jh633rllp9yjfkjjyf8455n84q7ppxw1kk9dp1rsg4dq327ks7"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 967c629324c..ddec15e5f31 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.01.24"; + version = "19.02.22"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0x3d21snfp4v9ippny1jmf2hw5dcscwrlasxvr5bgxhff1idf81c"; + sha256 = "0qn0s7cd795pm0hbx85gxd1s272zxrzf3r9r6da54h149v3wkgzw"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh index c3e09e8543c..683b2e8606b 100644 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -1,5 +1,3 @@ -#!/bin/sh -e - source "$stdenv/setup" mkdir -p $out/share/GeoIP diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c50c511e736..b167069cd89 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e95fefd56a6b8de585e92cd34de4870e31fb7bc7.tar.gz"; - sha256 = "08pzxwsc4incrl5mv8572xs9332206p2cw2mynxks33n7nh98vmx"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f59e85c25b8e9f07459338884e25d16752839b54.tar.gz"; + sha256 = "0yapmana2kzsixmgghj76w3s546d258rbzw7qmfqhi6bxyhc6a86"; } diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index d839d4a3dd8..79e573087a4 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "plata-theme-${version}"; - version = "0.4.9"; + version = "0.5.0"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9"; + sha256 = "16kpdil2bmapbd0g2znwz4ddplykzabydw6g2i8wxs9c5r1hx0q5"; }; preferLocalBuild = true; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index 4eac01b666a..ea2f06aae60 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, - bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3, + bamf, clutter-gtk, pantheon, libcanberra-gtk3, libwnck3, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, hicolor-icon-theme, deepin }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gnome3.libgee bamf clutter-gtk - granite + pantheon.granite libcanberra-gtk3 libwnck3 deepin-mutter diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 5de7d93f49c..4815103893f 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at-spi2-core dbus libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 310f8ccb63b..fa406e6f4db 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,5 +1,7 @@ { stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 +, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server +, adwaita-icon-theme, gnome-desktop, libgdata +, libgweather, glib-networking, gsettings-desktop-schemas , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: @@ -14,17 +16,17 @@ in stdenv.mkDerivation rec { sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; }; - propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; + propagatedUserEnvPkgs = [ evolution-data-server ]; buildInputs = [ - gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution-data-server libsecret libical gcr - webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 - libcanberra-gtk3 bogofilter gnome3.libgdata sqlite + gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu + evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter libgdata sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings-desktop-schemas - gnome3.glib-networking openldap + nss nspr libnotify procps highlight libgweather + gsettings-desktop-schemas + glib-networking openldap ]; nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index fe307bca797..5ee26eba6b7 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive +{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 61eda942194..8310f426be6 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,5 +1,6 @@ { stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib +, pkgconfig, gtk3, glib, adwaita-icon-theme +, libpeas, gtksourceview, gsettings-desktop-schemas , wrapGAppsHook, itstool, libsoup, libxml2 , gnome3, gspell }: @@ -16,9 +17,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - gnome3.defaultIconTheme libsoup - gnome3.libpeas gnome3.gtksourceview - gnome3.gsettings-desktop-schemas gspell + adwaita-icon-theme libsoup + libpeas gtksourceview + gsettings-desktop-schemas gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index d9f1e7850af..388808b7d64 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; + buildInputs = [ gtk3 intltool itstool libxml2 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "ghex"; + attrPath = "gnome3.ghex"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Ghex; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 39e0f2ba23e..9adffc7922c 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 357cd42d66b..21690287245 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libvirt-glib glib gtk3 gtk-vnc freerdp libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg acl libgudev libsecret + gnome3.adwaita-icon-theme librsvg acl libgudev libsecret libcap_ng numactl xen libapparmor ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 8cc8712a15d..9b48e323191 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 -, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup , glib, gnome-online-accounts, gsettings-desktop-schemas }: let @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; buildInputs = [ - gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib - gsettings-desktop-schemas gnome3.defaultIconTheme + gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib + gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 047f9bc2210..101b9f4a62e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 -, gobject-introspection, gjs, libunistring }: +, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }: stdenv.mkDerivation rec { name = "gnome-characters-${version}"; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; buildInputs = [ - glib gtk3 gjs pango gnome3.gsettings-desktop-schemas - gnome3.defaultIconTheme libunistring + glib gtk3 gjs pango gsettings-desktop-schemas + adwaita-icon-theme libunistring # typelib - gnome3.gnome-desktop + gnome-desktop ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 30323cf62f5..c614dc6486c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop +, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib , gnome3, gdk_pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound + gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme + gnome-desktop geocode-glib geoclue2 libgweather gsound ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index d2792304016..186f3a14d27 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme evince + gdk_pixbuf gnome3.adwaita-icon-theme evince libsoup webkitgtk gjs gobject-introspection tracker tracker-miners libgdata gnome-desktop libzapojit libgepub diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c6140a53fd9..89f4cc01e50 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 2f7e5bbe807..d7df923339a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { geocode-glib libchamplain libsoup gdk_pixbuf librsvg libgweather gnome3.gsettings-desktop-schemas evolution-data-server - gnome-online-accounts gnome3.defaultIconTheme + gnome-online-accounts gnome3.adwaita-icon-theme webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 3edf1f5dd40..98d3cfb5539 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = with gst_all_1; [ - gtk3 glib libmediaart gnome-online-accounts - gdk_pixbuf gnome3.defaultIconTheme python3 + gtk3 glib libmediaart gnome-online-accounts gobject-introspection + gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup gnome3.gsettings-desktop-schemas tracker gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index dcee87dc799..9bc71bb4338 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index e39ce00fd65..78c39651ad6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { gnome3.gnome-online-accounts zeitgeist gnome3.gsettings-desktop-schemas evolution-data-server - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 508b8af3f4f..8c0c216965d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gegl babl libgdata libdazzle gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme gfbgraph grilo-plugins grilo gnome-online-accounts tracker gexiv2 geocode-glib dleyna-renderer diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index 3f8ce7f4a51..2d9c313e641 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index 37b48a74482..23b671ebfc0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook -, gettext, gnome3, glib, gtk, libpeas +, gettext, gnome3, glib, gtk3, libpeas , gnome-online-accounts, gsettings-desktop-schemas -, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }: +, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }: let pname = "gnome-todo"; @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext python3 wrapGAppsHook ]; buildInputs = [ - glib gtk libpeas gnome-online-accounts - gsettings-desktop-schemas gnome3.defaultIconTheme + glib gtk3 libpeas gnome-online-accounts + gsettings-desktop-schemas gnome3.adwaita-icon-theme # Plug-ins evolution-data-server libxml2 libsoup libical - rest json-glib + librest json-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 6a827b7f0e3..5ae279f57f0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas + libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 9ef2b57e6d1..84f7b519d1e 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib gcr gnome3.gsettings-desktop-schemas gnupg - gnome3.defaultIconTheme gpgme + gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit openssh openldap ]; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 00037f526b6..ae360d73b87 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 4fa40a6c1b0..b091395ab37 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: +, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk_pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index c29e3ff5200..cf73524a0ca 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index fe2b50f296a..bad06bae405 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook }: +, wrapGAppsHook, libgee }: let pname = "caribou"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { libXtst gtk2 ]; - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + propagatedBuildInputs = [ libgee libxklavier ]; postPatch = '' patchShebangs . diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9c1d7d7d1a9..1f55071c83d 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: +, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }: let pname = "dconf"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl"; }; + patches = [ + # Fix the build on Darwin + # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch"; + sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 1a4ef2a1cf4..19f2783be3d 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gdk_pixbuf libnotify clutter libsoup gnutls libgee p11-kit libcanberra-gtk3 telepathy-farstream farstream - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c8ca0016d57..37cdce40f34 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu +{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit , sqlite, gcr, isocodes, desktop-file-utils, python3 @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify sqlite isocodes p11-kit icu - gdk_pixbuf gnome3.defaultIconTheme gcr + gdk_pixbuf gnome3.adwaita-icon-theme gcr glib-networking 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 json-glib libdazzle diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 94d39964bc4..1a01bd307ea 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook -, librsvg, gobject-introspection, yelp-tools, gspell +, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas +, libgxps , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook, pruneLibtoolFiles @@ -26,10 +27,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libarchive - libsecret librsvg gnome3.adwaita-icon-theme gspell - ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; + libsecret librsvg adwaita-icon-theme gspell + ] ++ stdenv.lib.optional supportXPS libgxps; configureFlags = [ "--disable-nautilus" # Do not build nautilus plugin @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { (if supportXPS then "--enable-xps" else "--disable-xps") ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = stdenv.lib.optionalString (recentListSize != null) '' sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c 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 bbe848a3b82..806c3f32d2b 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre -, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: +, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib +, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; @@ -19,13 +20,14 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tzdata; }) + ./hardcode-gsettings.patch ]; nativeBuildInputs = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; - buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome-online-accounts + buildInputs = [ + glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk glib-networking libcanberra-gtk3 pcre @@ -41,6 +43,10 @@ stdenv.mkDerivation rec { "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" ]; + postPatch = '' + substituteInPlace src/libedataserver/e-source-registry.c --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + ''; + passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch new file mode 100644 index 00000000000..8b64b3df801 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch @@ -0,0 +1,36 @@ +diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c +index 9c166dbaf..ef368f8d4 100644 +--- a/src/libedataserver/e-source-registry.c ++++ b/src/libedataserver/e-source-registry.c +@@ -116,6 +116,8 @@ struct _ESourceRegistryPrivate { + GHashTable *sources; + GMutex sources_lock; + ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *schema; + GSettings *settings; + + gboolean initialized; +@@ -1339,7 +1341,11 @@ source_registry_dispose (GObject *object) + if (priv->settings != NULL) { + g_signal_handlers_disconnect_by_data (priv->settings, object); + g_object_unref (priv->settings); ++ g_settings_schema_unref (priv->schema); ++ g_settings_schema_source_unref (priv->schema_source); + priv->settings = NULL; ++ priv->schema = NULL; ++ priv->schema_source = NULL; + } + + /* Chain up to parent's finalize() method. */ +@@ -1743,7 +1749,9 @@ e_source_registry_init (ESourceRegistry *registry) + + g_mutex_init (®istry->priv->sources_lock); + +- registry->priv->settings = g_settings_new (GSETTINGS_SCHEMA); ++ GSettingsSchemaSource *schema_source = registry->priv->schema_source = g_settings_schema_source_new_from_directory ("@ESD_GSETTINGS_PATH@", g_settings_schema_source_get_default (), TRUE, NULL); ++ registry->priv->schema = g_settings_schema_source_lookup (schema_source, GSETTINGS_SCHEMA, FALSE); ++ registry->priv->settings = g_settings_new_full (registry->priv->schema, NULL, NULL); + + g_signal_connect ( + registry->priv->settings, "changed", diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 135200ee3c4..c985d01a5e6 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth +, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth , librsvg, coreutils, xwayland, fetchpatch }: stdenv.mkDerivation rec { name = "gdm-${version}"; - version = "3.30.2"; + version = "3.30.3"; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y"; + sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak"; }; # Only needed to make it build @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd - gobject-introspection libX11 gtk + gobject-introspection libX11 gtk3 libcanberra-gtk3 pam plymouth librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index b065025327f..e09d0b4e6f9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 4a37599b136..037509b9c54 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview3 mpfr gmp - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas libsoup libmpc ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index a7347f74ca4..253bbc4e196 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas folks gnome-desktop telepathy-glib libxml2 gnome-online-accounts cheese - gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib + gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 58afc0ab85d..5e90998b539 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -5,17 +5,20 @@ , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session -, fontconfig, sound-theme-freedesktop, grilo, python3 }: +, fontconfig, sound-theme-freedesktop, grilo, python3 +, gtk3, glib, glib-networking, gsettings-desktop-schemas +, gnome-desktop, gnome-settings-daemon, gnome-online-accounts +, vino, gnome-bluetooth, tracker, adwaita-icon-theme }: let pname = "gnome-control-center"; - version = "3.30.2"; + 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 = "0rn4r0ng4pd9smpay4rf4dkcl09b2ipr9srryybhd1srmd02ps51"; + sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r"; }; nativeBuildInputs = [ @@ -23,13 +26,13 @@ in stdenv.mkDerivation rec { shared-mime-info python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib glib-networking upower gsettings-desktop-schemas + buildInputs = [ + ibus gtk3 glib glib-networking upower gsettings-desktop-schemas libxml2 gnome-desktop gnome-settings-daemon polkit libgtop gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret - gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese + gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese networkmanager modemmanager gnome-bluetooth tracker ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch index 59191bddd9a..57eb4b3d44a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch @@ -1,19 +1,15 @@ --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -504,14 +504,10 @@ +@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/lib", "/lib", -- "--ro-bind", "/lib64", "/lib64", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", -+ "--ro-bind", "/nix/store", "/nix/store", - "--proc", "/proc", - "--dev", "/dev", -- "--symlink", "usr/bin", "/bin", -- "--symlink", "usr/sbin", "/sbin", - "--chdir", "/", - "--setenv", "GIO_USE_VFS", "local", - "--unshare-all", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + NULL); + + /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index b98a6a2d676..bac8504eeec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland +, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch , libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; - version = "3.30.2"; + version = "3.30.2.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal"; + sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v"; }; enableParallelBuilding = true; @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + (fetchpatch { + name = "fix-missing-font-cache"; + url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch; + sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 1019a809d7f..a15d2d7f6e6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk, glib }: +, gnome3, gtk3, glib }: stdenv.mkDerivation rec { name = "gnome-dictionary-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 5d224623c3c..629dfe0421b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,5 +1,5 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify +, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: @@ -12,17 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; - }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; + buildInputs = [ - gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.defaultIconTheme + gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; @@ -31,6 +28,13 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome3.gnome-disk-utility"; + }; + }; + meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 06a5b258c80..3e8f7d3617f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2 +, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; - }; - doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-font-viewer"; + attrPath = "gnome3.gnome-font-viewer"; + }; + }; + meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index 4ceb0335c18..d12e558c276 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook +, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection , gettext, icu, glib-networking , libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos }: let pname = "gnome-online-accounts"; - 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 = "0havx26cfy0ln17jzmzbrrx35afknv2s9mdy34j0p7wmbqr8m5ky"; + sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5"; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup + glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup gcr kerberos ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 6deefaa3673..ed4c1a3da13 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart +, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-online-miners-${version}"; @@ -10,19 +11,24 @@ stdenv.mkDerivation rec { sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; - }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome-online-accounts gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest - dleyna-server ]; + buildInputs = [ + glib libgdata libxml2 libsoup gmp openssl + grilo libzapojit grilo-plugins + gnome-online-accounts libmediaart + tracker gfbgraph json-glib librest + dleyna-server + ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-online-miners"; + attrPath = "gnome3.gnome-online-miners"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 6fab2d5b0b7..4a22fc53519 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -2,15 +2,15 @@ , glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-remote-desktop-${version}"; - version = "0.1.6"; + pname = "gnome-remote-desktop"; + version = "0.1.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jadahl"; repo = "gnome-remote-desktop"; rev = version; - sha256 = "1d49kxhi1bn8ssh6nybg7d6zajqwc653czbsms2d59dbhj8mn75f"; + sha256 = "0gmazc8ww0lyhx9iclhi982bkpjsnflrzv4qfm3q6hcy0il21fsc"; }; nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ]; @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace meson.build --replace pipewire-0.1 pipewire-0.2 - chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index fc39ea81223..3ce2a4433ac 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2f44a4e168d..34921d46b4c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas +{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c76ba218c9a..7a2271e128d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager -, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: +, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }: stdenv.mkDerivation rec { name = "gnome-settings-daemon-${version}"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ]; - buildInputs = with gnome3; [ - ibus gtk glib gsettings-desktop-schemas networkmanager + buildInputs = [ + ibus gtk3 glib gsettings-desktop-schemas networkmanager libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib libcanberra-gtk3 upower colord libgweather xkeyboard_config nss polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 76e5bd13522..693a3bec486 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,9 +2,10 @@ , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd -, sassc, systemd, gst_all_1 }: +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop +, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 +, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -26,16 +27,16 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales sassc desktop-file-utils libxslt.bin ]; - buildInputs = with gnome3; [ + buildInputs = [ systemd caribou gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk gstreamer gdm libcanberra-gtk3 geoclue2 - defaultIconTheme gnome3.gnome-bluetooth - gnome3.gnome-clocks # schemas needed - at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon + libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + adwaita-icon-theme gnome-bluetooth + gnome-clocks # schemas needed + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobject-introspection @@ -45,7 +46,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ # Needed to support on-screen keyboard used with touch screen devices # see https://github.com/NixOS/nixpkgs/issues/25968 - gnome3.caribou + caribou ]; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 3c45842fdd4..cab777f4feb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd +, gtk3, gsettings-desktop-schemas, gnome-desktop , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtk3 glib packagekit appstream-glib libsoup + gsettings-desktop-schemas gnome-desktop gspell json-glib libsecret ostree polkit flatpak fwupd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index a1e3ece3db4..4b02411b486 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { polkit # for ITS file ]; buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg + bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gsettings-desktop-schemas systemd ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 4765edbcf7e..6bde15ba762 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus -, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk gsettings-desktop-schemas vte libuuid dconf + gtk3 gsettings-desktop-schemas vte libuuid dconf # For extension nautilus ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index b6c40b28ab1..3d5cfb85d67 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ]; postFixup = '' gtk-update-icon-cache "$out"/share/icons/HighContrast diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6a5d2fde501..134ba41d653 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus -, pkgconfig, gtk3, glib, libxml2, systemd +, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme , wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ @@ -26,15 +26,19 @@ stdenv.mkDerivation rec { -i data/dav_user_2.4.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + configureFlags = [ + "--with-httpd=${apacheHttpd.out}/bin/httpd" + "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool - wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra-gtk3 systemd ]; + buildInputs = [ + gtk3 glib intltool itstool libxml2 libtool + wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg + nautilus libnotify libcanberra-gtk3 systemd + ]; postInstall = '' mkdir -p $out/share/gsettings-schemas/$name diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix index ab2ead7d344..02e0c29fdaa 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart , gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }: let @@ -15,10 +15,10 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ]; buildInputs = [ - gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata + gnome3.grilo libxml2 gupnp gssdp libgdata lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts - totem-pl-parser gnome3.rest gmime json-glib - avahi gnome3.libmediaart tracker dleyna-server + totem-pl-parser librest gmime json-glib + avahi libmediaart tracker dleyna-server ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index a968bfd2b56..2b7794a9a8e 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme +{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme , glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools , docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { yelp-tools libxml2 desktop-file-utils gobject-introspection ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ]; configureFlags = [ "--with-unicode-data=${unicode-data}" diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index e80212713aa..2988dd1b47e 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, gsettings-desktop-schemas, gnome-desktop , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -32,10 +33,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 9a1418cbe0a..518b0ec1c48 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, gsettings-desktop-schemas, glib, gtk3, gnome-desktop +, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { name = "mutter-${version}"; @@ -12,9 +13,15 @@ stdenv.mkDerivation rec { sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; - }; + patches = [ + # https://gitlab.gnome.org/GNOME/mutter/issues/270 + # Fixes direction of the desktop switching animation when using workspace + # grid extension with desktops arranged horizontally. + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch; + sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i"; + }) + ]; configureFlags = [ "--with-x" @@ -36,10 +43,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; - buildInputs = with gnome3; [ - glib gobject-introspection gtk gsettings-desktop-schemas upower + buildInputs = [ + glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode-glib libinput libgudev libwacom + geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; @@ -51,6 +58,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "mutter"; + attrPath = "gnome3.mutter"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch index 051b7618612..e3ad75b869c 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch @@ -1,6 +1,6 @@ --- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c +++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -514,14 +514,10 @@ add_bwrap (GPtrArray *array, +@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, @@ -8,8 +8,9 @@ - "--ro-bind", "/usr", "/usr", - "--ro-bind", "/lib", "/lib", - "--ro-bind", "/lib64", "/lib64", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", ++ "@bubblewrap_bin@", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", "--proc", "/proc", "--dev", "/dev", - "--symlink", "usr/bin", "/bin", diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index b581d8f0983..715686460a3 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2 -, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar +, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf , substituteAll, bubblewrap @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - glib-networking shared-mime-info libexif gtk exempi libnotify libselinux + glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux tracker tracker-miners gexiv2 libseccomp bubblewrap gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index ef79f972ff0..742819e0ba1 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp +, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb - gtk libwebp packagekit sane-backends vala + cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb + gtk3 libwebp packagekit sane-backends vala ]; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 3565931e4df..d4a66b6c493 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser -, wrapGAppsHook, itstool, libxml2, vala, gnome3 +, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins +, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas , gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { @@ -15,15 +16,15 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins + gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins 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 gnome3.libpeas shared-mime-info - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info + gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop + gsettings-desktop-schemas tracker nautilus python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 7127ab71b1f..85bb32972f4 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif , libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid @@ -35,9 +35,9 @@ in stdenv.mkDerivation rec { flac giflib glib - gnome3.gexiv2 + gexiv2 totem-pl-parser - gnome3.tracker + tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 6ec2b0a17ed..b3f06c2dcc1 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ]; buildInputs = [ - gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup + gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 26bcb317190..644c2793831 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index e80c437afda..a347c8f2f9d 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3 +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,18 +10,21 @@ stdenv.mkDerivation rec { sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; - }; - preBuild = '' mkdir -p $out/include ''; - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; + buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "zenity"; + attrPath = "gnome3.zenity"; + }; + }; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 34b3faf71a4..41b0ccf6268 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -28,7 +28,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtk3.out # for gtk-update-icon-cache glib-networking gvfs dconf gnome-backgrounds gnome-control-center gnome-menus gnome-settings-daemon gnome-shell - gnome-themes-extra defaultIconTheme gnome-shell-extensions + gnome-themes-extra adwaita-icon-theme gnome-shell-extensions pkgs.hicolor-icon-theme ]; @@ -51,22 +51,11 @@ lib.makeScope pkgs.newScope (self: with self; { hitori gnome-taquin ]; - inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 - easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; - gtk = gtk3; - gtkmm = gtkmm3; vala = pkgs.vala_0_42; - gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; }; - rest = librest; - -# Simplify the nixos module and gnome packages - defaultIconTheme = adwaita-icon-theme; + gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -372,8 +361,8 @@ lib.makeScope pkgs.newScope (self: with self; { bijiben = gnome-notes; # added 2018-09-26 evolution_data_server = evolution-data-server; # added 2018-02-25 - geocode_glib = geocode-glib; # added 2018-02-25 - glib_networking = glib-networking; # added 2018-02-25 + geocode_glib = pkgs.geocode-glib; # added 2018-02-25 + glib_networking = pkgs.glib-networking; # added 2018-02-25 gnome_common = gnome-common; # added 2018-02-25 gnome_control_center = gnome-control-center; # added 2018-02-25 gnome_desktop = gnome-desktop; # added 2018-02-25 @@ -399,4 +388,13 @@ lib.makeScope pkgs.newScope (self: with self; { yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25 + # added 2019-02-08 + inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + easytag meld orca rhythmbox shotwell gnome-usage + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; + defaultIconTheme = adwaita-icon-theme; + gtk = gtk3; + gtkmm = gtkmm3; + rest = librest; }) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 052cd49998d..4a634de9447 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; buildInputs = [ glib gtk3 webkitgtk amtk - gnome3.defaultIconTheme gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index c8440037d3c..9fbce7c6cc0 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, - boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas, + boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas, gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gdb boost sqlite libgtop - glibmm gtkmm vte gtksourceview gtksourceviewmm + glibmm gtkmm3 vte gtksourceview gtksourceviewmm gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index b8171ef3185..33980f2d035 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 4e302e9f8b1..a3bb2df918a 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ]; buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme + gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 110e2e5c439..8955bcbc498 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ]; - buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 8e5cf198d9d..5812f16d296 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 0b4d6d770b0..ab1a54c0575 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ]; + buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 29763abba55..c64ee968f19 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 7896595de18..6ec18e55cf0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # gobject-introspection for finding vapi files nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ]; - buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index e36ca2a639d..ad522c4f56a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; buildInputs = [ - gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme + gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme libgee libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 19a6b60fb5b..b881dbbf800 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 - libxml2 gnome3.defaultIconTheme libgnome-games-support libgee + libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index eaa9f3a1c8d..0996b9bf10b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook -, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: +, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-sudoku-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ]; + buildInputs = [ gtk3 libgee json-glib qqwing ]; postPatch = '' chmod +x post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 75f511b17d0..583072d8470 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook librsvg libcanberra-gtk3 - intltool itstool libxml2 gnome3.defaultIconTheme + intltool itstool libxml2 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index fe81b429e99..f3f1fdbc415 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 8d4be7f1c6b..ebbbe9d1cee 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index a60ebe9590b..b1996e0fd59 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index ccd90c071fe..bbc65f3e5ba 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index c57ab1a9e14..d3ddcea77f7 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; buildInputs = [ - gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 clutter libxml2 clutter-gtk ]; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 5e0f01174e4..3c017d71382 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index e6cdd3c88b7..399562c0d99 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libxml2 itstool intltool wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 8f1080ccc2e..c522fbec57b 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,62 +1,71 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils -, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes -, gobject-introspection, libpthreadstubs, sqlite, gcr -, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja +, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme +, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext +, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 +, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }: -let - pname = "geary"; - version = "0.12.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "geary"; + version = "0.13.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0h9pf2mdskq7mylib1m9hw86nwfmdzyngjl7ywangqipm1k5svjx"; }; patches = [ - # Fix build with webkitgtk-2.22 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/5d0f711426d76f878cf9b71f7e8f785199c7cde1.patch; - sha256 = "1yifng5lfsc6wp7irmi8gjdcfig1cr0chf7rdv3asrk567nmwrsi"; - }) + # gobject-introspection is not needed + # https://gitlab.gnome.org/GNOME/geary/merge_requests/138 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/0d966950a2cba888873cd3a7f4f42bb7a017dc6d.patch; - sha256 = "1y6v4fnik4w3paj9nl0yqs54998sx1zr9w3940d579p6dsa8f3fg"; + url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch; + sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk"; }) + # Fixes tests on Aarch64 + # https://gitlab.gnome.org/GNOME/geary/issues/259 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch; - sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l"; - }) - # Fix build with vala 0.40.12 - # See: https://gitlab.gnome.org/GNOME/vala/blob/0.40.12/NEWS#L22 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/commit/088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45.patch"; - sha256 = "0cnjmbd3snm8ggmprqa32f7i3w86gs3ylab9p5ffj921dcpvvlb2"; + url = https://gitlab.gnome.org/GNOME/geary/commit/9c3fdbfb5c792daeb9c3924f798fa83a15096d8a.patch; + sha256 = "1ihjxnaj0g6gx264kd8cbhs88yp37vwmmcd3lvmz44agf7qcv2ri"; }) ]; - nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ]; + nativeBuildInputs = [ + desktop-file-utils gettext itstool libxml2 meson ninja + pkgconfig vala wrapGAppsHook python3 + ]; + buildInputs = [ - gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings-desktop-schemas gcr isocodes - gdk_pixbuf librsvg gnome3.defaultIconTheme + adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts + gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 + libgee libnotify libsecret sqlite webkitgtk glib-networking + libunwind ]; - cmakeFlags = [ - "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" + checkInputs = [ xvfb_run dbus ]; + + mesonFlags = [ + "-Dcontractor=true" # install the contractor file (Pantheon specific) ]; - # TODO: This is bad, upstream should fix their code. - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0"; + postPatch = '' + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py + ''; preFixup = '' # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; + doCheck = true; + + checkPhase = '' + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test -v --no-stdsplit + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -68,7 +77,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; maintainers = gnome3.maintainers; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index a447d2aa590..9f24d04337c 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib , json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection +, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret , meson, ninja, python3 }: @@ -35,9 +36,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - gtk3 glib json-glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas - libsecret gobject-introspection gnome3.adwaita-icon-theme + gtk3 glib json-glib libgee libpeas libsoup + libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas + libsecret gobject-introspection adwaita-icon-theme ]; nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 716988252d5..f9387c11b81 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -10,7 +10,7 @@ , gnome-session , gnome3 , gsettings-desktop-schemas -, gtk +, gtk3 , ibus , intltool , libcanberra-gtk3 @@ -85,7 +85,7 @@ let gnome-bluetooth gnome-desktop gsettings-desktop-schemas - gtk + gtk3 ibus libcanberra-gtk3 libpulseaudio diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index 8fbe24220b6..3cdab30ce8d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit -, systemd, wrapGAppsHook, desktop-file-utils }: +, gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { name = "gnome-packagekit-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gnome3.gtk packagekit systemd polkit ]; + buildInputs = [ gtk3 packagekit systemd polkit ]; postPatch = '' patchShebangs meson_post_install.sh diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index f9cc0a8aa4f..db00758fb55 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -11,7 +11,7 @@ , gnome-flashback , gnome-menus , gnome3 -, gtk +, gtk3 , itstool , libgweather , libsoup @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { glib gnome-desktop gnome-menus - gtk + gtk3 libgweather libsoup libwnck3 diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix index be8ab81457e..5afc92aa482 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix @@ -7,7 +7,7 @@ , gnome-common , gnome-desktop , gnome3 -, gtk +, gtk3 , gsettings-desktop-schemas , pkgconfig , intltool @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk + gtk3 gnome-desktop dbus-glib pam diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 77edf27fbdd..47de1de59ca 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas - gdk_pixbuf gnome3.defaultIconTheme + gdk_pixbuf gnome3.adwaita-icon-theme libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobject-introspection diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 86e12b58536..c42356aa16a 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -4,7 +4,7 @@ , glib , gnome3 , gsettings-desktop-schemas -, gtk +, gtk3 , libcanberra-gtk3 , libgtop , libstartup_notification @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gsettings-desktop-schemas - gtk + gtk3 libcanberra-gtk3 libgtop libstartup_notification diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 0a9b9bcfe9b..c77d5d89fe3 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dbus-glib libcanberra gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings-desktop-schemas - gnome3.gnome-shell gtk3 gnome3.defaultIconTheme + gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 9d1606ea6b7..e96dbf0b6fc 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -11,13 +11,13 @@ , pkgconfig, portaudio }: let - version = "1.25.1"; + version = "1.26.0"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj"; + sha256 = "0ws16rwqx0qvqpyjsxbdylfpkgjr19nqc9i3b30wywqcqrkc12zn"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 479491b35d8..f5331751c70 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "compton-conf"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vxbh0vr7wknr7rbmdbmy5md1fdkw3zwlgpbv16cwdplbv9m97xi"; + sha256 = "0bx21r83ahmsqf7bm1h17pi4y9js1iqsv7nwnlq58rc0ddkkhcdb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 70675e1408c..3ce1ea068a7 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libfm-qt"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1siqqn4waglymfi7c7lrmlxkylddw8qz0qfwqxr1hnmx3dsj9c36"; + sha256 = "00rn5i16h659zyp1dx213nc3jz7rx9phiw71zf6nspxzxsb8w2sc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 1b19275ece9..19335860599 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "liblxqt"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1cpl6sd2fifpflahm8fvrrscrv03sinfm03m7yc1k59y6nsbwi36"; + sha256 = "0g2502lcws5j74p82qhfryz9n51cvi85hb50r5s227xhkv91q65k"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 852c4bddec8..d351f3e0d6e 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg }: +{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: stdenv.mkDerivation rec { pname = "libqtxdg"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0qgqqgy15h0d1fwk4mnbv2hirz8njjjlng64bv33rc6wwrsaa50b"; + sha256 = "0y3s0hva64m64j9lqgnja1li8zhlywqzv8xwjg8pyd2nr9h918db"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt-build-tools ]; buildInputs = [ qtbase qtsvg ]; preConfigure = '' cmakeFlagsArray+=( - "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ) ''; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index a0a83ad3469..affa0cc8c9d 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0zx9903ym5a9zk4m9khr22fj5sy57mg2v8wnk177wjm11lhic5v8"; + sha256 = "175l2w5w6iag01v05jq90pxx0al24wpw3mgsbcgqhl4z6h860r32"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 013be8eea4f..7778eb92263 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-about"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "14b13v1r5ncz4ycg25ac9ppafiifc37qws8kcw078if72rp9n121"; + sha256 = "0dj2rhbhnkzmv1iqqyq0bcp03imwnvxdr7rnpqnrs9kkjacm8zvr"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 528f9a390f9..5ea6b0d0882 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-admin"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0sdb514hgha5yvmbzi6nm1yx1rmbkh5fam09ybidjwpdwl2l4pxx"; + sha256 = "121qj46app2bqdr24g5sz2mdjfd9w86wpgkwap46s0zgxm4li44i"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index d2c583b53fa..e7ba00bc8a8 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pp2pw43zh8kwi2cxk909wn6bw7kba95b6bv96l2gmzhdqpfw2a7"; + sha256 = "0x1k08587i2pakxlrj2n0l82r179sfywnzn2cphxiy89r5zpn7vi"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 5382be304ae..0502426e82d 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "14bfkh54mn3jyq8g9ipy3xmc3n9lmlqpvm26kpqig7567hbncv7n"; + sha256 = "0q7hfbs4dhsgyzch2msq2hsfzzfgbc611ki9x1x132n7zqk76pmp"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 53826f62bcc..7eed84b3390 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nawcxy2qnrngcxvwjwmmh4fn7mhnfgy1g77rn90243jvy29wv5f"; + sha256 = "1ihaf2i361j2snyy6kg8ccpfnc8hppvacmxjqzb1lpyaf1ajd139"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index f880aed63f8..7ba2f00b5c5 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "19xcc6i7jg35780r4dfg4vwfp9x4pz5sqzagxnpzspz61jaj5ibv"; + sha256 = "04jmvhhlhhspwzj4hfq7fnaa3h7h02z3rlq8p55hzlzkvshqqh1q"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index f691357f25f..4363c9f8392 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0jr7ylf6d35m0ckn884arjk4armknnw8iyph00gcphn5bqycbn8l"; + sha256 = "1py3i7qgm6h2iwjwqfjml1rp06s7ls1d7z5i9iizsmfshdzkaq86"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 862e0c08ced..792a323e682 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "lxqt-policykit"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "05k39819nsdyg2pp1vk6g2hdpxqp78h6bhb0hp5rclf9ap5fpvvc"; + sha256 = "0mh9jw09r0mk8xmgvmzk3yyfix0pzqya28rcx71fqjpbdv1sc44l"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 9ebff5d4de5..6bdf5ce2c0c 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "08xdnb54lji09izzzfip8fw0gp17qkx66jm6i04zby4whx4mqniv"; + sha256 = "1nhp4a28bpczhwz8b8da355zsxr1qwmkrm3bwllwp39liw947clx"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index dc2d8c58caf..54236bfbb7e 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -3,13 +3,13 @@ menu-cache, muparser, pcre }: stdenv.mkDerivation rec { pname = "lxqt-runner"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1qyacig9ksnjrhws8cpk6arlaxn7kl0z39l3c62ql3m89mibsm88"; + sha256 = "01a8ycpkzcbh85y4025pd3nbpnzxh98ll1xwz4ykz13yvm0l2n1w"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 5b4d7b606c7..40ef5697a54 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-session"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0nla1ki23p1bwzw5hbmh9l8yg3b0f55kflgnvyfakmvpivjbz3k6"; + sha256 = "0s6b0lblb795zz1p7sy677c1iznhmdzc4vw3jkc2agmsrhm7if7s"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 7e3ca84109f..6deef1bf56b 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lxqt-sudo"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0l8fq06kfsrmvg2fr8lqdsxr6fwxmxsa9zwaa3fs9inzaylm0jkh"; + sha256 = "1my0wpic20493rdlabp9ghag1g3nhwafk2yklkgczlajmarakgpc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index a0d0a973ad7..2360d1970c9 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "obconf-qt"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "00v5w8qr3vs0k91flij9lz7y1cpp2g8ivgnmmm43ymjfiz5j6l27"; + sha256 = "15dizs072ylmld1lxwgqkvybqy8ms8zki5586xm305jnlmrkb4lq"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index dcc3ead31bf..00359e2ffed 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vyjm6phgbxglk65c889bd73b0p2ffb5bsc89dmb07qzllyrjb4h"; + sha256 = "124dk41v8l5pv7afi1h7fgbhm8zj605yfd8b769sn7id2bqj7bis"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index aa7479b02f8..320d451f087 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0hf4qyn12mpr6rrla9mf6ka5gb4y36amk7d14ayr7yka1r16p8lz"; + sha256 = "1zchxlbyiifing94mqwh45pp7z3ihldknqiaz0kanq1cnma1jj6k"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index d46b7e14e33..c17ef21c676 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qps"; - version = "1.10.19"; + version = "1.10.20"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vyi1vw4z5j2sp9yhhv91wl2sbg4fh0djqslg1ssc7fww2ka6dx3"; + sha256 = "1g8j4cjy5x33jzjkx6vwyl5qbf9i2z2w01ipgk7nrik5drf9crbf"; }; nativeBuildInputs = [ cmake lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index f9a2e5ff0a1..748d33aa2ce 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "071qz248j9gcqzchnrz8xamm07g4r2xyrmnb0a2vjkjd63pk2r8f"; + sha256 = "0bq6lvns56caijdmjm05nsj9vg69v9x5vid24bfxasck6q8nw24w"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 9e0798ecb52..e47d8e05082 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtermwidget"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0wv8fssbc2w7kkpq9ngsa8wyjraggdhsbz36gyxyv8fy5m78jq0n"; + sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv"; }; nativeBuildInputs = [ cmake lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index cc7f113b7d1..14fa977e023 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "screengrab"; - version = "1.100"; + version = "1.101"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1iqrmf581x9ab6zzjxm2509gg6fkn7hwril4v0aki7n7dgxw1c4g"; + sha256 = "111gnkhp77qkch7xqr7k3h8zrg4871gapyd4vvlpaj0gjhirjg6h"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/update.sh b/pkgs/desktops/lxqt/update.sh index f3dfc4d5975..47d3dfb3d5f 100755 --- a/pkgs/desktops/lxqt/update.sh +++ b/pkgs/desktops/lxqt/update.sh @@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" root=../../.. export NIXPKGS_ALLOW_UNFREE=1 -lxqt_version=0.14.0 +lxqt_version=0.14.1 lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html version() { diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index abb1b8c28a1..d71bb08dd5c 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { python gnome3.gtksourceview gnome3.libpeas - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix new file mode 100644 index 00000000000..c8ade1c9c35 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig +, meson, ninja, vala, desktop-file-utils, libxml2 +, gtk3, python3, granite, libgee, gobject-introspection +, elementary-icon-theme, appstream, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "calculator"; + version = "1.5.1"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0vc27kjmfkly2jkqjiyzlybxyjqhwal3xrxca5b4abfgb379yswa"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/elementary/calculator; + description = "Calculator app designed for elementary OS"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix new file mode 100644 index 00000000000..28983db7f91 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson +, ninja, vala, desktop-file-utils, gtk3, granite, libgee +, geoclue2, libchamplain, clutter, folks, geocode-glib, python3 +, libnotify, libical, evolution-data-server, appstream-glib +, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "calendar"; + version = "4.2.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "100wy8lkp4nrxj57ywyx44ckm3k7n8h5l6av92hr5pyx8fxn9m48"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter + elementary-icon-theme + evolution-data-server + folks + geoclue2 + geocode-glib + granite + gtk3 + libchamplain + libgee + libical + libnotify + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Desktop calendar app designed for elementary OS"; + homepage = https://github.com/elementary/calendar; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix new file mode 100644 index 00000000000..2e90a96411a --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala +, desktop-file-utils, python3, gettext, libxml2, gtk3, granite, libgee, gst_all_1 +, libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "camera"; + version = "1.0.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "05rjymflhwbkw8yc57rgi9n7lrhf4dpvfvlifdnazyqn9iiaxc46"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + gettext + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gst + clutter-gtk + elementary-icon-theme + granite + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk3 + libcanberra + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Camera app designed for elementary OS"; + homepage = https://github.com/elementary/camera; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix new file mode 100644 index 00000000000..ad890bc4610 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, substituteAll +, python3, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme +, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup +, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "code"; + version = "3.0.2"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0zmm4a7galrs9phiplf6cygwq3rplghv7r8g47mi4nlndgxqyssg"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + ctags + elementary-icon-theme + editorconfig-core-c + granite + gtk3 + gtksourceview3 + gtkspell3 + libgee + libgit2-glib + libpeas + libsoup + vte + webkitgtk + zeitgeist + ]; + + # See: https://github.com/elementary/code/pull/626 + LIBRARY_PATH = stdenv.lib.makeLibraryPath [ editorconfig-core-c ]; + + # install script fails with UnicodeDecodeError because of printing a fancy elipsis character + LC_ALL = "C.UTF-8"; + + # ctags needed in path by outline plugin + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${stdenv.lib.makeBinPath [ ctags ]}" + ) + ''; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Code editor designed for elementary OS"; + homepage = https://github.com/elementary/code; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix new file mode 100644 index 00000000000..9855a1394e5 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala +, python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify +, libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking +, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "files"; + version = "4.1.5"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0z0pisg7py2k6i31v18z5fgpj8x64m1s5clfq4vbbjrcjwx6dcx5"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + glib-networking + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + bamf + elementary-icon-theme + granite + gtk3 + libcanberra + libdbusmenu-gtk3 + libgee + libnotify + libunity + pango + plank + sqlite + zeitgeist + ]; + + patches = [ ./hardcode-gsettings.patch ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + + substituteInPlace filechooser-module/FileChooserDialog.vala --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + ''; + + meta = with stdenv.lib; { + description = "File browser designed for elementary OS"; + homepage = https://github.com/elementary/files; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch new file mode 100644 index 00000000000..3191f4e3cb2 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch @@ -0,0 +1,22 @@ +diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala +index cb7c3c49..8b1899d1 100644 +--- a/filechooser-module/FileChooserDialog.vala ++++ b/filechooser-module/FileChooserDialog.vala +@@ -57,10 +57,15 @@ public class CustomFileChooserDialog : Object { + chooser_dialog.deletable = false; + chooser_dialog.local_only = false; + +- var settings = new Settings ("io.elementary.files.preferences"); ++ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); ++ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false); ++ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); ++ ++ var settings = new Settings.full (preferences_schema, null, null); ++ + is_single_click = settings.get_boolean ("single-click"); + +- var chooser_settings = new Settings ("io.elementary.files.file-chooser"); ++ var chooser_settings = new Settings.full (chooser_schema, null, null); + + assign_container_box (); + remove_gtk_widgets (); diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix new file mode 100644 index 00000000000..7b374236a12 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -0,0 +1,78 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson +, ninja, vala, desktop-file-utils, libxml2, gtk3, granite +, python3, libgee, clutter-gtk, json-glib, libgda, libgpod +, libnotify, libpeas, libsoup, zeitgeist, gst_all_1, taglib +, libdbusmenu, libsignon-glib, libaccounts-glib +, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "music"; + version = "5.0.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0qbny4484kr7lihg54rbhfwah9k43iivk3rivfvn7i5w66vn5spl"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = with gst_all_1; [ + clutter-gtk + elementary-icon-theme + granite + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + gtk3 + json-glib + libaccounts-glib + libdbusmenu + libgda + libgee + libgpod + libsignon-glib + libnotify + libpeas + libsoup + taglib + zeitgeist + ]; + + mesonFlags = [ + "-Dplugins=lastfm,audioplayer,cdrom,ipod" + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Music player and library designed for elementary OS"; + homepage = https://github.com/elementary/music; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix new file mode 100644 index 00000000000..21d5b9f1db4 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils +, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2 +, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 +, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }: + +stdenv.mkDerivation rec { + pname = "photos"; + version = "2.6.2"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "166a1jb85n67z6ffm5i0xzap407rv0r511lzh0gidkap1qy6pnmi"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = with gst_all_1; [ + elementary-icon-theme + geocode-glib + gexiv2 + granite + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + gtk3 + json-glib + libaccounts-glib + libexif + libgee + libgphoto2 + libgudev + libraw + libsoup + libunity + libwebp + librest + scour + sqlite + webkitgtk + ]; + + mesonFlags = [ + "-Dplugins=false" + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Photo viewer and organizer designed for elementary OS"; + homepage = https://github.com/elementary/photos; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix new file mode 100644 index 00000000000..f1c07b8d3f5 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, callPackage +, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee +, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +let + + redacted-script = callPackage ./redacted-script.nix {}; + +in + +stdenv.mkDerivation rec { + pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 + version = "1.6.2"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "screenshot"; + rev = version; + sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = "screenshot"; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libcanberra + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + postInstall = '' + mkdir -p $out/share/fonts/truetype + cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Screenshot tool designed for elementary OS"; + homepage = https://github.com/elementary/screenshot; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix new file mode 100644 index 00000000000..db1d9d240c4 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pantheon }: + +stdenv.mkDerivation rec { + name = "elementary-redacted-script-${version}"; + version = "5.1.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = "fonts"; + rev = version; + sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2"; + }; + + dontConfigure = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype/redacted-elementary + cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary + ''; + + meta = with stdenv.lib; { + description = "Redacted Script Font for elementary"; + homepage = https://github.com/elementary/fonts; + license = licenses.ofl; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix new file mode 100644 index 00000000000..01fe35e4a8e --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 +, vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee +, elementary-icon-theme, appstream, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "terminal"; + version = "5.3.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1rhqfq5dn913g551ribycid4k8add2lanxkkqpv6zzdgvah26ni8"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + libnotify + vte + ]; + + # See https://github.com/elementary/terminal/commit/914d4b0e2d0a137f12276d748ae07072b95eff80 + mesonFlags = [ "-Dubuntu-bionic-patched-vte=false" ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Terminal emulator designed for elementary OS"; + longDescription = '' + A super lightweight, beautiful, and simple terminal. Comes with sane defaults, browser-class tabs, sudo paste protection, + smart copy/paste, and little to no configuration. + ''; + homepage = https://github.com/elementary/terminal; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix new file mode 100644 index 00000000000..b123d4cbf5b --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3 +, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1 +, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "videos"; + version = "2.6.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = with gst_all_1; [ + clutter-gst + clutter-gtk + elementary-icon-theme + granite + gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + gtk3 + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Video player and library app designed for elementary OS"; + homepage = https://github.com/elementary/videos; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix deleted file mode 100644 index d6bc8f5330b..00000000000 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, vte_290, libnotify, gettext, wrapGAppsHook, gobject-introspection }: - -stdenv.mkDerivation rec { - majorVersion = "0.4"; - minorVersion = "3"; - name = "pantheon-terminal-${majorVersion}.${minorVersion}"; - src = fetchurl { - url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; - sha256 = "0bfrqxig26i9qhm15kk7h9lgmzgnqada5snbbwqkp0n0pnyyh4ss"; - }; - - nativeBuildInputs = [ - perl cmake vala_0_38 pkgconfig wrapGAppsHook - # For setup hook - gobject-introspection - ]; - buildInputs = with gnome3; [ - glib gtk3 granite libnotify gettext vte_290 libgee - gsettings-desktop-schemas defaultIconTheme - ]; - meta = { - description = "Elementary OS's terminal"; - longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; - homepage = https://launchpad.net/pantheon-terminal; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.vozz ]; - }; -} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix new file mode 100644 index 00000000000..2ee92520983 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-a11y"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Universal Access Plug"; + homepage = https://github.com/elementary/switchboard-plug-a11y; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix new file mode 100644 index 00000000000..bdba8328fe9 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, switchboard, pciutils, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-about"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "11diwz2aj45yqkxdija8ny0sgm0wl2905gl3799cdl12ss9ffndp"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + patches = [ + (substituteAll { + src = ./lspci-path.patch; + inherit pciutils; + }) + ./remove-update-button.patch + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard About Plug"; + homepage = https://github.com/elementary/witchboard-plug-about; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch new file mode 100644 index 00000000000..352d84c4262 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/lspci-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala +index a3e449c..a95fe93 100644 +--- a/src/Views/HardwareView.vala ++++ b/src/Views/HardwareView.vala +@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid { + + // Graphics + try { +- Process.spawn_command_line_sync ("lspci", out graphics); ++ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics); + + if ("VGA" in graphics) { //VGA-keyword indicates graphics-line + string[] lines = graphics.split("\n"); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch new file mode 100644 index 00000000000..41433f9a76b --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-update-button.patch @@ -0,0 +1,55 @@ +diff --git a/src/Plug.vala b/src/Plug.vala +index 76fca34..3e79c1f 100644 +--- a/src/Plug.vala ++++ b/src/Plug.vala +@@ -65,7 +65,6 @@ public class About.Plug : Switchboard.Plug { + search_results.set ("%s → %s".printf (display_name, _("Restore Default Settings")), ""); + search_results.set ("%s → %s".printf (display_name, _("Suggest Translation")), ""); + search_results.set ("%s → %s".printf (display_name, _("Report Problems")), ""); +- search_results.set ("%s → %s".printf (display_name, _("Updates")), ""); + return search_results; + } + +@@ -161,7 +160,7 @@ public class About.Plug : Switchboard.Plug { + var kernel_version_label = new Gtk.Label (kernel_version); + kernel_version_label.set_selectable (true); + +- var gtk_version_label = new Gtk.Label (_("GTK+ %s").printf (gtk_version)); ++ var gtk_version_label = new Gtk.Label (_("GTK+ %s").printf (gtk_version)); + gtk_version_label.set_selectable (true); + + var website_label = new Gtk.LinkButton.with_label (website_url, _("Website")); +@@ -202,16 +201,6 @@ public class About.Plug : Switchboard.Plug { + issue_dialog.run (); + }); + +- // Update button +- var update_button = new Gtk.Button.with_label (_("Check for Updates")); +- update_button.clicked.connect (() => { +- try { +- Process.spawn_command_line_async ("io.elementary.appcenter --show-updates"); +- } catch (Error e) { +- warning (e.message); +- } +- }); +- + // Restore settings button + var settings_restore_button = new Gtk.Button.with_label (_("Restore Default Settings")); + settings_restore_button.clicked.connect (settings_restore_clicked); +@@ -224,7 +213,6 @@ public class About.Plug : Switchboard.Plug { + button_grid.add (settings_restore_button); + button_grid.add (translate_button); + button_grid.add (bug_button); +- button_grid.add (update_button); + button_grid.set_child_non_homogeneous (help_button, true); + + var software_grid = new Gtk.Grid (); +@@ -238,7 +226,7 @@ public class About.Plug : Switchboard.Plug { + software_grid.attach (based_off, 0, 2, 2, 1); + } + +- software_grid.attach (kernel_version_label, 0, 3, 2, 1); ++ software_grid.attach (kernel_version_label, 0, 3, 2, 1); + software_grid.attach (gtk_version_label, 0, 4, 2, 1); + software_grid.attach (website_label, 0, 5, 2, 1); + diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix new file mode 100644 index 00000000000..0cdb732ca73 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-applications"; + version = "2.1.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1c4agff456625kycacpsww7c9jsnsg1rqps96r7cvn9zq371b5ir"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Applications Plug"; + homepage = https://github.com/elementary/switchboard-plug-applications; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix new file mode 100644 index 00000000000..697c3ac592b --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee +, granite, gtk3, bluez, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-bluetooth"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "13jm2idjsgqkvdz1dxgl2wwx7bsqahppf6cnpl0pmz167wahg5zp"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + bluez + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Bluetooth Plug"; + homepage = https://github.com/elementary/switchboard-plug-bluetooth; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch new file mode 100644 index 00000000000..0fe0ac8b10c --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/clock-format.patch @@ -0,0 +1,12 @@ +diff --git a/src/DateTime1.vala b/src/DateTime1.vala +index 5a80fbd..2e1f948 100644 +--- a/src/DateTime1.vala ++++ b/src/DateTime1.vala +@@ -38,6 +38,6 @@ public class DateTime.Settings : Granite.Services.Settings { + public string clock_format { get; set; } + + public Settings () { +- base ("io.elementary.desktop.wingpanel.datetime"); ++ base ("io.elementary.granite"); + } + } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix new file mode 100644 index 00000000000..95a350372b9 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig +, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-datetime"; + version = "2.1.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1iz8skf5dw76a07ljc8v8lw2x2nrmq8j6sggm227cmxy60gadsdv"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + libxml2 + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + patches = [ + (substituteAll { + src = ./timezone.patch; + tzdata = "${tzdata}/share/zoneinfo/zone.tab"; + }) + # Use "clock-format" GSettings key that's been moved to granite + ./clock-format.patch + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Date & Time Plug"; + homepage = https://github.com/elementary/switchboard-plug-datetime; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch new file mode 100644 index 00000000000..35f73d36599 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch @@ -0,0 +1,13 @@ +diff --git a/src/Parser.vala b/src/Parser.vala +index faccb64..432a362 100644 +--- a/src/Parser.vala ++++ b/src/Parser.vala +@@ -28,7 +28,7 @@ public class DateTime.Parser : GLib.Object { + return parser; + } + private Parser () { +- var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab"); ++ var file = File.new_for_path ("@tzdata@"); + if (!file.query_exists ()) { + critical ("/usr/share/zoneinfo/zone.tab doesn't exist !"); + return; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix new file mode 100644 index 00000000000..192f8a69ae9 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-display"; + version = "2.1.6"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0pw21bnc79shiynmg7h9bs1x1v011lh07ypn22j73yhmxp6wiypd"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Displays Plug"; + homepage = https://github.com/elementary/switchboard-plug-display; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix new file mode 100644 index 00000000000..f38f15e3c6d --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig, vala, libgee +, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-keyboard"; + version = "2.3.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1997hnhlcp2jmf3z70na42vl1b7i5vxhp7k5ga5sl68dv0g4126y"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + libxml2 + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + libgnomekbd + libxklavier + switchboard + ]; + + patches = [ + (substituteAll { + src = ./xkb.patch; + config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"; + }) + ]; + + LIBRARY_PATH = stdenv.lib.makeLibraryPath [ libgnomekbd ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Keyboard Plug"; + homepage = https://github.com/elementary/switchboard-plug-keyboard; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch new file mode 100644 index 00000000000..33237d9c939 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch @@ -0,0 +1,22 @@ +diff --git a/src/Layout/Handler.vala b/src/Layout/Handler.vala +index 297314b..b36509a 100644 +--- a/src/Layout/Handler.vala ++++ b/src/Layout/Handler.vala +@@ -29,7 +29,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object { + } + + private void parse_layouts () { +- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); ++ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); + if (doc == null) { + critical ("'evdev.xml' not found or permissions missing\n"); + return; +@@ -76,7 +76,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object { + public HashTable<string, string> get_variants_for_language (string language) { + var returned_table = new HashTable<string, string> (str_hash, str_equal); + returned_table.set ("", _("Default")); +- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); ++ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); + if (doc == null) { + critical ("'evdev.xml' not found or permissions incorrect\n"); + return returned_table; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix new file mode 100644 index 00000000000..6c4bdeb7fb7 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, fetchpatch, meson, ninja +, pkgconfig, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-mouse-touchpad"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1zh5472ab01bckrc1py5bqqsal9i9pbgx6i8ap2d4yzhc8sirjrf"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Mouse & Touchpad Plug"; + homepage = https://github.com/elementary/switchboard-plug-mouse-touchpad; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix new file mode 100644 index 00000000000..3943cad48fd --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala +, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-network"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "12lvcc15jngzsa40fjhxa6kccs58h5qq4lqrc7lcx5przmfaik8k"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + networkmanager + networkmanagerapplet + switchboard + ]; + + patches = [ + (substituteAll { + src = ./nma.patch; + networkmanagerapplet = "${networkmanagerapplet}"; + }) + ]; + + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Networking Plug"; + homepage = https://github.com/elementary/switchboard-plug-network; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch new file mode 100644 index 00000000000..a5fff9d6a32 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch @@ -0,0 +1,43 @@ +diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala +index 19fd514..bc800d9 100644 +--- a/src/Widgets/SettingsButton.vala ++++ b/src/Widgets/SettingsButton.vala +@@ -23,7 +23,7 @@ + label = _("Edit Connections…"); + clicked.connect (() => { + try { +- var appinfo = AppInfo.create_from_commandline ("nm-connection-editor", null, AppInfoCreateFlags.NONE); ++ var appinfo = AppInfo.create_from_commandline ("@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE); + appinfo.launch (null, null); + } catch (Error e) { + warning ("%s", e.message); +@@ -61,13 +61,13 @@ + label = title; + clicked.connect (() => { + edit_connection_uuid (connection.get_uuid ()); +- }); ++ }); + } + + private void edit_connection_uuid (string uuid) { + try { + var appinfo = AppInfo.create_from_commandline ( +- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE ++ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE + ); + + appinfo.launch (null, null); +diff --git a/src/Widgets/VPN/VPNPage.vala b/src/Widgets/VPN/VPNPage.vala +index 23c3ae9..c71984c 100644 +--- a/src/Widgets/VPN/VPNPage.vala ++++ b/src/Widgets/VPN/VPNPage.vala +@@ -86,8 +86,7 @@ namespace Network { + add_button.tooltip_text = _("Add VPN Connection…"); + add_button.clicked.connect (() => { + add_button.sensitive = false; +- var command = new Granite.Services.SimpleCommand ("/usr/bin", +- "nm-connection-editor --create --type=vpn"); ++ var command = new Granite.Services.SimpleCommand ("@networkmanagerapplet@", "bin/nm-connection-editor --create --type=vpn"); + command.done.connect ((exit) => { + if (exit != 0) { + var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, "%s", _("Failed to run Connection Editor.")); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix new file mode 100644 index 00000000000..6bb5d285a34 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-notifications"; + version = "2.1.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0p0aj3bbjrh6x8wajqqb5yqm2iqfnj7kp16zf4hdr4siw0sx5p8n"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Notifications Plug"; + homepage = https://github.com/elementary/switchboard-plug-notifications; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix new file mode 100644 index 00000000000..0417d33df7d --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala +, libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib +, librest, webkitgtk, libsoup, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-onlineaccounts"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "03h8ii8zz59fpp4fwlvyx3m3550096fn7a6w612b1rbj3dqhlmh9"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + json-glib + libaccounts-glib + libgee + libsignon-glib + libsoup + librest + switchboard + webkitgtk + ]; + + PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; + PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; + + + meta = with stdenv.lib; { + description = "Switchboard Online Accounts Plug"; + homepage = https://github.com/elementary/switchboard-plug-onlineaccounts; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch new file mode 100644 index 00000000000..a1b019179d1 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/backgrounds.patch @@ -0,0 +1,26 @@ +diff --git a/set-wallpaper-contract/set-wallpaper.vala b/set-wallpaper-contract/set-wallpaper.vala +index 3e02089..7ce7041 100644 +--- a/set-wallpaper-contract/set-wallpaper.vala ++++ b/set-wallpaper-contract/set-wallpaper.vala +@@ -38,7 +38,7 @@ namespace SetWallpaperContractor { + </transition> + """; + +- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds"; ++ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds"; + + private int delay_value = 60; + +diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala +index 4be14fa..aa8832f 100644 +--- a/src/Views/Wallpaper.vala ++++ b/src/Views/Wallpaper.vala +@@ -38,7 +38,7 @@ public class Wallpaper : Gtk.Grid { + FileAttribute.THUMBNAIL_IS_VALID + }; + +- const string SYSTEM_BACKGROUNDS_PATH = "/usr/share/backgrounds"; ++ const string SYSTEM_BACKGROUNDS_PATH = "/run/current-system/sw/share/backgrounds"; + + public Switchboard.Plug plug { get; construct set; } + private GLib.Settings settings; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix new file mode 100644 index 00000000000..e47dc4c4060 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala +, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop +, gala, wingpanel, plank, switchboard, gettext, gobject-introspection, bamf }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-pantheon-shell"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0yy821hl26jfd9hyigqi7nmaf30iww0lhg9qzcwlfzsvvfwnxagi"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + bamf + gexiv2 + gnome-desktop + elementary-settings-daemon + granite + gtk3 + libgee + plank + switchboard + ]; + + patches = [ + ./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded + ./hardcode-gsettings.patch + ]; + + postPatch = '' + substituteInPlace src/Views/Appearance.vala --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas + substituteInPlace src/Views/Appearance.vala --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas + ''; + + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Desktop Plug"; + homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch new file mode 100644 index 00000000000..d023e1b55ce --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch @@ -0,0 +1,23 @@ +diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala +index 721d458..17e1c58 100644 +--- a/src/Views/Appearance.vala ++++ b/src/Views/Appearance.vala +@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid { + attach (text_size_label, 0, 2); + attach (text_size_modebutton, 1, 2); + +- var animations_settings = new Settings (ANIMATIONS_SCHEMA); ++ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); ++ SettingsSchema animations_schema = gala_schema_source.lookup (ANIMATIONS_SCHEMA, false); ++ ++ var animations_settings = new Settings.full (animations_schema, null, null); + animations_settings.bind (ANIMATIONS_KEY, animations_switch, "active", SettingsBindFlags.DEFAULT); + +- var panel_settings = new Settings (PANEL_SCHEMA); ++ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); ++ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false); ++ ++ var panel_settings = new Settings.full (panel_schema, null, null); + panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT); + + var interface_settings = new Settings (INTERFACE_SCHEMA); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix new file mode 100644 index 00000000000..ab1fd98795a --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja +, pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon +, makeWrapper, granite, gtk3, dbus, polkit, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-power"; + version = "2.3.5"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1wcxz4jxyv8kms9gxpwvrb356h10qvcwmdjzjzl2bvj5yl1rfcs9"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + dbus + granite + gtk3 + libgee + polkit + switchboard + ]; + + patches = [ + (substituteAll { + src = ./dpms-helper-exec.patch; + elementary_dpms_helper = "${elementary-dpms-helper}"; + }) + ./hardcode-gsettings.patch + ]; + + postPatch = '' + substituteInPlace src/MainView.vala --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas + substituteInPlace src/MainView.vala --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + ''; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "share/dbus-1/system-services"; + PKG_CONFIG_DBUS_1_SYSCONFDIR = "etc"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions"; + + meta = with stdenv.lib; { + description = "Switchboard Power Plug"; + homepage = https://github.com/elementary/switchboard-plug-power; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch new file mode 100644 index 00000000000..335d3f29626 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch @@ -0,0 +1,13 @@ +diff --git a/src/MainView.vala b/src/MainView.vala +index 1654e68..175f220 100644 +--- a/src/MainView.vala ++++ b/src/MainView.vala +@@ -317,7 +317,7 @@ public class Power.MainView : Gtk.Grid { + + private static void run_dpms_helper () { + try { +- string[] argv = { "io.elementary.dpms-helper" }; ++ string[] argv = { "@elementary_dpms_helper@/bin/io.elementary.dpms-helper" }; + Process.spawn_async (null, argv, Environ.get (), + SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL | SpawnFlags.STDOUT_TO_DEV_NULL, + null, null); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch new file mode 100644 index 00000000000..caacdad6eda --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch @@ -0,0 +1,20 @@ +diff --git a/src/MainView.vala b/src/MainView.vala +index 1654e68..ad8fed9 100644 +--- a/src/MainView.vala ++++ b/src/MainView.vala +@@ -46,8 +46,13 @@ public class Power.MainView : Gtk.Grid { + + var label_size = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); + +- settings = new GLib.Settings ("org.gnome.settings-daemon.plugins.power"); +- elementary_dpms_settings = new GLib.Settings ("io.elementary.dpms"); ++ SettingsSchemaSource gsd_sss = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS_PATH@", null, true); ++ SettingsSchema gsd_schema = gsd_sss.lookup ("org.gnome.settings-daemon.plugins.power", false); ++ settings = new GLib.Settings.full (gsd_schema, null, null); ++ ++ SettingsSchemaSource dpms_sss = new SettingsSchemaSource.from_directory ("@DPMS_HELPER_GSETTINGS_PATH@", null, true); ++ SettingsSchema elementary_dpms_schema = dpms_sss.lookup ("io.elementary.dpms", false); ++ elementary_dpms_settings = new GLib.Settings.full (elementary_dpms_schema, null, null); + + battery = new Battery (); + power_supply = new PowerSupply (); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix new file mode 100644 index 00000000000..bb9e576a4c4 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, cups, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-printers"; + version = "2.1.6"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "05pkf3whh51gd9d0h2h4clgf7r3mvzl4ybas7834vhy19dzcbzmc"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + cups + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Printers Plug"; + homepage = https://github.com/elementary/switchboard-plug-printers; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix new file mode 100644 index 00000000000..4060e071789 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja +, pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist +, switchboard, lightlocker, pantheon-agent-geoclue2, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-security-privacy"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0f1idh36hlgmdva5jn0xnj2b6gbic0asnj3b7j283gyziibm3pxa"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + polkit + switchboard + zeitgeist + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + patches = [ + ./hardcode-gsettings.patch + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + + substituteInPlace src/Views/LockPanel.vala --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas + substituteInPlace src/Views/FirewallPanel.vala --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + ''; + + meta = with stdenv.lib; { + description = "Switchboard Security & Privacy Plug"; + homepage = https://github.com/elementary/switchboard-plug-security-privacy; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch new file mode 100644 index 00000000000..ffaf1ecf5db --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch @@ -0,0 +1,36 @@ +diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala +index 994c4d1..5702de2 100644 +--- a/src/Views/FirewallPanel.vala ++++ b/src/Views/FirewallPanel.vala +@@ -49,10 +49,13 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage { + } + + construct { +- settings = new Settings ("io.elementary.switchboard.security-privacy"); ++ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); ++ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false); ++ settings = new Settings.full (security_privacy_schema, null, null); ++ + disabled_rules = new Gee.HashMap<string, UFWHelpers.Rule> (); + load_disabled_rules (); +- ++ + status_switch.notify["active"].connect (() => { + if (loading == false) { + view.sensitive = status_switch.active; +diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala +index 081cf10..42f6118 100644 +--- a/src/Views/LockPanel.vala ++++ b/src/Views/LockPanel.vala +@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage { + } + + construct { +- locker = new Settings ("apps.light-locker"); ++ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@LIGHTLOCKER_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); ++ SettingsSchema locker_schema = sss.lookup ("apps.light-locker", false); ++ ++ locker = new Settings.full (locker_schema, null, null); + + var lock_suspend_label = new Gtk.Label (_("Lock on sleep:")); + var lock_suspend_switch = new Gtk.Switch (); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix new file mode 100644 index 00000000000..a2c047ffcb4 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-sharing"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1yi6aga9i18wwn22zwmfbhsk16f92fka837is5r8xghqb7a50hyh"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Sharing Plug"; + homepage = https://github.com/elementary/switchboard-plug-sharing; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix new file mode 100644 index 00000000000..e4d0db46923 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig +, vala, libgee, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3 +, switchboard, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-sound"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0dvxmjziifffa2rm7h43ca5grhlcpih3rgik50mz808mqfxr4l1q"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ + granite + gtk3 + libcanberra + libcanberra-gtk3 + libgee + pulseaudio + switchboard + ]; + + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + meta = with stdenv.lib; { + description = "Switchboard Sound Plug"; + homepage = https://github.com/elementary/switchboard-plug-sound; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix new file mode 100644 index 00000000000..310230c7aac --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja +, vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity +, elementary-icon-theme, wrapGAppsHook, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "switchboard"; + version = "2.3.6"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0lsrn636b0f9a58jbid6mlhgrf8ajnh7phwmhgxz55sz7k7qa58g"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + elementary-icon-theme + granite + gtk3 + libgee + libunity + ]; + + patches = [ ./plugs-path-env.patch ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Extensible System Settings app for Pantheon"; + homepage = https://github.com/elementary/switchboard; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch b/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch new file mode 100644 index 00000000000..f5d8567bffe --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch @@ -0,0 +1,25 @@ +diff --git a/lib/PlugsManager.vala b/lib/PlugsManager.vala +index 75d0eaf..c227908 100644 +--- a/lib/PlugsManager.vala ++++ b/lib/PlugsManager.vala +@@ -34,10 +34,18 @@ public class Switchboard.PlugsManager : GLib.Object { + private Gee.LinkedList<Switchboard.Plug> plugs; + + public signal void plug_added (Switchboard.Plug plug); +- ++ + private PlugsManager () { + plugs = new Gee.LinkedList<Switchboard.Plug> (); +- var base_folder = File.new_for_path (Build.PLUGS_DIR); ++ ++ var plugs_path = Environment.get_variable("SWITCHBOARD_PLUGS_PATH"); ++ if (plugs_path != null) { ++ debug ("SWITCHBOARD_PLUGS_PATH set to %s", plugs_path); ++ } else { ++ critical ("SWITCHBOARD_PLUGS_PATH not set"); ++ } ++ ++ var base_folder = File.new_for_path (plugs_path); + find_plugins (base_folder); + } + diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix new file mode 100644 index 00000000000..cae8e74f4ba --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -0,0 +1,19 @@ +{ stdenv, makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }: + +let + selectedPlugs = if plugs == null then switchboardPlugs else plugs; +in +symlinkJoin { + name = "${switchboard.name}-with-plugs"; + + paths = [ switchboard ] ++ selectedPlugs; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/io.elementary.switchboard \ + --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard" + ''; + + inherit (switchboard) meta; +} diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix new file mode 100644 index 00000000000..2f7e79f9f9b --- /dev/null +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "stylesheet"; + version = "5.2.1"; + + name = "elementary-gtk-theme-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "03l8m87f7z25svxk0hhcqnn4qnnqvasr5qwzq3s87lx25gwjml29"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-gtk-theme"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + meta = with stdenv.lib; { + description = "GTK theme designed to be smooth, attractive, fast, and usable"; + homepage = https://github.com/elementary/stylesheet; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix new file mode 100644 index 00000000000..23fb8445838 --- /dev/null +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }: + +stdenv.mkDerivation rec { + pname = "icons"; + version = "5.0.3"; + + name = "elementary-icon-theme-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0wpv7yirf44bfqfmyshzfw9605j1idm7c9jqg68k3nmymmd6iqzf"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-icon-theme"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + python3 + ]; + + buildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; + + mesonFlags = [ + "-Dvolume_icons=false" # Tries to install some icons to / + "-Dpalettes=false" # Don't install gimp and inkscape palette files + ]; + + postPatch = '' + chmod +x meson/symlink.py + patchShebangs meson/symlink.py + ''; + + postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; + + meta = with stdenv.lib; { + description = "Named, vector icons for elementary OS"; + longDescription = '' + An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. + ''; + homepage = https://github.com/elementary/icons; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix new file mode 100644 index 00000000000..430acfd9ac1 --- /dev/null +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "sound-theme"; + version = "1.0"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "A set of system sounds for elementary"; + homepage = https://github.com/elementary/sound-theme; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix new file mode 100644 index 00000000000..898d5f7b454 --- /dev/null +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pantheon }: + +stdenv.mkDerivation rec { + pname = "wallpapers"; + version = "5.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/backgrounds/elementary + cp -av *.jpg $out/share/backgrounds/elementary + ''; + + meta = with stdenv.lib; { + description = "Collection of wallpapers for elementary"; + homepage = https://github.com/elementary/wallpapers; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} + diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix new file mode 100644 index 00000000000..27e6e02a4a3 --- /dev/null +++ b/pkgs/desktops/pantheon/default.nix @@ -0,0 +1,224 @@ +{ pkgs, lib, gnome3 }: + + +lib.makeScope pkgs.newScope (self: with self; { + + apps = [ + elementary-calculator elementary-calendar + elementary-camera elementary-code elementary-files + elementary-music elementary-photos elementary-screenshot-tool + elementary-terminal elementary-videos switchboard-with-plugs + ]; + + artwork = [ + elementary-gtk-theme + elementary-icon-theme + elementary-sound-theme + elementary-wallpapers + ]; + + desktop = [ + elementary-session-settings + elementary-shortcut-overlay + gala + wingpanel-with-indicators + ]; + + services = [ + cerbere + elementary-capnet-assist + elementary-settings-daemon + elementary-dpms-helper + pantheon-agent-geoclue2 + pantheon-agent-polkit + ]; + + switchboardPlugs = [ + switchboard-plug-a11y switchboard-plug-about + switchboard-plug-applications switchboard-plug-bluetooth + switchboard-plug-datetime switchboard-plug-display + switchboard-plug-keyboard switchboard-plug-mouse-touchpad + switchboard-plug-network switchboard-plug-notifications + switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell + switchboard-plug-power switchboard-plug-printers + switchboard-plug-security-privacy switchboard-plug-sharing + switchboard-plug-sound + ]; + + wingpanelIndicators = [ + wingpanel-applications-menu wingpanel-indicator-bluetooth + wingpanel-indicator-datetime wingpanel-indicator-keyboard + wingpanel-indicator-network wingpanel-indicator-nightlight + wingpanel-indicator-notifications wingpanel-indicator-power + wingpanel-indicator-session wingpanel-indicator-sound + ]; + + updateScript = callPackage ./update.nix { }; + + maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; + + mutter = pkgs.gnome3.mutter328; + vala = pkgs.vala_0_40; + + elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; + + notes-up = pkgs.notes-up.override { withPantheon = true; }; + + #### APPS + + elementary-calculator = callPackage ./apps/elementary-calculator { }; + + elementary-calendar = callPackage ./apps/elementary-calendar { }; + + elementary-camera = callPackage ./apps/elementary-camera { }; + + elementary-code = callPackage ./apps/elementary-code { }; + + elementary-files = callPackage ./apps/elementary-files { }; + + elementary-music = callPackage ./apps/elementary-music { }; + + elementary-photos = callPackage ./apps/elementary-photos { }; + + elementary-screenshot-tool = callPackage ./apps/elementary-screenshot-tool { }; + + elementary-terminal = callPackage ./apps/elementary-terminal { }; + + elementary-videos = callPackage ./apps/elementary-videos { }; + + #### DESKTOP + + elementary-default-settings = callPackage ./desktop/elementary-default-settings { }; + + elementary-greeter = callPackage ./desktop/elementary-greeter { + inherit (gnome3) gnome-desktop; + }; + + elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; + + elementary-session-settings = callPackage ./desktop/elementary-session-settings { + inherit (gnome3) gnome-session gnome-keyring; + }; + + elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; + + extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts { + inherit (gnome3) file-roller gnome-bluetooth; + }; + + gala = callPackage ./desktop/gala { + inherit (gnome3) gnome-desktop; + }; + + wingpanel = callPackage ./desktop/wingpanel { }; + + wingpanel-with-indicators = callPackage ./desktop/wingpanel/wrapper.nix { + indicators = null; + }; + + #### LIBRARIES + + granite = callPackage ./granite { }; + + #### SERVICES + + cerbere = callPackage ./services/cerbere { }; + + contractor = callPackage ./services/contractor { }; + + elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { }; + + elementary-dpms-helper = callPackage ./services/elementary-dpms-helper { }; + + # We're using ubuntu and elementary's patchset due to reasons + # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 + # Take note of "I am holding off on "fixing" this bug for as long as possible." + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { + inherit (gnome3) libgweather; + }; + + pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; + + pantheon-agent-polkit = callPackage ./services/pantheon-agent-polkit { }; + + #### WINGPANEL INDICATORS + + wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { }; + + wingpanel-indicator-bluetooth = callPackage ./desktop/wingpanel-indicators/bluetooth { }; + + wingpanel-indicator-datetime = callPackage ./desktop/wingpanel-indicators/datetime { }; + + wingpanel-indicator-keyboard = callPackage ./desktop/wingpanel-indicators/keyboard { }; + + wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network { + inherit (gnome3) networkmanagerapplet; + }; + + wingpanel-indicator-nightlight = callPackage ./desktop/wingpanel-indicators/nightlight { }; + + wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; + + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; + + wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; + + wingpanel-indicator-sound = callPackage ./desktop/wingpanel-indicators/sound { }; + + #### SWITCHBOARD + + switchboard = callPackage ./apps/switchboard { }; + + switchboard-with-plugs = callPackage ./apps/switchboard/wrapper.nix { + plugs = null; + }; + + switchboard-plug-a11y = callPackage ./apps/switchboard-plugs/a11y { }; + + switchboard-plug-about = callPackage ./apps/switchboard-plugs/about { }; + + switchboard-plug-applications = callPackage ./apps/switchboard-plugs/applications { }; + + switchboard-plug-bluetooth = callPackage ./apps/switchboard-plugs/bluetooth { }; + + switchboard-plug-datetime = callPackage ./apps/switchboard-plugs/datetime { }; + + switchboard-plug-display = callPackage ./apps/switchboard-plugs/display { }; + + switchboard-plug-keyboard = callPackage ./apps/switchboard-plugs/keyboard { }; + + switchboard-plug-mouse-touchpad = callPackage ./apps/switchboard-plugs/mouse-touchpad { }; + + switchboard-plug-network = callPackage ./apps/switchboard-plugs/network { + inherit (gnome3) networkmanagerapplet; + }; + + switchboard-plug-notifications = callPackage ./apps/switchboard-plugs/notifications { }; + + switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; + + switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { + inherit (gnome3) gnome-desktop; + }; + + switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; + + switchboard-plug-printers = callPackage ./apps/switchboard-plugs/printers { }; + + switchboard-plug-security-privacy = callPackage ./apps/switchboard-plugs/security-privacy { }; + + switchboard-plug-sharing = callPackage ./apps/switchboard-plugs/sharing { }; + + switchboard-plug-sound = callPackage ./apps/switchboard-plugs/sound { }; + + ### ARTWORK + + elementary-gtk-theme = callPackage ./artwork/elementary-gtk-theme { }; + + elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { }; + + elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { }; + + elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { }; + +}) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch new file mode 100644 index 00000000000..438ed79d1bb --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch @@ -0,0 +1,25 @@ +diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override +index 6452c30..899972d 100644 +--- a/debian/elementary-default-settings.gsettings-override ++++ b/debian/elementary-default-settings.gsettings-override +@@ -1,5 +1,5 @@ + [net.launchpad.plank.dock.settings] +-dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] ++dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.gnome.Geary.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] + hide-delay=250 + hide-mode='window-dodge' + show-dock-item=false +@@ -8,13 +8,6 @@ theme='Gtk+' + [org.freedesktop.ibus.general.hotkey] + triggers=['<Control>space'] + +-[org.gnome.desktop.background] +-draw-background=true +-picture-options='zoom' +-picture-uri='file:///usr/share/backgrounds/elementaryos-default' +-primary-color='#000000' +-show-desktop-icons=false +- + [org.gnome.desktop.datetime] + automatic-timezone=true + diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix new file mode 100644 index 00000000000..f133324a81e --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, fetchpatch, pantheon }: + +stdenv.mkDerivation rec { + pname = "default-settings"; + version = "5.0"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + patches = [ + # See: https://github.com/elementary/default-settings/pull/86 (didn't make 5.0 release) + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/05d0b2a4e98c28203521d599b40745b46be549fa.patch"; + sha256 = "1wk1qva3yzc28gljnkx9hb3pwhqnfrsb08wd76lsl3xnylg0wn2l"; + }) + # See: https://github.com/elementary/default-settings/pull/94 (didn't make 5.0 release) + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/a2ca00130c16e805179fb5abd7b624a873dff2da.patch"; + sha256 = "1jp1c5d8jfm0404zsylfk7h9vj81s409wgbzbsd2kxmz65icq16x"; + }) + ./correct-override.patch + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/etc/gtk-3.0 + cp -av settings.ini $out/etc/gtk-3.0 + + mkdir -p $out/share/glib-2.0/schemas + cp -av debian/elementary-default-settings.gsettings-override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override + + mkdir $out/etc/wingpanel.d + cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist + + mkdir -p $out/share/elementary/config/plank/dock1 + cp -avr ${./launchers} $out/share/elementary/config/plank/dock1/launchers + ''; + + meta = with stdenv.lib; { + description = "Default settings and configuration files for elementary"; + homepage = https://github.com/elementary/default-settings; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist b/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist new file mode 100644 index 00000000000..0cff31f4f77 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.whitelist @@ -0,0 +1,6 @@ +liba11y.so +libbluetooth.so +libkeyboard.so +libnetwork.so +libpower.so +libsession.so diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem new file mode 100644 index 00000000000..b25bb8c8590 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/gala-multitaskingview.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/gala-multitaskingview.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem new file mode 100644 index 00000000000..3bd7d531840 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.calendar.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.calendar.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem new file mode 100644 index 00000000000..494edde183c --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.music.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.music.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem new file mode 100644 index 00000000000..89536754964 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.photos.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.photos.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem new file mode 100644 index 00000000000..312c35d9bf0 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.switchboard.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.switchboard.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem new file mode 100644 index 00000000000..3b0f721a564 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.videos.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.videos.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem new file mode 100644 index 00000000000..b0218bac52d --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Epiphany.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/org.gnome.Epiphany.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem new file mode 100644 index 00000000000..8b04efe417e --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/org.gnome.Geary.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch new file mode 100644 index 00000000000..626e56ce596 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/01-sysconfdir-install.patch @@ -0,0 +1,25 @@ +From 2384bee55a46eac44eb9d329be4c2a097e053ae1 Mon Sep 17 00:00:00 2001 +From: worldofpeace <worldofpeace@users.noreply.github.com> +Date: Tue, 17 Jul 2018 07:04:18 -0400 +Subject: [PATCH 1/1] 'sysconfdir' will be etc not /etc for install + +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 7621b03..7c08eaf 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,7 +20,7 @@ i18n.merge_file ( + + install_data( + meson.project_name() + '.conf', +- install_dir: join_paths(get_option('sysconfdir'), 'lightdm') ++ install_dir: join_paths(get_option('prefix'), 'etc', 'lightdm') + ) + + install_data( +-- +2.17.1 + diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix new file mode 100644 index 00000000000..303aae6882b --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, substituteAll, makeWrapper, meson +, ninja, vala, desktop-file-utils, gtk3, granite, libgee, elementary-settings-daemon +, gnome-desktop, mutter, gobject-introspection, elementary-icon-theme, wingpanel-with-indicators +, elementary-gtk-theme, nixos-artwork, elementary-default-settings, lightdm, numlockx +, clutter-gtk, libGL, dbus, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "greeter"; + version = "3.3.1"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + elementary-icon-theme + elementary-gtk-theme + elementary-settings-daemon + gnome-desktop + granite + gtk3 + libgee + libGL + lightdm + mutter + wingpanel-with-indicators + ]; + + patches = [ + (substituteAll { + src = ./gsd.patch; + elementary-settings-daemon = "${elementary-settings-daemon}/libexec"; + }) + (substituteAll { + src = ./numlockx.patch; + inherit numlockx; + }) + ./01-sysconfdir-install.patch + ]; + + mesonFlags = [ + # A hook does this but after wrapGAppsHook so the files never get wrapped. + "--sbindir=${placeholder "out"}/bin" + # baked into the program for discovery of the greeter configuration + "--sysconfdir=/etc" + ]; + + preFixup = '' + gappsWrapperArgs+=( + # GTK+ reads default settings (such as icons and themes) from elementary's settings.ini here + --prefix XDG_CONFIG_DIRS : "${elementary-default-settings}/etc" + + # dbus-launch needed in path + --prefix PATH : "${dbus}/bin" + + # for `wingpanel -g` + --prefix PATH : "${wingpanel-with-indicators}/bin" + + # TODO: they should be using meson for this + # See: https://github.com/elementary/greeter/blob/19c0730fded4e9ddec5a491f0e78f83c7c04eb59/src/PantheonGreeter.vala#L451 + --prefix PATH : "$out/bin" + ) + ''; + + postFixup = '' + substituteInPlace $out/share/xgreeters/io.elementary.greeter.desktop \ + --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" + + substituteInPlace $out/etc/lightdm/io.elementary.greeter.conf \ + --replace "#default-wallpaper=/usr/share/backgrounds/elementaryos-default" "default-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png" + ''; + + meta = with stdenv.lib; { + description = "LightDM Greeter for Pantheon"; + homepage = https://github.com/elementary/greeter; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch new file mode 100644 index 00000000000..1770d54aee0 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index 2450c1a..a908d11 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,7 +1,7 @@ + conf_data = configuration_data() + conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm')) + conf_data.set('GETTEXT_PACKAGE', meson.project_name()) +-conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/') ++conf_data.set('GSD_DIR', '@elementary-settings-daemon@') + conf_data.set('VERSION', meson.project_version()) + config_header = configure_file ( + input: 'config.vala.in', diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch new file mode 100644 index 00000000000..2c7766b4284 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/numlockx.patch @@ -0,0 +1,13 @@ +diff --git a/src/PantheonGreeter.vala b/src/PantheonGreeter.vala +index 11aa4c0..ae7bf7e 100644 +--- a/src/PantheonGreeter.vala ++++ b/src/PantheonGreeter.vala +@@ -163,7 +163,7 @@ public class PantheonGreeter : Gtk.Window { + warning (e.message); + } + if (activate_numlock) { +- Granite.Services.System.execute_command ("/usr/bin/numlockx on"); ++ Granite.Services.System.execute_command ("@numlockx@/bin/numlockx on"); + } + + var screensaver_timeout = 60; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix new file mode 100644 index 00000000000..bd5688f941b --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -0,0 +1,44 @@ +{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank +, extraGSettingsOverrides ? "" +, extraGSettingsOverridePackages ? [] +}: + +let + + gsettingsOverridePackages = [ + gala + epiphany + elementary-settings-daemon + gnome3.mutter + gtk3 + plank + ] ++ extraGSettingsOverridePackages; + +in + +with stdenv.lib; + +# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this +runCommand "elementary-gsettings-desktop-schemas" {} + '' + mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + + ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} + + chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides + cp ${elementary-default-settings}/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override \ + $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + + cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF + [org.gnome.desktop.background] + draw-background=true + picture-options='zoom' + picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' + primary-color='#000000' + + ${extraGSettingsOverrides} + EOF + + ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ + '' diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix new file mode 100644 index 00000000000..d8634b48570 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }: + +stdenv.mkDerivation rec { + pname = "print"; + version = "0.1.3"; + + name = "elementary-print-shim-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}-shim"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + vala + ]; + + buildInputs = [ gtk3 ]; + + meta = with stdenv.lib; { + description = "Simple shim for printing support via Contractor"; + homepage = https://github.com/elementary/print; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop new file mode 100644 index 00000000000..517a9457ae1 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Instantiate Default elementary dockitems +Exec=@script@ +StartupNotify=false +NoDisplay=true +OnlyShowIn=Pantheon; +X-GNOME-Autostart-Phase=EarlyInitialization diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix new file mode 100644 index 00000000000..a6ec70a6b58 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -0,0 +1,107 @@ +{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeTextFile, writeShellScriptBin, elementary-settings-daemon, runtimeShell }: + +let + + # + # ─── ENSURES PLANK GETS ELEMENTARY'S DEFAULT DOCKITEMS ──────────────────────────── + # + + # + # Upstream relies on /etc/skel to initiate a new users home directory with planks dockitems. + # + # That is not possible within nixos, but we can achieve this easily with a simple script that copies + # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session + # which is most appropriate for installing files into $HOME. + # + + dockitems-script = writeScript "dockitems-script" '' + #!${runtimeShell} + + elementary_default_settings="${elementary-default-settings}" + dock_items="$elementary_default_settings/share/elementary/config/plank/dock1/launchers"/* + + if [ ! -d "$HOME/.config/plank/dock1" ]; then + echo "Instantiating default Plank Dockitems..." + + mkdir -p $HOME/.config/plank/dock1/launchers + cp -r --no-preserve=mode,ownership $dock_items $HOME/.config/plank/dock1/launchers/ + else + echo "Plank Dockitems already instantiated" + fi + ''; + + dockitemAutostart = substituteAll { + src = ./default-elementary-dockitems.desktop; + script = "${dockitems-script}"; + }; + + executable = writeShellScriptBin "pantheon" '' + export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:$XDG_CONFIG_DIRS + export XDG_DATA_DIRS=${placeholder "out"}/share:$XDG_DATA_DIRS + exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" + ''; + +in + +stdenv.mkDerivation rec { + pname = "session-settings"; + version = "5.0.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/applications + cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list + + mkdir -p $out/etc/xdg/autostart + cp -av ${gnome-keyring}/etc/xdg/autostart/* $out/etc/xdg/autostart + cp -av ${orca}/etc/xdg/autostart/* $out/etc/xdg/autostart + cp -av ${at-spi2-core}/etc/xdg/autostart/* $out/etc/xdg/autostart + + cp "${dockitemAutostart}" $out/etc/xdg/autostart/default-elementary-dockitems.desktop + + mkdir -p $out/share/gnome-session/sessions + cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions + + mkdir -p $out/share/xsessions + cp -av xsessions/pantheon.desktop $out/share/xsessions + ''; + + postFixup = '' + substituteInPlace $out/share/xsessions/pantheon.desktop \ + --replace "gnome-session --session=pantheon" "${executable}/bin/pantheon" \ + --replace "wingpanel" "${wingpanel}/bin/wingpanel" + + for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done + + for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart) + do + echo "Patching OnlyShowIn to Pantheon in: $autostart" + sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart + done + ''; + + meta = with stdenv.lib; { + description = "Session settings for elementary"; + homepage = https://github.com/elementary/session-settings; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list new file mode 100644 index 00000000000..3b5e3b0e77a --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list @@ -0,0 +1,168 @@ +[Default Applications] +application/ogg=io.elementary.music.desktop +application/oxps=org.gnome.Evince.desktop +application/pdf=org.gnome.Evince.desktop +application/postscript=org.gnome.Evince.desktop +application/vnd.ms-xpsdocument=org.gnome.Evince.desktop +application/vnd.rn-realmedia=io.elementary.videos.desktop +application/x-ar=org.gnome.FileRoller.desktop +application/x-arj=org.gnome.FileRoller.desktop +application/x-bzdvi=org.gnome.Evince.desktop +application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop +application/x-bzip=org.gnome.FileRoller.desktop +application/x-bzpdf=org.gnome.Evince.desktop +application/x-bzpostscript=org.gnome.Evince.desktop +application/x-cbr=org.gnome.Evince.desktop +application/x-cbt=org.gnome.Evince.desktop +application/x-cbz=org.gnome.Evince.desktop +application/x-compress=org.gnome.FileRoller.desktop +application/x-compressed-tar=org.gnome.FileRoller.desktop +application/x-dvi=org.gnome.Evince.desktop +application/x-ear=org.gnome.FileRoller.desktop +application/x-extension-m4a=io.elementary.videos.desktop +application/x-extension-mp4=io.elementary.videos.desktop +application/x-flac=io.elementary.music.desktop +application/x-gtar=org.gnome.FileRoller.desktop +application/x-gzdvi=org.gnome.Evince.desktop +application/x-gzip=org.gnome.FileRoller.desktop +application/x-gzpdf=org.gnome.Evince.desktop +application/x-gzpostscript=org.gnome.Evince.desktop +application/x-lha=org.gnome.FileRoller.desktop +application/x-lhz=org.gnome.FileRoller.desktop +application/x-lzop=org.gnome.FileRoller.desktop +application/x-matroska=io.elementary.videos.desktop +application/x-ogg=io.elementary.music.desktop +application/x-perl=io.elementary.code.desktop +application/x-rar-compressed=org.gnome.FileRoller.desktop +application/x-rar=org.gnome.FileRoller.desktop +application/x-rpm=org.gnome.FileRoller.desktop +application/x-tar=org.gnome.FileRoller.desktop +application/x-war=org.gnome.FileRoller.desktop +application/x-xz-compressed-tar=org.gnome.FileRoller.desktop +application/x-xz=org.gnome.FileRoller.desktop +application/x-xzpdf=org.gnome.Evince.desktop +application/x-zip-compressed=org.gnome.FileRoller.desktop +application/x-zip=org.gnome.FileRoller.desktop +application/x-zoo=org.gnome.FileRoller.desktop +application/xhtml+xml=org.gnome.Epiphany.desktop +application/zip=org.gnome.FileRoller.desktop +audio/3gpp=io.elementary.music.desktop +audio/ac3=io.elementary.music.desktop +audio/AMR-WB=io.elementary.music.desktop +audio/AMR=io.elementary.music.desktop +audio/basic=io.elementary.music.desktop +audio/flac=io.elementary.music.desktop +audio/midi=io.elementary.music.desktop +audio/mp4=io.elementary.music.desktop +audio/mpeg=io.elementary.music.desktop +audio/mpegurl=io.elementary.music.desktop +audio/ogg=io.elementary.music.desktop +audio/prs.sid=io.elementary.music.desktop +audio/vnd.rn-realaudio=io.elementary.music.desktop +audio/x-ape=io.elementary.music.desktop +audio/x-flac=io.elementary.music.desktop +audio/x-gsm=io.elementary.music.desktop +audio/x-it=io.elementary.music.desktop +audio/x-m4a=io.elementary.music.desktop +audio/x-matroska=io.elementary.music.desktop +audio/x-mod=io.elementary.music.desktop +audio/x-mp3=io.elementary.music.desktop +audio/x-mpeg=io.elementary.music.desktop +audio/x-mpegurl=io.elementary.music.desktop +audio/x-ms-asf=io.elementary.music.desktop +audio/x-ms-asx=io.elementary.music.desktop +audio/x-ms-wax=io.elementary.music.desktop +audio/x-ms-wma=io.elementary.music.desktop +audio/x-musepack=io.elementary.music.desktop +audio/x-pn-aiff=io.elementary.music.desktop +audio/x-pn-au=io.elementary.music.desktop +audio/x-pn-realaudio-plugin=io.elementary.music.desktop +audio/x-pn-realaudio=io.elementary.music.desktop +audio/x-pn-wav=io.elementary.music.desktop +audio/x-pn-windows-acm=io.elementary.music.desktop +audio/x-real-audio=io.elementary.music.desktop +audio/x-realaudio=io.elementary.music.desktop +audio/x-sbc=io.elementary.music.desktop +audio/x-scpls=io.elementary.music.desktop +audio/x-speex=io.elementary.music.desktop +audio/x-tta=io.elementary.music.desktop +audio/x-vorbis+ogg=io.elementary.music.desktop +audio/x-vorbis=io.elementary.music.desktop +audio/x-wav=io.elementary.music.desktop +audio/x-wavpack=io.elementary.music.desktop +audio/x-xm=io.elementary.music.desktop +image/bmp=io.elementary.photos-viewer.desktop +image/gif=io.elementary.photos-viewer.desktop +image/jpeg=io.elementary.photos-viewer.desktop +image/jpg=io.elementary.photos-viewer.desktop +image/pjpeg=io.elementary.photos-viewer.desktop +image/png=io.elementary.photos-viewer.desktop +image/tiff=io.elementary.photos-viewer.desktop +image/vnd.djvu=org.gnome.Evince.desktop +image/vnd.rn-realpix=io.elementary.videos.desktop +image/webp=io.elementary.photos-viewer.desktop +image/x-bmp=io.elementary.photos-viewer.desktop +image/x-bzeps=org.gnome.Evince.desktop +image/x-eps=org.gnome.Evince.desktop +image/x-gzeps=org.gnome.Evince.desktop +image/x-png=io.elementary.photos-viewer.desktop +inode/directory=io.elementary.files.desktop +misc/ultravox=io.elementary.videos.desktop +multipart/x-zip=org.gnome.FileRoller.desktop +text/calendar=io.elementary.calendar.desktop +text/html=org.gnome.Epiphany.desktop +text/mathml=io.elementary.code.desktop +text/plain=io.elementary.code.desktop +text/x-chdr=io.elementary.code.desktop +text/x-csrc=io.elementary.code.desktop +text/x-dtd=io.elementary.code.desktop +text/x-java=io.elementary.code.desktop +text/x-python=io.elementary.code.desktop +text/x-sql=io.elementary.code.desktop +text/xml=io.elementary.code.desktop +video/3gpp=io.elementary.videos.desktop +video/dv=io.elementary.videos.desktop +video/fli=io.elementary.videos.desktop +video/flv=io.elementary.videos.desktop +video/mp2t=io.elementary.videos.desktop +video/mp4=io.elementary.videos.desktop +video/mp4v-es=io.elementary.videos.desktop +video/mpeg=io.elementary.videos.desktop +video/msvideo=io.elementary.videos.desktop +video/ogg=io.elementary.videos.desktop +video/quicktime=io.elementary.videos.desktop +video/vivo=io.elementary.videos.desktop +video/vnd.divx=io.elementary.videos.desktop +video/vnd.rn-realvideo=io.elementary.videos.desktop +video/vnd.vivo=io.elementary.videos.desktop +video/webm=io.elementary.videos.desktop +video/x-anim=io.elementary.videos.desktop +video/x-avi=io.elementary.videos.desktop +video/x-flc=io.elementary.videos.desktop +video/x-fli=io.elementary.videos.desktop +video/x-flic=io.elementary.videos.desktop +video/x-flv=io.elementary.videos.desktop +video/x-m4v=io.elementary.videos.desktop +video/x-matroska=io.elementary.videos.desktop +video/x-mpeg=io.elementary.videos.desktop +video/x-ms-asf=io.elementary.videos.desktop +video/x-ms-asx=io.elementary.videos.desktop +video/x-ms-wm=io.elementary.videos.desktop +video/x-ms-wmv=io.elementary.videos.desktop +video/x-ms-wmx=io.elementary.videos.desktop +video/x-ms-wvx=io.elementary.videos.desktop +video/x-msvideo=io.elementary.videos.desktop +video/x-nsv=io.elementary.videos.desktop +video/x-ogm+ogg=io.elementary.videos.desktop +video/x-theora+ogg=io.elementary.videos.desktop +video/x-totem-stream=io.elementary.videos.desktop +x-content/image-dcf=io.elementary.photos.desktop +x-content/image-picturecd=io.elementary.photos.desktop +x-content/video-dvd=io.elementary.videos.desktop +x-content/video-svcd=io.elementary.videos.desktop +x-content/video-vcd=io.elementary.videos.desktop +x-scheme-handler/http=org.gnome.Epiphany.desktop +x-scheme-handler/https=org.gnome.Epiphany.desktop +x-scheme-handler/mailto=org.gnome.Evolution.desktop +x-scheme-handler/trash=io.elementary.files.desktop + diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix new file mode 100644 index 00000000000..6ceebf1980c --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils +, gtk3, glib, granite, libgee, elementary-icon-theme, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "shortcut-overlay"; + version = "1.0.1"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + libxml2 + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + glib + granite + gtk3 + libgee + ]; + + meta = with stdenv.lib; { + description = "A native OS-wide shortcut overlay to be launched by Gala"; + homepage = https://github.com/elementary/shortcut-overlay; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix new file mode 100644 index 00000000000..4e19a65b58d --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -0,0 +1,39 @@ +{ stdenv, substituteAll, fetchFromGitHub, file-roller, gnome-bluetooth }: + +stdenv.mkDerivation rec { + pname = "extra-elementary-contracts"; + version = "2018-08-21"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "worldofpeace"; + repo = pname; + rev = "a05dfb00695854163805b666185e3e9f31b6eb83"; + sha256 = "0fkaf2w4xg0n9faj74rgzy7gvd3yz112l058b157a3pr39vpci7g"; + }; + + patches = [ + (substituteAll { + src = ./exec-path.patch; + file_roller = "${file-roller}"; + gnome_bluetooth = "${gnome-bluetooth}"; + }) + ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/contractor + + cp *.contract $out/share/contractor/ + ''; + + meta = with stdenv.lib; { + description = "Extra contractor files for elementary"; + homepage = https://github.com/worldofpeace/extra-elementary-contracts; + license = licenses.gpl2; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch new file mode 100644 index 00000000000..3b97e306119 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/exec-path.patch @@ -0,0 +1,34 @@ +diff --git a/file-roller-compress.contract b/file-roller-compress.contract +index 8de5396..de7e939 100644 +--- a/file-roller-compress.contract ++++ b/file-roller-compress.contract +@@ -3,6 +3,6 @@ Name=Compress + Icon=add-files-to-archive + Description=Create a compressed archive with the selected objects + MimeType=!archive;inode/blockdevice;inode/chardevice;inode/fifo;inode/socket; +-Exec=file-roller --add %U ++Exec=@file_roller@/bin/file-roller --add %U + Gettext-Domain=file-roller + +diff --git a/file-roller-extract-here.contract b/file-roller-extract-here.contract +index 184a6f2..345f4e7 100644 +--- a/file-roller-extract-here.contract ++++ b/file-roller-extract-here.contract +@@ -3,5 +3,5 @@ Name=Extract Here + Icon=extract-archive + Description=Extract the contents of the archives in the archive folder and quit the program + MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip; +-Exec=file-roller --extract-here %U ++Exec=@file_roller@/bin/file-roller --extract-here %U + Gettext-Domain=file-roller +diff --git a/gnome-bluetooth.contract b/gnome-bluetooth.contract +index 745dbbe..8cc0102 100644 +--- a/gnome-bluetooth.contract ++++ b/gnome-bluetooth.contract +@@ -3,5 +3,5 @@ Name=Send files via Bluetooth + Icon=bluetooth + Description=Send files to device... + MimeType=!inode; +-Exec=bluetooth-sendto %F ++Exec=@gnome_bluetooth@/bin/bluetooth-sendto %F + Gettext-Domain=gnome-bluetooth2 diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix new file mode 100644 index 00000000000..ba14621e8bd --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala +, desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra +, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, gobject-introspection +, elementary-icon-theme, elementary-settings-daemon, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "gala"; + version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = "1a96644c6aac405927499dacb308dea13512e919"; + sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + versionPolicy = "master"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gettext + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + bamf + clutter + elementary-icon-theme + gnome-desktop + elementary-settings-daemon + granite + gtk3 + libcanberra + libcanberra-gtk3 + libgee + mutter + plank + ]; + + patches = [ ./plugins-dir.patch ]; + + postPatch = '' + chmod +x build-aux/meson/post_install.py + patchShebangs build-aux/meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; + homepage = https://github.com/elementary/gala; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch new file mode 100644 index 00000000000..e83308ea552 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 6b20a60..205699b 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,7 @@ conf.set_quoted('PACKAGE_VERSION', gala_version) + conf.set_quoted('DATADIR', data_dir) + conf.set_quoted('PKGDATADIR', pkgdata_dir) + conf.set_quoted('PKGLIBDIR', pkglib_dir) +-conf.set_quoted('PLUGINSDIR', plugins_dir) ++conf.set_quoted('PLUGINSDIR', '/run/current-system/sw/lib/gala/plugins') + conf.set_quoted('RELEASE_NAME', 'Window Manager.') + conf.set_quoted('VERSION', gala_version) + conf.set_quoted('VERSION_INFO', (is_release ? 'Release' : 'Development')) +@@ -83,7 +83,7 @@ add_project_arguments([ + '-DDATADIR="@0@"'.format(data_dir), + '-DPKGDATADIR="@0@"'.format(pkgdata_dir), + '-DPKGLIBDIR="@0@"'.format(pkglib_dir), +- '-DPLUGINDIR="@0@"'.format(plugins_dir), ++ '-DPLUGINDIR="@0@"'.format('/run/current-system/sw/lib/gala/plugins'), + '-DSCHEMA="org.pantheon.desktop.gala"', + '-DRESOURCEPATH="/org/pantheon/desktop/gala"', + diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch new file mode 100644 index 00000000000..264a4a5b26d --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/bc.patch @@ -0,0 +1,24 @@ +diff --git a/lib/synapse-plugins/calculator-plugin.vala b/lib/synapse-plugins/calculator-plugin.vala +index 1b5fa06..076c0c7 100644 +--- a/lib/synapse-plugins/calculator-plugin.vala ++++ b/lib/synapse-plugins/calculator-plugin.vala +@@ -51,9 +51,7 @@ namespace Synapse { + _("Calculator"), + _("Calculate basic expressions."), + "accessories-calculator", +- register_plugin, +- Environment.find_program_in_path ("bc") != null, +- _("bc is not installed")); ++ register_plugin); + } + + static construct { +@@ -90,7 +88,7 @@ namespace Synapse { + if (matched) { + Pid pid; + int read_fd, write_fd; +- string[] argv = {"bc", "-l"}; ++ string[] argv = {"@exec@", "-l"}; + string? solution = null; + + try { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix new file mode 100644 index 00000000000..e4f7df107ba --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja +, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus +, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3 +, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "applications-menu"; + version = "2.4.2"; + + name = "wingpanel-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "wingpanel-${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + cmake + ninja + gettext + gobject-introspection + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + bamf + elementary-icon-theme + gnome-menus + granite + gtk3 + json-glib + libgee + libsoup + libunity + libwnck3 + plank + switchboard + wingpanel + zeitgeist + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "lib/switchboard"; + + patches = [ + (substituteAll { + src = ./bc.patch; + exec = "${bc}/bin/bc"; + }) + ./xdg.patch + ]; + + meta = with stdenv.lib; { + description = "Lightweight and stylish app launcher for Pantheon"; + homepage = https://github.com/elementary/applications-menu; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch new file mode 100644 index 00000000000..f17e2581e07 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 928976a..7f0ea58 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS}) + + # Installation + install (TARGETS ${APPNAME} RUNTIME DESTINATION bin) +-install (FILES ${applications_menu} DESTINATION /etc/xdg/menus) ++install (FILES ${applications_menu} DESTINATION etc/xdg/menus) + file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*") + + # Settings schema diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix new file mode 100644 index 00000000000..16f3ae2e28e --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 +, ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2 +, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-bluetooth"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1gx0xglp6b3znxl4d2vpzhfkxz5z8q04hh7z2mrihj1in155bn44"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + libnotify + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Bluetooth Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-bluetooth; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch new file mode 100644 index 00000000000..2370fbcd3cb --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch @@ -0,0 +1,13 @@ +diff --git a/src/Widgets/calendar/Calendar.vala b/src/Widgets/calendar/Calendar.vala +index 76443ca..d86bd44 100644 +--- a/src/Widgets/calendar/Calendar.vala ++++ b/src/Widgets/calendar/Calendar.vala +@@ -19,7 +19,7 @@ + + namespace DateTime.Widgets { + public class Calendar : Gtk.Box { +- private const string CALENDAR_EXEC = "/usr/bin/io.elementary.calendar"; ++ private const string CALENDAR_EXEC = "@elementary-calendar@"; + + ControlHeader heading; + CalendarView cal; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix new file mode 100644 index 00000000000..ee5cd511818 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3 +, ninja, substituteAll, vala, gtk3, granite, wingpanel, evolution-data-server +, libical, libgee, libxml2, libsoup, gobject-introspection +, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-datetime"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1y7a4xjwl3bpls56ys6g3s6mh5b3qbjm2vw7b6n2i4x7a63c4cbh"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + evolution-data-server + granite + gtk3 + libgee + libical + libsoup + wingpanel + ]; + + patches = [ + (substituteAll { + src = ./calendar-exec.patch; + elementary-calendar = "${elementary-calendar}/bin/io.elementary.calendar"; + }) + # Use "clock-format" GSettings key that's been moved to granite + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch"; + sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880"; + }) + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Date & Time Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-datetime; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix new file mode 100644 index 00000000000..e2faccedbb7 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja +, substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee +, xorg, libgnomekbd, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-keyboard"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0x0bdd9svw4sffx8pa0pqlh6mrj3fqp4mgrb4n7ys26k2w20ngnb"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + libxml2 + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + wingpanel + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + libgnomekbd_path = "${libgnomekbd}/bin/"; + config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"; + }) + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + meta = with stdenv.lib; { + description = "Keyboard Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-keyboard; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch new file mode 100644 index 00000000000..58e6853e606 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/src/Indicator.vala b/src/Indicator.vala +index cd7ca49..0bef9c7 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator { + private void show_keyboard_map () { + close (); + +- string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\""; ++ string command = "@libgnomekbd_path@gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\""; + + try { + AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null); +diff --git a/src/LayoutsManager.vala b/src/LayoutsManager.vala +index 1bac80e..67df847 100644 +--- a/src/LayoutsManager.vala ++++ b/src/LayoutsManager.vala +@@ -97,7 +97,7 @@ public class Keyboard.Widgets.LayoutManager : Gtk.ScrolledWindow { + + public string? get_name_for_xkb_layout (string language, string? variant) { + debug ("get_name_for_xkb_layout (%s, %s)", language, variant); +- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); ++ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); + if (doc == null) { + critical ("'evdev.xml' not found or permissions incorrect\n"); + return null; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix new file mode 100644 index 00000000000..245e12d4591 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala +, gtk3, granite, networkmanager, networkmanagerapplet, wingpanel +, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-network"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0fch27imk5x4nfx49cwcylkxd7m289rl9niy1vx5kjplhbhyhdq2"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + networkmanager + networkmanagerapplet + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + meta = with stdenv.lib; { + description = "Network Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-network; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix new file mode 100644 index 00000000000..08b0710977f --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala +, gtk3, granite, wingpanel, libgee, libxml2, gobject-introspection +, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-nightlight"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + libxml2 + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + meta = with stdenv.lib; { + description = "Night Light Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-nightlight; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix new file mode 100644 index 00000000000..aff7d9891ad --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite +, wingpanel, libgee, libwnck3, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-notifications"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1960s3xcsx6yjlnk0csf1m66s1z1sj5rym9b2fy7pm2nan47z3ld"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libgee + libwnck3 + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + meta = with stdenv.lib; { + description = "Notifications Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-notifications; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix new file mode 100644 index 00000000000..d7627c51100 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 +, ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel +, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-power"; + version = "2.1.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "02gp9m9zkmhcl43nz02kjkcim4zm25zab3il8dhwkihh731g1c6j"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + bamf + elementary-icon-theme + granite + gtk3 + libgee + libgtop + udev + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Power Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-power; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix new file mode 100644 index 00000000000..b910f6a7180 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson +, ninja, vala, gtk3, granite, wingpanel, accountsservice +, libgee, gobject-introspection, elementary-icon-theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-session"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "15ghhiabk74m7fm5pzr2qmdwpc330jczvvkwbf5pf7qczfyipjln"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + accountsservice + elementary-icon-theme + granite + gtk3 + libgee + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + meta = with stdenv.lib; { + description = "Session Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-session; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix new file mode 100644 index 00000000000..003e431bcf7 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson +, python3, ninja, vala, gtk3, granite, wingpanel, libnotify +, pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook +, gobject-introspection, elementary-icon-theme }: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-sound"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0hxbr5dp8d1czq8ffw339r41c7srqb72vr48hxph8g091d3mcgcl"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + granite + gtk3 + libcanberra-gtk3 + libgee + libnotify + pulseaudio + wingpanel + ]; + + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Sound Indicator for Wingpanel"; + homepage = https://github.com/elementary/wingpanel-indicator-sound; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix new file mode 100644 index 00000000000..a5ca227bbc2 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja +, vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib +, python3, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "wingpanel"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1knkqh9q6yp7qf27zi6ki20fq4w0ia2hklvv84ivfmfa0irz0j6r"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gettext + glib-networking + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + gala + granite + gtk3 + json-glib + libgee + mutter + ]; + + patches = [ ./indicators.patch ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "The extensible top panel for Pantheon"; + longDescription = '' + Wingpanel is an empty container that accepts indicators as extensions, + including the applications menu. + ''; + homepage = https://github.com/elementary/wingpanel; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch b/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch new file mode 100644 index 00000000000..68a5fd532a8 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch @@ -0,0 +1,21 @@ +diff --git a/lib/IndicatorManager.vala b/lib/IndicatorManager.vala +index a99a1ec..0ae7799 100644 +--- a/lib/IndicatorManager.vala ++++ b/lib/IndicatorManager.vala +@@ -115,7 +115,15 @@ public class Wingpanel.IndicatorManager : GLib.Object { + } + + /* load indicators */ +- var base_folder = File.new_for_path (Build.INDICATORS_DIR); ++ ++ var indicators_path = Environment.get_variable("WINGPANEL_INDICATORS_PATH"); ++ if (indicators_path != null) { ++ debug ("WINGPANEL_INDICATORS_PATH set to %s", indicators_path); ++ } else { ++ critical ("WINGPANEL_INDICATORS_PATH not set"); ++ } ++ ++ var base_folder = File.new_for_path (indicators_path); + + try { + monitor = base_folder.monitor_directory (FileMonitorFlags.NONE, null); diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix new file mode 100644 index 00000000000..cfae604d3a5 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -0,0 +1,23 @@ +{ lib, makeWrapper, symlinkJoin, wingpanel, wingpanelIndicators, switchboard-with-plugs, indicators ? null }: + +let + selectedIndicators = if indicators == null then wingpanelIndicators else indicators; +in +symlinkJoin { + name = "${wingpanel.name}-with-indicators"; + + paths = [ wingpanel ] ++ selectedIndicators; + + buildInputs = [ makeWrapper ]; + + # We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu + # has a plugin to search switchboard settings + postBuild = '' + wrapProgram $out/bin/wingpanel \ + --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \ + --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \ + --suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators} + ''; + + inherit (wingpanel) meta; +} diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index eacb84e3361..66ba331ddcd 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, gobject-introspection, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "granite"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh"; + sha256 = "10ddq1s2w4jvpzq813cylmqhh8pggzaz890fy3kzg07275i98gah"; }; patches = [ - # Add Meson support that hit after 5.2.2 - (fetchpatch { - url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch"; - sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85"; - }) - (fetchpatch { - url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch"; - sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs"; - }) # Resolve the circular dependency between granite and the datetime wingpanel indicator # See: https://github.com/elementary/granite/pull/242 - ./02-datetime-clock-format-gsettings.patch + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch"; + sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq"; + }) ]; + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + nativeBuildInputs = [ gettext gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + vala wrapGAppsHook ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { glib gtk3 hicolor-icon-theme - gnome3.libgee + libgee ]; postPatch = '' @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/elementary/granite; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ vozz worldofpeace ]; + maintainers = pantheon.maintainers; }; } diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix new file mode 100644 index 00000000000..59983469c11 --- /dev/null +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "cerbere"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0f9jr6q5z6nir5b77f96wm9rx6r6s9i0sr1yrymg3n7jyjgrvdwp"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + glib + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "A simple service to ensure uptime of essential processes"; + homepage = https://github.com/elementary/cerbere; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; + +} diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix new file mode 100644 index 00000000000..a979b134195 --- /dev/null +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "contractor"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1jzqv7pglhhyrkj1pfk1l624zn1822wyl5dp6gvwn4sk3iqxwwhl"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + dbus + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + ]; + + buildInputs = [ + glib + glib-networking + libgee + ]; + + PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "share/dbus-1/services"; + + meta = with stdenv.lib; { + description = "A desktop-wide extension service used by elementary OS"; + homepage = https://github.com/elementarycontractor; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix new file mode 100644 index 00000000000..e77948ccf29 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala +, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "capnet-assist"; + version = "2.2.3"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + gcr + granite + gtk3 + libgee + webkitgtk + ]; + + # Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3 + patches = [ ./remove-capnet-test.patch ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "A small WebKit app that assists a user with login when a captive portal is detected"; + homepage = https://github.com/elementary/capnet-assist; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch b/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch new file mode 100644 index 00000000000..a59c74f22b3 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 46c594b..ba0ea10 100644 +--- a/meson.build ++++ b/meson.build +@@ -33,8 +33,3 @@ meson.add_install_script('meson/post_install.py') + + subdir('data') + subdir('po') +- +-install_data( +- '90captive_portal_test', +- install_dir: join_paths(get_option('sysconfdir'), 'NetworkManager', 'dispatcher.d') +-) diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix new file mode 100644 index 00000000000..4dab02d5083 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, pantheon, makeWrapper, lib, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "dpms-helper"; + version = "1.0"; + + name = "elementary-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + attrPath = "elementary-${pname}"; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + makeWrapper + meson + ninja + wrapGAppsHook + ]; + + buildInputs = [ + elementary-settings-daemon + glib + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ glib.dev coreutils ]}") + ''; + + postFixup = '' + substituteInPlace $out/etc/xdg/autostart/io.elementary.dpms-helper.desktop \ + --replace "Exec=io.elementary.dpms-helper" "Exec=$out/bin/io.elementary.dpms-helper" + ''; + + # See: https://github.com/elementary/dpms-helper/pull/10 + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = with stdenv.lib; { + description = "Sets DPMS settings found in org.pantheon.dpms"; + homepage = https://github.com/elementary/dpms-helper; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix new file mode 100644 index 00000000000..3829cf551f7 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -0,0 +1,118 @@ +{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit +, geocode-glib, gtk3 +, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager +, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }: + +stdenv.mkDerivation rec { + pname = "elementary-settings-daemon"; + version = "3.30.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/gnome-settings-daemon-${version}.tar.xz"; + sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; + }; + + # Source for ubuntu's patchset + src2 = fetchgit { + url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon"; + rev = "refs/tags/ubuntu/${version}-1ubuntu1"; + sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; + }; + + # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. + # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 + # + # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. + patches = let patchPath = "${src2}/debian/patches"; in [ + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" + "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" + "${patchPath}/correct_logout_action.patch" + "${patchPath}/ubuntu-lid-close-suspend.patch" + "${patchPath}/revert-wacom-migration.patch" + "${patchPath}/revert-gsettings-removals.patch" + "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" + "${patchPath}/ubuntu_ibus_configs.patch" + (fetchurl { + url = "https://github.com/elementary/os-patches/raw/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch"; + sha256 = "0kh508ppiv4nvkg30gmw85cljlfq1bvkzhvf1iaxw0snb0mwgsxi"; + }) + ]; + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; + + postFixup = '' + for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done + + for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart) + do + echo "Patching OnlyShowIn to Pantheon in: $autostart" + sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart + done + + # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 + rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop + ''; + + nativeBuildInputs = [ + docbook_xsl + gettext + libxml2 + libxslt + meson + ninja + perl + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + accountsservice + alsaLib + colord + geoclue2 + geocode-glib + glib + gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas + gtk3 + ibus + lcms2 + libXtst + libcanberra-gtk3 + libgudev + libgweather + libnotify + libpulseaudio + librsvg + libwacom + libxkbfile + networkmanager + nss + polkit + udev + upower + xf86_input_wacom + xkeyboard_config + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + ]; + + meta = with stdenv.lib; { + license = licenses.gpl2Plus; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch new file mode 100644 index 00000000000..2229302cab7 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -0,0 +1,15 @@ +--- a/plugins/datetime/tz.h ++++ b/plugins/datetime/tz.h +@@ -27,11 +27,7 @@ + + #include <glib.h> + +-#ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" +-#else +-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" +-#endif ++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + + typedef struct _TzDB TzDB; + typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix new file mode 100644 index 00000000000..2487c4ba3af --- /dev/null +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, vala, glib +, gtk3, libgee, desktop-file-utils, geoclue2, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "pantheon-agent-geoclue2"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "0fww65dnbg9zn0gy1q2db39kjra50ykzw05pmn9iwxkijyxi8hm5"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + geoclue2 + gtk3 + libgee + ]; + + # This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21 + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = with stdenv.lib; { + description = "Pantheon Geoclue2 Agent"; + homepage = https://github.com/elementary/pantheon-agent-geoclue2; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix new file mode 100644 index 00000000000..4fdaa4a8bf9 --- /dev/null +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja +, vala, gtk3, libgee, polkit, gobject-introspection, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "pantheon-agent-polkit"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1g9l2jzpvv0dbvxh93w98a7ijsfqv3s3382li4s256179gihhd67"; + }; + + passthru = { + updateScript = pantheon.updateScript { + repoName = pname; + }; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgee + polkit + ]; + + meta = with stdenv.lib; { + description = "Polkit Agent for the Pantheon Desktop"; + homepage = https://github.com/elementary/pantheon-agent-polkit; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix new file mode 100644 index 00000000000..48fd2f2bf85 --- /dev/null +++ b/pkgs/desktops/pantheon/update.nix @@ -0,0 +1,18 @@ +{ stdenv, writeScript, runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }: +{ repoName, attrPath ? repoName, versionPolicy ? "release" }: +let + script = ./update.sh; + + updateScript = runCommand "update.sh" { + inherit bash git jq nix coreutils gnugrep gnused curl; + # These weren't being substituted + nix_prefetch_scripts = nix-prefetch-scripts; + common_updater_scripts = common-updater-scripts; + } '' + substituteAll ${script} $out + chmod +x $out + ''; + + versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy}; + +in [ updateScript versionFlag repoName attrPath ] diff --git a/pkgs/desktops/pantheon/update.sh b/pkgs/desktops/pantheon/update.sh new file mode 100755 index 00000000000..9bbbe260034 --- /dev/null +++ b/pkgs/desktops/pantheon/update.sh @@ -0,0 +1,223 @@ +#!@bash@/bin/bash +PATH=@bash@/bin:@nix_prefetch_scripts@/bin:@common_updater_scripts@/bin:@git@/bin:@jq@/bin:@nix@/bin:@gnugrep@/bin:@gnused@/bin:@curl@/bin:$PATH +#!/usr/bin/env bash + +set -eu -o pipefail + +# +# ─── HOW TO USE ───────────────────────────────────────────────────────────────── +# + +function usage ( ) { + cat <<EOF +Usage: update.sh <repo_name> <attr> +EOF +} + +# +# ─── POINTS YOU IN THE RIGHT DIRECTION ────────────────────────────────────────── +# + + function usage_tip ( ) { + echo 'run `update.sh -h` for usage instructions' >&2 + exit 1 + } + +# +# ─── OPTIONS: RELEASE | MASTER ──────────────────────────────────────────────────── +# + + while getopts ":hrm" opt; do + case $opt in + r) + release=1 + master=0 + ;; + m) + master=1 + release=0 + ;; + h) + usage + exit + ;; + ?) + echo "Invalid option: -$OPTARG" >&2 + usage_tip + ;; + esac + done + + shift $((OPTIND-1)) + +# +# ─── FAIL WITH MESSAGE AND NON-ZERO EXIT STATUS ───────────────────────────────── +# + + function fail ( ) { + echo "$1" >&2 + exit 1 + } + +# +# ─── UPDATES PACKAGE TO LATEST TAGGED RELEASE ─────────────────────────────── +# + + function update_to_latest_release ( ) { + repo_name="$1" + attr="$2" + + version=$(get_latest_tag "$repo_name") + fetch=$(fetch "$repo_name" "refs/tags/${version}") + sha256=$(get_hash "${fetch}") + + update-source-version "pantheon.$attr" "$version" "$sha256" + + nix_file=$(get_file_path $attr) + + if [ ! -f "$nix_file" ]; then + fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!" + fi + + correct_rev "$attr" "$nix_file" "version" + } + +# +# ─── UPDATES PACKAGE TO MASTER ────────────────────────────────────────────────── +# + + function update_to_master ( ) { + repo_name="$1" + attr="$2" + + fetch=$(fetch "$repo_name" "refs/heads/master") + + version=$(get_version "$fetch") + sha256=$(get_hash "$fetch") + proper_version=$(get_master_date "$fetch") + + update-source-version "pantheon.$attr" "$proper_version" "$sha256" + + nix_file=$(get_file_path $attr) + + if [ ! -f "$nix_file" ]; then + fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!" + fi + + correct_rev "$attr" "$nix_file" '"'$version'"' + } + +# +# ─── GETS THE LATEST TAGGED RELEASE NAME FROM GITHUB ───────────────────── +# + + function get_latest_tag ( ) { + repo_name="$1" + + # Using github release api because sorting this repo just doesn't work because of old git sillyness + # Also too lazy to care to adapt `git ls-remote` command to work with it + if [ $repo_name == "switchboard-plug-pantheon-shell" ]; then + curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name' + else + git ls-remote --tags --sort="v:refname" "https://github.com/elementary/$repo_name" | tail -n1 | sed 's/.*\///; s/\^{}//' + fi + } + +# +# ─── FETCHES REPO AND RETURNS RELEVANT INFORMATION ────────────────── +# + + function fetch ( ) { + repo_name="$1" + version="$2" + + base_url="https://github.com/elementary" + full_url="$base_url/$repo_name" + + nix-prefetch-git --quiet --no-deepClone --url "$full_url" --rev "$version" + } + +# +# ─── PARSES GIT REVISION FROM FETCH ───────────────────────────────────────────── +# + + function get_version ( ) { + fetch_info="$1" + + echo "$fetch_info" | jq -r '.rev' + } + +# +# ─── PARSES HASH FROM FETCH ───────────────────────────────────────────────────── +# + + function get_hash ( ) { + fetch_info="$1" + + echo "$fetch_info" | jq -r '.sha256' + } + +# +# ─── PARSES DATE FROM FETCH AND NORMALIZES IT TO NIXPKGS STANDARD ─────────────── +# + + function get_master_date ( ) { + fetch_info="$1" + + full_date=$(echo "$fetch_info" | jq -r '.date') + short_date=$(date -d "$full_date" +"%Y-%m-%d") + + echo "unstable-$short_date" + } + +# +# ─── RETURN NIX EXPRESSION PATH ───────────────────────────────────────────────── +# + + function get_file_path () { + attr="$1" + + nix-instantiate --eval --strict -A "pantheon.$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/' + } + +# +# ─── CORRECTS REV VERSION ─────────────────────────────────────────────────────────── +# + + function correct_rev ( ) { + attr="$1" + nix_file="$2" + rev="$3" + + check_pattern1='^\s*rev\s*=\s*"[0-9a-f]{5,40}"' + check_pattern2='^\s*rev\s*=\s*version' + + replace_pattern1='/\brev\b\s*=/ s|\"[0-9a-f]{5,40}\"|'$rev'|' + replace_pattern2='/\brev\b\s*=/ s|version|'$rev'|' + + if [ $(grep -c -P "$check_pattern1" "$nix_file") = 1 ]; then + pattern="$replace_pattern1" + elif [ $(grep -c -P "$check_pattern2" "$nix_file") = 1 ]; then + pattern="$replace_pattern2" + else + fail "Couldn't figure out where out where to patch in the correct version in pantheon.$attr!" + fi + + sed -i.bak "$nix_file" -re "$pattern" + rm -f "$nix_file.bak" + } + + +# +# ─── WHETHER TO UPDATE TO RELEASE OR MASTER ────────────────────────────────── +# + + if [ $release = 1 ]; then + update_to_latest_release $1 $2 + elif [ $master = 1 ]; then + update_to_master $1 $2 + else + exit 1 + fi + +# ──────────────────────────────────────────────────────────────────────────────── diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index cc51c4b0471..1be3fe1c309 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }: +{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }: let inherit (lib) getLib; in mkDerivation { name = "breeze-gtk"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ]; buildInputs = [ qtbase ]; postPatch = '' sed -i cmake/FindGTKEngine.cmake \ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 57b11f970f2..510ebf69fff 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.2/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index dd5f7321f0e..4fac5645d1c 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -9,12 +9,12 @@ index 69d30705..52e91028 100644 -background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png +background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt -index cb75aeca..247db953 100644 +index 6a1a2121..f03fd349 100644 --- a/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt -@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) - add_subdirectory(ksyncdbusenv) +@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv) add_subdirectory(waitforname) + add_subdirectory(kcheckrunning) -#FIXME: reconsider, looks fishy -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") @@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 714a9bf1..9733c612 100644 +index b68f0c68..a18efd96 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -81,7 +81,7 @@ index 714a9bf1..9733c612 100644 fi # Boot sequence: -@@ -33,61 +42,133 @@ fi +@@ -33,62 +42,134 @@ fi # # * Then ksmserver is started which takes control of the rest of the startup sequence @@ -176,6 +176,7 @@ index 714a9bf1..9733c612 100644 -ksplashrc KSplash Theme Breeze +ksplashrc KSplash Theme org.kde.breeze.desktop ksplashrc KSplash Engine KSplashQML + kdeglobals KScreen ScaleFactor '' kdeglobals KScreen ScreenScaleFactors '' kcmfonts General forceFontDPI 0 +kcmfonts General dontChangeAASettings true @@ -244,7 +245,7 @@ index 714a9bf1..9733c612 100644 #Do not sync any of this section with the wayland versions as there scale factors are #sent properly over wl_output -@@ -99,26 +180,33 @@ fi +@@ -104,26 +185,33 @@ fi #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us export QT_AUTO_SCREEN_SCALE_FACTOR=0 @@ -291,7 +292,7 @@ index 714a9bf1..9733c612 100644 Xft.dpi: $kcmfonts_general_forcefontdpi EOF fi -@@ -127,11 +215,11 @@ dl=$DESKTOP_LOCKED +@@ -132,11 +220,11 @@ dl=$DESKTOP_LOCKED unset DESKTOP_LOCKED # Don't want it in the environment ksplash_pid= @@ -305,7 +306,7 @@ index 714a9bf1..9733c612 100644 ;; None) ;; -@@ -140,69 +228,6 @@ if test -z "$dl"; then +@@ -145,27 +233,6 @@ if test -z "$dl"; then esac fi @@ -330,52 +331,10 @@ index 714a9bf1..9733c612 100644 - done -done - --# Activate the kde font directories. --# --# There are 4 directories that may be used for supplying fonts for KDE. --# --# There are two system directories. These belong to the administrator. --# There are two user directories, where the user may add her own fonts. --# --# The 'override' versions are for fonts that should come first in the list, --# i.e. if you have a font in your 'override' directory, it will be used in --# preference to any other. --# --# The preference order looks like this: --# user override, system override, X, user, system --# --# Where X is the original font database that was set up before this script --# runs. -- --usr_odir=$HOME/.fonts/kde-override --usr_fdir=$HOME/.fonts -- --if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -- sys_odir=$kdedirs_first/share/fonts/override -- sys_fdir=$kdedirs_first/share/fonts --else -- sys_odir=$KDEDIR/share/fonts/override -- sys_fdir=$KDEDIR/share/fonts --fi -- --# We run mkfontdir on the user's font dirs (if we have permission) to pick --# up any new fonts they may have installed. If mkfontdir fails, we still --# add the user's dirs to the font path, as they might simply have been made --# read-only by the administrator, for whatever reason. -- --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -- --# Ask X11 to rebuild its font list. --xset fp rehash -- # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two -@@ -257,44 +282,65 @@ export XDG_DATA_DIRS +@@ -221,44 +288,65 @@ export XDG_DATA_DIRS # KDE_FULL_SESSION=true export KDE_FULL_SESSION @@ -454,7 +413,7 @@ index 714a9bf1..9733c612 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -270,12 +358,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -474,7 +433,7 @@ index 714a9bf1..9733c612 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 -@@ -322,36 +372,36 @@ fi +@@ -286,36 +378,36 @@ fi #Anything after here is logout #It is not called after shutdown/restart @@ -525,7 +484,7 @@ index 714a9bf1..9733c612 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index de98541c..39c0b521 100644 +index 1fe41c59..39c0b521 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -573,62 +532,14 @@ index de98541c..39c0b521 100644 ;; None) ;; -@@ -50,48 +48,6 @@ fi - #In wayland we want Plasma to use Qt's scaling - export PLASMA_USE_QT_SCALING=1 - --# Activate the kde font directories. --# --# There are 4 directories that may be used for supplying fonts for KDE. --# --# There are two system directories. These belong to the administrator. --# There are two user directories, where the user may add her own fonts. --# --# The 'override' versions are for fonts that should come first in the list, --# i.e. if you have a font in your 'override' directory, it will be used in --# preference to any other. --# --# The preference order looks like this: --# user override, system override, X, user, system --# --# Where X is the original font database that was set up before this script --# runs. -- --usr_odir=$HOME/.fonts/kde-override --usr_fdir=$HOME/.fonts -- --if test -n "$KDEDIRS"; then -- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` -- sys_odir=$kdedirs_first/share/fonts/override -- sys_fdir=$kdedirs_first/share/fonts --else -- sys_odir=$KDEDIR/share/fonts/override -- sys_fdir=$KDEDIR/share/fonts --fi -- --# We run mkfontdir on the user's font dirs (if we have permission) to pick --# up any new fonts they may have installed. If mkfontdir fails, we still --# add the user's dirs to the font path, as they might simply have been made --# read-only by the administrator, for whatever reason. -- --test -d "$sys_odir" && xset +fp "$sys_odir" --test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") --test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") --test -d "$sys_fdir" && xset fp+ "$sys_fdir" -- --# Ask X11 to rebuild its font list. --xset fp rehash -- - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard - # from some users that they're confused and don't know what to do. This is - # especially necessary on slow machines, where starting KDE takes one or two -@@ -100,22 +56,13 @@ xset fp rehash +@@ -58,23 +56,13 @@ export PLASMA_USE_QT_SCALING=1 # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # -xsetroot -cursor_name left_ptr - -# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap +-usr_fdir=$HOME/.fonts -if test -n "$GS_LIB" ; then - GS_LIB=$usr_fdir:$GS_LIB - export GS_LIB @@ -648,7 +559,7 @@ index de98541c..39c0b521 100644 # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then -@@ -131,16 +78,15 @@ fi +@@ -90,16 +78,15 @@ fi # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. @@ -667,7 +578,7 @@ index de98541c..39c0b521 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -166,19 +112,19 @@ fi +@@ -125,19 +112,19 @@ fi #Anything after here is logout #It is not called after shutdown/restart @@ -695,7 +606,7 @@ index de98541c..39c0b521 100644 done break fi -@@ -187,15 +133,17 @@ fi +@@ -146,15 +133,17 @@ fi echo 'startplasma: Shutting down...' 1>&2 # just in case @@ -718,7 +629,7 @@ index de98541c..39c0b521 100644 echo 'startplasma: Done.' 1>&2 diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index dd9e304d..12132f9e 100644 +index dcb473a4..48dbf465 100644 --- a/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake @@ -1,118 +1,165 @@ @@ -922,18 +833,18 @@ index dd9e304d..12132f9e 100644 #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output export QT_AUTO_SCREEN_SCALE_FACTOR=0 --# XCursor mouse theme needs to be applied here to work even for kded or ksmserver --if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then -- @EXPORT_XCURSOR_PATH@ +XCURSOR_PATH=~/.icons +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" +for xdgDir in "${xdgDirs[@]}"; do + XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" +done +export XCURSOR_PATH - ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver +-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then +- @EXPORT_XCURSOR_PATH@ +- - # TODO: is kapplymousetheme a core app? -+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver +if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" - if test $? -eq 10; then @@ -1018,7 +929,7 @@ index dd9e304d..12132f9e 100644 : # ok else echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 -@@ -212,26 +228,47 @@ export KDE_FULL_SESSION +@@ -212,7 +228,7 @@ export KDE_FULL_SESSION KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION @@ -1027,7 +938,9 @@ index dd9e304d..12132f9e 100644 export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE - export XDG_CURRENT_DESKTOP +@@ -221,20 +237,41 @@ export XDG_CURRENT_DESKTOP + XDG_SESSION_TYPE=wayland + export XDG_SESSION_TYPE +# Source scripts found in <config locations>/plasma-workspace/env/*.sh +# (where <config locations> correspond to the system and user's configuration diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 9fc1c7b6a9a..0a0a9015de3 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/bluedevil-5.14.4.tar.xz"; - sha256 = "04c7nwlmwkdmqjxxy9wz2sdb9nx40vzln150iyw6bpw8vix5wwkv"; - name = "bluedevil-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/bluedevil-5.15.2.tar.xz"; + sha256 = "1d6dq7kgxni7hj5cdfqlb2ff3ddy30a82w80nxfwshzp1xbdljzw"; + name = "bluedevil-5.15.2.tar.xz"; }; }; breeze = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-5.14.4.tar.xz"; - sha256 = "0xdnfnvkzy96wn4y670wq1xq4jla8pqr2pwy4z4flhck61a0s7nf"; - name = "breeze-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-5.15.2.tar.xz"; + sha256 = "0m2fpcbi3fsj9a3j3ry7l7f38whm38mpprap86v40m4zcv3wcav8"; + name = "breeze-5.15.2.tar.xz"; }; }; breeze-grub = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-grub-5.14.4.tar.xz"; - sha256 = "1q21frlacgjyl5r6x32ihzsy25rihdpc18hg0qdcar1zq5hmk7b1"; - name = "breeze-grub-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-grub-5.15.2.tar.xz"; + sha256 = "18rm4h395w8x3yrirl53402qiiz7yc4i3iw5ncmd0184jhl6n7z5"; + name = "breeze-grub-5.15.2.tar.xz"; }; }; breeze-gtk = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-gtk-5.14.4.tar.xz"; - sha256 = "0aqj4ap1j9pajk211pbx7a692gm89kjdfh3lpbrrsi1bnq1rcq94"; - name = "breeze-gtk-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-gtk-5.15.2.tar.xz"; + sha256 = "0fbxfsjyxjk9shrjiz5w9x3v5jk3f4csw2rryk7kdk5q1m5ppfjw"; + name = "breeze-gtk-5.15.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/breeze-plymouth-5.14.4.tar.xz"; - sha256 = "1q9z5d96rrm8m3kjg3vi82az7a4c7h5n4mj736867nbcy4slqwk7"; - name = "breeze-plymouth-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/breeze-plymouth-5.15.2.tar.xz"; + sha256 = "0n6pr4k9jc3ivi0dhrrfv9xhf0p4irxbpghx3m3b860jwmm5d4zh"; + name = "breeze-plymouth-5.15.2.tar.xz"; }; }; discover = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/discover-5.14.4.tar.xz"; - sha256 = "0pivys2ygpzyi3ykyqslnh1c429f722mk5raa4h4krl8aa5cwwni"; - name = "discover-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/discover-5.15.2.tar.xz"; + sha256 = "0v9wnsgqxa4vbvgdsgpm54hnw8dsxahapl42vkf0xjfx101f3y62"; + name = "discover-5.15.2.tar.xz"; }; }; drkonqi = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/drkonqi-5.14.4.tar.xz"; - sha256 = "1fyz5wxmilar01x94i46mzfg5nvkqanx2xsw8bwkzqmnd8ndmnmi"; - name = "drkonqi-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/drkonqi-5.15.2.tar.xz"; + sha256 = "085dv4ga7gvycs470v594i5j8s55aygalx52fcbbncji8r1x0zdv"; + name = "drkonqi-5.15.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kactivitymanagerd-5.14.4.tar.xz"; - sha256 = "1ahfsqqgwlcsfy5d86i35kz8m90iarldnmlhsqw2bqk9al0qnsgm"; - name = "kactivitymanagerd-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kactivitymanagerd-5.15.2.tar.xz"; + sha256 = "1bldpay46gww1m0087bdrl64paw2466mnnr10w3qv1c2g3w4aiky"; + name = "kactivitymanagerd-5.15.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kde-cli-tools-5.14.4.tar.xz"; - sha256 = "11gkplnn95c78rdr0qs2hr08qv6scplsrff2nrz0n3g8sdplz2yy"; - name = "kde-cli-tools-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kde-cli-tools-5.15.2.tar.xz"; + sha256 = "1b178szx0ansd9srkj1rzqcc1ijfvs92vg870plzqy4ygg94yc32"; + name = "kde-cli-tools-5.15.2.tar.xz"; }; }; kdecoration = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kdecoration-5.14.4.tar.xz"; - sha256 = "10nqshn8jj5dvrmdzn2x62lpa99d3q9wq7pv9q7lkbianlic3zzk"; - name = "kdecoration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kdecoration-5.15.2.tar.xz"; + sha256 = "1gyy55j0bs1adglqq8wjy284pdp3vm9bj51q7h7q7yz2khk8kc3r"; + name = "kdecoration-5.15.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kde-gtk-config-5.14.4.tar.xz"; - sha256 = "1dmx9pd404jy03k7wgh0xjdpxn2nmz8mbg6ysjvw1z89ggm4dxy8"; - name = "kde-gtk-config-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kde-gtk-config-5.15.2.tar.xz"; + sha256 = "07ng7nynmfn23zssbawn4xjnj8sqkqsdv1nv29pkhda82bpji5a4"; + name = "kde-gtk-config-5.15.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kdeplasma-addons-5.14.4.tar.xz"; - sha256 = "0sdrkjsh4a4i7iv49m9s8rjp40bzarq8i3w4c64w6446jz66g4j9"; - name = "kdeplasma-addons-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kdeplasma-addons-5.15.2.tar.xz"; + sha256 = "0c1j9830n5vyqjmyclljkxhgmgyhhzm4ck9zm5cnjf1s5x9hqdly"; + name = "kdeplasma-addons-5.15.2.tar.xz"; }; }; kgamma5 = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kgamma5-5.14.4.tar.xz"; - sha256 = "028alj0768pc2zb7h613vcxs8zsqgd6nn4lpni4c8l25n5wzyd11"; - name = "kgamma5-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kgamma5-5.15.2.tar.xz"; + sha256 = "06qp20dnvqg0bcf09iwhwcqbkyz85z27cp811vg72nq6vqpd98sy"; + name = "kgamma5-5.15.2.tar.xz"; }; }; khotkeys = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/khotkeys-5.14.4.tar.xz"; - sha256 = "033syji5mwd0il6d71p3r2dgqvs3lb5ybxkjb4m54sffbb0glrx2"; - name = "khotkeys-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/khotkeys-5.15.2.tar.xz"; + sha256 = "18hjlvvbnid6j77pnr515kglllsidx8dgrx5sbvy9myvsd47wlki"; + name = "khotkeys-5.15.2.tar.xz"; }; }; kinfocenter = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kinfocenter-5.14.4.tar.xz"; - sha256 = "1nh9dg37dnl2b11l400dswaf8qf8qspck0pdr7svrncv2yn3zirc"; - name = "kinfocenter-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kinfocenter-5.15.2.tar.xz"; + sha256 = "0wag0md22dvnz897s535qigsimmcis7i9fsngq1hbqz22rx7x5pw"; + name = "kinfocenter-5.15.2.tar.xz"; }; }; kmenuedit = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kmenuedit-5.14.4.tar.xz"; - sha256 = "09lafgcxv2v745m04ljgsqgflw3j3ydx17974c1c7qfgr255994g"; - name = "kmenuedit-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kmenuedit-5.15.2.tar.xz"; + sha256 = "1xjnj40m86sdyna9xm5bj0m4mnmqrpkpg9gnhr1naqwqxaahvvyk"; + name = "kmenuedit-5.15.2.tar.xz"; }; }; kscreen = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kscreen-5.14.4.tar.xz"; - sha256 = "1cqlhi4r1qli2izrj64x07cwz1k0qxclr0ckgkfx2lzdgp00gc96"; - name = "kscreen-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kscreen-5.15.2.tar.xz"; + sha256 = "1vzp98cjhpbp565rfa1id1pcyir4hagmrz020jjn0gb2dfk6wrsv"; + name = "kscreen-5.15.2.tar.xz"; }; }; kscreenlocker = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kscreenlocker-5.14.4.tar.xz"; - sha256 = "1fpknd22d1lr63d203k1m7w09d2dxg80a5r83jhxs439y9winwz2"; - name = "kscreenlocker-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kscreenlocker-5.15.2.tar.xz"; + sha256 = "09b3zb95psg3gwg1lcnqsrw6llg7bdlq97zsg373gs4ljlmdgwms"; + name = "kscreenlocker-5.15.2.tar.xz"; }; }; ksshaskpass = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/ksshaskpass-5.14.4.tar.xz"; - sha256 = "1cj6w9kqjg7qxq7xdn227xy6wnmpv72s08wdphhpv1lhpafgf0pm"; - name = "ksshaskpass-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/ksshaskpass-5.15.2.tar.xz"; + sha256 = "1nf8s8vdgbak8sys9fw53xfcjpy1hnq1jjyxfyw22fhz2qnx4a7p"; + name = "ksshaskpass-5.15.2.tar.xz"; }; }; ksysguard = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/ksysguard-5.14.4.tar.xz"; - sha256 = "0gqji22k1pvs89zr6f5y71v2rma3p2ypp9ld449jn6rlizyfski1"; - name = "ksysguard-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/ksysguard-5.15.2.tar.xz"; + sha256 = "1n38kc9m7jkimxrh0lqff9zz82jap0qv69l3490zsl70pgbhgwdn"; + name = "ksysguard-5.15.2.tar.xz"; }; }; kwallet-pam = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwallet-pam-5.14.4.tar.xz"; - sha256 = "15656m50xly9x7j2min813pr5lk7ymyb82is2s1lmfggrxghqjiq"; - name = "kwallet-pam-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwallet-pam-5.15.2.tar.xz"; + sha256 = "12hjg6cwgh4h85hfyw3mdpci9p6s6h6z7i6s2hhnsvfr2zm6nq6z"; + name = "kwallet-pam-5.15.2.tar.xz"; }; }; kwayland-integration = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwayland-integration-5.14.4.tar.xz"; - sha256 = "02w048f366mikpbqmjpliyrali7gd2flfjbv9nfgzhld9ixx1wwq"; - name = "kwayland-integration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwayland-integration-5.15.2.tar.xz"; + sha256 = "1j076lmkgm1m1ymrpkmzh7yq4sk8qv12ggrczb9ri2gimklghmav"; + name = "kwayland-integration-5.15.2.tar.xz"; }; }; kwin = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwin-5.14.4.tar.xz"; - sha256 = "0g9j394q7a2fk6wb2np7rjr1icdz9sr6iqjsicr881j088vxsini"; - name = "kwin-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwin-5.15.2.tar.xz"; + sha256 = "112xysqgffw718272praaym86kbbq01rwjf9w1sv3b8i1lbrfjfy"; + name = "kwin-5.15.2.tar.xz"; }; }; kwrited = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/kwrited-5.14.4.tar.xz"; - sha256 = "1c8zwvc672a1z4dj8qq1wma5a8lm0kvyxki4kacx7n9xfrh54njv"; - name = "kwrited-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/kwrited-5.15.2.tar.xz"; + sha256 = "0inm1ry62p23ivad0k3p5cwk8hwirrk7incpx8znd755pr5905hy"; + name = "kwrited-5.15.2.tar.xz"; }; }; libkscreen = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/libkscreen-5.14.4.tar.xz"; - sha256 = "1n56fb6sxjyh73lb17s44yjlfhyqx2n3q320vncjx2jxxh0an80z"; - name = "libkscreen-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/libkscreen-5.15.2.tar.xz"; + sha256 = "051carpksbh3n25cvd6i504jjjzmqzh0dj9p5chqmyfcp7m0lvm4"; + name = "libkscreen-5.15.2.tar.xz"; }; }; libksysguard = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/libksysguard-5.14.4.tar.xz"; - sha256 = "1nflk9vr2s2mc8ddl0rjvvh9iks4vwvf8ahlskqc068xm8ja0cr2"; - name = "libksysguard-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/libksysguard-5.15.2.tar.xz"; + sha256 = "058yajija7d7zvyv9vfyxbmj2y5amrv96mkbypqcdmzx69x5ig4c"; + name = "libksysguard-5.15.2.tar.xz"; }; }; milou = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/milou-5.14.4.tar.xz"; - sha256 = "1dkkr5zinia1zy439rm1sdz6r8hix1l4w8bw9rwwbk6yydvp2mkf"; - name = "milou-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/milou-5.15.2.tar.xz"; + sha256 = "0y7dbjhwbk7gnjpxsn2rddp3i3a02hfwiyx9070lm6am3lvlj8r8"; + name = "milou-5.15.2.tar.xz"; }; }; oxygen = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/oxygen-5.14.4.tar.xz"; - sha256 = "1rdxisnrmyywbanvchs57fr37d3ilakg83b78v8z6ji0jiy1wk0z"; - name = "oxygen-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/oxygen-5.15.2.tar.xz"; + sha256 = "1vrcdj61ii391swqxjbsfccmv854vg8zsbvjxb78a6fp6k11wivj"; + name = "oxygen-5.15.2.tar.xz"; }; }; plasma-browser-integration = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-browser-integration-5.14.4.tar.xz"; - sha256 = "0gwdi6mqfmv7hpdbhklxcxy07awvm9k22vj4wmzca3h7k334l35m"; - name = "plasma-browser-integration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-browser-integration-5.15.2.tar.xz"; + sha256 = "00mp7wwk0jz7wrkii5yq58amsw54dyjcprp3w58phvydam2d3n79"; + name = "plasma-browser-integration-5.15.2.tar.xz"; }; }; plasma-desktop = { - version = "5.14.4.1"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-desktop-5.14.4.1.tar.xz"; - sha256 = "0qcmqm9dag6xjfdn5zlbcpksbc70z3bwpc0dg5s315bdv2jha8c4"; - name = "plasma-desktop-5.14.4.1.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-desktop-5.15.2.tar.xz"; + sha256 = "1axlkjmgf3chg9wl13j91vmfik0va8lngq45y0xr15lc88w6qms0"; + name = "plasma-desktop-5.15.2.tar.xz"; }; }; plasma-integration = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-integration-5.14.4.tar.xz"; - sha256 = "0jjfb0gx51zglcn59xzz8306zm55b6nsd057vkwddinq5qi3x938"; - name = "plasma-integration-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-integration-5.15.2.tar.xz"; + sha256 = "0glj6gsah96xbgcdijqjfpn7dj0yh05dvpvjhk6wmrb30z63hykx"; + name = "plasma-integration-5.15.2.tar.xz"; }; }; plasma-nm = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-nm-5.14.4.tar.xz"; - sha256 = "14jjaaaqbsqgzzfpz7nqk7sw1jy4dc6sxrgz46hrdf0n04ga9kxk"; - name = "plasma-nm-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-nm-5.15.2.tar.xz"; + sha256 = "12fahsqs54k8b5g9ipzisvaq1lmmgmyh3xbdixn1bxqdfdc50jax"; + name = "plasma-nm-5.15.2.tar.xz"; }; }; plasma-pa = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-pa-5.14.4.tar.xz"; - sha256 = "18mc1aagz4b3lmv1dmabqnc4xr64j9is597lqpjc0c28gm0rnqp3"; - name = "plasma-pa-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-pa-5.15.2.tar.xz"; + sha256 = "1cw3c84spl2y6fzp0mn986xl7j60z28acga95x5zr2xiaig1p1q3"; + name = "plasma-pa-5.15.2.tar.xz"; }; }; plasma-sdk = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-sdk-5.14.4.tar.xz"; - sha256 = "1mg1229xcv0zjx85a0418ypv38q0q87xxcmmzjdqgxmhk6dx5dys"; - name = "plasma-sdk-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-sdk-5.15.2.tar.xz"; + sha256 = "0kq5h2zfg1f11cmfzmsn4vlfvj1jfkz1pnc67zgs7f70bap4k8zr"; + name = "plasma-sdk-5.15.2.tar.xz"; }; }; plasma-tests = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-tests-5.14.4.tar.xz"; - sha256 = "17imxri9n4hv27z0d7nbwvdgvc45ql224aj1gcpxmrn4p4zfc8w7"; - name = "plasma-tests-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-tests-5.15.2.tar.xz"; + sha256 = "1bsplrmvw73lsdiqwiznbxicyl36vf30mm34bfib8ii0rpx4cn2i"; + name = "plasma-tests-5.15.2.tar.xz"; }; }; plasma-vault = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-vault-5.14.4.tar.xz"; - sha256 = "1fwa8w95n3d25mk823q1dzyhari4fzwnnx6jwny0spcqyhzr4xcr"; - name = "plasma-vault-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-vault-5.15.2.tar.xz"; + sha256 = "0gmch0s9vy72qbxk0bshxd2hmx6dwdad0pk29glpq7l3av3nirlp"; + name = "plasma-vault-5.15.2.tar.xz"; }; }; plasma-workspace = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz"; - sha256 = "0dmgk26wcs69py9qd6q3hg8npkbkk25fl5l6nl88x0jh9mqiyff5"; - name = "plasma-workspace-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-5.15.2.tar.xz"; + sha256 = "1ncd0mc3y8j3r8m9hrq3b07lmcccq7xz76b19rilba1a7qyd03az"; + name = "plasma-workspace-5.15.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plasma-workspace-wallpapers-5.14.4.tar.xz"; - sha256 = "1kvc0v0rjixkf4zfr9gcpmyrs62xpccv96fyw534xiw4w5pr73i6"; - name = "plasma-workspace-wallpapers-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-wallpapers-5.15.2.tar.xz"; + sha256 = "00c19b3clgcjcvafmiwb2mdkkzcq8dvwpaqaajr54c3xn9fa5vss"; + name = "plasma-workspace-wallpapers-5.15.2.tar.xz"; }; }; plymouth-kcm = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/plymouth-kcm-5.14.4.tar.xz"; - sha256 = "02c7s9js3943by7s0d3lalamliq98jm26syafmn6q1wz0msza40x"; - name = "plymouth-kcm-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/plymouth-kcm-5.15.2.tar.xz"; + sha256 = "1bkrkym2kjj7knhqzzcd6qhd1nmzvwah45hqvvnaja8kd82vjlzi"; + name = "plymouth-kcm-5.15.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.14.4"; + version = "1-5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/polkit-kde-agent-1-5.14.4.tar.xz"; - sha256 = "1pvyxjg1p510v6ahrab017s2sqfq3zld0xjf2yh30x55hz6pvnmb"; - name = "polkit-kde-agent-1-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/polkit-kde-agent-1-5.15.2.tar.xz"; + sha256 = "1i0hf77ms0k3q4r4cmfjcv2jnml5cig15biwfkh3jyafz8q8miha"; + name = "polkit-kde-agent-1-5.15.2.tar.xz"; }; }; powerdevil = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/powerdevil-5.14.4.tar.xz"; - sha256 = "04qyz7jncnyj65rpdriaylarsnimqhk1va98im50bsdyiya5hj33"; - name = "powerdevil-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/powerdevil-5.15.2.tar.xz"; + sha256 = "0gl5wh8s7bmjprbv9gph83qhviv87pmdadrlrnbm5n1nwb1h7kd9"; + name = "powerdevil-5.15.2.tar.xz"; }; }; sddm-kcm = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/sddm-kcm-5.14.4.tar.xz"; - sha256 = "03xisf0z88385zfixmah09ry53cayc4kqjn92zlqnfrc9pqnmgcz"; - name = "sddm-kcm-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/sddm-kcm-5.15.2.tar.xz"; + sha256 = "1l8ma0kpqq7hcg4addm2c47w33dc12q8inii0aw4yq0syhqgzq9s"; + name = "sddm-kcm-5.15.2.tar.xz"; }; }; systemsettings = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/systemsettings-5.14.4.tar.xz"; - sha256 = "0glyk9798kaps0fdmclchb6phpr0p315n7w9c9p8ww4b8kj4jyly"; - name = "systemsettings-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/systemsettings-5.15.2.tar.xz"; + sha256 = "0rx3av1by04551y88y5f1lm1rvvxkxqjdjw04fjdnpx7qipv0l6l"; + name = "systemsettings-5.15.2.tar.xz"; }; }; user-manager = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/user-manager-5.14.4.tar.xz"; - sha256 = "110w6n8k1zjbillcmbqy3vc43lznimns60pwh84js8mgqrjx7psb"; - name = "user-manager-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/user-manager-5.15.2.tar.xz"; + sha256 = "09xlnzdsk94p95s1zms8li0q0pv8z66hkla8ns27im21rrnrz6l0"; + name = "user-manager-5.15.2.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.14.4"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.14.4/xdg-desktop-portal-kde-5.14.4.tar.xz"; - sha256 = "1p2h7rqgvwzlfk9jjhsifjcdl81d72d1d7zmgxy9alc4cqnlmbih"; - name = "xdg-desktop-portal-kde-5.14.4.tar.xz"; + url = "${mirror}/stable/plasma/5.15.2/xdg-desktop-portal-kde-5.15.2.tar.xz"; + sha256 = "1zzy01lgznc7z3hz9yhbspx3zg8lala7zzcsxsly4jwx4666ixp4"; + name = "xdg-desktop-portal-kde-5.15.2.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index fc77e163e8f..ae1ee50a121 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, + kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, cups, pcre, pipewire }: @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ cups pcre pipewire - kcoreaddons knotifications kwayland kwidgetsaddons + kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem ]; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 541b30ec1b3..80153332934 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 5331c29a454..8a602b8b4a1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 57cd48c6f27..73ab7782ebd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 9e160acf2d4..abe3c9e5122 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -61,8 +61,9 @@ let export HEX_OFFLINE=1 export HEX_HOME=`pwd` export MIX_ENV=prod + export MIX_NO_DEPS=1 - MIX_ENV=prod mix compile ${debugInfoFlag} --no-deps-check + mix compile ${debugInfoFlag} runHook postBuild '' diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 345bd125025..09422a7a862 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2018.09.08"; src = fetchFromGitHub { - owner = "cseed"; + owner = "yosyshq"; repo = "arachne-pnr"; rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd"; sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ae6af8dd4b4..646963eedbc 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4 }: +{ stdenv, fetchurl, bootstrap_cmds, coreutils, glibc, m4, runtimeShell }: let options = rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { cp -r . "$out/share/ccl-installation" mkdir -p "$out/bin" - echo -e '#!${stdenv.shell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" + echo -e '#!${runtimeShell}\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 2b2ae896a6d..960a54489da 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python, runtimeShell }: stdenv.mkDerivation rec { name = "cmdstan-2.17.1"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary cat > $out/bin/stan <<EOF - #!/bin/sh + #!${runtimeShell} make -C $out/opt/cmdstan "\$(realpath "\$1")" EOF chmod a+x $out/bin/stan diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 05958d52336..8be482e2150 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ config, stdenv , fetchFromGitHub , fetchpatch , which @@ -14,7 +14,7 @@ , liburcu , libuuid , libkrb5 -, debug ? false +, debug ? config.coreclr.debug or false }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 51cea9810bc..b2b92908f95 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -2,30 +2,32 @@ , gmp, openssl, readline, tzdata, libxml2, libyaml , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: -let - binaryVersion = "0.26.0"; - releaseDate = "2018-08-29"; +# We need multiple binaries as a given binary isn't always able to build +# (even slightly) older or newer version. +# - 0.26.1 can build 0.25.x and 0.26.x but not 0.27.x +# - 0.27.2 can build 0.27.x but not 0.25.x and 0.26.x +# +# We need to keep around at least the latest version released with a stable +# NixOS - arch = { +let + archs = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + }; + + arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); checkInputs = [ gmp openssl readline libxml2 libyaml tzdata ]; - # we could turn this into a function instead in case we cannot use the same - # binary to build multiple versions - binary = stdenv.mkDerivation rec { - name = "crystal-binary-${binaryVersion}"; + genericBinary = { version, sha256s, rel ? 1 }: + stdenv.mkDerivation rec { + name = "crystal-binary-${version}"; src = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${binaryVersion}/crystal-${binaryVersion}-1-${arch}.tar.gz"; - sha256 = { - "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; - }."${stdenv.system}"; + url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + sha256 = sha256s."${stdenv.system}"; }; buildCommand = '' @@ -34,7 +36,7 @@ let ''; }; - generic = { version, sha256, doCheck ? true }: + generic = { version, sha256, binary, doCheck ? true }: stdenv.mkDerivation rec { inherit doCheck; name = "crystal-${version}"; @@ -46,13 +48,10 @@ let inherit sha256; }; - # the first bit can go when https://github.com/crystal-lang/crystal/pull/6788 is merged postPatch = '' - substituteInPlace src/compiler/crystal/config.cr \ - --replace '{{ `date "+%Y-%m-%d"`.stringify.chomp }}' '"${releaseDate}"' ln -s spec/compiler spec/std substituteInPlace spec/std/process_spec.cr \ - --replace /bin/ /run/current-system/sw/bin + --replace /bin/ /run/current-system/sw/bin/ ''; buildInputs = [ @@ -64,9 +63,7 @@ let nativeBuildInputs = [ binary makeWrapper which ]; - makeFlags = [ - "CRYSTAL_CONFIG_BUILD_DATE=${releaseDate}" "CRYSTAL_CONFIG_VERSION=${version}" ]; @@ -121,22 +118,49 @@ let homepage = https://crystal-lang.org/; license = licenses.asl20; maintainers = with maintainers; [ manveru david50407 peterhoeg ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = builtins.attrNames archs; }; }; in rec { + binaryCrystal_0_26 = genericBinary { + version = "0.26.1"; + sha256s = { + "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; + }; + }; + + binaryCrystal_0_27 = genericBinary { + version = "0.27.2"; + sha256s = { + "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; + "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; + "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; + }; + }; + crystal_0_25 = generic { version = "0.25.1"; sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl"; doCheck = false; + binary = binaryCrystal_0_26; }; crystal_0_26 = generic { version = "0.26.1"; sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84"; doCheck = false; # about 20 tests out of more than 14000 are failing + binary = binaryCrystal_0_26; + }; + + crystal_0_27 = generic { + version = "0.27.2"; + sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj"; + doCheck = false; # about 20 tests out of more than 15000 are failing + binary = binaryCrystal_0_27; }; - crystal = crystal_0_26; + crystal = crystal_0_27; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 3ab25c3a830..a9f0e3ec0a5 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,199 +1,165 @@ -{ stdenv, fetchFromGitHub -, makeWrapper, unzip, which +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git , callPackage, targetPackages, ldc -, version ? "2.084.0" -, dmdSha256 ? "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf" -, druntimeSha256 ? "0vp414j6s11l9s54v81np49mv60ywmd7nnk41idkbwrq0nz4sfrq" -, phobosSha256 ? "1wp7z1x299b0w9ny1ah2wrfhrs05vc4bk51csgw9774l3dqcnv53" +, version ? "2.084.1" +, dmdSha256 ? "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms" +, druntimeSha256 ? "0i0g2cnzh097pmvb86gvyj79canaxppw33hp7ylqnd11q4kqc8pb" +, phobosSha256 ? "1hxpismj9gy5n1bc9kl9ykgd4lfmkq9i8xgrq09j0fybfwn9j1gc" }: let - dmdBuild = stdenv.mkDerivation rec { - name = "dmdBuild-${version}"; - inherit version; + dmdConfFile = writeTextFile { + name = "dmd.conf"; + text = (lib.generators.toINI {} { + "Environment" = { + DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + }; + }); + }; - enableParallelBuilding = true; +in - srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; - name = "dmd"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = druntimeSha256; - name = "druntime"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; - name = "phobos"; +stdenv.mkDerivation rec { + name = "dmd-${version}"; + inherit version; + + enableParallelBuilding = true; + + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) + ]; + + patches = [ + (fetchpatch { + name = "fix-loader-import.patch"; + url = "https://github.com/dlang/dmd/commit/e7790436c4af1910b8c079dac9bb69627d7dea4b.patch"; + sha256 = "0w69hajx8agywc7m2hph5m27g2yclz8ml0gjjyjk9k6ii3jv45kx"; }) - ]; - - sourceRoot = "."; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - ''; - - postPatch = '' - substituteInPlace dmd/test/compilable/extra-files/ddocYear.html \ - --replace "2018" "__YEAR__" - - substituteInPlace dmd/test/runnable/test16096.sh \ - --replace "{EXT}" "{EXE}" - ''; - - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - buildInputs = [ curl tzdata ]; - - bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then - "osx" - else - stdenv.hostPlatform.parsed.kernel.name; - top = "$(echo $NIX_BUILD_TOP)"; - pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; - - # Buid and install are based on http://wiki.dlang.org/Building_DMD - buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} - cd ../phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - cd .. - ''; - - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - doCheck = true; - - checkPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHARED=0 SHELL=$SHELL - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release - cd .. - ''; - - dontStrip = true; - - installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp ${pathToDmd} $out/bin - - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ - - cd ../druntime - mkdir $out/include - mkdir $out/include/d2 - cp -r import/* $out/include/d2 - - cd ../phobos - mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - - cp -r std $out/include/d2 - cp -r etc $out/include/d2 - - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - - cd $out/bin - tee dmd.conf << EOF - [Environment] - DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC - EOF - ''; - - meta = with stdenv.lib; { - description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; - # Everything is now Boost licensed, even the backend. - # https://github.com/dlang/dmd/pull/6680 - license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; - }; + ]; + + patchFlags = [ "--directory=dmd" "-p1" ]; + + sourceRoot = "."; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + ''; + + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - phobosUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "phobosUnittests-${version}"; - version = dmdBuild.version; - - enableParallelBuilding = dmdBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dmdBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - srcs = dmdBuild.srcs; - - sourceRoot = "."; - - nativeBuildInputs = dmdBuild.nativeBuildInputs; - buildInputs = dmdBuild.buildInputs; - - buildPhase = '' - cd phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl.so > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - ''; - - installPhase = '' - echo -n $inputString > $out - ''; - } + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); + + buildInputs = [ curl tzdata ]; + + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; + osname = if stdenv.hostPlatform.isDarwin then + "osx" else - ""; + stdenv.hostPlatform.parsed.kernel.name; + top = "$(echo $NIX_BUILD_TOP)"; + pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; + + # Buid and install are based on http://wiki.dlang.org/Building_DMD + buildPhase = '' + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; -in + doCheck = true; + + checkPhase = '' + cd dmd + # https://github.com/NixOS/nixpkgs/pull/55998#issuecomment-465871846 + #make -j$NIX_BUILD_CORES -C test -f Makefile PIC=1 CC=$CXX DMD=${pathToDmd} BUILD=release SHELL=$SHELL + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak unittest PIC=1 DMD=${pathToDmd} BUILD=release + cd ../phobos + make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. + ''; -stdenv.mkDerivation rec { - inherit phobosUnittests; - name = "dmd-${version}"; - phases = "installPhase"; - buildInputs = dmdBuild.buildInputs; + dontStrip = true; installPhase = '' - mkdir $out - cp -r --symbolic-link ${dmdBuild}/* $out/ + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin + + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ + + cd ../druntime + mkdir $out/include + mkdir $out/include/dmd + cp -r import/* $out/include/dmd + + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib + + cp -r std $out/include/dmd + cp -r etc $out/include/dmd + + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + + substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out ''; - meta = dmdBuild.meta; + + meta = with stdenv.lib; { + description = "Official reference compiler for the D language"; + homepage = http://dlang.org/; + # Everything is now Boost licensed, even the backend. + # https://github.com/dlang/dmd/pull/6680 + license = licenses.boost; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index f9f083f04d7..2de487cc9c8 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = '' sed -i '988d' src/FSharpSource.targets - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" ./autogen.sh --prefix $out ''; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index 3ce7ae60e11..e0094c73098 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" + substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" ./autogen.sh --prefix $out ''; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index adaf4e36ce9..6fd1995354f 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -180,18 +180,23 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" "pie" ]; - # This should kill all the stdinc frameworks that gcc and friends like to - # insert into default search paths. - prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' - substituteInPlace gcc/config/darwin-c.c \ - --replace 'if (stdinc)' 'if (0)' - - substituteInPlace libgcc/config/t-slibgcc-darwin \ - --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" - - substituteInPlace libgfortran/configure \ - --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" - ''; + prePatch = + (stdenv.lib.optionalString (langJava || langGo) '' + export lib=$out + '') + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + + stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; postPatch = if targetPlatform != hostPlatform || stdenv.cc.libc != null then @@ -447,7 +452,7 @@ stdenv.mkDerivation ({ // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } -// optionalAttrs (langJava) { +// optionalAttrs (langJava && !stdenv.hostPlatform.isDarwin) { postFixup = '' target="$(echo "$out/libexec/gcc"/*/*/ecj*)" patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 956f357f84c..68c05d28978 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -48,6 +48,9 @@ let version = "7.4.0"; ./riscv-no-relax.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optionals targetPlatform.isNetBSD [ + ../libstdc++-netbsd-ctypes.patch + ] ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; @@ -302,6 +305,7 @@ stdenv.mkDerivation ({ "--disable-gnu-indirect-function" ] ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" + ++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 66b98cc6d64..ce3395f0be0 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "8.2.0"; +let version = "8.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -132,7 +132,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; + sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4"; }; inherit patches; diff --git a/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch b/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch new file mode 100644 index 00000000000..28fff80b786 --- /dev/null +++ b/pkgs/development/compilers/gcc/libstdc++-netbsd-ctypes.patch @@ -0,0 +1,141 @@ +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +index ff3ec893974..21eccf9fde1 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +@@ -38,40 +38,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + /// @brief Base class for ctype. + struct ctype_base + { +- // Non-standard typedefs. +- typedef const unsigned char* __to_type; + + // NB: Offsets into ctype<char>::_M_table force a particular size + // on the mask type. Because of this, we don't use an enum. +- typedef unsigned char mask; + + #ifndef _CTYPE_U +- static const mask upper = _U; +- static const mask lower = _L; +- static const mask alpha = _U | _L; +- static const mask digit = _N; +- static const mask xdigit = _N | _X; +- static const mask space = _S; +- static const mask print = _P | _U | _L | _N | _B; +- static const mask graph = _P | _U | _L | _N; +- static const mask cntrl = _C; +- static const mask punct = _P; +- static const mask alnum = _U | _L | _N; ++ // Non-standard typedefs. ++ typedef const unsigned char* __to_type; ++ ++ typedef unsigned char mask; ++ ++ static const mask upper = _U; ++ static const mask lower = _L; ++ static const mask alpha = _U | _L; ++ static const mask digit = _N; ++ static const mask xdigit = _N | _X; ++ static const mask space = _S; ++ static const mask print = _P | _U | _L | _N | _B; ++ static const mask graph = _P | _U | _L | _N; ++ static const mask cntrl = _C; ++ static const mask punct = _P; ++ static const mask alnum = _U | _L | _N; + #else +- static const mask upper = _CTYPE_U; +- static const mask lower = _CTYPE_L; +- static const mask alpha = _CTYPE_U | _CTYPE_L; +- static const mask digit = _CTYPE_N; +- static const mask xdigit = _CTYPE_N | _CTYPE_X; +- static const mask space = _CTYPE_S; +- static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B; +- static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N; +- static const mask cntrl = _CTYPE_C; +- static const mask punct = _CTYPE_P; +- static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N; ++ typedef const unsigned short* __to_type; ++ ++ typedef unsigned short mask; ++ ++ static const mask upper = _CTYPE_U; ++ static const mask lower = _CTYPE_L; ++ static const mask alpha = _CTYPE_A; ++ static const mask digit = _CTYPE_D; ++ static const mask xdigit = _CTYPE_X; ++ static const mask space = _CTYPE_S; ++ static const mask print = _CTYPE_R; ++ static const mask graph = _CTYPE_G; ++ static const mask cntrl = _CTYPE_C; ++ static const mask punct = _CTYPE_P; ++ static const mask alnum = _CTYPE_A | _CTYPE_D; + #endif + #if __cplusplus >= 201103L +- static const mask blank = space; ++ static const mask blank = space; + #endif + }; + +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +index ed3b7cd0d6a..33358e8f5d8 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_configure_char.cc +@@ -38,11 +38,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + // Information as gleaned from /usr/include/ctype.h + +- extern "C" const u_int8_t _C_ctype_[]; +- + const ctype_base::mask* + ctype<char>::classic_table() throw() +- { return _C_ctype_ + 1; } ++ { return _C_ctype_tab_ + 1; } + + ctype<char>::ctype(__c_locale, const mask* __table, bool __del, + size_t __refs) +@@ -69,14 +67,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + char + ctype<char>::do_toupper(char __c) const +- { return ::toupper((int) __c); } ++ { return ::toupper((int)(unsigned char) __c); } + + const char* + ctype<char>::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { +- *__low = ::toupper((int) *__low); ++ *__low = ::toupper((int)(unsigned char) *__low); + ++__low; + } + return __high; +@@ -84,14 +82,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + char + ctype<char>::do_tolower(char __c) const +- { return ::tolower((int) __c); } ++ { return ::tolower((int)(unsigned char) __c); } + + const char* + ctype<char>::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { +- *__low = ::tolower((int) *__low); ++ *__low = ::tolower((int)(unsigned char) *__low); + ++__low; + } + return __high; +diff --git a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +index ace1120fba2..3234ce17c70 100644 +--- a/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h ++++ b/libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h +@@ -48,7 +48,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + is(const char* __low, const char* __high, mask* __vec) const + { + while (__low < __high) +- *__vec++ = _M_table[*__low++]; ++ *__vec++ = _M_table[(unsigned char)*__low++]; + return __high; + } + diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 2ea95b332fe..16450cf24ab 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp + '' + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475 + + '' + substituteInPlace h/elf64_i386_reloc.h \ + --replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:' ''; sourceRoot = "gcl/gcl"; diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 643dd4b7dbd..50d397d2cd4 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { sha256 = "00jbsn0qp8ki2w7dx8caha7g2hr9076xa6bg48j3qqqncff93zdh"; })]; + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475 + postPatch = '' + substituteInPlace h/elf64_i386_reloc.h \ + --replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:' + ''; + buildInputs = [ mpfr m4 binutils emacs gmp libX11 xorgproto libXi diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index f52d8fd4a11..678245d3e43 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, substituteAll , fetchurl, perl, gcc, llvm_39 , ncurses5, gmp, glibc, libiconv }: @@ -110,10 +110,16 @@ stdenv.mkDerivation rec { ''; configurePlatforms = [ ]; - configureFlags = [ - "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" + configureFlags = + let + gcc-clang-wrapper = substituteAll { + inherit (stdenv) shell; + src = ./gcc-clang-wrapper.sh; + }; + in + [ "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${gcc-clang-wrapper}" ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # Stripping combined with patchelf breaks the executables (they die diff --git a/pkgs/development/compilers/ghc/8.6.3.nix b/pkgs/development/compilers/ghc/8.6.3.nix index c57e4d96ae2..605e442553d 100644 --- a/pkgs/development/compilers/ghc/8.6.3.nix +++ b/pkgs/development/compilers/ghc/8.6.3.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi}/include" "--with-ffi-libraries=${libffi}/lib" + ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi.dev}/include" "--with-ffi-libraries=${libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ diff --git a/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh b/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh index d081be231a1..45af982c297 100755 --- a/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh +++ b/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ inPreprocessorMode () { hasE=0 diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 14a21078389..06187987b6c 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -105,4 +105,6 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.broken = true; + meta.hydraPlatforms = []; } diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 39d1652fc70..41c325c2b1a 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, -gnutls, gnome2, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: +{ config, stdenv, fetchurl, pkgconfig, libtool +, zip, libffi, libsigsegv, readline, gmp +, gnutls, gnome2, cairo, SDL, sqlite +, emacsSupport ? config.emacsSupport or false, emacs ? null }: assert emacsSupport -> (emacs != null); diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 867344e84da..5dce1529a8b 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation +, fetchpatch +}: let @@ -122,6 +124,11 @@ stdenv.mkDerivation rec { ./creds-test.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch + (fetchpatch { + name = "missing_cpuHog_in_pprof_output.diff"; + url = "https://github.com/golang/go/commit/33110e2c.diff"; + sha256 = "04vh9lflbpz9xjvymyzhd91gkxiiwwz4lhglzl3r8z0lk45p96qn"; + }) ]; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 1c9bc0a3009..db3731c2fca 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation -, mailcap +, mailcap, runtimeShell , buildPackages, targetPackages }: let @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # This source produces shell script at run time, # and thus it is not corrected by patchShebangs. substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' # Patch the mimetype database location which is missing on NixOS. substituteInPlace src/mime/type_unix.go \ @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isAarch32 '' - echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 7b0b1f2fb41..2b589125604 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Intel ACPI Compiler"; homepage = http://www.acpica.org/; license = stdenv.lib.licenses.iasl; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index c2d834aa127..82c4188344f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.20"; + version = "1.3.21"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1w7k09sxlvyy53p4mxnl4qsnsyivpabhsmradbybfgf50nsmyl1d"; + sha256 = "0mpb9l46jj4i4cgkrclblgd953ggq6gxivzn5qprmyp0cznzpiyv"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 80ccb0dbbd3..a290d2b6cfe 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, targetPackages , bootstrapVersion ? false -, version ? "1.12.0" -, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm" +, version ? "1.14.0" +, ldcSha256 ? "147vlzzzjx2n6zyz9wj54gj046i1mw5p5wixwzi5wkllgxghyy9c" }: let @@ -18,208 +18,156 @@ let else ""; - ldcBuild = stdenv.mkDerivation rec { - name = "ldcBuild-${version}"; +in - enableParallelBuilding = true; +stdenv.mkDerivation rec { + name = "ldc-${version}"; - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; + enableParallelBuilding = true; - postUnpack = '' - patchShebangs . - '' + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org - rm -r ldc-${version}-src/tests/dynamiccompile + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + postUnpack = '' + patchShebangs . + '' - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d - rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + '' - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh - '' + + stdenv.lib.optionalString (!bootstrapVersion) '' + echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile - + stdenv.lib.optionalString (!bootstrapVersion) '' - echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > ldc-${version}-src/LibcurlPathFile + ''; - # Remove cppa test for now because it doesn't work. - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d - rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp - ''; + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' - datetimePath = if bootstrapVersion then - "phobos/std/datetime.d" - else - "phobos/std/datetime/timezone.d"; + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' - postPatch = '' - # https://issues.dlang.org/show_bug.cgi?id=15391 - substituteInPlace runtime/phobos/std/net/curl.d \ - --replace libcurl.so ${curl.out}/lib/libcurl.so + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + '' - substituteInPlace tests/d2/dmd-testsuite/Makefile \ - --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + # TODO Remove with version > 0.17.6 + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + ''; - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ] - - ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig - ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); - - - buildInputs = [ curl tzdata ]; - - #"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc" - # Xcode 9.0.1 fixes that bug according to ldc release notes - #"-DRT_ARCHIVE_WITH_LDC=OFF" - #"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/" - #"-DCMAKE_BUILD_TYPE=Release" - #"-DCMAKE_SKIP_RPATH=ON" - - #-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc - # - cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' - "-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD" - ''; - - preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' - cmakeFlagsArray=( - ${cmakeFlagsString} - ) - ''; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - doCheck = !bootstrapVersion; - - checkPhase = '' - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - # Run LIT testsuite. - ctest -V -R "lit-tests" - # Run DMD testsuite. - DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; - }; + nativeBuildInputs = [ cmake makeWrapper llvm unzip ] - # Need to test Phobos in a fixed-output derivation, otherwise the - # network stuff in Phobos would fail if sandbox mode is enabled. - # - # Disable tests on Darwin for now because of - # https://github.com/NixOS/nixpkgs/issues/41099 - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - ldcUnittests = if (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) then - stdenv.mkDerivation rec { - name = "ldcUnittests-${version}"; + ++ stdenv.lib.optional (!bootstrapVersion) [ + bootstrapLdc python lit + ] - enableParallelBuilding = ldcBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = ldcBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ] - src = ldcBuild.src; + ++ stdenv.lib.optional (bootstrapVersion) [ + libconfig + ] - postUnpack = ldcBuild.postUnpack; + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); - postPatch = ldcBuild.postPatch; - nativeBuildInputs = ldcBuild.nativeBuildInputs + buildInputs = [ curl tzdata ]; - ++ [ - ldcBuild - ]; + cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" + "-DCMAKE_BUILD_TYPE=Release" + ''; - buildInputs = ldcBuild.buildInputs; + preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' + cmakeFlagsArray=( + ${cmakeFlagsString} + ) + ''; - preConfigure = '' - cmakeFlagsArray=( - ${ldcBuild.cmakeFlagsString} - "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2" - ) - ''; + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; - postConfigure = ldcBuild.postConfigure; + makeFlags = [ "DMD=$DMD" ]; - makeFlags = ldcBuild.makeFlags; + fixNames = if stdenv.hostPlatform.isDarwin then '' + fixDarwinDylibNames() { + local flags=() - buildCmd = if bootstrapVersion then - "ctest -V -R \"build-druntime-ldc-unittest|build-phobos2-ldc-unittest\"" - else - "make -j$NIX_BUILD_CORES DMD=${ldcBuild.out}/bin/ldc2 phobos2-test-runner phobos2-test-runner-debug"; + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done - testCmd = if bootstrapVersion then - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest|llvm-ir-testsuite\"" - else - "ctest -j$NIX_BUILD_CORES --output-on-failure -E \"dmd-testsuite|lit-tests|ldc2-unittest\""; + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } - buildPhase = '' - ${buildCmd} - ln -s ${ldcBuild.out}/bin/ldmd2 $PWD/bin/ldmd2 - ${testCmd} - ''; + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + '' + else + ""; - installPhase = '' - echo -n $inputString > $out - ''; - } + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = if stdenv.hostPlatform.isDarwin then + "|druntime-test-shared" else ""; -in + doCheck = !bootstrapVersion; -stdenv.mkDerivation rec { - inherit ldcUnittests; - name = "ldc-${version}"; - phases = "installPhase"; - buildInputs = ldcBuild.buildInputs; + checkPhase = stdenv.lib.optionalString doCheck '' + # Build default lib test runners + make -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" + ctest -V -R "dmd-testsuite" - installPhase = '' - mkdir $out - cp -r --symbolic-link ${ldcBuild}/* $out/ + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" ''; - meta = ldcBuild.meta; + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = https://github.com/ldc-developers/ldc; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index ca6723172d7..261a1d0f94c 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -79,8 +79,8 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 678ec759425..6c935fd88de 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6344304b84b..2b543b9d793 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index aac9c4275ad..5cd7901fe22 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,8 +100,8 @@ in stdenv.mkDerivation (rec { "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 68ee80fa7a6..6807240df81 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 6dc81e10163..b182f1250e7 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/5/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index 5ee551f6b6b..ae51c19ec72 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -59,6 +59,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index b90b6b7b58c..3a165e9da7b 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/6/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index f16f3f72137..1d96513a0ec 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -14,9 +14,6 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -# Mesa requires AMDGPU target -# BPF is used by bcc -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ] }: let @@ -94,7 +91,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/llvm/7/bintools.nix b/pkgs/development/compilers/llvm/7/bintools.nix new file mode 100644 index 00000000000..72a2a733193 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/bintools.nix @@ -0,0 +1,19 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||") + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + rm -f $out/bin/${prefix}cat + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index bc6767e8766..e4252647ce6 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,10 +1,10 @@ { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python , fixDarwinDylibNames , enableManpages ? false +, enablePolly ? false # TODO: get this info from llvm (passthru?) }: let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; self = stdenv.mkDerivation ({ name = "clang-${version}"; @@ -30,6 +30,9 @@ let "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ stdenv.lib.optionals enablePolly [ + "-DWITH_POLLY=ON" + "-DLINK_POLLY_INTO_TOOLS=ON" ]; patches = [ ./purity.patch ]; @@ -77,8 +80,8 @@ let passthru = { isClang = true; inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux { - inherit gcc; + } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) { + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; }; meta = { diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index dff9cb9c49c..b44ba62ee92 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -7,8 +7,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - configureFlags = [ + cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" ]; outputs = [ "out" "dev" ]; @@ -16,7 +27,8 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra @@ -26,11 +38,23 @@ stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" ''; # Hack around weird upsream RPATH bug postInstall = stdenv.lib.optionalString stdenv.isDarwin '' ln -s "$out/lib"/*/* "$out/lib" + '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o + ln -s $out/lib/*/cclang_rt.crtend-*.o $out/lib/linux/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch new file mode 100644 index 00000000000..032b04708d1 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch @@ -0,0 +1,595 @@ +Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791 + +Index: compiler-rt/CMakeLists.txt +=================================================================== +--- compiler-rt/CMakeLists.txt ++++ compiler-rt/CMakeLists.txt +@@ -29,6 +29,8 @@ + + option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON) + mark_as_advanced(COMPILER_RT_BUILD_BUILTINS) ++option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON) ++mark_as_advanced(COMPILER_RT_BUILD_CRT) + option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON) + mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS) + option(COMPILER_RT_BUILD_XRAY "Build xray" ON) +Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake +=================================================================== +--- compiler-rt/cmake/Modules/AddCompilerRT.cmake ++++ compiler-rt/cmake/Modules/AddCompilerRT.cmake +@@ -132,7 +132,7 @@ + # Adds static or shared runtime for a list of architectures and operating + # systems and puts it in the proper directory in the build and install trees. + # add_compiler_rt_runtime(<name> +-# {STATIC|SHARED} ++# {OBJECT|STATIC|SHARED} + # ARCHS <architectures> + # OS <os list> + # SOURCES <source files> +@@ -144,8 +144,8 @@ + # PARENT_TARGET <convenience parent target> + # ADDITIONAL_HEADERS <header files>) + function(add_compiler_rt_runtime name type) +- if(NOT type MATCHES "^(STATIC|SHARED)$") +- message(FATAL_ERROR "type argument must be STATIC or SHARED") ++ if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$") ++ message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED") + return() + endif() + cmake_parse_arguments(LIB +@@ -204,7 +204,10 @@ + message(FATAL_ERROR "Architecture ${arch} can't be targeted") + return() + endif() +- if(type STREQUAL "STATIC") ++ if(type STREQUAL "OBJECT") ++ set(libname "${name}-${arch}") ++ set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX}) ++ elseif(type STREQUAL "STATIC") + set(libname "${name}-${arch}") + set_output_name(output_name_${libname} ${name} ${arch}) + else() +@@ -270,12 +273,34 @@ + set(COMPONENT_OPTION COMPONENT ${libname}) + endif() + +- add_library(${libname} ${type} ${sources_${libname}}) +- set_target_compile_flags(${libname} ${extra_cflags_${libname}}) +- set_target_link_flags(${libname} ${extra_link_flags_${libname}}) +- set_property(TARGET ${libname} APPEND PROPERTY +- COMPILE_DEFINITIONS ${LIB_DEFS}) +- set_target_output_directories(${libname} ${output_dir_${libname}}) ++ if(type STREQUAL "OBJECT") ++ string(TOUPPER ${CMAKE_BUILD_TYPE} config) ++ get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS) ++ separate_arguments(cflags) ++ add_custom_command( ++ OUTPUT ${output_dir_${libname}}/${libname}.o ++ COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o ++ DEPENDS ${sources_${libname}} ++ COMMENT "Building C object ${libname}.o") ++ add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o) ++ install(FILES ${output_dir_${libname}}/${libname}.o ++ DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION}) ++ else() ++ add_library(${libname} ${type} ${sources_${libname}}) ++ set_target_compile_flags(${libname} ${extra_cflags_${libname}}) ++ set_target_link_flags(${libname} ${extra_link_flags_${libname}}) ++ set_property(TARGET ${libname} APPEND PROPERTY ++ COMPILE_DEFINITIONS ${LIB_DEFS}) ++ set_target_output_directories(${libname} ${output_dir_${libname}}) ++ install(TARGETS ${libname} ++ ARCHIVE DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION} ++ LIBRARY DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION} ++ RUNTIME DESTINATION ${install_dir_${libname}} ++ ${COMPONENT_OPTION}) ++ endif() + set_target_properties(${libname} PROPERTIES + OUTPUT_NAME ${output_name_${libname}}) + set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") +@@ -299,13 +324,6 @@ + ) + endif() + endif() +- install(TARGETS ${libname} +- ARCHIVE DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- LIBRARY DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- RUNTIME DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION}) + + # We only want to generate per-library install targets if you aren't using + # an IDE because the extra targets get cluttered in IDEs. +Index: compiler-rt/cmake/config-ix.cmake +=================================================================== +--- compiler-rt/cmake/config-ix.cmake ++++ compiler-rt/cmake/config-ix.cmake +@@ -227,6 +227,7 @@ + ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X}) + set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} + ${MIPS32} ${MIPS64} ${PPC64} ${S390X}) ++set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}) + set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64}) + set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64}) + +@@ -474,6 +475,7 @@ + SANITIZER_COMMON_SUPPORTED_ARCH) + + else() ++ filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH}) + # Architectures supported by compiler-rt libraries. + filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH + ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH}) +@@ -563,6 +565,12 @@ + + # TODO: Add builtins support. + ++if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux") ++ set(COMPILER_RT_HAS_CRT TRUE) ++else() ++ set(COMPILER_RT_HAS_CRT FALSE) ++endif() ++ + if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND + OS_NAME MATCHES "Linux") + set(COMPILER_RT_HAS_DFSAN TRUE) +Index: compiler-rt/lib/CMakeLists.txt +=================================================================== +--- compiler-rt/lib/CMakeLists.txt ++++ compiler-rt/lib/CMakeLists.txt +@@ -17,6 +17,10 @@ + add_subdirectory(builtins) + endif() + ++if(COMPILER_RT_BUILD_CRT) ++ add_subdirectory(crt) ++endif() ++ + function(compiler_rt_build_runtime runtime) + string(TOUPPER ${runtime} runtime_uppercase) + if(COMPILER_RT_HAS_${runtime_uppercase}) +Index: compiler-rt/lib/crt/CMakeLists.txt +=================================================================== +--- /dev/null ++++ compiler-rt/lib/crt/CMakeLists.txt +@@ -0,0 +1,101 @@ ++add_compiler_rt_component(crt) ++ ++function(check_cxx_section_exists section output) ++ cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN}) ++ if(NOT ARG_SOURCE) ++ set(ARG_SOURCE "int main() { return 0; }\n") ++ endif() ++ ++ string(RANDOM TARGET_NAME) ++ set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir") ++ file(MAKE_DIRECTORY ${TARGET_NAME}) ++ ++ file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n") ++ ++ string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions ++ ${CMAKE_C_COMPILE_OBJECT}) ++ ++ set(try_compile_flags "${ARG_FLAGS}") ++ if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) ++ list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}") ++ endif() ++ ++ string(REPLACE ";" " " extra_flags "${try_compile_flags}") ++ ++ set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}") ++ foreach(substitution ${substitutions}) ++ if(substitution STREQUAL "<CMAKE_C_COMPILER>") ++ string(REPLACE "<CMAKE_C_COMPILER>" ++ "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command}) ++ elseif(substitution STREQUAL "<OBJECT>") ++ string(REPLACE "<OBJECT>" "${TARGET_NAME}/CheckSectionExists.o" ++ test_compile_command ${test_compile_command}) ++ elseif(substitution STREQUAL "<SOURCE>") ++ string(REPLACE "<SOURCE>" "${TARGET_NAME}/CheckSectionExists.c" ++ test_compile_command ${test_compile_command}) ++ elseif(substitution STREQUAL "<FLAGS>") ++ string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${extra_flags}" ++ test_compile_command ${test_compile_command}) ++ else() ++ string(REPLACE "${substitution}" "" test_compile_command ++ ${test_compile_command}) ++ endif() ++ endforeach() ++ ++ string(REPLACE " " ";" test_compile_command "${test_compile_command}") ++ ++ execute_process( ++ COMMAND ${test_compile_command} ++ RESULT_VARIABLE TEST_RESULT ++ OUTPUT_VARIABLE TEST_OUTPUT ++ ERROR_VARIABLE TEST_ERROR ++ ) ++ ++ execute_process( ++ COMMAND ${CMAKE_OBJDUMP} -h "${TARGET_NAME}/CheckSectionExists.o" ++ RESULT_VARIABLE CHECK_RESULT ++ OUTPUT_VARIABLE CHECK_OUTPUT ++ ERROR_VARIABLE CHECK_ERROR ++ ) ++ string(FIND ${CHECK_OUTPUT} ${section} SECTION_FOUND) ++ ++ if(NOT SECTION_FOUND EQUAL -1) ++ set(${output} TRUE PARENT_SCOPE) ++ else() ++ set(${output} FALSE PARENT_SCOPE) ++ endif() ++ ++ file(REMOVE_RECURSE ${TARGET_NAME}) ++endfunction() ++ ++check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY ++ SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") ++ ++append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) ++ ++foreach(arch ${CRT_SUPPORTED_ARCH}) ++ add_compiler_rt_runtime(clang_rt.crtbegin ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c ++ CFLAGS ${CRT_CFLAGS} ++ PARENT_TARGET crt) ++ add_compiler_rt_runtime(clang_rt.crtbegin_shared ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ PARENT_TARGET crt) ++ add_compiler_rt_runtime(clang_rt.crtend ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c ++ CFLAGS ${CRT_CFLAGS} ++ PARENT_TARGET crt) ++ add_compiler_rt_runtime(clang_rt.crtend_shared ++ OBJECT ++ ARCHS ${arch} ++ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ PARENT_TARGET crt) ++endforeach() +Index: compiler-rt/lib/crt/crtbegin.c +=================================================================== +--- /dev/null ++++ compiler-rt/lib/crt/crtbegin.c +@@ -0,0 +1,110 @@ ++/* ===-- crtbegin.c - Start of constructors and destructors ----------------=== ++ * ++ * The LLVM Compiler Infrastructure ++ * ++ * This file is dual licensed under the MIT and the University of Illinois Open ++ * Source Licenses. See LICENSE.TXT for details. ++ * ++ * ===----------------------------------------------------------------------=== ++ */ ++ ++#include <stddef.h> ++ ++__attribute__((visibility("hidden"))) ++#ifdef CRT_SHARED ++void *__dso_handle = &__dso_handle; ++#else ++void *__dso_handle = (void *)0; ++#endif ++ ++static long __EH_FRAME_LIST__[] __attribute__(( ++ section(".eh_frame"), aligned(sizeof(void *)), visibility("hidden"))) = {}; ++ ++extern void __register_frame_info(const void *, void *) __attribute__((weak)); ++extern void *__deregister_frame_info(const void *) __attribute__((weak)); ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++typedef void (*fp)(void); ++ ++static fp __CTOR_LIST__[] ++ __attribute__((section(".ctors"), aligned(sizeof(fp)), visibility("hidden"), ++ used)) = {(fp)-1}; ++extern fp __CTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++#endif ++ ++#ifdef CRT_SHARED ++extern void __cxa_finalize(void *) __attribute__((weak)); ++#endif ++ ++static void __attribute__((used)) __do_init() { ++ static _Bool __initialized; ++ if (__builtin_expect(__initialized, 0)) ++ return; ++ __initialized = 1; ++ ++ static struct { void *p[8]; } __object; ++ if (__register_frame_info) ++ __register_frame_info(__EH_FRAME_LIST__, &__object); ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++ const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1; ++ for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i](); ++#endif ++} ++ ++#ifdef CRT_HAS_INITFINI_ARRAY ++__attribute__((section(".init_array"), ++ used)) static void (*__init)(void) = __do_init; ++#else // CRT_HAS_INITFINI_ARRAY ++#if defined(__i386__) || defined(__x86_64__) ++asm(".pushsection .init,\"ax\",@progbits\n\t" ++ "call " __USER_LABEL_PREFIX__ "__do_init\n\t" ++ ".popsection"); ++#elif defined(__arm__) ++asm(".pushsection .init,\"ax\",%progbits\n\t" ++ "bl " __USER_LABEL_PREFIX__ "__do_init\n\t" ++ ".popsection"); ++#endif // CRT_HAS_INITFINI_ARRAY ++#endif ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++static fp __DTOR_LIST__[] ++ __attribute__((section(".dtors"), aligned(sizeof(fp)), visibility("hidden"), ++ used)) = {(fp)-1}; ++extern fp __DTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++#endif ++ ++static void __attribute__((used)) __do_fini() { ++ static _Bool __finalized; ++ if (__builtin_expect(__finalized, 0)) ++ return; ++ __finalized = 1; ++ ++#ifdef CRT_SHARED ++ if (__cxa_finalize) ++ __cxa_finalize(__dso_handle); ++#endif ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++ if (__deregister_frame_info) ++ __deregister_frame_info(__EH_FRAME_LIST__); ++ ++ const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1; ++ for (size_t i = 1; i < n; i++) __DTOR_LIST__[i](); ++#endif ++} ++ ++#ifdef CRT_HAS_INITFINI_ARRAY ++__attribute__((section(".fini_array"), ++ used)) static void (*__fini)(void) = __do_fini; ++#else // CRT_HAS_INITFINI_ARRAY ++#if defined(__i386__) || defined(__x86_64__) ++asm(".pushsection .fini,\"ax\",@progbits\n\t" ++ "call " __USER_LABEL_PREFIX__ "__do_fini\n\t" ++ ".popsection"); ++#elif defined(__arm__) ++asm(".pushsection .fini,\"ax\",%progbits\n\t" ++ "bl " __USER_LABEL_PREFIX__ "__do_fini\n\t" ++ ".popsection"); ++#endif ++#endif // CRT_HAS_INIT_FINI_ARRAY +Index: compiler-rt/lib/crt/crtend.c +=================================================================== +--- /dev/null ++++ compiler-rt/lib/crt/crtend.c +@@ -0,0 +1,23 @@ ++/* ===-- crtend.c - End of constructors and destructors --------------------=== ++ * ++ * The LLVM Compiler Infrastructure ++ * ++ * This file is dual licensed under the MIT and the University of Illinois Open ++ * Source Licenses. See LICENSE.TXT for details. ++ * ++ * ===----------------------------------------------------------------------=== ++ */ ++ ++#include <stdint.h> ++ ++// Put 4-byte zero which is the length field in FDE at the end as a terminator. ++const int32_t __EH_FRAME_LIST_END__[] ++ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), used)) = {0}; ++ ++#ifndef CRT_HAS_INITFINI_ARRAY ++typedef void (*fp)(void); ++fp __CTOR_LIST_END__[] ++ __attribute__((section(".ctors"), visibility("hidden"), used)) = {0}; ++fp __DTOR_LIST_END__[] ++ __attribute__((section(".dtors"), visibility("hidden"), used)) = {0}; ++#endif +Index: compiler-rt/test/CMakeLists.txt +=================================================================== +--- compiler-rt/test/CMakeLists.txt ++++ compiler-rt/test/CMakeLists.txt +@@ -73,6 +73,9 @@ + if(COMPILER_RT_BUILD_XRAY) + compiler_rt_test_runtime(xray) + endif() ++ if(COMPILER_RT_HAS_CRT) ++ add_subdirectory(crt) ++ endif() + # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests + # include their own minimal runtime + add_subdirectory(shadowcallstack) +Index: compiler-rt/test/crt/CMakeLists.txt +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/CMakeLists.txt +@@ -0,0 +1,31 @@ ++set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++set(CRT_TESTSUITES) ++ ++set(CRT_TEST_DEPS "") ++ ++if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_CRT AND ++ COMPILER_RT_HAS_CRT) ++ list(APPEND CRT_TEST_DEPS crt) ++endif() ++ ++set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH}) ++if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT) ++ foreach(arch ${CRT_TEST_ARCH}) ++ set(CRT_TEST_TARGET_ARCH ${arch}) ++ string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX) ++ get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS) ++ string(TOUPPER ${arch} ARCH_UPPER_CASE) ++ set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) ++ ++ configure_lit_site_cfg( ++ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ++ ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) ++ list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) ++ endforeach() ++endif() ++ ++add_lit_testsuite(check-crt "Running the CRT tests" ++ ${CRT_TESTSUITES} ++ DEPENDS ${CRT_TEST_DEPS}) ++set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc") +Index: compiler-rt/test/crt/dso_handle.cpp +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/dso_handle.cpp +@@ -0,0 +1,33 @@ ++// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o ++// RUN: %clangxx -g -c %s -fPIC -o %t.o ++// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %shared_crtbegin %tshared.o %libstdcxx -lc -lm -lgcc_s %shared_crtend %crtn ++// RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn ++// RUN: %run %t 2>&1 | FileCheck %s ++ ++#include <stdio.h> ++ ++// CHECK: 1 ++// CHECK-NEXT: ~A() ++ ++#ifdef CRT_SHARED ++bool G; ++void C() { ++ printf("%d\n", G); ++} ++ ++struct A { ++ A() { G = true; } ++ ~A() { ++ printf("~A()\n"); ++ } ++}; ++ ++A a; ++#else ++void C(); ++ ++int main() { ++ C(); ++ return 0; ++} ++#endif +Index: compiler-rt/test/crt/lit.cfg +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/lit.cfg +@@ -0,0 +1,80 @@ ++# -*- Python -*- ++ ++import os ++import subprocess ++ ++# Setup config name. ++config.name = 'CRT' + config.name_suffix ++ ++# Setup source root. ++config.test_source_root = os.path.dirname(__file__) ++ ++ ++def get_library_path(file): ++ cmd = subprocess.Popen([config.clang.strip(), ++ config.target_cflags.strip(), ++ '-print-file-name=%s' % file], ++ stdout=subprocess.PIPE, ++ env=config.environment) ++ if not cmd.stdout: ++ lit_config.fatal("Couldn't find the library path for '%s'" % file) ++ dir = cmd.stdout.read().strip() ++ if sys.platform in ['win32'] and execute_external: ++ # Don't pass dosish path separator to msys bash.exe. ++ dir = dir.replace('\\', '/') ++ # Ensure the result is an ascii string, across Python2.5+ - Python3. ++ return str(dir.decode('ascii')) ++ ++ ++def get_libgcc_file_name(): ++ cmd = subprocess.Popen([config.clang.strip(), ++ config.target_cflags.strip(), ++ '-print-libgcc-file-name'], ++ stdout=subprocess.PIPE, ++ env=config.environment) ++ if not cmd.stdout: ++ lit_config.fatal("Couldn't find the library path for '%s'" % file) ++ dir = cmd.stdout.read().strip() ++ if sys.platform in ['win32'] and execute_external: ++ # Don't pass dosish path separator to msys bash.exe. ++ dir = dir.replace('\\', '/') ++ # Ensure the result is an ascii string, across Python2.5+ - Python3. ++ return str(dir.decode('ascii')) ++ ++ ++def build_invocation(compile_flags): ++ return ' ' + ' '.join([config.clang] + compile_flags) + ' ' ++ ++ ++# Setup substitutions. ++config.substitutions.append( ++ ('%clang ', build_invocation([config.target_cflags]))) ++config.substitutions.append( ++ ('%clangxx ', ++ build_invocation(config.cxx_mode_flags + [config.target_cflags]))) ++ ++base_lib = os.path.join( ++ config.compiler_rt_libdir, "clang_rt.%%s-%s.o" % config.target_arch) ++config.substitutions.append(('%crtbegin', base_lib % "crtbegin")) ++config.substitutions.append(('%shared_crtbegin', base_lib % "crtbegin_shared")) ++config.substitutions.append(('%crtend', base_lib % "crtend")) ++config.substitutions.append(('%shared_crtend', base_lib % "crtend_shared")) ++ ++config.substitutions.append( ++ ('%crt1', get_library_path('crt1.o'))) ++config.substitutions.append( ++ ('%crti', get_library_path('crti.o'))) ++config.substitutions.append( ++ ('%crtn', get_library_path('crtn.o'))) ++ ++config.substitutions.append( ++ ('%libgcc', get_libgcc_file_name())) ++ ++config.substitutions.append( ++ ('%libstdcxx', '-l' + config.sanitizer_cxx_lib.lstrip('lib'))) ++ ++# Default test suffixes. ++config.suffixes = ['.c', '.cc', '.cpp'] ++ ++if config.host_os not in ['Linux']: ++ config.unsupported = True +Index: compiler-rt/test/crt/lit.site.cfg.in +=================================================================== +--- /dev/null ++++ compiler-rt/test/crt/lit.site.cfg.in +@@ -0,0 +1,14 @@ ++@LIT_SITE_CFG_IN_HEADER@ ++ ++# Tool-specific config options. ++config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@" ++config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@" ++config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@" ++config.target_arch = "@CRT_TEST_TARGET_ARCH@" ++config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@" ++ ++# Load common config for all compiler-rt lit tests ++lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") ++ ++# Load tool-specific config that would do the real work. ++lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg") diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 47c6e9e383f..060bef69bc1 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith +, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -23,16 +23,22 @@ let ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc) '' echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags ''; in { llvm = callPackage ./llvm.nix { }; + llvm-polly = callPackage ./llvm.nix { enablePolly = true; }; clang-unwrapped = callPackage ./clang { inherit clang-tools-extra_src; }; + clang-polly-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src; + llvm = tools.llvm-polly; + enablePolly = true; + }; llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; @@ -59,6 +65,7 @@ let libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi @@ -70,13 +77,63 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; + + bintools = callPackage ./bintools.nix {}; + + lldClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + # targetLlvmLibraries.libcxx + # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ + # targetLlvmLibraries.libcxx + # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + ''; + }; + }); libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt.nix {}; + compiler-rt = callPackage ./compiler-rt.nix { + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt + else stdenv; + }; stdenv = overrideCC stdenv buildLlvmTools.clang; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 8a13f3eb590..d372984dac7 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a deleted file mode 100644 index f676948115e..00000000000 --- a/pkgs/development/compilers/llvm/7/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 5bb629931fd..34f8a5478d1 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -16,12 +16,14 @@ , enableManpages ? false , enableSharedLibraries ? true , enablePFM ? !stdenv.isDarwin +, enablePolly ? false }: let inherit (stdenv.lib) optional optionals optionalString; src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3"; + polly_src = fetch "polly" "0wgvayfilgb530bq51l7szxfb13l24nnrmyji2f6ncq95a24dw8v"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -34,6 +36,9 @@ in stdenv.mkDerivation (rec { unpackFile ${src} mv llvm-${version}* llvm sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile ${polly_src} + mv polly-* $sourceRoot/tools/polly ''; outputs = [ "out" "python" ] @@ -101,7 +106,7 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" ] ++ optionals enableSharedLibraries [ diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 048dd598a48..b7fc3e4dd77 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://mercurylang.org"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8709c718649..bfb3c154a3c 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "nasm-${version}"; version = "2.14.02"; - src = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l"; + src = fetchFromRepoOrCz { + repo = "nasm"; + rev = name; + sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + + postBuild = "make manpages"; doCheck = true; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 156657d61d6..ef07b01a750 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2019.01.08"; + version = "2019.02.20"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "c1d15c749c2aa105ee7b38ebe1b60a27e3743e8c"; - sha256 = "082ac03s6164s7dwz1l9phshl8m1lizn45jykabrhks5jcccchbh"; + rev = "e8d3aaaf34895a073e4023192d97fc936d090990"; + sha256 = "0ijqpjnn7x16crd6cmd4nmgay320flizmjb7bbvg9hv464z3p4x7"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index ae36041b33e..0d319d235fd 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.19.0"; + version = "0.19.4"; src = fetchurl { url = "https://nim-lang.org/download/${name}.tar.xz"; - sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1"; + sha256 = "0k59dhfsg5wnkc3nxg5a336pjd9jnfxabns63bl9n28iwdg16hgl"; }; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/compilers/ocaml/4.08.nix b/pkgs/development/compilers/ocaml/4.08.nix new file mode 100644 index 00000000000..c6d0a114974 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.08.nix @@ -0,0 +1,12 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "08"; + patch_version = "0+beta1"; + sha256 = "1jgvp4pyhrg27wqpsx88kacw3ymjiz44nms9lzbh5s8pp05z5f5f"; + + # If the executable is stripped it does not work + dontStrip = true; + + # Breaks build with Clang + hardeningDisable = [ "strictoverflow" ]; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 7ada5b804e3..0085739147b 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -41,8 +41,10 @@ stdenv.mkDerivation (args // rec { }; prefixKey = "-prefix "; - configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ] + configureFlags = optionals useX11 ( + if stdenv.lib.versionAtLeast version "4.08" + then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"] + else [ "-x11lib" x11lib "-x11include" x11inc ]) ++ optional flambdaSupport "-flambda" ; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index a389f0f5ca1..f2a566c87df 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -18,8 +18,8 @@ let else "amd64"; major = "11"; - update = ".0.1"; - build = "13"; + update = ".0.2"; + build = "9"; repover = "jdk-${major}${update}+${build}"; openjdk = stdenv.mkDerivation { @@ -27,7 +27,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; - sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm"; + sha256 = "0xc7nksvj72cgw8zrmvlcwaasinpij1j1959398a4nqvzpvpxg30"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 35575f1052e..a3a0a9d5934 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -98,7 +98,7 @@ let preConfigure = '' chmod +x configure substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell" + substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "${stdenv.shell}" substituteInPlace hotspot/make/linux/makefiles/dtrace.make --replace /usr/include/sys/sdt.h "/no-such-path" '' # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 4d88f3b9772..8342c9fd335 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -17,7 +17,8 @@ , installjdk ? true , pluginSupport ? true , installjce ? false -, licenseAccepted ? false +, config +, licenseAccepted ? config.oraclejdk.accept_license or false , glib , libxml2 , libav_0_8 diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 9528d798618..b44c7815e90 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.30.1"; + version = "1.32.0"; - # fetch hashes by running `print-hashes.sh 1.30.0` + # fetch hashes by running `print-hashes.sh 1.32.0` hashes = { - i686-unknown-linux-gnu = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf"; - x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e"; - armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b"; - aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874"; - i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083"; - x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94"; + i686-unknown-linux-gnu = "4ce3a6a656669fa86606074b43fadeac7465ef48394249407e21106ed714c8db"; + x86_64-unknown-linux-gnu = "e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810"; + armv7-unknown-linux-gnueabihf = "d7b69f60689d2905d8d3c2829b0f1cd0f86265a255ff88ea0deb601aebac6428"; + aarch64-unknown-linux-gnu = "60def40961728212da4b3a9767d5a2ddb748400e150a5f8a6d5aa0e1b8ba1cee"; + i686-apple-darwin = "76cc1280f6b61bf7cf1fddd5202cc236db7573ee05f39fc8cd12ddda8f39a7c3"; + x86_64-apple-darwin = "f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304"; }; platform = diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 02ea7ebbbfb..a7e2a40597b 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { inherit version src patches; # the rust source tarball already has all the dependencies vendored, no need to fetch them again - cargoVendorDir = "src/vendor"; - preBuild = "cd src; pushd tools/cargo"; + cargoVendorDir = "vendor"; + preBuild = "pushd src/tools/cargo"; postBuild = "popd"; passthru.rustc = rustc; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 1f24157eea4..df64fff04dd 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.31.0"; - cargoVersion = "1.31.0"; + version = "1.33.0"; + cargoVersion = "1.33.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs"; + sha256 = "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as"; }; in rec { rustc = callPackage ./rustc.nix { @@ -22,11 +22,6 @@ in rec { # Re-evaluate if this we need to disable this one #./patches/stdsimd-disable-doctest.patch - - # Fails on hydra - not locally; the exact reason is unknown. - # Comments in the test suggest that some non-reproducible environment - # variables such $RANDOM can make it fail. - ./patches/disable-test-inherit-env.patch ]; withBundledLLVM = false; diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch deleted file mode 100644 index fcb75ed098e..00000000000 --- a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rustc-1.26.2-src.org/src/libstd/process.rs 2018-06-01 21:40:11.000000000 +0100 -+++ rustc-1.26.2-src/src/libstd/process.rs 2018-06-08 07:50:23.023828658 +0100 -@@ -1745,6 +1745,7 @@ - } - - #[test] -+ #[ignore] - fn test_inherit_env() { - use env; - diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch index 10713b6b7aa..1bb9a98f7b6 100644 --- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch +++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch @@ -1,8 +1,8 @@ diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs -index 0f60b5b3e..9b08415e7 100644 +index 86ecb10edf..626be0a52d 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs -@@ -962,6 +962,7 @@ mod tests { +@@ -955,6 +955,7 @@ mod tests { } } @@ -10,7 +10,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn listen_localhost() { let socket_addr = next_test_ip4(); -@@ -1020,6 +1021,7 @@ mod tests { +@@ -1013,6 +1014,7 @@ mod tests { }) } @@ -18,7 +18,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn read_eof() { each_ip(&mut |addr| { -@@ -1039,6 +1041,7 @@ mod tests { +@@ -1032,6 +1034,7 @@ mod tests { }) } @@ -26,7 +26,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn write_close() { each_ip(&mut |addr| { -@@ -1065,6 +1068,7 @@ mod tests { +@@ -1058,6 +1061,7 @@ mod tests { }) } @@ -34,7 +34,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn multiple_connect_serial() { each_ip(&mut |addr| { -@@ -1087,6 +1091,7 @@ mod tests { +@@ -1080,6 +1084,7 @@ mod tests { }) } @@ -42,7 +42,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn multiple_connect_interleaved_greedy_schedule() { const MAX: usize = 10; -@@ -1123,6 +1128,7 @@ mod tests { +@@ -1116,6 +1121,7 @@ mod tests { } #[test] @@ -50,7 +50,7 @@ index 0f60b5b3e..9b08415e7 100644 fn multiple_connect_interleaved_lazy_schedule() { const MAX: usize = 10; each_ip(&mut |addr| { -@@ -1401,6 +1407,7 @@ mod tests { +@@ -1394,6 +1400,7 @@ mod tests { } #[test] @@ -58,7 +58,7 @@ index 0f60b5b3e..9b08415e7 100644 fn clone_while_reading() { each_ip(&mut |addr| { let accept = t!(TcpListener::bind(&addr)); -@@ -1421,7 +1422,10 @@ mod tests { +@@ -1504,7 +1511,10 @@ mod tests { // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code // no longer has rounding errors. @@ -70,7 +70,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn timeouts() { let addr = next_test_ip4(); -@@ -1596,6 +1603,7 @@ mod tests { +@@ -1591,6 +1601,7 @@ mod tests { drop(listener); } @@ -78,7 +78,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn nodelay() { let addr = next_test_ip4(); -@@ -1610,6 +1618,7 @@ mod tests { +@@ -1605,6 +1616,7 @@ mod tests { assert_eq!(false, t!(stream.nodelay())); } @@ -86,7 +86,7 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn ttl() { let ttl = 100; -@@ -1647,6 +1656,7 @@ mod tests { +@@ -1642,6 +1654,7 @@ mod tests { } } @@ -94,11 +94,3 @@ index 0f60b5b3e..9b08415e7 100644 #[test] fn peek() { each_ip(&mut |addr| { -@@ -1679,6 +1689,7 @@ mod tests { - } - - #[test] -+ #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)] - fn connect_timeout_unroutable() { - // this IP is unroutable, so connections should always time out, - // provided the network is reachable to begin with. diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index c6350e42bc2..1f43832716b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, targetPackages, removeReferencesTo , fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps -, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl +, llvm, ncurses, darwin, rustPlatform, git, cmake, curl , which, libffi, gdb , version , withBundledLLVM ? false @@ -20,8 +20,6 @@ let llvmShared = llvm.override { enableSharedLibraries = true; }; - prefixedJemalloc = jemalloc.override { stripPrefix = false; }; - target = builtins.replaceStrings [" "] [","] (builtins.toString targets); in @@ -62,7 +60,6 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" "--enable-vendor" - "--jemalloc-root=${prefixedJemalloc}/lib" "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] ++ optional (targets != []) "--target=${target}"; @@ -85,7 +82,6 @@ stdenv.mkDerivation { patchShebangs src/etc ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} - rm -rf src/jemalloc # Fix the configure script to not require curl as we won't use it sed -i configure \ @@ -97,7 +93,7 @@ stdenv.mkDerivation { # https://github.com/rust-lang/rust/issues/39522 echo removing gdb-version-sensitive tests... find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete - rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs} + rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums.rs,generic-enum-with-different-disr-sizes.rs} # Useful debugging parameter # export VERBOSE=1 diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 80ca6ade845..bca50616988 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.16"; + version = "1.5.0"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd"; + sha256 = "1a4c84b6qqi4w4l1zzhnhnywk73j3wb0gjgghzcw0h5syqbqzy8z"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index a2a03328b6d..b0ca96f23ac 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -1,32 +1,32 @@ { stdenv, fetchurl, darwin }: let - version = "110.84"; + version = "110.85"; baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}"; sources = map fetchurl [ - { url = "${baseurl}/config.tgz"; sha256 = "0cpqrvixqwf64fa94wzwf59p0lnnmwxgkwm3qwhf28l2fv5d640q"; } - { url = "${baseurl}/cm.tgz"; sha256 = "0qq6kdi8xqi3w1rsmi4rgjdbjr9m4crizb1ma5xg51x8h42ccmbh"; } - { url = "${baseurl}/compiler.tgz"; sha256 = "11zfdwr7a10ylzvap2j0c1py11zi500hfnmhd5lvy9spwzray8vd"; } - { url = "${baseurl}/runtime.tgz"; sha256 = "0v2dv0hh0gxnzzxz8vzqn5avxh7mynaj4g9kkbv4gcnxxaylpksz"; } - { url = "${baseurl}/system.tgz"; sha256 = "0612a6qls202l6wbckcd6dklh7nb75fk4c4qmbs9h2h0j3kisszl"; } - { url = "${baseurl}/MLRISC.tgz"; sha256 = "0wnhvy677p2f7pxlk8mmk3gi605nawy1zzn2cf4619wg04v54g6s"; } - { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1pg9y0lcp18fc91y45yb2lysnrzml00xdhcilkc1cx17am394mik"; } - { url = "${baseurl}/old-basis.tgz"; sha256 = "14zdkzfri4a7mj7zck2c43aqkg0y7kppp2nkbihg069g4ifgw5fg"; } - { url = "${baseurl}/ckit.tgz"; sha256 = "0dlccmnchs38www0a3ibrjxipf8xi03d7pgriynjqdyjjgik89by"; } - { url = "${baseurl}/nlffi.tgz"; sha256 = "0c9z2fq8d7ln4flzc5pkfym9rkjhjymjm60v1avh1c337lmai5lb"; } - { url = "${baseurl}/cml.tgz"; sha256 = "16jn5fn8khxnjj0kwjzavx2ms3kv16zy35wamh8k51nv8v3i0qam"; } - { url = "${baseurl}/eXene.tgz"; sha256 = "1701l155aiprzxh5p5whb9qbg368cqq0bzdwkwsxgrrllfhwdq9z"; } - { url = "${baseurl}/ml-lpt.tgz"; sha256 = "19dk9yqq6f5ayqlf7p95aakc4swj6x1j8m0ka2slzzb9g93f2q1g"; } - { url = "${baseurl}/ml-lex.tgz"; sha256 = "0w20w17rd67n6zgxzwq89k9ywc78l3ydxcax0pniwzv6m5d08znc"; } - { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1fdxhy4f2dgs19p20vg7yysi9gxp6hc1ggs97k4zq448y2ssxsyg"; } - { url = "${baseurl}/ml-burg.tgz"; sha256 = "066r0zy5rc60y8kzh2c06hy1b217lh6qffvxlwz8w1w86yqkgsk2"; } - { url = "${baseurl}/pgraph.tgz"; sha256 = "1jy1g9xiv14jj9svb5wgbdm520qbdhamfmxlf31xnh552gg18bxa"; } - { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0nkawi2mdmsw24a1pkwp2brixrvxyqgxzsylp7w7ak35p20l5igc"; } - { url = "${baseurl}/heap2asm.tgz"; sha256 = "159y8c8xnim7p4pyynjirqhwi73lkrq0fksk8wnpcdh5clmwacrx"; } - { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1sgfdnvkqa6wmwg027wg8lvg7zxq36p83bkymy8qkjdlxhxm2nhl"; } - { url = "${baseurl}/doc.tgz"; sha256 = "083h5h937gkhfq3xk982vmng903c83d98yh5fps53f62wib99mhf"; } - { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "10nf79jzmv64ag8c11fxd9ggw21a9kdn9shqkiz1kni3lq63p7m2"; } - { url = "${baseurl}/asdl.tgz"; sha256 = "13jvdgv63h4s8p9q563hyisbz464y88y2flvwyxvi1n11lh15rwb"; } + { url = "${baseurl}/config.tgz"; sha256 = "1qlir3q0vi7f1wyz2jyaiqy3z72d0xngsa122ks5g0b7b0hcdgm1"; } + { url = "${baseurl}/cm.tgz"; sha256 = "0330jkmaxgy085hsgajqikm242gms650rks24mfxhgk11r4ks105"; } + { url = "${baseurl}/compiler.tgz"; sha256 = "1zrqqvi9332g3clrh01z19sl06g3zlnp6zzz5z8rvsfwbiqp929m"; } + { url = "${baseurl}/runtime.tgz"; sha256 = "1n9hd99s2i834yihx4n59gl1cnh7hiiz8im735bmifmv50vzfdf4"; } + { url = "${baseurl}/system.tgz"; sha256 = "17samia4lzcz3mk73i330bspap2ks937arx35n9dr7bws0appfm8"; } + { url = "${baseurl}/MLRISC.tgz"; sha256 = "039g6dwxy96bkvw1z19vwn8q150h7s8jlcmsg851bgz3j3h6vs18"; } + { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1wk4w1npipm6qqgwis2xrbdjamwmiwv6ci4y40nzryhb37yxfj6d"; } + { url = "${baseurl}/old-basis.tgz"; sha256 = "0lkhbkkglz7lk1c93hc1y1di5dx20fgfhybvsqjp1bcwz8jsd70y"; } + { url = "${baseurl}/ckit.tgz"; sha256 = "14qxgw2vhq4dfiv5zl2gdhvjp75s10dqw97mqxffmh3vayyad1fi"; } + { url = "${baseurl}/nlffi.tgz"; sha256 = "16l8iszkyh34dqdbplsxycipvbw61yjamgxllcq8axiq4h7spy7w"; } + { url = "${baseurl}/cml.tgz"; sha256 = "05dlqz4r3qa3rpqgjlx91fsfx7j6gk3dkw28zcgg5g32irmd1la3"; } + { url = "${baseurl}/eXene.tgz"; sha256 = "07mahzxns26hkfax9gc8cq4s8sfzj531wwnm47b8qkhd72d3ncn2"; } + { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0073hfn98l61ryshhqw9855fb49vs9qcz9nplbg2pa2f7manqbk0"; } + { url = "${baseurl}/ml-lex.tgz"; sha256 = "106km17f4wyvhzkx62cfq2gp4ihya8l234550laqb50zf8vxyklq"; } + { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1r0k7lz8xnir271pykbs4agadysbs35kkmg1p816kzfyz5bsrrq9"; } + { url = "${baseurl}/ml-burg.tgz"; sha256 = "10jqasplbxp50ryq74aazbnyaz8l492rhdij5mr1kzyfj79fysh9"; } + { url = "${baseurl}/pgraph.tgz"; sha256 = "1pxqddbrb7y9kp89gz8v8vfjmw4wajfy6757gb8c6x499jarxa60"; } + { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0fkalpdzdrm1gmafn33ck4dw8s92p9iwm4fav4m9jcqyha9az3g7"; } + { url = "${baseurl}/heap2asm.tgz"; sha256 = "056gkmrylyrf0q0r3cpx76zx8mc62033jkn1bnjn0f8r31yhbipc"; } + { url = "${baseurl}/smlnj-c.tgz"; sha256 = "04c4jnylj5dnd4sjywzwnqlv9g7dkrilq6d4cy543dw03yhjdykw"; } + { url = "${baseurl}/doc.tgz"; sha256 = "1rpk9g1nhjpc2b4pmzmj8v80knrhljn17ghiwznnljv53hka7jzx"; } + { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "05rh1y74jvp6zs96mb7nkwbgwwbss0zy2iw4gicdkyf6in0nk4la"; } + { url = "${baseurl}/asdl.tgz"; sha256 = "1d465bncgy92ni6430dbq6isvnysfhvykjrxm98dz82iih7a6vqb"; } ]; in stdenv.mkDerivation { name = "smlnj-${version}"; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index b7a2f602cc6..bd4b10ddec0 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: +{ stdenv, fetchzip, fetchFromGitHub, boost, cmake +, z3Support ? true, z3 ? null +}: + +assert z3Support -> z3 != null; let version = "0.5.3"; @@ -33,6 +37,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_SHARED_LIBS=ON" + ] ++ stdenv.lib.optionals (!z3Support) [ + "-DUSE_Z3=OFF" ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; @@ -40,7 +46,8 @@ stdenv.mkDerivation { "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost z3 ]; + buildInputs = [ boost ] + ++ stdenv.lib.optionals z3Support [ z3 ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 80d04080aac..312facde948 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }: let - luajitArchive = "LuaJIT-2.0.4.tar.gz"; + luajitArchive = "LuaJIT-2.0.5.tar.gz"; luajitSrc = fetchurl { url = "http://luajit.org/download/${luajitArchive}"; - sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; }; in stdenv.mkDerivation rec { name = "terra-git-${version}"; - version = "2016-06-09"; + version = "1.0.0-beta1"; src = fetchFromGitHub { owner = "zdevito"; repo = "terra"; - rev = "22696f178be8597af555a296db804dba820638ba"; - sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g"; + rev = "release-${version}"; + sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c"; }; outputs = [ "bin" "dev" "out" "static" ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 5f21399229a..d94437b6a16 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook -, graphviz, glib, libiconv, libintl, libtool, expat +, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll }: let @@ -45,6 +45,11 @@ let name = "vala-${version}"; version = "${major}.${minor}"; + setupHook = substituteAll { + src = ./setup-hook.sh; + apiVersion = major; + }; + src = fetchurl { url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; inherit sha256; diff --git a/pkgs/development/compilers/vala/setup-hook.sh b/pkgs/development/compilers/vala/setup-hook.sh new file mode 100644 index 00000000000..8252143e998 --- /dev/null +++ b/pkgs/development/compilers/vala/setup-hook.sh @@ -0,0 +1,15 @@ +make_vala_find_vapi_files() { + # XDG_DATA_DIRS: required for finding .vapi files + if [ -d "$1/share/vala/vapi" -o -d "$1/share/vala-@apiVersion@/vapi" ]; then + addToSearchPath XDG_DATA_DIRS $1/share + fi +} + +addEnvHooks "$hostOffset" make_vala_find_vapi_files + +_multioutMoveVapiDirs() { + moveToOutput share/vala/vapi "${!outputDev}" + moveToOutput share/vala-@apiVersion@/vapi "${!outputDev}" +} + +preFixupHooks+=(_multioutMoveVapiDirs) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 1afeae73f2f..7167a967c1c 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2019.01.08"; + version = "2019.02.22"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "2a2e0a4722ded7628b71f436b94a06aebd57bb62"; - sha256 = "19wzh7yssk90s58l2f89m0q5bjjrjpkhvikf5zc0563wccvl712c"; + rev = "c521f4632f1c82b48a5538c832980668044e8fd9"; + sha256 = "18pg1ry5qhhx8c49n2gqwlf55sd9bfsfk3khfyh1a1vjh1qpfgdf"; name = "yosys"; }) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index b282a49e8af..eb45f446dc9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -130,7 +130,7 @@ let echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then echo "$OUT" >&2 return 1 @@ -163,11 +163,12 @@ let else touch $TMPDIR/buildFlagsArray fi - export -f buildGoDir # xargs needs to see the function if [ -z "$enableParallelBuilding" ]; then export NIX_BUILD_CORES=1 fi - getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' -- + for pkg in $(getGoDirs ""); do + buildGoDir install "$pkg" + done '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # normalize cross-compiled builds w.r.t. native builds ( @@ -187,7 +188,9 @@ let checkPhase = args.checkPhase or '' runHook preCheck - getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' -- + for pkg in $(getGoDirs test); do + buildGoDir test "$pkg" + done runHook postCheck ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41d050531a3..e27348b9455 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,7 +85,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "06385r9rlncrrmzdfl8q600bw6plbvkmkwgl3llg595xrm711a97"; + sha256 = "1v2v6cwy957y5rgclb66ia7bl5j5mx291s3lh2swa39q3420m6v0"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -953,17 +953,13 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # hledger needs a newer megaparsec version than we have in LTS 12.x. - hledger-lib = super.hledger-lib.overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; - }); - # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { postInstall = '' + # Don't install files that don't belong into this package to avoid + # conflicts when hledger and hledger-ui end up in the same profile. + rm embeddedfiles/hledger-{api,ui,web}.* for i in $(seq 1 9); do for j in embeddedfiles/*.$i; do mkdir -p $out/share/man/man$i @@ -974,7 +970,7 @@ self: super: { cp -v embeddedfiles/*.info* $out/share/info/ ''; }); - hledger-ui = (overrideCabal super.hledger-ui (drv: { + hledger-ui = overrideCabal super.hledger-ui (drv: { postInstall = '' for i in $(seq 1 9); do for j in *.$i; do @@ -985,11 +981,6 @@ self: super: { mkdir -p $out/share/info cp -v *.info* $out/share/info/ ''; - })).overrideScope (self: super: { - # cassava-megaparsec = self.cassava-megaparsec_2_0_0; - # config-ini = self.config-ini_0_2_4_0; - # hspec-megaparsec = self.hspec-megaparsec_2_0_0; - # megaparsec = self.megaparsec_7_0_4; }); hledger-web = overrideCabal super.hledger-web (drv: { postInstall = '' @@ -1231,4 +1222,16 @@ self: super: { # https://github.com/qfpl/tasty-hedgehog/issues/24 tasty-hedgehog = dontCheck super.tasty-hedgehog; + # The latest release version is ancient. You really need this tool from git. + haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" + (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { + version = "2019.02.22-git"; + src = pkgs.fetchFromGitHub { + owner = "haskell-CI"; + repo = "haskell-ci"; + rev = "3a861aa7d6099296a9ac1003c7218e3ed831ca8c"; + sha256 = "0hwfg3ab5mh3xml3nlabbr1x8bhg26gw6sxn8bgb8bh6r0ccq9pi"; + }; + }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck])); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index c2fbb4d6126..de01fe4cd12 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -20,6 +20,7 @@ self: super: { ghc-boot = null; ghc-boot-th = null; ghc-compact = null; + ghc-heap = null; ghc-prim = null; ghci = null; haskeline = null; @@ -42,11 +43,6 @@ self: super: { stm = self.stm_2_5_0_0; text = self.text_1_2_3_1; - # Make sure we can still build Cabal 1.x. - Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: { - prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; - }); - # Build with the latest Cabal version, which works best albeit not perfectly. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; }; @@ -89,10 +85,10 @@ self: super: { cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - # GHC 8.2 doesn't have semigroups included by default + # Older GHC versions need these additional dependencies. ListLike = addBuildDepend super.ListLike self.semigroups; + base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 2a72eced2ba..4e953b7b6af 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -20,6 +20,7 @@ self: super: { ghc-boot = null; ghc-boot-th = null; ghc-compact = null; + ghc-heap = null; ghc-prim = null; ghci = null; haskeline = null; @@ -63,15 +64,12 @@ self: super: { # more verbose but friendlier for Hydra. stack = (doJailbreak super.stack).override { Cabal = self.Cabal_2_4_1_0; - hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_1_0; }; - yaml = self.yaml_0_11_0_0; + hpack = self.hpack.override { Cabal = self.Cabal_2_4_1_0; }; hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; }; }; - hpack_0_31_1 = super.hpack_0_31_1.override { - yaml = self.yaml_0_11_0_0; - }; - # cabal2nix doesn't list this because of a conditional on the GHC version. + # Older GHC versions need these additional dependencies. aeson = addBuildDepend super.aeson self.contravariant; + base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index abfbe69568a..2d382e90632 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -45,7 +45,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; @@ -54,7 +53,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 2118be37534..09755e4cc94 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -52,7 +52,6 @@ self: super: { unordered-containers = dontCheck super.unordered-containers; # Test suite does not compile. - cereal = dontCheck super.cereal; data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x dates = doJailbreak super.dates; # base >=4.9 && <4.12 Diff = dontCheck super.Diff; @@ -60,7 +59,6 @@ self: super: { hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 http-api-data = doJailbreak super.http-api-data; persistent-sqlite = dontCheck super.persistent-sqlite; - psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience" unicode-transforms = dontCheck super.unicode-transforms; wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7071f345037..28022fdf41c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.7 + # LTS Haskell 13.9 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -234,7 +234,7 @@ default-package-overrides: - authenticate-oauth ==1.6 - auto ==0.4.3.1 - autoexporter ==1.1.13 - - auto-update ==0.1.4 + - auto-update ==0.1.4.1 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 @@ -365,7 +365,7 @@ default-package-overrides: - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - category ==0.2.2.0 - - cayley-client ==0.4.8 + - cayley-client ==0.4.9 - cborg ==0.2.1.0 - cborg-json ==0.2.1.0 - cereal ==0.5.8.0 @@ -447,7 +447,7 @@ default-package-overrides: - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 - - conduit-extra ==1.3.0 + - conduit-extra ==1.3.1 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 @@ -481,7 +481,7 @@ default-package-overrides: - cql-io ==1.0.1.1 - crackNum ==2.3 - credential-store ==0.1.2 - - criterion ==1.5.3.0 + - criterion ==1.5.4.0 - criterion-measurement ==0.1.1.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -557,8 +557,8 @@ default-package-overrides: - dataurl ==0.1.0.0 - DAV ==1.3.3 - dbcleaner ==0.1.3 - - DBFunctor ==0.1.1.0 - - dbus ==1.2.3 + - DBFunctor ==0.1.1.1 + - dbus ==1.2.4 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 @@ -595,7 +595,7 @@ default-package-overrides: - digits ==0.3.1 - di-monad ==1.3 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.23 + - direct-sqlite ==2.3.24 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.1 @@ -610,7 +610,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.16.0.1 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.0 + - doctest-driver-gen ==0.3.0.1 - do-list ==1.0.1 - dom-parser ==3.1.0 - dotenv ==0.8.0.0 @@ -644,7 +644,7 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.29 - eliminators ==0.5 - - elm2nix ==0.1.0 + - elm2nix ==0.1.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 @@ -664,6 +664,7 @@ default-package-overrides: - errors-ext ==0.4.2 - error-util ==0.0.1.2 - ersatz ==0.4.4 + - esqueleto ==2.6.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 @@ -698,7 +699,7 @@ default-package-overrides: - fb ==1.2.1 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - - fedora-dists ==1.0.0.2 + - fedora-dists ==1.0.1 - fedora-haskell-tools ==0.6 - feed ==1.0.1.0 - FenwickTree ==0.1.2.1 @@ -710,6 +711,7 @@ default-package-overrides: - filelock ==0.1.1.2 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 + - filepattern ==0.1.1 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 @@ -784,7 +786,7 @@ default-package-overrides: - generics-mrsop ==1.2.2 - generics-sop ==0.4.0.1 - generics-sop-lens ==0.1.2.1 - - genvalidity ==0.7.0.0 + - genvalidity ==0.7.0.1 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.3.0.1 - genvalidity-containers ==0.5.1.1 @@ -850,7 +852,7 @@ default-package-overrides: - gloss-rendering ==1.13.0.2 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - - gnuplot ==0.5.5.3 + - gnuplot ==0.5.6 - goggles ==0.3.2 - google-isbn ==1.0.3 - google-oauth2-jwt ==0.3.1 @@ -865,9 +867,11 @@ default-package-overrides: - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groundhog ==0.10.0 + - groundhog-inspector ==0.10.0 - groundhog-mysql ==0.10 - groundhog-postgresql ==0.10 - groundhog-sqlite ==0.10.0 + - groundhog-th ==0.10.2 - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 @@ -901,7 +905,7 @@ default-package-overrides: - haskell-src ==1.0.3.0 - haskell-src-exts ==1.20.3 - haskell-src-exts-util ==0.2.4 - - haskell-src-meta ==0.8.0.3 + - haskell-src-meta ==0.8.1 - haskey-btree ==0.3.0.0 - haskoin-core ==0.8.4 - hasql ==1.3.0.3 @@ -918,11 +922,11 @@ default-package-overrides: - HDBC-session ==0.1.2.0 - heap ==1.0.4 - heaps ==0.3.6.1 - - hebrew-time ==0.1.1 + - hebrew-time ==0.1.2 - hedgehog ==0.6.1 - hedgehog-corpus ==0.1.0 - hedis ==0.10.10 - - hedn ==0.2.0.0 + - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.3 @@ -977,8 +981,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1103,14 +1107,14 @@ default-package-overrides: - inline-c-cpp ==0.3.0.1 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.1.0 - - inspection-testing ==0.4.1.1 + - inspection-testing ==0.4.1.2 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2.2 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 - interpolatedstring-perl6 ==1.0.1 - - interpolation ==0.1.0.3 + - interpolation ==0.1.1 - interpolator ==0.1.1 - IntervalMap ==0.6.1.0 - intervals ==0.8.1 @@ -1184,7 +1188,7 @@ default-package-overrides: - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.6.0.11 - - language-puppet ==1.4.2 + - language-puppet ==1.4.3 - lapack-ffi ==0.0.2 - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 @@ -1216,7 +1220,7 @@ default-package-overrides: - libgraph ==1.14 - libmpd ==0.9.0.9 - libraft ==0.1.1.0 - - libyaml ==0.1.0.0 + - libyaml ==0.1.1.0 - LibZip ==1.0.1 - lifted-async ==0.10.0.3 - lifted-base ==0.2.3.12 @@ -1321,7 +1325,7 @@ default-package-overrides: - mmap ==0.5.9 - mmark ==0.0.6.1 - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.1 + - mmark-ext ==0.2.1.2 - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 @@ -1491,10 +1495,10 @@ default-package-overrides: - parsers ==0.12.9 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.0.0 + - partial-semigroup ==0.5.1.0 - path ==0.6.1 - path-extra ==0.2.0 - - path-io ==1.4.1 + - path-io ==1.4.2 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.2 - pathtype ==0.8.1 @@ -1614,7 +1618,7 @@ default-package-overrides: - proto-lens-runtime ==0.4.0.2 - proto-lens-setup ==0.4.0.2 - protolude ==0.2.3 - - proxied ==0.3 + - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - psqueues ==0.2.7.1 - pureMD5 ==2.1.3 @@ -1825,11 +1829,12 @@ default-package-overrides: - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - show-combinators ==0.1.1.0 - - show-prettyprint ==0.2.2 + - show-prettyprint ==0.2.3 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.2 + - simple-cmd ==0.1.3 + - simple-cmd-args ==0.1.0.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.28 @@ -2038,6 +2043,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 + - tidal ==1.0.7 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2147,7 +2153,7 @@ default-package-overrides: - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1 - - validity ==0.9.0.0 + - validity ==0.9.0.1 - validity-aeson ==0.2.0.2 - validity-bytestring ==0.4.0.0 - validity-containers ==0.3.1.0 @@ -2183,7 +2189,7 @@ default-package-overrides: - void ==0.7.2 - vty ==5.25.1 - wai ==3.2.2 - - wai-app-static ==3.1.6.2 + - wai-app-static ==3.1.6.3 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 @@ -2221,7 +2227,7 @@ default-package-overrides: - websockets-snap ==0.10.3.0 - weigh ==0.0.13 - wide-word ==0.1.0.8 - - wikicfp-scraper ==0.1.0.9 + - wikicfp-scraper ==0.1.0.10 - wild-bind ==0.1.2.3 - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 @@ -2286,26 +2292,26 @@ default-package-overrides: - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yam ==0.5.11 - - yam-datasource ==0.5.11 + - yam ==0.5.13 + - yam-datasource ==0.5.13 - yaml ==0.11.0.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - - yesod-auth ==1.6.5 + - yesod-auth ==1.6.6 - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.11 + - yesod-core ==1.6.12 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - yesod-form ==1.6.4 - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - - yesod-gitrev ==0.2.0.0 + - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.1 - yesod-newsfeed ==1.6.1.0 - yesod-paginator ==1.1.0.1 @@ -3226,6 +3232,7 @@ dont-distribute-packages: broadcast-chan-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] broadcast-chan: [ i686-linux, x86_64-linux, x86_64-darwin ] broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] + brok: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] browscap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3279,6 +3286,7 @@ dont-distribute-packages: c2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-bundle-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3325,6 +3333,7 @@ dont-distribute-packages: caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + cairo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3474,6 +3483,7 @@ dont-distribute-packages: cil: [ i686-linux, x86_64-linux, x86_64-darwin ] cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] cio: [ i686-linux, x86_64-linux, x86_64-darwin ] + ciphersaber2: [ i686-linux, x86_64-linux, x86_64-darwin ] circlehs: [ i686-linux, x86_64-linux, x86_64-darwin ] citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3922,10 +3932,12 @@ dont-distribute-packages: data-util: [ i686-linux, x86_64-linux, x86_64-darwin ] data-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] + datadog-tracing: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] datafix: [ i686-linux, x86_64-linux, x86_64-darwin ] dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + datasets: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] date-conversions: [ i686-linux, x86_64-linux, x86_64-darwin ] dates: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4586,6 +4598,7 @@ dont-distribute-packages: flite: [ i686-linux, x86_64-linux, x86_64-darwin ] float-binstring: [ i686-linux, x86_64-linux, x86_64-darwin ] floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + floskell: [ i686-linux, x86_64-linux, x86_64-darwin ] flow-er: [ i686-linux, x86_64-linux, x86_64-darwin ] flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4740,6 +4753,7 @@ dont-distribute-packages: game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] + gamma: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gargoyle-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4846,6 +4860,7 @@ dont-distribute-packages: ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4878,6 +4893,7 @@ dont-distribute-packages: ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-cairo-again: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gsttag: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5243,6 +5259,7 @@ dont-distribute-packages: happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay-ajax: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-foundation: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hamlet: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5437,6 +5454,7 @@ dont-distribute-packages: haskus-utils-data: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-utils-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskus-web: [ i686-linux, x86_64-linux, x86_64-darwin ] haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5725,6 +5743,7 @@ dont-distribute-packages: hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmep: [ i686-linux, x86_64-linux, x86_64-darwin ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6256,6 +6275,7 @@ dont-distribute-packages: insert-ordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] + instana-haskell-trace-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6472,7 +6492,9 @@ dont-distribute-packages: kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-logzio: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-scalyr-scribe: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6526,6 +6548,7 @@ dont-distribute-packages: krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ] Kriens: [ i686-linux, x86_64-linux, x86_64-darwin ] krpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ks-test: [ i686-linux, x86_64-linux, x86_64-darwin ] KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6652,6 +6675,7 @@ dont-distribute-packages: ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] + leanpub-wreq: [ i686-linux, x86_64-linux, x86_64-darwin ] leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6958,6 +6982,7 @@ dont-distribute-packages: MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] master-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] + math-grads: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathflow: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7092,6 +7117,8 @@ dont-distribute-packages: ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] mltool: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmark-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmark-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7648,6 +7675,7 @@ dont-distribute-packages: pareto: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] + parseargs: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-free: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-pratt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7971,6 +7999,7 @@ dont-distribute-packages: priority-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] + probable: [ i686-linux, x86_64-linux, x86_64-darwin ] proc: [ i686-linux, x86_64-linux, x86_64-darwin ] process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8181,6 +8210,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rating-chgk-info: [ i686-linux, x86_64-linux, x86_64-darwin ] rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8249,6 +8279,7 @@ dont-distribute-packages: refh: [ i686-linux, x86_64-linux, x86_64-darwin ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom-core: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8474,6 +8505,7 @@ dont-distribute-packages: saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] + salak: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8502,6 +8534,8 @@ dont-distribute-packages: sax: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbvPlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + sc2-lowlevel: [ i686-linux, x86_64-linux, x86_64-darwin ] + sc2-proto: [ i686-linux, x86_64-linux, x86_64-darwin ] sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8543,6 +8577,7 @@ dont-distribute-packages: scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + scrapbook: [ i686-linux, x86_64-linux, x86_64-darwin ] scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] script-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8666,6 +8701,7 @@ dont-distribute-packages: servant-swagger-ui-redoc: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-waargonaut: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8739,6 +8775,7 @@ dont-distribute-packages: shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] ShortestPathProblems: [ i686-linux, x86_64-linux, x86_64-darwin ] showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] + shower: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] shuffle: [ i686-linux, x86_64-linux, x86_64-darwin ] si-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8843,6 +8880,8 @@ dont-distribute-packages: sme: [ i686-linux, x86_64-linux, x86_64-darwin ] smerdyakov: [ i686-linux, x86_64-linux, x86_64-darwin ] smiles: [ i686-linux, x86_64-linux, x86_64-darwin ] + smith-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + smith-client: [ i686-linux, x86_64-linux, x86_64-darwin ] Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8945,6 +8984,8 @@ dont-distribute-packages: sorting: [ i686-linux, x86_64-linux, x86_64-darwin ] sorty: [ i686-linux, x86_64-linux, x86_64-darwin ] sound-collage: [ i686-linux, x86_64-linux, x86_64-darwin ] + sounddelay: [ i686-linux, x86_64-linux, x86_64-darwin ] + soundgen: [ i686-linux, x86_64-linux, x86_64-darwin ] source-code-server: [ i686-linux, x86_64-linux, x86_64-darwin ] SourceGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9075,6 +9116,7 @@ dont-distribute-packages: stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + stdio: [ i686-linux, x86_64-linux, x86_64-darwin ] steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9274,6 +9316,7 @@ dont-distribute-packages: target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] + taskell: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9552,6 +9595,7 @@ dont-distribute-packages: tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] trivia: [ i686-linux, x86_64-linux, x86_64-darwin ] tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] + truelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] trurl: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9785,6 +9829,7 @@ dont-distribute-packages: vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9915,6 +9960,7 @@ dont-distribute-packages: wasm: [ i686-linux, x86_64-linux, x86_64-darwin ] watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + WAVE: [ i686-linux, x86_64-linux, x86_64-darwin ] wavefront-obj: [ i686-linux, x86_64-linux, x86_64-darwin ] WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9970,6 +10016,7 @@ dont-distribute-packages: whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] why3: [ i686-linux, x86_64-linux, x86_64-darwin ] + wide-word: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] wild-bind-indicator: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0502e700313..11cede5771a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -286,7 +286,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ... + gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); @@ -487,6 +487,9 @@ self: super: builtins.intersectAttrs super { # https://github.com/plow-technologies/servant-streaming/issues/12 servant-streaming-server = dontCheck super.servant-streaming-server; + # https://github.com/haskell-servant/servant/pull/1128 + servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch; + # tests run executable, relying on PATH # without this, tests fail with "Couldn't launch intero process" intero = overrideCabal super.intero (drv: { diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2724ff5d622..e8195668c41 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -19,6 +19,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , buildFlags ? [] +, haddockFlags ? [] , description ? "" , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false @@ -372,7 +373,8 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ - ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} + ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ + ${stdenv.lib.concatStringsSep " " haddockFlags} ''} runHook postHaddock ''; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f7a8e6c0182..8b0f62c60f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3520,34 +3520,6 @@ self: { }: mkDerivation { pname = "DBFunctor"; - version = "0.1.1.0"; - sha256 = "1hjjnjs8nlqrqfiv5qxn60avl1avpgsxx8aq5hihrr6f6yj61s4a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - executableHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava cereal containers deepseq either MissingH - text time transformers unordered-containers vector - ]; - description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "DBFunctor_0_1_1_1" = callPackage - ({ mkDerivation, base, bytestring, cassava, cereal, containers - , deepseq, either, MissingH, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "DBFunctor"; version = "0.1.1.1"; sha256 = "0n3qmgjf9ly5vpnsvh8rhwbd94l157d1asy95n8yqpmrb6xqc1k4"; isLibrary = true; @@ -4649,6 +4621,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Earley_0_13_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, ListLike, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "Earley"; + version = "0.13.0.1"; + sha256 = "169qjicjj09wg879vp86ali4rrqpw0ikazvdi3i1qi6pl3yvqq0y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ListLike ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq ListLike parsec + ]; + description = "Parsing all context-free grammars using Earley's algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Ebnf2ps" = callPackage ({ mkDerivation, array, base, containers, directory, happy , old-time, unix @@ -14984,8 +14978,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.7.1.0"; - sha256 = "1zgf37q6jcvda28vfmbhlr1jvcgpq2ma4n67i2id02bmc86nk4x1"; + version = "0.7.3.0"; + sha256 = "17asilwlq7c8kj5jk0gm0pkfr2m65pgdspgx8hl0hwlp1wsg74yl"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec template-haskell text @@ -18836,6 +18830,7 @@ self: { ]; description = "WAVE audio file IO library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WL500gPControl" = callPackage @@ -21306,6 +21301,8 @@ self: { pname = "acme-zalgo"; version = "0.1.2.1"; sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz"; + revision = "1"; + editedCabalFile = "1bwpaqqvp8mwpw7966xjn8zhi0rs9iqpwkhkzjxw8c885h45n1za"; libraryHaskellDepends = [ array base random ]; description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; license = stdenv.lib.licenses.mit; @@ -21472,6 +21469,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ad_4_3_6" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, semigroups, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.3.6"; + sha256 = "0fgpv3lm20k1vwlychs7a76hn96cvpbczkdcbg9mr9f1nivg7035"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base comonad containers data-reify erf free nats reflection + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21683,6 +21701,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "adtrees" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "adtrees"; + version = "0.1.0.0"; + sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg"; + libraryHaskellDepends = [ base ]; + description = "Modelling, rendering and quantitative analysis on attack defense trees"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "advent-of-code-api" = callPackage ({ mkDerivation, attoparsec, base, containers, curl, deepseq , directory, filepath, finite-typelits, HUnit, mtl, tagsoup, text @@ -21879,6 +21908,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-casing_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck + , tasty-th + }: + mkDerivation { + pname = "aeson-casing"; + version = "0.1.1.0"; + sha256 = "14qx1aqrf25bdasrwibprl116ixxfr0s4fc62fa6pdj64a7jc480"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base tasty tasty-hunit tasty-quickcheck tasty-th + ]; + description = "Tools to change the formatting of field names in Aeson instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-coerce" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text }: mkDerivation { @@ -22867,20 +22913,20 @@ self: { , bytestring, bytestring-trie, case-insensitive, containers , cryptohash, directory, either, filepath, http-date, http-media , http-types, lifted-base, microlens, mime-types, mmorph - , monad-control, mtl, network, old-locale, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers + , monad-control, mtl, network, old-locale, random, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers , transformers-base, unix, unordered-containers, wai, wai-extra }: mkDerivation { pname = "airship"; - version = "0.9.3"; - sha256 = "0nildnm2f8n87sy6lrzkfxjypf72vy3d8yknl9qcnzv6kmyq6m72"; + version = "0.9.4"; + sha256 = "03wawmbd1dcf9bmv9046q93gn6isdlpcyvzb7bp0awqmzaymyw4z"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring bytestring-trie case-insensitive containers cryptohash directory either filepath http-date http-media http-types lifted-base microlens mime-types mmorph monad-control mtl network old-locale - random text time transformers transformers-base unix + random semigroups text time transformers transformers-base unix unordered-containers wai wai-extra ]; testHaskellDepends = [ @@ -23287,6 +23333,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alg_0_2_10_0" = callPackage + ({ mkDerivation, base, util }: + mkDerivation { + pname = "alg"; + version = "0.2.10.0"; + sha256 = "1zpr3knnj37fwi6h7mlxdlm88iy47srx1nkhgkix3f81ig9hlzd9"; + libraryHaskellDepends = [ base util ]; + description = "Algebraic structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions , file-embed, filepath, formatting, haskeline, hspec, hxt @@ -23529,10 +23587,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alist"; - version = "0.1.0.5"; - sha256 = "19771h6vxzxn0zj0r59qgc6lclks3ysxli21dziavmr784z2dbgn"; - revision = "1"; - editedCabalFile = "1lc1x072g6vkfifh11cfpw95wb0ly9ifs8xg3y1yrpqv4fyl8y0b"; + version = "0.1.0.6"; + sha256 = "19r7g8ghpiklam6pv081sh60d7lrlznpwbp5yqlm5h7ah1m284jh"; libraryHaskellDepends = [ base ]; description = "lists with O(1) append"; license = stdenv.lib.licenses.bsd3; @@ -27268,14 +27324,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_6_3_0" = callPackage + "antiope-athena_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "6.3.0"; - sha256 = "0yzvzhwl92k1v50w1jzlz2zq5rp7n6x1j51fpqrqq97vj7vqzfsq"; + version = "6.4.0"; + sha256 = "0537hjh070l6z5wylbzr41qka3j75q2sbshqcmaazarzllsr5mxk"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -27292,8 +27348,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.3.0"; - sha256 = "1d9z3vm7ab6fn0b1v0795v36x36j7lczjgkn2krx7zxq7srzf77l"; + version = "6.4.0"; + sha256 = "1l6a80plff3f9yd2iaw7hpqvas177xbkprz9maxk2xlf7klzpvcd"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -27324,15 +27380,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-core_6_3_0" = callPackage + "antiope-core_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, base, bytestring , exceptions, generic-lens, http-client, http-types, lens , monad-logger, mtl, resourcet, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "6.3.0"; - sha256 = "001qkmiild396pg9hnw776djygjm692k1w9bmckn6l9ahiz8yah0"; + version = "6.4.0"; + sha256 = "0snfalkpv9ckh3mkffx96zql3vnr479kkxxdyl2f2iad616a5wss"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens monad-logger mtl resourcet text @@ -27368,15 +27424,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-dynamodb_6_3_0" = callPackage + "antiope-dynamodb_6_4_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.3.0"; - sha256 = "0912726sm6g2ssrzni3ldiavb506wa51ib07n4gm8vapzhnwxxlb"; + version = "6.4.0"; + sha256 = "10kdvmfy7aya2yv77048mrkr9xdms5rq4gdip9ssidasib0fxcai"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -27412,15 +27468,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-messages_6_3_0" = callPackage + "antiope-messages_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson , monad-loops, network-uri, text, unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "6.3.0"; - sha256 = "0yg38mayxzm7awgn0jczyh3vkyvhm3nmi47vry7knws916xrpr4x"; + version = "6.4.0"; + sha256 = "0m7sag2pk0sba1v14xpc60b7h5pk6s807yi0n5h6xrfsvslp09k9"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27461,27 +27517,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-s3_6_3_0" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core - , attoparsec, base, bytestring, conduit, conduit-extra, exceptions - , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog - , lens, monad-logger, mtl, network-uri, resourcet, text - , unliftio-core + "antiope-s3_6_4_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, attoparsec, base, bytestring, conduit + , conduit-extra, exceptions, generic-lens, hedgehog, hspec + , http-types, hw-hspec-hedgehog, lens, monad-logger, mtl + , network-uri, resourcet, text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.3.0"; - sha256 = "00szjn9vbb6xndzs0wpq2hw9a529ldy5y0pckfm3xkd6ap5ifx41"; + version = "6.4.0"; + sha256 = "019j8n0rmv4cmkaa8lc69r02lrwbk267y99qbwy3fx2wqdicdij2"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens http-types - lens monad-logger mtl network-uri resourcet text unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + http-types lens monad-logger mtl network-uri resourcet text time + unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 antiope-core attoparsec base - bytestring conduit conduit-extra exceptions generic-lens hedgehog - hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + hedgehog hspec http-types hw-hspec-hedgehog lens monad-logger mtl + network-uri resourcet text time unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27507,21 +27564,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-sns_6_3_0" = callPackage + "antiope-sns_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, unliftio-core + , generic-lens, lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "6.3.0"; - sha256 = "0fr51vp8ihlv7pnlrl73knd8wwck1rsw5v4yzm2b8299m7gqd86v"; + version = "6.4.0"; + sha256 = "0ghr37p0k8pgch42cksfdinz7h7q7brvknj7flj1bgkh03j3gw03"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core + text time unliftio-core ]; testHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text unliftio-core + text time unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27550,7 +27607,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "antiope-sqs_6_3_0" = callPackage + "antiope-sqs_6_4_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-sqs, antiope-messages, antiope-s3, base, conduit , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri @@ -27558,8 +27615,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.3.0"; - sha256 = "0a1kkzy9nldhwgh8xvnp4lqv49gpm6q9prnv2bgwlp00izy2r5s1"; + version = "6.4.0"; + sha256 = "067c29virlmi3lizhr9kmakr23ipc6sy2wwhg7wgf1wbmwcszs8j"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base conduit generic-lens lens @@ -27799,6 +27856,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs_0_7_3" = callPackage + ({ mkDerivation, base, containers, criterion, linear, mtl + , QuickCheck, template-haskell, vector + }: + mkDerivation { + pname = "apecs"; + version = "0.7.3"; + sha256 = "1vrfmpnpihsywd8lq1kc7bsjsp8kxrcv341mzxsaa68qd5xi698l"; + libraryHaskellDepends = [ + base containers mtl template-haskell vector + ]; + testHaskellDepends = [ base containers linear QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion linear ]; + description = "Fast Entity-Component-System library for game programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apecs-gloss" = callPackage ({ mkDerivation, apecs, apecs-physics, base, containers, gloss , linear @@ -27830,6 +27905,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-physics_0_3_2" = callPackage + ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + , template-haskell, vector + }: + mkDerivation { + pname = "apecs-physics"; + version = "0.3.2"; + sha256 = "15xwhji60garvryv971ahibdb6b0qlpafx9xy5898h0s4bhrhysf"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + apecs base containers inline-c linear template-haskell vector + ]; + description = "2D physics for apecs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apecs-physics-gloss" = callPackage ({ mkDerivation, apecs, apecs-physics, base, gloss }: mkDerivation { @@ -28756,8 +28848,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric"; - version = "1.1.1"; - sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h"; + version = "1.2.0"; + sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf"; libraryHaskellDepends = [ base containers generic-lens lens mtl resourcet stm text transformers @@ -28826,6 +28918,8 @@ self: { pname = "arbtt"; version = "0.10.1"; sha256 = "09n6v32yz612ag4acjd4jwnmv0ljarxi3b7v2mp4bj18c2gx1wbq"; + revision = "1"; + editedCabalFile = "0wnm1izr12yjh1kc7bhhj87sd7jwbh7qf6qpij0z84mlk58nq0mb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29843,7 +29937,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asif_4_0_0" = callPackage + "asif_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -29853,8 +29947,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "4.0.0"; - sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6"; + version = "4.1.0"; + sha256 = "1ys8cj08pj7z3yiks014z9jmvzkxnbh11khihzg57ig4z4w7bvp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29877,6 +29971,7 @@ self: { old-locale profunctors resourcet temporary-resourcet text thyme transformers vector ]; + description = "Library for creating and querying segmented feeds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -31637,8 +31732,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "auto-update"; - version = "0.1.4"; - sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy"; + version = "0.1.4.1"; + sha256 = "1jfgxwicd0r31dcbcd83sj99v1w9mbg873xp7v7z21gmxhalpzrm"; libraryHaskellDepends = [ base ]; description = "Efficiently run periodic, on-demand actions"; license = stdenv.lib.licenses.mit; @@ -32137,8 +32232,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.21"; - sha256 = "0g6sp8wgirinp0kaa73s283mjws6wbihg38jklbj9dx6sxdmdja9"; + version = "0.21.1"; + sha256 = "047zfpc3bzdxgh6adfi1xls3j300vhyzcykzf9wyasxksw4xnrxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32981,30 +33076,31 @@ self: { "b9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile - , directory, filepath, free, hashable, hspec, hspec-expectations - , lens, mtl, optparse-applicative, parallel, parsec, pretty - , pretty-show, process, QuickCheck, random, shake, syb, template - , text, time, transformers, unordered-containers, vector, yaml + , directory, exceptions, extensible-effects, filepath, free + , hashable, hspec, hspec-expectations, lens, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, shake, syb, tagged, template, text + , time, transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.61"; - sha256 = "0yr29ynxiwc2qr000c5h1w3k373qvbr5p8z451r3q24i4c6rcrid"; + version = "0.5.63"; + sha256 = "04ni56gqwa8rr8wl00sck2zjyj3nrb5hpf320719ixlj23m4cj4y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bifunctors binary boxes - bytestring conduit conduit-extra ConfigFile directory filepath free - hashable lens mtl parallel parsec pretty pretty-show process - QuickCheck random shake syb template text time transformers - unordered-containers vector yaml + bytestring conduit conduit-extra ConfigFile directory exceptions + extensible-effects filepath free hashable lens mtl parallel parsec + pretty pretty-show process QuickCheck random shake syb tagged + template text time transformers unordered-containers vector yaml ]; executableHaskellDepends = [ - base bytestring directory lens optparse-applicative + base bytestring directory lens optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring hspec hspec-expectations QuickCheck text - unordered-containers vector yaml + aeson base binary bytestring hspec hspec-expectations QuickCheck + text unordered-containers vector yaml ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; @@ -33407,6 +33503,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "barbies_1_1_1_0" = callPackage + ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "barbies"; + version = "1.1.1.0"; + sha256 = "1rlrsxddnlrhx15ki3pwh2hpvcawl5gd6x6i8n9n716ra2p6ca90"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "barchart" = callPackage ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }: mkDerivation { @@ -40242,6 +40355,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Finds broken links in text files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broker-haskell" = callPackage @@ -40879,8 +40993,8 @@ self: { ({ mkDerivation, base, cmdargs, doctest, hspec, text, unix }: mkDerivation { pname = "bunz"; - version = "0.0.7"; - sha256 = "124vas0i5hdx7wmcdmydxal6c3iqy89fypparf9hzpkbb7gwrpwz"; + version = "0.0.9"; + sha256 = "0q5520pdq52fhx4yd6lhxr77c00njmy0wqbmb0gi1p4ahqs5wrgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -41703,10 +41817,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bytestring-trie"; - version = "0.2.4.1"; - sha256 = "0qqklrvdcprchnl4bxr6w7zf6k5gncincl3kysm34gd04sszxr1g"; - revision = "1"; - editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r"; + version = "0.2.5.0"; + sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; license = stdenv.lib.licenses.bsd3; @@ -42124,6 +42236,7 @@ self: { ]; description = "Bundling C/C++ projects in Cabal package made easy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-cargs" = callPackage @@ -42671,6 +42784,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_0_13_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , http-client, http-client-tls, http-conduit, process, simple-cmd + , time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.13.1"; + sha256 = "1k61jknk99hrw1h4kfkpl0905lgybidvlqn5ny6d54kr5f7fn9d3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory filepath http-client + http-client-tls http-conduit process simple-cmd time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -43382,6 +43515,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Cairo Haskell binding (partial)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cake" = callPackage @@ -45113,26 +45247,6 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.8"; - sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_9" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; version = "0.4.9"; sha256 = "05i032xqi4hplchf9dklxqi0fh5byw2ibyf1ba2wnxql2j7y177z"; libraryHaskellDepends = [ @@ -46595,6 +46709,8 @@ self: { pname = "chimera"; version = "0.2.0.0"; sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi"; + revision = "1"; + editedCabalFile = "029hpcs3x1sv3jsq10bygm4246b4gy83yxg3s4r98f37055dyzyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim vector ]; @@ -47325,6 +47441,7 @@ self: { executableHaskellDepends = [ array base bytestring parseargs ]; description = "Implementation of CipherSaber2 RC4 cryptography"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "circ" = callPackage @@ -49780,8 +49897,8 @@ self: { }: mkDerivation { pname = "codeworld-api"; - version = "0.2.5"; - sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m"; + version = "0.3.1"; + sha256 = "13kggrhm7hvkh3c9pilzgsb7yhkdbyxzj6jmfxqf4lskws17h0bg"; libraryHaskellDepends = [ base blank-canvas cereal cereal-text containers ghc-prim hashable mtl random random-shuffle text time @@ -50113,8 +50230,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.3.1.0"; - sha256 = "0wlpv47jj5q2kiwm1daaw4p4s9vh3xfs4rpb78y2a1qw6r6nw9vw"; + version = "1.3.1.3"; + sha256 = "098in13gkrv4lrdn67b010c5wsl0zqwzcyfd504039wdcm6pazng"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; @@ -50965,6 +51082,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compact-mutable-vector" = callPackage + ({ mkDerivation, base, compact, ghc-prim, hspec, primitive, vector + }: + mkDerivation { + pname = "compact-mutable-vector"; + version = "0.0.0.1"; + sha256 = "1plz7rwn66r3b03hn60gsh8w5wk8hgzj0g3hdnc36f2rrav4n7mj"; + libraryHaskellDepends = [ base compact ghc-prim primitive vector ]; + testHaskellDepends = [ base compact hspec ]; + description = "Mutable vector with different GC characteristics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compact-socket" = callPackage ({ mkDerivation, base, binary, bytestring, compact, deepseq , directory, filepath, network, unix @@ -52536,8 +52666,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.0"; - sha256 = "1bi2b6kdzy5f9glq46jzsk02has95jkxqz0cchpbmnakzhjwjh9c"; + version = "1.3.1"; + sha256 = "0zfdrpdc86kw2c3gzq5lxdy1qmy069qy7xcjjbnf4359igjyq69v"; libraryHaskellDepends = [ async attoparsec base bytestring conduit directory filepath network primitive process resourcet stm streaming-commons text transformers @@ -52545,8 +52675,8 @@ self: { ]; testHaskellDepends = [ async attoparsec base bytestring bytestring-builder conduit - directory exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base + directory exceptions filepath hspec process QuickCheck resourcet + stm streaming-commons text transformers transformers-base ]; benchmarkHaskellDepends = [ base bytestring bytestring-builder conduit gauge transformers @@ -52808,7 +52938,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "confcrypt_0_2_0_0" = callPackage + "confcrypt_0_2_3_0" = callPackage ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring , bytestring, conduit, containers, crypto-pubkey-openssh , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec @@ -52817,8 +52947,8 @@ self: { }: mkDerivation { pname = "confcrypt"; - version = "0.2.0.0"; - sha256 = "0gg1p06lmv7rs143am5kak6n7777f1ccf36xlscxwsyza5j1gi57"; + version = "0.2.3.0"; + sha256 = "1pqgh5jhnf18mfhhq8z39l2kv5pn11zw9zqxb30r75l5qhqvjjic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53632,8 +53762,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.1.2.0"; - sha256 = "1fgnb4q5bbad6rmknclvwv79s593r054x7iafrhj3czrfzg94dfx"; + version = "2.2.0.0"; + sha256 = "0r7v5gfi7lw19h9chhn80fwnlgph5ak6n1vf153gq6l7bm10hacl"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -55765,8 +55895,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.3"; - sha256 = "0hjk66ygs9kr6mxzqnxgbbh9ww2f2xdshk7gq35jlrvhc3csfqsp"; + version = "10.4"; + sha256 = "182lnbci8vdp7mc6mihap00ffv59xdnjhbbbx5pwjjhxwpavfvv6"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -55985,41 +56115,6 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.5.3.0"; - sha256 = "17q4dj9sl9dp2gyknycc9kdp5y6ak4vlmbfqp1w0fwfy76aaj0mn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers criterion-measurement deepseq - directory exceptions filepath Glob js-flot js-jquery microstache - mtl mwc-random optparse-applicative parsec statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_4_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, criterion-measurement, deepseq, directory, exceptions - , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, statistics - , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; version = "1.5.4.0"; sha256 = "1yh4dk4hi6d3jz2jmn8jc9i6jqb02w63g2rq3aagi16qfyanlqbg"; isLibrary = true; @@ -56042,7 +56137,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-measurement" = callPackage @@ -60448,8 +60542,8 @@ self: { }: mkDerivation { pname = "datadog-tracing"; - version = "1.0.1"; - sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq"; + version = "1.1.0"; + sha256 = "1zrdbgljm35r8nqw0lg4pq1ywcv76ifplgdh860zq9sjdz5f5lxi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60466,6 +60560,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Datadog tracing client and mock agent"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataenc" = callPackage @@ -60627,6 +60722,7 @@ self: { ]; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataurl" = callPackage @@ -60963,33 +61059,6 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.3"; - sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_4" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; version = "1.2.4"; sha256 = "1lzpvl4lfl84j56cdyn64gxm6zkgbjaczc41g235fikyx83vci88"; libraryHaskellDepends = [ @@ -61006,7 +61075,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -61780,10 +61848,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "decimal-literals"; - version = "0.1.0.0"; - sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7"; - revision = "3"; - editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb"; + version = "0.1.0.1"; + sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -62679,6 +62745,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deque_0_3_1" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances + , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "deque"; + version = "0.3.1"; + sha256 = "0gf5jy0vx3i3s3sdf8xiq2gk4m9hi0vacg8ifhx8j41papp9afl9"; + libraryHaskellDepends = [ base mtl strict-list ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Double-ended queues"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -65112,31 +65196,16 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.23"; - sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz"; - libraryHaskellDepends = [ base bytestring semigroups text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_24" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, semigroups, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; version = "2.3.24"; sha256 = "0xd6wcmshzadwqjgd9ddcfi76p0v2c18h49spl076h285kp3plj1"; + revision = "1"; + editedCabalFile = "0cfl7h43q2qib1qq8sipgcxcm3i9d6cp1diwmxv8n7ygx7awz6w6"; libraryHaskellDepends = [ base bytestring semigroups text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -65313,8 +65382,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "0.8.0"; - sha256 = "10lmn9wkrzzslwbxgw9l25hyxldprz1ig87glg681aibssh0p54m"; + version = "0.8.1"; + sha256 = "0r7nlivcrqazjgsh54k8qrl64h7065c9vdg4ndv8bahvxvw1ld8r"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default http-client iso8601-time JuicyPixels MonadRandom req @@ -67022,22 +67091,6 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.3.0.0"; - sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "doctest-driver-gen_0_3_0_1" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; version = "0.3.0.1"; sha256 = "1sa47c1wml8k00h4h1gzbckfzbr3w7k3j0lvr1x5z6fh05s5xbsn"; isLibrary = true; @@ -67569,6 +67622,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "download_0_3_2_7" = callPackage + ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: + mkDerivation { + pname = "download"; + version = "0.3.2.7"; + sha256 = "1qg61d7z05dxpzfnv1gyf0dm2mpx23p29a9n5mx4pham5hfmfm3i"; + libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; + testHaskellDepends = [ base hspec ]; + description = "High-level file download based on URLs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "download-curl" = callPackage ({ mkDerivation, base, bytestring, curl, feed, tagsoup, xml }: mkDerivation { @@ -68945,8 +69011,8 @@ self: { }: mkDerivation { pname = "dynamodb-simple"; - version = "0.6.0.0"; - sha256 = "0dshi4binsfjrlw7sl1jxa09a1s4qkp3g48x6hchaipk6b1nx960"; + version = "0.6.0.1"; + sha256 = "00966z61119p2qammdiaxnfc5by0b12pj95745i792kqw647vygj"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb base bytestring conduit containers double-conversion exceptions generics-sop @@ -69315,16 +69381,19 @@ self: { }) {}; "eccrypto" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, SHA, vector + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal + , criterion, cryptohash-sha512, integer-gmp, random }: mkDerivation { pname = "eccrypto"; - version = "0.0.1"; - sha256 = "1jcwlwbcd77536ii0wxalbdslzbvv224b07g3801pgjvr38xljpx"; + version = "0.2.0"; + sha256 = "1ng9lin5cavmcrp60lrnqxfkhb5drhlk9nzrl8d6gr1g7zfj75qm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cereal crypto-api SHA vector + base bytestring cryptohash-sha512 integer-gmp random ]; + testHaskellDepends = [ base base16-bytestring bytestring Cabal ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Elliptic Curve Cryptography for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -70775,6 +70844,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-street" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, prettyprinter + , servant, servant-server, text, time, wai, warp + }: + mkDerivation { + pname = "elm-street"; + version = "0.0.0"; + sha256 = "0my3f08h019rhmyvcbf5xz87wnrd52fsqpiqj6jv1544psczc2sq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory filepath prettyprinter text time + ]; + executableHaskellDepends = [ + base servant servant-server wai warp + ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Crossing the road between Haskell and Elm"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "elm-websocket" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-extra , containers, directory, formatting, hspec, http-types, lens, mtl @@ -70828,8 +70919,8 @@ self: { }: mkDerivation { pname = "elm2nix"; - version = "0.1.0"; - sha256 = "140qv6zvq4860fd5pglhwgd9pnxv6nha3ah3pmp4d2x3jkvg3hcy"; + version = "0.1.1"; + sha256 = "16b7vv7ndn8mpkg05rhljpmld2dazsgl9yqg8j3mza1f5x4f6jwp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72044,19 +72135,20 @@ self: { }) {}; "equivalence" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, test-framework, test-framework-quickcheck2 - , transformers, transformers-compat + ({ mkDerivation, base, containers, fail, mtl, QuickCheck + , STMonadTrans, template-haskell, test-framework + , test-framework-quickcheck2, transformers, transformers-compat }: mkDerivation { pname = "equivalence"; - version = "0.3.3"; - sha256 = "02jhn8z1aqyxp3krylhfnwr7zzjcd17q9qriyd9653i92b7di3gf"; + version = "0.3.4"; + sha256 = "02s24624xnwq790mip5pj6828an36j8jbdj5kvx9bv5a7ap3vzn1"; libraryHaskellDepends = [ - base containers mtl STMonadTrans transformers transformers-compat + base containers fail mtl STMonadTrans transformers + transformers-compat ]; testHaskellDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell + base containers fail mtl QuickCheck STMonadTrans template-haskell test-framework test-framework-quickcheck2 transformers transformers-compat ]; @@ -73599,6 +73691,8 @@ self: { pname = "exact-pi"; version = "0.5.0.1"; sha256 = "0q0qrkmpff835m3zz3w60i1y4sqicnzqb6vqmk13cjh4ign5d0ax"; + revision = "1"; + editedCabalFile = "1l55d7x61i2d5rlh7sh2nhn0af9cyp92gzdmqqnnjzg55d347qsm"; libraryHaskellDepends = [ base numtype-dk ]; testHaskellDepends = [ base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck @@ -76089,8 +76183,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fedora-dists"; - version = "1.0.0.2"; - sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl"; + version = "1.0.1"; + sha256 = "107ykp3f1f35ghlxfv53mxl0wmj1jyr7xnil16gyg6gcyi0shbll"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; license = stdenv.lib.licenses.gpl3; @@ -76113,6 +76207,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fedora-haskell-tools_0_7" = callPackage + ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP + , optparse-applicative, process, simple-cmd, simple-cmd-args, split + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.7"; + sha256 = "1c6pn63jn2afbnr0ink4sblhh4ggvgan9h4fk8l6bpg7g6wm68kp"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base csv directory fedora-dists filepath HTTP optparse-applicative + process simple-cmd simple-cmd-args split time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -76639,6 +76753,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; + "ffunctor" = callPackage + ({ mkDerivation, aeson, base, composition, http-client, mtl + , servant, servant-client, tasty, tasty-discover, tasty-hspec + , tasty-quickcheck, time + }: + mkDerivation { + pname = "ffunctor"; + version = "1.1.0"; + sha256 = "0y9x6xhpizg07d7nc3adk8x4ccy331w7if6jvq2p7hbyr57gbid7"; + revision = "1"; + editedCabalFile = "1x74grqgsjrbncpkz6iyyalfkhbs3vw0lfzv6s1bfd6zx0j4lggv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base composition http-client mtl servant servant-client tasty + tasty-hspec tasty-quickcheck time + ]; + testToolDepends = [ tasty-discover ]; + description = "FFunctor typeclass"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fgl" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers @@ -78259,12 +78394,12 @@ self: { ({ mkDerivation, base, directory, parsec }: mkDerivation { pname = "flat-tex"; - version = "0.3.1"; - sha256 = "1msf49m61lswj9nplxm22v7xl0vhbj7m3rz5k41mlzdcii28hksp"; + version = "0.6.1"; + sha256 = "1g116pdjlxx8mz3w2bapbcfd4jgk8jl24fg7fck3j2gyh8282zbm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec ]; - description = "flatten a latex multi-file latex document"; + description = "flatten a latex multi-file latex document and remove all comments"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -78572,6 +78707,7 @@ self: { ]; description = "A flexible Haskell source code pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow" = callPackage @@ -78759,8 +78895,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.6.0.0"; - sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb"; + version = "0.7.0.4"; + sha256 = "1v130jcya7qhm29byfz8wazbi4yvv5pmmwp07fhpaffm1hq8v03k"; configureFlags = [ "-fopengl" ]; isLibrary = true; isExecutable = true; @@ -78842,14 +78978,15 @@ self: { }: mkDerivation { pname = "fltkhs-themes"; - version = "0.1.0.1"; - sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6"; + version = "0.1.0.6"; + sha256 = "056q8b2sdiwbhd6w8kmjllv03pcpxks8xiiqz8id3n1n8pazyx50"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring fltkhs load-font text vector ]; librarySystemDepends = [ fontconfig ]; + description = "A set of themed widgets that provides drop in replacements to the ones in FLTKHS"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fontconfig;}; @@ -80437,8 +80574,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.7.1"; - sha256 = "16hdc019x32azkhzag1d504ahdgqswim5cpgmacvdxj3r08havq3"; + version = "0.0.7.2"; + sha256 = "0hljd9wsv516jcqp7pkacmadjchkd9sxq42pj5j1my95hvc5apfd"; libraryHaskellDepends = [ base constraints containers data-fix dlist free groups kan-extensions mtl natural-numbers transformers @@ -81202,6 +81339,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "front" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, fay + , text + }: + mkDerivation { + pname = "front"; + version = "0.0.0.1"; + sha256 = "1iaabr2cfvgismar58w7nazi4mckcvxv37qrkjqnxm82zhnv2fgc"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring fay text + ]; + description = "A reactive frontend web framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "frontmatter" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck , text, yaml @@ -81847,8 +81999,10 @@ self: { }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.7"; - sha256 = "132l3wzhr60xnp1zd3qh5yrz9y8fk0v6fz9i242vdvj1rbacfdhf"; + version = "0.2.0.9"; + sha256 = "0k3560521kf1krj5j1wgbcipqcnvjq3igb9fymfdsswwqr1wpx67"; + revision = "1"; + editedCabalFile = "0h68688dy1x2wj5m5gi5lc3xhskzpdnfqfk3i4bzkxvh87mak7l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81868,8 +82022,8 @@ self: { ({ mkDerivation, base, bv, containers, multiset, text, vector }: mkDerivation { pname = "funcons-values"; - version = "0.1.0.5"; - sha256 = "0wmkag1dlvk6lq2f17pvzwxlafd7hn69vxwrkr8ar02vb1yvnb2q"; + version = "0.1.0.7"; + sha256 = "0jdgwv44gs4zr8z5pg6lzikrgn3dzna8z0vriq71anlifjyci8yq"; libraryHaskellDepends = [ base bv containers multiset text vector ]; @@ -82206,6 +82360,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_0_2_0_1" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest, hspec + , MonadRandom, QuickCheck, random + }: + mkDerivation { + pname = "fused-effects"; + version = "0.2.0.1"; + sha256 = "1n5ywp07s4fhpjwnk15y72flwaxjd9dingr4xlrpkp00cgfh1ax8"; + libraryHaskellDepends = [ base deepseq MonadRandom random ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-lens" = callPackage ({ mkDerivation, base, fused-effects, hspec, lens }: mkDerivation { @@ -82628,6 +82798,7 @@ self: { ]; description = "Gamma function and related functions"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gang-of-threads" = callPackage @@ -84048,8 +84219,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.7.0.0"; - sha256 = "1bjsqqyr1n306icfdl8sh3amqq95zpr5hawwbv46nbf0rxci88w1"; + version = "0.7.0.1"; + sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; @@ -84506,8 +84677,8 @@ self: { ({ mkDerivation, base, dimensional, lens, semigroups }: mkDerivation { pname = "geodetic-types"; - version = "0.0.1"; - sha256 = "0sj82sz20zfys2h4g74wj9gwfyc2c4jkzazw882xrr18g8zx82p8"; + version = "0.0.2"; + sha256 = "1y37ad3x8kkj5mhvaj94bf8mm4ssavkbd3fc513qkyazp1c64g15"; libraryHaskellDepends = [ base dimensional lens semigroups ]; description = "Types for geodetic operations"; license = stdenv.lib.licenses.bsd3; @@ -85095,6 +85266,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_6" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.6"; + sha256 = "1m5ri5rn9inh9m70bpm695848pbwkjvk8gvvk8my0jpcba1wsnlq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -85245,6 +85440,7 @@ self: { ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -85863,6 +86059,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghci-hexcalc_0_1_0_2" = callPackage + ({ mkDerivation, base, doctest, QuickCheck }: + mkDerivation { + pname = "ghci-hexcalc"; + version = "0.1.0.2"; + sha256 = "134nby24044l0nxdss004325scca315dsa31101b9qcbwq2hd3fv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "GHCi as a Hex Calculator interactive"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghci-history-parser" = callPackage ({ mkDerivation, base, doctest, hspec, parsec }: mkDerivation { @@ -86334,6 +86543,7 @@ self: { ]; description = "Bridge between packages gi-* and cairo-core"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gi-cairo-connector" = callPackage @@ -86408,7 +86618,7 @@ self: { doHaddock = false; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;}; + }) {gtk3 = pkgs.gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -86429,7 +86639,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf @@ -86470,7 +86680,7 @@ self: { doHaddock = false; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -86529,7 +86739,7 @@ self: { doHaddock = false; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib @@ -86713,7 +86923,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject @@ -86811,7 +87021,7 @@ self: { doHaddock = false; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {gtksourceview3 = pkgs.gtksourceview3;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -86832,7 +87042,7 @@ self: { description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -87004,7 +87214,7 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - }) {vte_291 = pkgs.gnome3.vte;}; + }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -87050,7 +87260,7 @@ self: { description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -87377,12 +87587,12 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190129"; - sha256 = "0gsi1ymv7dmx429vhv58979hfh23zrfvrsam6saf16ckh5hd0n81"; + version = "7.20190219"; + sha256 = "0161jszid9nih31q55zh8dldyfz5q0v4m2gw9dbb2hb1x47w3ww2"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp" - "-fwebdav" + "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" + "-fwebapp" "-fwebdav" ]; isLibrary = false; isExecutable = true; @@ -87420,7 +87630,7 @@ self: { ''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -87798,23 +88008,24 @@ self: { "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring - , binary, binary-orphans, byteable, bytestring, containers - , cryptohash, deepseq, deepseq-generics, exceptions, file-embed - , hashable, hspec, hspec-discover, http-client, http-client-tls + , binary, binary-orphans, bytestring, containers, cryptohash-sha1 + , deepseq, deepseq-generics, exceptions, file-embed, hashable + , hspec, hspec-discover, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, tls, transformers, transformers-compat - , unordered-containers, vector, vector-instances + , semigroups, tagged, text, time, tls, transformers + , transformers-compat, unordered-containers, vector + , vector-instances }: mkDerivation { pname = "github"; - version = "0.20"; - sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp"; + version = "0.21"; + sha256 = "1ck4mnvxzgbpzy1v7xgggfn69733hm2smhbivmcvdmxd104lzvsq"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-orphans - byteable bytestring containers cryptohash deepseq deepseq-generics + bytestring containers cryptohash-sha1 deepseq deepseq-generics exceptions hashable http-client http-client-tls http-link-header - http-types iso8601-time mtl network-uri semigroups text time tls - transformers transformers-compat unordered-containers vector + http-types iso8601-time mtl network-uri semigroups tagged text time + tls transformers transformers-compat unordered-containers vector vector-instances ]; testHaskellDepends = [ @@ -88744,10 +88955,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.29"; - sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; - revision = "2"; - editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; + version = "2.30"; + sha256 = "1ky0xwspnfknbjyf0fa459f38nwqakwq6fh7ady4rch8ck22phql"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -89410,27 +89619,6 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.5.3"; - sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers data-accessor data-accessor-transformers - deepseq filepath process semigroups temporary time transformers - utility-ht - ]; - description = "2D and 3D plots using gnuplot"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "gnuplot_0_5_6" = callPackage - ({ mkDerivation, array, base, containers, data-accessor - , data-accessor-transformers, deepseq, filepath, process - , semigroups, temporary, time, transformers, utility-ht - }: - mkDerivation { - pname = "gnuplot"; version = "0.5.6"; sha256 = "1g6xgnlkh17avivn1rlq7l2nvs26dvrbx4rkfld0bf6kyqaqwrgp"; isLibrary = true; @@ -89443,7 +89631,6 @@ self: { ]; description = "2D and 3D plots using gnuplot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gnutls" = callPackage @@ -94440,7 +94627,7 @@ self: { description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "gtk-strut" = callPackage ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: @@ -94779,7 +94966,7 @@ self: { description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; + }) {gtksourceview3 = pkgs.gtksourceview3;}; "guarded-allocation" = callPackage ({ mkDerivation, base }: @@ -96318,8 +96505,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.5.6"; - sha256 = "0im76n8487q08rmw8bn536qncrdhz9pjir5cxlf2myh7prrrrczs"; + version = "0.6"; + sha256 = "1fi3f90jd7s10iw1lcqhy8vfv27794sfsp7bjlb9rgab7jqf3wqv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97441,10 +97628,10 @@ self: { }: mkDerivation { pname = "hal"; - version = "0.1.2"; - sha256 = "0fflx0xism12cfdifwpiv0caxkm4f46yqhcwyrdwrdmq6q0pxdk2"; + version = "0.3.0"; + sha256 = "1mc7h9fnf75dw7ph4b2iqqvx23xw6wm0ls6c90804vdqcpjzapqh"; revision = "1"; - editedCabalFile = "09ng464s88dsfdwk4zdzi0yagy5mm41035p4glwiyhdqxc5n60yg"; + editedCabalFile = "08pfvlqvsslfrxfk7zmvqc3b2dzar2az9l8w5mwrxv7flskzr7ii"; libraryHaskellDepends = [ aeson base bytestring containers envy exceptions http-conduit http-types mtl text time @@ -97534,26 +97721,28 @@ self: { "halive" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear - , mtl, process, random, sdl2, signal, stm, text, time, transformers + , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec + , lens, linear, mtl, pretty-show, process, random, sdl2, signal + , stm, text, time, transformers }: mkDerivation { pname = "halive"; - version = "0.1.3"; - sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378"; + version = "0.1.6"; + sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath foreign-store fsnotify ghc - ghc-boot ghc-paths mtl process signal stm time transformers + ghc-boot ghc-paths mtl process signal stm text time transformers ]; executableHaskellDepends = [ base directory filepath fsnotify ghc ghc-paths process stm transformers ]; testHaskellDepends = [ - base bytestring containers filepath foreign-store gl linear mtl - random sdl2 stm text time + base bytestring containers directory filepath foreign-store ghc + ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text + time ]; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; @@ -98487,6 +98676,7 @@ self: { ]; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hamlet" = callPackage @@ -100235,19 +100425,17 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.10.1"; - sha256 = "187blp0s8grabi11qpv06ckrys84ia51chf9h01449jxcw53fa76"; - revision = "1"; - editedCabalFile = "16kxaa0b9law55c3v9m664wpb8zafldh2wpl0brznq5bjwg1pqz5"; + version = "0.0.11.0"; + sha256 = "098j65f241giy8z576s1iafcskl8m6qnj173476iw3sggw6iw1f1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ]; + libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc ghc-boot ghc-paths ghci haskeline process text time transformers unix ]; - description = "haskell-dap is a GHCi having DAP interface"; + description = "Haskell implementation of the DAP interface data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -100443,8 +100631,7 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobject-introspection;}; + }) {inherit (pkgs) glib gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: @@ -100641,6 +100828,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_8_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec + , lens, mtl, network-uri, parsec, sorted-list, stm, text, time + , transformers, unordered-containers, vector, yi-rope + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.8.1.0"; + sha256 = "1imy96hhhs2fcbs34pln0l430j19n4nqsgir4hww95wbl0058kcx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable haskell-lsp-types hslogger lens mtl network-uri parsec + sorted-list stm text time unordered-containers yi-rope + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hslogger lens mtl network-uri parsec stm text time transformers + unordered-containers vector yi-rope + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri sorted-list stm text yi-rope + ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -101264,27 +101482,46 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb - , template-haskell, test-framework, test-framework-hunit + ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty + , syb, template-haskell, test-framework, test-framework-hunit , th-orphans }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.0.3"; - sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4"; - revision = "2"; - editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c"; + version = "0.8.1"; + sha256 = "0cainxgsa206fc2ij5gv1zaaazvqwzp5bavimrvwbscpnscnm89n"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; testHaskellDepends = [ - base haskell-src-exts HUnit pretty template-haskell test-framework - test-framework-hunit + base containers haskell-src-exts HUnit pretty syb template-haskell + test-framework test-framework-hunit ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_2" = callPackage + ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty + , syb, template-haskell, test-framework, test-framework-hunit + , th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.2"; + sha256 = "0vqnq668c88x4amvbs34rxiwdpnxqxr40jy998fc4vd9z6gd4w3r"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base containers haskell-src-exts HUnit pretty syb template-haskell + test-framework test-framework-hunit + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -102644,8 +102881,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.10.1"; - sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2"; + version = "0.11.0"; + sha256 = "03rhbp4rc4ycmnj5gsa79pjzgmp659xwbajaqfns4xgb3d0nhylx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103342,6 +103579,7 @@ self: { ]; description = "Haskus web"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskyapi" = callPackage @@ -105481,23 +105719,6 @@ self: { }) {}; "hebrew-time" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, time - }: - mkDerivation { - pname = "hebrew-time"; - version = "0.1.1"; - sha256 = "0ckridxf4rvhhp0k1mckbbbpzfs32l4mwg7n9mrmsggldpl7x6f7"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 time - ]; - description = "Hebrew dates and prayer times"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hebrew-time_0_1_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck, time }: mkDerivation { pname = "hebrew-time"; @@ -105507,7 +105728,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck time ]; description = "Hebrew dates and prayer times"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hecc" = callPackage @@ -105835,27 +106055,6 @@ self: { "hedn" = callPackage ({ mkDerivation, base, containers, deepseq, deriving-compat , hedgehog, megaparsec, parser-combinators, prettyprinter - , scientific, template-haskell, text, time, uuid, vector - }: - mkDerivation { - pname = "hedn"; - version = "0.2.0.0"; - sha256 = "1yi7j2ikpd1lv32hzgv38v1r4wzh7ffq71js2648d4j1v9jhq1sj"; - libraryHaskellDepends = [ - base containers deepseq deriving-compat megaparsec - parser-combinators prettyprinter scientific template-haskell text - time uuid vector - ]; - testHaskellDepends = [ - base containers hedgehog megaparsec text time uuid vector - ]; - description = "EDN parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedn_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, deriving-compat - , hedgehog, megaparsec, parser-combinators, prettyprinter , scientific, template-haskell, text, time, uuid-types, vector }: mkDerivation { @@ -105872,7 +106071,6 @@ self: { ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedra" = callPackage @@ -108000,7 +108198,7 @@ self: { "hierarchical-spectral-clustering" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava - , clustering, containers, eigen, fgl, filepath + , clustering, containers, directory, eigen, fgl, filepath , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl , optparse-generic, safe, sparse-linear-algebra , spectral-clustering, streaming, streaming-bytestring @@ -108009,8 +108207,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.3.0.0"; - sha256 = "0n4rs9s7gavzm9ms2rgxw4jri0n10x5y9jg1vkcmkkklp8n04w70"; + version = "0.4.0.0"; + sha256 = "1mw546dvyzrhcw7a61zb0anfgxk3s5r3bjrj7iry36shh1ancs1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108021,8 +108219,8 @@ self: { vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring cassava containers filepath - hmatrix lens optparse-generic safe text text-show vector + aeson aeson-pretty base bytestring cassava containers directory + filepath hmatrix lens optparse-generic safe text text-show vector ]; description = "Hierarchical spectral clustering of a graph"; license = stdenv.lib.licenses.gpl3; @@ -109223,8 +109421,8 @@ self: { }: mkDerivation { pname = "hjugement"; - version = "2.0.0.20181030"; - sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi"; + version = "2.0.1.20190208"; + sha256 = "10921dk9y460dmgy5dhkfxcsc96cxkw2xxziykizp8zhmzrdlwz6"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -109330,8 +109528,8 @@ self: { }: mkDerivation { pname = "hleap"; - version = "0.1.2.7"; - sha256 = "1qpfwg69dzwzaf09q3pzkzwanzc9kb5zx733ck27g5xdsi79slsf"; + version = "0.2.0.0"; + sha256 = "0hh9r884kjw8gi7mcg74kzixzxxwzs1h67mg9z108kmlmnb742ry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109360,8 +109558,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.13.2"; - sha256 = "0dxw5zhynhdhangib5awcciz7qlgmnx9km4dph7nrw2ikj6ffmwv"; + version = "1.14.1"; + sha256 = "139iqa7kpnn2r9r3awbpmhbgn7nvybppmx648fjk6hgsivggjpay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109410,8 +109608,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.13"; - sha256 = "1pkim0qxgakbngnslw04lhlmv2ad195lw60hxz5iyrxywizkiwp3"; + version = "1.14"; + sha256 = "18zpclm3nh2zq6cqa10vm232ndg22r8s4h3ffmn2m4fg05172ymd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109466,8 +109664,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.8"; - sha256 = "02dfi6drhipj1an2smalhgjp52scmcy6ndixakjk5y0zpvkxzzbx"; + version = "1.3.9"; + sha256 = "07g48w4099m4vm7z5hrg9zzd2v2yhy7kcv40902njz6v8cklgdgq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109536,8 +109734,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.13.1"; - sha256 = "1g98gikpvx002zjc1smj21lz4x9ghfa2965rb0vlnqmwcz5pqak7"; + version = "1.14"; + sha256 = "0nj8qrqkvmxmq0sqhq1z5i3zfivb7glsnv37g9k5ag6vcr48r7i8"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -109568,8 +109766,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.13.1"; - sha256 = "0jafgvnc88r24zab8kijj1v0jj8y2481ybsya3gnf3bfcb7p7xyp"; + version = "1.14"; + sha256 = "1pnzbc4myyqlz4rc1lm1acyynvkhxwdd82fl2rrwc31phj1b46jk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109603,27 +109801,28 @@ self: { }) {}; "hledger-web" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra - , data-default, directory, filepath, hjsmin, hledger, hledger-lib - , http-client, http-conduit, json, megaparsec, mtl, semigroups - , shakespeare, template-haskell, text, time, transformers, wai - , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core - , yesod-form, yesod-static + , containers, data-default, Decimal, directory, filepath, hjsmin + , hledger, hledger-lib, http-client, http-conduit, http-types, json + , megaparsec, mtl, semigroups, shakespeare, template-haskell, text + , time, transformers, wai, wai-extra, wai-handler-launch, warp + , yaml, yesod, yesod-core, yesod-form, yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.13"; - sha256 = "045bhllvxs92r96hx9aaipc9hpaqhv7b3dm2nxc1912iq761wqnp"; + version = "1.14"; + sha256 = "15ajph5cmc1a44lqw42020pb4znkrpgx3wk5dl26pbynilm5247b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring case-insensitive - clientsession cmdargs conduit conduit-extra data-default directory - filepath hjsmin hledger hledger-lib http-client http-conduit json - megaparsec mtl semigroups shakespeare template-haskell text time - transformers wai wai-extra wai-handler-launch warp yaml yesod - yesod-core yesod-form yesod-static + aeson base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra containers data-default + Decimal directory filepath hjsmin hledger hledger-lib http-client + http-conduit http-types json megaparsec mtl semigroups shakespeare + template-haskell text time transformers wai wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static ]; executableHaskellDepends = [ base ]; description = "Web interface for the hledger accounting tool"; @@ -109710,8 +109909,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.14"; - sha256 = "0arz6x0r4pji37papdrc6brybcd2a2sackvhzmhy89ycgy0k04kk"; + version = "2.1.15"; + sha256 = "0xvr9b0ys0il0g0z145pxwyr3vq6fj571gad4858mpmqdvjh4b0i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -110319,6 +110518,7 @@ self: { testHaskellDepends = [ base HUnit vector ]; description = "HMEP Multi Expression Programming – a genetic programming variant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmidi" = callPackage @@ -113318,20 +113518,22 @@ self: { }) {ole32 = null; oleaut32 = null;}; "hs-duktape" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec - , hspec-expectations-pretty-diff, raw-strings-qq, template-haskell - , text, transformers, unordered-containers, vector + ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal + , directory, hspec, hspec-expectations-pretty-diff, process + , raw-strings-qq, template-haskell, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "hs-duktape"; - version = "0.1.5"; - sha256 = "1x430rj39j33v98dbn0nz7ic0a8zgpsdqyib7p868k21lzwa2vki"; + version = "1.0.0"; + sha256 = "1bbxp7285vw39jbqpl80jqg46vwycva5fzn4prk3a2fs419xdxzm"; + setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ aeson base bytestring text transformers unordered-containers vector ]; testHaskellDepends = [ aeson aeson-qq base bytestring hspec hspec-expectations-pretty-diff - raw-strings-qq template-haskell text + raw-strings-qq template-haskell text time ]; description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; license = stdenv.lib.licenses.mit; @@ -118124,7 +118326,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_6_1" = callPackage + "http-client_0_6_2" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -118133,10 +118335,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.6.1"; - sha256 = "0ryj5far7744c297ji9aaqcm56rpm2fyma8mbghli086nq4xiryl"; - revision = "1"; - editedCabalFile = "10fihwn9vvk4mdjppmzhxz7iacm8av03xv8hshiwnz3wg6bfh813"; + version = "0.6.2"; + sha256 = "1w22n2jqbwwzgljaw9frhhmkm7bq6xzdcmd4z6mhx35n3a4nshlv"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -118456,8 +118656,8 @@ self: { }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.31"; - sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c"; + version = "1.0.33"; + sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types mtl network network-uri @@ -118980,6 +119180,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-types_0_12_3" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive, doctest + , hspec, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "http-types"; + version = "0.12.3"; + sha256 = "05j00b9nqmwh9zaq9y9x50k81v2pd3j7a71kd91zlnbl8xk4m2jf"; + libraryHaskellDepends = [ + array base bytestring case-insensitive text + ]; + testHaskellDepends = [ + base bytestring doctest hspec QuickCheck quickcheck-instances text + ]; + description = "Generic HTTP types for Haskell (for both client and server code)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-wget" = callPackage ({ mkDerivation, base, failure, process, transformers }: mkDerivation { @@ -120728,8 +120947,8 @@ self: { }: mkDerivation { pname = "hwhile"; - version = "0.1.1.3"; - sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s"; + version = "0.1.1.5"; + sha256 = "1zajz5iibip4j05awmz9k2vmh1njl3i0zd95dizap8hrma4ng7d9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124593,8 +124812,8 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.1.1"; - sha256 = "1liysxim5lhf0a09asvv7j9hin60bljhp1p642j5j1j0hh2jax4l"; + version = "0.4.1.2"; + sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -124657,6 +124876,7 @@ self: { ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "instance-control" = callPackage @@ -125104,6 +125324,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "interp" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , megaparsec, mtl, optparse-applicative, parser-combinators + , random-fu, rvar, semigroups, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "interp"; + version = "1.0.0.2"; + sha256 = "036j44vrvgvxvnlj57mkg4h8cc6dycxfrszmgai70mybr3bxvhd5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec megaparsec mtl + optparse-applicative parser-combinators random-fu rvar semigroups + text transformers unordered-containers vector + ]; + description = "Tracery-like randomized text interpolation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "interpol" = callPackage ({ mkDerivation, base, haskell-src-exts, HUnit, regex-posix, syb , test-framework, test-framework-hunit @@ -125198,22 +125449,6 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; - version = "0.1.0.3"; - sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base utility-ht ]; - testHaskellDepends = [ - array base containers QuickCheck utility-ht - ]; - description = "piecewise linear and cubic Hermite interpolation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "interpolation_0_1_1" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: - mkDerivation { - pname = "interpolation"; version = "0.1.1"; sha256 = "0rpzilzcld0xwcfz9pkhq9sx9qd8ysz9yy3znpdslk4ia8i507y7"; isLibrary = true; @@ -125224,7 +125459,6 @@ self: { ]; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolator" = callPackage @@ -126208,10 +126442,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.5.0"; - sha256 = "124zfp6s8hj7z3m873145bnr0z8xlkbr1qgj2hvasd2qs2zrb8y8"; - revision = "1"; - editedCabalFile = "06n7shnd8ij4wlzm5xhxdqv26b3am8mgbqfcvsqppk6hgmmyvggq"; + version = "2.6.0"; + sha256 = "07w8nyvscc2d643dq02bl533c2kwx8zw8j1b1dizfwhixwnzgphq"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -127012,6 +127244,8 @@ self: { pname = "ival"; version = "0.2.0.0"; sha256 = "1djgkxz6npymkzf5802hdcvr40jlc16pmyxd3qpi98f1c1h4rg5x"; + revision = "1"; + editedCabalFile = "0hgvsmjkblbawwv7kfa3imnbjvv330gccv2n245nd0vhfgsbpvxa"; libraryHaskellDepends = [ alg base ]; testHaskellDepends = [ alg base smallcheck tasty tasty-smallcheck @@ -129886,8 +130120,8 @@ self: { }: mkDerivation { pname = "kafka-device"; - version = "0.2.1.2"; - sha256 = "0fs6k04cchlsmrcn2sm9sdq07waia4ff8hhhqx24yjjab5ai2798"; + version = "1.0.0.0"; + sha256 = "1bcd7fm42vly9hlfzv0cjzx2g4hrqp66nrypki75f2c8lqfzcr11"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129905,8 +130139,8 @@ self: { ({ mkDerivation, base, GLUT, kafka-device, OpenGL }: mkDerivation { pname = "kafka-device-glut"; - version = "0.2.1.2"; - sha256 = "0in1hwmhbj41cvcwysbzbda7idbdpnlq2zggw2smlxjv078zp939"; + version = "1.0.0.0"; + sha256 = "0pkvar1rf0gv7h5a95h28jaifpwknfdvxvcv4s7f5vdrs0376j3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base GLUT kafka-device OpenGL ]; @@ -129922,8 +130156,8 @@ self: { }: mkDerivation { pname = "kafka-device-joystick"; - version = "0.2.1.2"; - sha256 = "17plqjbl2jh185yjbphgw1viim7w52ib8sjv1g93i460ggpwsyp0"; + version = "1.0.0.0"; + sha256 = "0vm1a61brvhr5digsw480210cq7s6y2yp80j6907425y1r4165q4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129941,8 +130175,8 @@ self: { ({ mkDerivation, aeson, base, hleap, kafka-device, websockets }: mkDerivation { pname = "kafka-device-leap"; - version = "0.2.1.2"; - sha256 = "14wn3ywa462nf4snjl78bnxjf9jfqj39zkiay2z594yplqp2qsy1"; + version = "1.0.0.0"; + sha256 = "1xkkkq1plzjf20p6gfnk8nc809rp57ihffggvgzsgq8dwybzfssg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129962,8 +130196,8 @@ self: { }: mkDerivation { pname = "kafka-device-spacenav"; - version = "0.2.1.2"; - sha256 = "0drpf4frlnf17qa92rppjdnxpsks8v3q0h3jad5lyvcvmpssrw1r"; + version = "1.0.0.0"; + sha256 = "0m382s7q3w21pl62fjh6pw9w4dwi6cmpc8s4xnzivwjj91hynryb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129981,8 +130215,8 @@ self: { ({ mkDerivation, base, kafka-device, vrpn }: mkDerivation { pname = "kafka-device-vrpn"; - version = "0.2.1.2"; - sha256 = "0zmiyfvdn16rd2jg44xvdpfm08fi8ivv0af6hdhc46l5q4zd9p4s"; + version = "1.0.0.0"; + sha256 = "13l32gfpz5l2xi42xvvyzj9g1kqsbd3jkx2498lacwx4kgvlm2rd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base kafka-device vrpn ]; @@ -130348,6 +130582,7 @@ self: { ]; description = "Datadog scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage @@ -130419,6 +130654,7 @@ self: { ]; description = "Logz.IO scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-rollbar" = callPackage @@ -131842,6 +132078,7 @@ self: { libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ksystools" = callPackage @@ -132080,6 +132317,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_1_0_9" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "1.0.9"; + sha256 = "0prkaxa9f03m5a333zsl75jdv2hi48w9ghv1ff1r68gnqf4hbvlr"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -132981,6 +133231,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-asn" = callPackage + ({ mkDerivation, base, bytestring, contravariant, hashable, pretty + , primitive, text, vector + }: + mkDerivation { + pname = "language-asn"; + version = "0.1.0.0"; + sha256 = "0pjzcnw5d9j8nif0w8ibh3rnsgpv710ng8w8hsrcsbq7qm02sp7f"; + libraryHaskellDepends = [ + base bytestring contravariant hashable pretty primitive text vector + ]; + description = "ASN.1 encoding and decoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-asn1" = callPackage ({ mkDerivation, base, parsec, syb }: mkDerivation { @@ -133002,8 +133267,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.0.5"; - sha256 = "1vdn1f5bx395jynacmpsvfsyyr29jgpg1y25i1jmbkzjdzkb0h2b"; + version = "1.7.0.6"; + sha256 = "0d2bjha52jph49jiac045igpxarrksihvv46s047qigs435linck"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -133814,8 +134079,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.2"; - sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq"; + version = "1.4.3"; + sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -134995,6 +135260,7 @@ self: { ]; description = "Use the Leanpub API via Wreq"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leapseconds" = callPackage @@ -135243,7 +135509,7 @@ self: { description = "Haskell IDE written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "leksah-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, binary @@ -136041,11 +136307,11 @@ self: { ({ mkDerivation, base, bytestring, filepath, libarchive }: mkDerivation { pname = "libarchive"; - version = "0.2.0.0"; - sha256 = "14kad23r22bx65h2iq0n0cbxhzzwj56gwpi73vciycjg0i5w04yd"; + version = "0.2.1.1"; + sha256 = "03qyyqki2s55lvpc9iwyh96sv4yslxw9an89n87a138bvwrdyyma"; libraryHaskellDepends = [ base bytestring filepath ]; libraryPkgconfigDepends = [ libarchive ]; - description = "Haskell bindings for libarchive"; + description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libarchive;}; @@ -136531,7 +136797,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "libraft_0_3_0_0" = callPackage + "libraft_0_4_0_0" = callPackage ({ mkDerivation, async, atomic-write, attoparsec, base , base16-bytestring, bytestring, cereal, concurrency, containers , cryptohash-sha256, dejafu, directory, exceptions, file-embed @@ -136544,8 +136810,8 @@ self: { }: mkDerivation { pname = "libraft"; - version = "0.3.0.0"; - sha256 = "0mfp5m4kz3hfj96c2056wpm9rgn3frrry5jfvswq9bch3092bm2l"; + version = "0.4.0.0"; + sha256 = "1y36y2prkvclcfxpb9a72hihd4px9nlfzqzwi4ns2qxmxvsv4spn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136880,23 +137146,11 @@ self: { ({ mkDerivation, base, bytestring, conduit, resourcet }: mkDerivation { pname = "libyaml"; - version = "0.1.0.0"; - sha256 = "01vgzf05ad1v8h65n12fwd2whldnqhlv7cbcaf08m3ck2viqimlw"; - libraryHaskellDepends = [ base bytestring conduit resourcet ]; - description = "Low-level, streaming YAML interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "libyaml_0_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, resourcet }: - mkDerivation { - pname = "libyaml"; version = "0.1.1.0"; sha256 = "0psznm9c3yjsyj9aj8m2svvv9m2v0x90hnwarcx5sbswyi3l00va"; libraryHaskellDepends = [ base bytestring conduit resourcet ]; description = "Low-level, streaming YAML interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libzfs" = callPackage @@ -137375,6 +137629,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "line-bot-sdk" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash-sha256, errors, hspec, hspec-wai, hspec-wai-json + , http-api-data, http-client, http-client-tls, http-types + , scientific, servant, servant-client, servant-client-core + , servant-server, string-conversions, text, time, transformers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "line-bot-sdk"; + version = "0.3.0.0"; + sha256 = "19yq7k0ibriy2yv7x4cbwhs9pwb6ik1mz1qbnbxs1q0zf3i3nwk5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash-sha256 errors + http-api-data http-client http-client-tls http-types scientific + servant servant-client servant-client-core servant-server + string-conversions text time transformers wai wai-extra + ]; + executableHaskellDepends = [ + base servant servant-client servant-server time transformers wai + wai-extra warp + ]; + testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json ]; + description = "Haskell SDK for LINE Messaging API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -139614,12 +139897,18 @@ self: { }: mkDerivation { pname = "log-effect"; - version = "1.1.1"; - sha256 = "10fd3xnkybca8pi7nw2hq1ggk5g89z8b2ml3avqi1x91chqdqi85"; + version = "1.2.0"; + sha256 = "0d9vwwvbf9dkwppv5hz5g2lp96807adn5kjifmx3pqm0kf59bzfn"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring extensible-effects monad-control text transformers-base ]; + executableHaskellDepends = [ + base bytestring extensible-effects monad-control text + transformers-base + ]; description = "An extensible log effect using extensible-effects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -139631,8 +139920,8 @@ self: { }: mkDerivation { pname = "log-effect-syslog"; - version = "0.1.0"; - sha256 = "0db4pgl0np1yyl9arq5cvdp3njdlw62dnbldggjc9p0q6dh3hspc"; + version = "0.2.0"; + sha256 = "04r96hpngw4p0k3g3fcm7dpc69ncsmi9varm7rp3agg4d4zcxkhm"; libraryHaskellDepends = [ base bytestring extensible-effects hsyslog log-effect monad-control transformers-base @@ -140842,7 +141131,7 @@ self: { description = "Leksah tool kit"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "ltl" = callPackage ({ mkDerivation, base, vcd }: @@ -140992,6 +141281,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lucid-extras_0_2_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory + , lucid, text + }: + mkDerivation { + pname = "lucid-extras"; + version = "0.2.2"; + sha256 = "0zi48ly2729rs3rsbnwj3z5zk9zgzmva0d3dvp448726r62ryfc3"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring lucid text + ]; + testHaskellDepends = [ base directory lucid ]; + description = "Generate more HTML with Lucid - Bootstrap, Rdash, Vega-Lite, Leaflet JS, Email"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -141807,8 +142113,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.14"; - sha256 = "1fpqs3cyb0iwld53gljkzsz7xhwamkd4g2irk7j3z6pxvn36bhin"; + version = "4.0.2.15"; + sha256 = "0fv2p6f6gj9jg72kmlf56nymvs3sf6hn98jh4q0ighn6k5dkhbf3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -143494,6 +143800,7 @@ self: { testHaskellDepends = [ array base containers hspec random ]; description = "Library containing graph data structures and graph algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathblog" = callPackage @@ -147197,6 +147504,7 @@ self: { ]; description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mmark-ext" = callPackage @@ -147206,26 +147514,6 @@ self: { }: mkDerivation { pname = "mmark-ext"; - version = "0.2.1.1"; - sha256 = "01av7d9n75mg9yzkxszrvbxjbsv4n0gsdmg3n2620zn40j5lwmcq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri - skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark skylighting text ]; - testToolDepends = [ hspec-discover ]; - description = "Commonly useful extensions for the MMark markdown processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mmark-ext_0_2_1_2" = callPackage - ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec - , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting - , text - }: - mkDerivation { - pname = "mmark-ext"; version = "0.2.1.2"; sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; enableSeparateDataOutput = true; @@ -155170,8 +155458,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.3.0.0"; - sha256 = "15qw2knzj5b90vb4rhzxiv9wxdv41f5l75hpp4y0ycc60q5xja27"; + version = "0.3.1.1"; + sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri test-invariant text @@ -155362,16 +155650,16 @@ self: { }) {}; "newsynth" = callPackage - ({ mkDerivation, base, containers, fixedprec, random, superdoc - , time + ({ mkDerivation, base, Cabal, containers, fixedprec, random + , superdoc, time }: mkDerivation { pname = "newsynth"; - version = "0.3.0.4"; - sha256 = "0w31h7xqv9sk0jb1mdviv107w8y7v018bzdvdw8gcrjyvp47307q"; + version = "0.3.0.5"; + sha256 = "1qfan8vf7s3bhdc3bfjsig4sv0cip0qfvqmyxw0iqc7gqbbkinzy"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base superdoc ]; + setupHaskellDepends = [ base Cabal superdoc ]; libraryHaskellDepends = [ base containers fixedprec random ]; executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; @@ -155868,8 +156156,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.6"; - sha256 = "0ls3zh769ibba1f5igwxvm49nyp2iljx9msgawi6g01s4469yzxv"; + version = "1.0.7"; + sha256 = "0zf09wffmzkk6rbk5nx4qhygpb6m492mz422w9a71dzv1icxkbfs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158196,8 +158484,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.1"; - sha256 = "0vw0k1lvh8fq4ivr7dq14ilydyaps010cz7wxk2m9sc6i2qq4jbf"; + version = "1.0.2"; + sha256 = "1pmyx9w3jg3wsfhqp4hby6px05g09a91s6fiazyvm9yxmhaaxhxd"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -159002,8 +159290,8 @@ self: { }: mkDerivation { pname = "openapi-petstore"; - version = "0.0.3.0"; - sha256 = "1zm76djxnr2hrws3rhby144m2hqgwfk57cm3my2r26py76lf8c5i"; + version = "0.0.4.0"; + sha256 = "0ihrzkbkq03six73ir30hy1dbi53wrl6bns27m5dphl9qdlcc1mi"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -161205,8 +161493,8 @@ self: { ({ mkDerivation, array, base, colour, containers, MonadRandom }: mkDerivation { pname = "palette"; - version = "0.3.0.1"; - sha256 = "0ylwgb7a0mhffz00hmhx93y4kyjb9xgm96jrfcxl464x8cjka5gi"; + version = "0.3.0.2"; + sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -161446,8 +161734,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.2.3"; - sha256 = "1ip5z2zyich5f4h8arwmi67nlzwfd0hfpz3ixgisips3mz2d5hl2"; + version = "1.2.4"; + sha256 = "0bdarf6rjncd8lfap4xn479675vsvqzxrmdqd367l2gxfi1nmrv5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162760,6 +163048,7 @@ self: { testHaskellDepends = [ base process ]; description = "Parse command-line arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec_3_1_13_0" = callPackage @@ -163259,25 +163548,12 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.0.0"; - sha256 = "03wfizykalpnv2i2qmj2vm27ajs1s8kmzy7ynsh8b2l43nafixqm"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hedgehog ]; - description = "A partial binary associative operator"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "partial-semigroup_0_5_1_0" = callPackage - ({ mkDerivation, base, doctest, hedgehog }: - mkDerivation { - pname = "partial-semigroup"; version = "0.5.1.0"; sha256 = "15rg80dgawmjz0gzfsspbb0b1045l6w5vvhwd4dgr7vv4hwj9gs9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage @@ -163614,27 +163890,6 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.4.1"; - sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p"; - revision = "1"; - editedCabalFile = "1qb9b3rvzpdm6xp2xljmp2izz0x26bj3zvai22iyl914pzph3181"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions hspec path transformers unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_4_2" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; version = "1.4.2"; sha256 = "0jqx3mi4an4kb3kg78n1p3xrz832yrfrnvj795b0xhkv6h1z5ir3"; libraryHaskellDepends = [ @@ -163646,7 +163901,6 @@ self: { ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -163774,10 +164028,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "patience"; - version = "0.2.1.0"; - sha256 = "0mfkqf5kwxqva6pizj967gv7m8zvjvwnli5ala0qvv7jq8gqnfsf"; - revision = "1"; - editedCabalFile = "0zr4w80zx7gw7amj2mlxl0k7lvczxnl0i13mijvxnb0g15sa5clg"; + version = "0.2.1.1"; + sha256 = "14d6hkrkbanlv09z7dbg8q7hk5ax5mfpgzr0knmcviq02kmzbs0s"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -166786,15 +167038,16 @@ self: { }: mkDerivation { pname = "pinch"; - version = "0.3.4.0"; - sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a"; + version = "0.3.4.1"; + sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim hashable semigroups text unordered-containers vector ]; + libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck - semigroups text unordered-containers vector + base bytestring containers hspec QuickCheck semigroups text + unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; @@ -166945,6 +167198,17 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "pipeline" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "pipeline"; + version = "0.1.0"; + sha256 = "1bz7pfyfgc1cps5pwy31m5z3r6kxi5c4661qa60q333y0rd2y2j1"; + libraryHaskellDepends = [ base transformers ]; + description = "Continuation patterns"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, semigroups, test-framework @@ -169981,8 +170245,8 @@ self: { ({ mkDerivation, base, primitive, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.2.0.0"; - sha256 = "059b5zip3i7cfa977kz0jzxc7b8nws9libkxwf8pnvxk70i7apq1"; + version = "0.2.1.0"; + sha256 = "1vxasjdy3l41brzyrjqv13zazm1ryqy496p2rfvm19062bfpixji"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive tasty tasty-hunit ]; description = "posix bindings"; @@ -172665,6 +172929,7 @@ self: { ]; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proc" = callPackage @@ -174300,6 +174565,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-radius-test_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers + , protocol-radius, QuickCheck, quickcheck-simple, transformers + }: + mkDerivation { + pname = "protocol-radius-test"; + version = "0.1.0.0"; + sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88"; + libraryHaskellDepends = [ + base bytestring cereal containers protocol-radius QuickCheck + quickcheck-simple transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "testsuit of protocol-radius haskell package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text @@ -174388,8 +174671,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "proxied"; - version = "0.3"; - sha256 = "09pbvf40qykrzmg4lrk5krhx30gzsldk1bz2i6bb6d18bx14skak"; + version = "0.3.1"; + sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r"; libraryHaskellDepends = [ base ]; description = "Make functions consume Proxy instead of undefined"; license = stdenv.lib.licenses.bsd3; @@ -175135,8 +175418,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.12.2"; - sha256 = "1y7bcfj6fdlwmisdd75xcdkz7grch0pcmb9xsh6zwyvi6c40a3g2"; + version = "0.12.3"; + sha256 = "0h4216x80cgqdvl7l0glw9xxhnpakh8272p65yc2d5zwbvvfra6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177429,6 +177712,8 @@ self: { pname = "radian"; version = "0.1"; sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; + revision = "1"; + editedCabalFile = "1mkk17rrg2z6s1qkzz7qcm6q6qvgmcmvii9rzjzgn73m1x1l5rim"; libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base HUnit lens ]; description = "Isomorphisms for measurements that use radians"; @@ -178680,6 +178965,7 @@ self: { benchmarkHaskellDepends = [ base-noprelude gauge relude ]; description = "Client for rating.chgk.info API and CSV tables (documentation in Russian)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-systems" = callPackage @@ -178736,7 +179022,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_6_2_1" = callPackage + "rattletrap_6_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, clock, containers, filepath, http-client , http-client-tls, HUnit, template-haskell, temporary, text @@ -178744,8 +179030,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "6.2.1"; - sha256 = "0pygwgq5q6mvpbkis2xiw6ac65fn8q9452qql5dc21p4mi27bwka"; + version = "6.2.3"; + sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179981,8 +180267,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.2.0"; - sha256 = "1ij7yxh06zb7fjkba2ghq88kvhr1rw4jlc0miwqfl53f6ssvcklf"; + version = "2.2.3.0"; + sha256 = "193v6ygjhgv8l5b31gs4279dah677lhlj68kvj80pw5vj5azyawr"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -180081,13 +180367,14 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "1.1.0.0"; - sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; + version = "2.0.2.1"; + sha256 = "0wnzzx7hvk1yhg7x7mzi6zkr6x7j7682i3d843qk6hhpa3agcb8j"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty tasty-hunit text ]; + doHaddock = false; description = "Extensible records and variants indexed by a type-level Red-Black tree"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -180692,6 +180979,7 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflex-dom-fragment-shader-canvas" = callPackage @@ -182854,7 +183142,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_2_0_0" = callPackage + "req_2_0_1" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls @@ -182863,8 +183151,8 @@ self: { }: mkDerivation { pname = "req"; - version = "2.0.0"; - sha256 = "0avwvslsb689p9afbh3k0zwmqwkrqagicz26xcyfjsd5648mh3wr"; + version = "2.0.1"; + sha256 = "1mfm6yy23l64kqbxvp1yn3yqf7fl46as87rz4yazg7f5x13bas3r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -184258,27 +184546,29 @@ self: { "ribosome" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , data-default-class, deepseq, directory, either, filepath - , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs - , pretty-terminal, prettyprinter, process, resourcet, safe, split - , stm, strings, text, time, transformers, unliftio, utf8-string + , data-default, deepseq, directory, either, filepath, hslogger, HTF + , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal + , prettyprinter, prettyprinter-ansi-terminal, process, resourcet + , safe, split, stm, text, time, transformers, typed-process, unix + , unliftio, unliftio-core, utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.1.2.0"; - sha256 = "0sx4c7inv7dgy68wjnl13wmx6ybfjwl6flf2x9wz5aw1v5ssaw8z"; + version = "0.2.2.0"; + sha256 = "0cz0ksrxin9k8pnzfhvv6ihskba7kmrwn6np3bdg6rq2g9745v9d"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet safe split stm strings text time transformers unliftio - utf8-string + aeson ansi-terminal base bytestring containers data-default deepseq + directory either filepath hslogger lens messagepack MissingH mtl + nvim-hs pretty-terminal prettyprinter prettyprinter-ansi-terminal + process resourcet safe split stm text time transformers + typed-process unix unliftio unliftio-core utf8-string ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger HTF lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet safe split stm strings text time transformers unliftio + aeson ansi-terminal base bytestring containers data-default deepseq + directory either filepath hslogger HTF lens messagepack MissingH + mtl nvim-hs pretty-terminal prettyprinter + prettyprinter-ansi-terminal process resourcet safe split stm text + time transformers typed-process unix unliftio unliftio-core utf8-string ]; description = "api extensions for nvim-hs"; @@ -184393,6 +184683,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rigel-viz" = callPackage + ({ mkDerivation, aeson, base, bytestring, colour, containers, hspec + , QuickCheck, text + }: + mkDerivation { + pname = "rigel-viz"; + version = "0.2.0.0"; + sha256 = "0z6c6hynisf5165c4izh31bfr4zcdik13ww5c4ylpqzxsig2z5xs"; + libraryHaskellDepends = [ + aeson base bytestring colour containers text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "A mid-level wrapper for vega-lite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ring-buffer" = callPackage ({ mkDerivation, base, exceptions, HUnit, mtl, primitive , QuickCheck, vector @@ -185185,8 +185491,8 @@ self: { }: mkDerivation { pname = "ron"; - version = "0.5"; - sha256 = "1czcpcc52sv1m4wj66wsbjscb5g2wrg22spvi1qsxgpjjs3grj1f"; + version = "0.6"; + sha256 = "022ilxpk9axw41d1cmlgdsgc3c7ss6a0j6a1w10l81g56xlpi67z"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable integer-gmp mtl template-haskell text time unordered-containers @@ -185232,15 +185538,16 @@ self: { "ron-storage" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , integer-gmp, mtl, network-info, ron, ron-rdt, text, transformers + , integer-gmp, mtl, network-info, ron, ron-rdt, stm, text + , transformers }: mkDerivation { pname = "ron-storage"; - version = "0.5"; - sha256 = "17gq7pxnniigvg7jk6kn87fd5m9bg0glv0mrahhralsb3zdp4klq"; + version = "0.6"; + sha256 = "07bnvlamw8cdw9s8fra9fd1jz3sw203jnimj2ad50rahn2r3zrnq"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl - network-info ron ron-rdt text transformers + network-info ron ron-rdt stm text transformers ]; description = "RON Storage"; license = stdenv.lib.licenses.bsd3; @@ -186993,6 +187300,7 @@ self: { ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak_0_2_3" = callPackage @@ -187306,6 +187614,8 @@ self: { pname = "sandi"; version = "0.5"; sha256 = "1ndgai8idlxyccvkz5zsgq06v58blc30i6hkky5b1sf5x6gs2h29"; + revision = "1"; + editedCabalFile = "1aj9i1ir6ks3bdb47yvqlxv2azrz09p69ggr73m0cxvir9rd0y5j"; libraryHaskellDepends = [ base bytestring conduit exceptions ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck tasty-th @@ -187726,6 +188036,7 @@ self: { ]; description = "Low-level Starcraft II API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sc2-proto" = callPackage @@ -187745,6 +188056,7 @@ self: { libraryToolDepends = [ proto-lens-protoc protoc ]; description = "A protocol buffer model for the Starcraft II bot API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {protoc = null;}; "sc2-support" = callPackage @@ -188178,8 +188490,8 @@ self: { }: mkDerivation { pname = "schematic"; - version = "0.4.2.0"; - sha256 = "0k63pnv8mip8kn623s5n7w24bd4spjmi1a9h280nf7wd1q8z72n4"; + version = "0.5.0.0"; + sha256 = "0mq38m08gj90gyk38lj4vyyfz0d6qrpxlpqjizqvyj4k3hqqy4ka"; libraryHaskellDepends = [ aeson base bytestring containers hjsonschema mtl profunctors regex-tdfa regex-tdfa-text scientific singletons smallcheck tagged @@ -188852,6 +189164,7 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scrape-changes" = callPackage @@ -190722,6 +191035,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant_0_16" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq + , doctest, hspec, hspec-discover, http-api-data, http-media + , http-types, mmorph, mtl, network-uri, QuickCheck + , quickcheck-instances, singleton-bool, string-conversions, tagged + , text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.16"; + sha256 = "0flpk4hd459lglxxyrbcvsk1401lcl5qrcr4ixz87jrs6vx97h37"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive deepseq http-api-data http-media http-types mmorph + mtl network-uri QuickCheck singleton-bool string-conversions tagged + text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring doctest hspec mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -190794,8 +191136,8 @@ self: { pname = "servant-auth-client"; version = "0.3.3.0"; sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9"; - revision = "2"; - editedCabalFile = "05ibhx700r0xn746g691ypysnjgxqb0lkq2gjrih5ylzc7nfvv2s"; + revision = "3"; + editedCabalFile = "1kzyqd9hg7xld5s8qpm76l9ym48z81j6ycdwp3lb0f1p2d3aagcd"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core text @@ -190930,6 +191272,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-server_0_4_4_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, cookie, data-default-class, entropy + , hspec, hspec-discover, http-client, http-types, jose, lens + , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck + , servant, servant-auth, servant-server, tagged, text, time + , transformers, unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.4.4.0"; + sha256 = "13196aknmb125ri3szqx8z5hdkk8lglv4795ck5glpn953vgq51c"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + case-insensitive cookie data-default-class entropy http-types jose + lens memory monad-time mtl servant servant-auth servant-server + tagged text time unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive hspec http-client http-types + jose lens lens-aeson mtl QuickCheck servant servant-auth + servant-server time transformers wai warp wreq + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "servant-server/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-swagger" = callPackage ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck , servant, servant-auth, servant-swagger, swagger2, text @@ -191083,8 +191454,8 @@ self: { }: mkDerivation { pname = "servant-auth-wordpress"; - version = "1.0.0.0"; - sha256 = "0ns744n58irm2la9xz4nqxz3yyb69vwbw2h9nqcfhr66dmqd80ar"; + version = "1.0.0.1"; + sha256 = "08ngbgmzksp27n8znigrj5i2nvsqjansn4vv3my38vdqqgzm09w8"; libraryHaskellDepends = [ base mtl servant-server text time wai wordpress-auth ]; @@ -191133,6 +191504,8 @@ self: { pname = "servant-blaze"; version = "0.9"; sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; + revision = "1"; + editedCabalFile = "06lq9lyli0pnmpw9489vzindjs0s9f982v6y9zk1lwc043nzg3ax"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; @@ -191148,8 +191521,8 @@ self: { pname = "servant-cassava"; version = "0.10"; sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "4"; - editedCabalFile = "0kk7vqnh5ycrvhrvhi3ahva6v56fvi17k3qrh8a8qnhx25094jaj"; + revision = "5"; + editedCabalFile = "1hidradrcdcchbr0hn9y7y1bc0i0gxzfbganyy7p2z8ip2czddvj"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -191244,6 +191617,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-client_0_16" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.16"; + sha256 = "0641fqlvqkm5075pcgcg5q81j7jil79sjpifg1snagfisrsxifxj"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server stm + tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, generics-sop @@ -191265,6 +191669,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client-core_0_16" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, deepseq, exceptions, free, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , safe, servant, template-haskell, text, transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.16"; + sha256 = "0cvv9a7z6ahwjp433c4sxa9i1ifabbih63bx71r9gvqzl85pb3dz"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring containers + deepseq exceptions free http-media http-types network-uri safe + servant template-haskell text transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-client-namedargs" = callPackage ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck , servant, servant-client, servant-client-core, servant-namedargs @@ -191272,10 +191698,8 @@ self: { }: mkDerivation { pname = "servant-client-namedargs"; - version = "0.1.0.0"; - sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd"; - revision = "1"; - editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n"; + version = "0.1.1.0"; + sha256 = "11638zddkdna50lxiyk8ya1hakkriymlyvz6l6zli94ri5a3lprg"; libraryHaskellDepends = [ base named servant servant-client-core servant-namedargs text ]; @@ -191298,6 +191722,8 @@ self: { pname = "servant-conduit"; version = "0.15"; sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz"; + revision = "1"; + editedCabalFile = "0l6pv8bqca88k8wjx7qczagka6l99zd7xyz1ma95004665gc56x6"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -191375,10 +191801,8 @@ self: { }: mkDerivation { pname = "servant-dhall"; - version = "0.1.0.1"; - sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; - revision = "3"; - editedCabalFile = "13mq4pwffxqpjirb6rfhzd2xqhm0xyycl98h6kf4j0ic38g3saz1"; + version = "0.1.0.2"; + sha256 = "09fvyhkqpypg73cxs7y2asvlch83i4sqzh2w0d5ix0zl5i7f6rz3"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -191403,6 +191827,8 @@ self: { pname = "servant-docs"; version = "0.11.3"; sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7"; + revision = "1"; + editedCabalFile = "1f5vdd096yrb0fsnzy709xw3x1r5q1pymscqaaarz3h2sky385lv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191446,26 +191872,27 @@ self: { }) {}; "servant-ekg" = callPackage - ({ mkDerivation, aeson, base, ekg, ekg-core, hspec, http-client - , http-types, process, servant, servant-client, servant-server - , text, time, transformers, unordered-containers, wai, warp + ({ mkDerivation, aeson, base, ekg, ekg-core, hashable, hspec + , hspec-discover, http-client, http-types, process, servant + , servant-client, servant-server, text, time, transformers + , unordered-containers, wai, warp }: mkDerivation { pname = "servant-ekg"; - version = "0.2.0.0"; - sha256 = "1crsd5yirv5rygc6855qcz31c7abjakzklgxg6c6qnkyx1h4xd82"; - isLibrary = true; - isExecutable = true; + version = "0.3"; + sha256 = "0kqsvpqh36ripps7lvqlg5d407yhh3rzccgyn8zkbrir0ifjfy2l"; libraryHaskellDepends = [ - base ekg-core http-types servant text time unordered-containers wai - ]; - executableHaskellDepends = [ - aeson base ekg ekg-core process servant-server text wai warp + base ekg-core hashable http-types servant text time + unordered-containers wai ]; testHaskellDepends = [ aeson base ekg ekg-core hspec http-client servant servant-client servant-server text transformers unordered-containers wai warp ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base ekg ekg-core process servant-server text wai warp + ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -191553,6 +191980,8 @@ self: { pname = "servant-foreign"; version = "0.15"; sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi"; + revision = "1"; + editedCabalFile = "1amvhixa0zwjipmv6iv97pfzlr83p0b0kvxif2d2l7akcdgd2ddz"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -191695,6 +192124,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-http-streams" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.16"; + sha256 = "1gkgk13zxi8y071i9dx0i1kbs14rgp8cfnfcd7rpg86pffxkx6cp"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -191765,6 +192227,8 @@ self: { pname = "servant-js"; version = "0.9.4"; sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; + revision = "1"; + editedCabalFile = "09nd1wlpaj20pyp6jzp2hsnyl02lvbi5vvvymhfhqf3rjxxpnyyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191828,6 +192292,8 @@ self: { pname = "servant-lucid"; version = "0.9"; sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; + revision = "1"; + editedCabalFile = "0fgik3s4vqyx5f8r777x82baj42qqgnxwi8gfp8iz3wfifvpc43k"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -191844,6 +192310,8 @@ self: { pname = "servant-machines"; version = "0.15"; sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; + revision = "1"; + editedCabalFile = "18ag4ynzq62n8n52551bm4y4xr7sn03jyp14f3kx08wid3pf5p8a"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -191901,6 +192369,8 @@ self: { pname = "servant-mock"; version = "0.8.5"; sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; + revision = "1"; + editedCabalFile = "0jn1inj9rc6dwf1lml3blwf1kx2d73zpwarn6jwd4j4mf7wvak4a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191927,16 +192397,14 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11.3"; - sha256 = "0xkzzsi4d3hjn33zfrqadxjv7ymp4z7r5g37fidj3ryhwc1l6d9v"; - isLibrary = true; - isExecutable = true; + version = "0.11.4"; + sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; libraryHaskellDepends = [ base bytestring directory http-media lens resourcet servant servant-docs servant-foreign servant-server text transformers wai wai-extra ]; - executableHaskellDepends = [ + testHaskellDepends = [ base bytestring http-client network servant servant-server text transformers wai warp ]; @@ -191967,10 +192435,8 @@ self: { ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: mkDerivation { pname = "servant-namedargs"; - version = "0.1.0.1"; - sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh"; - revision = "1"; - editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7"; + version = "0.1.1.0"; + sha256 = "10y1a9cr5fb794nqck1dmdr4dr6yl2x32zwsk1l2k4zfwy9bwyj1"; libraryHaskellDepends = [ base named servant text ]; testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; @@ -192021,8 +192487,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.2.0"; - sha256 = "15imbn6iyvbi80yainpi59q2r621r43d6cim3aydf6bbmz9pgnxd"; + version = "2.2.2"; + sha256 = "00ki2crhrp87m0dwyrb6rv25cfyag51igm772a54zvgi713qj7rr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192060,6 +192526,8 @@ self: { pname = "servant-pipes"; version = "0.15"; sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90"; + revision = "1"; + editedCabalFile = "1q4w4fnvpi4m62yhv37pcg5sj21m4s02glsa5q56vc51bjbx8xi4"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -192251,6 +192719,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-reflex" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, exceptions, ghcjs-dom, http-api-data, http-media + , jsaddle, mtl, network-uri, reflex, reflex-dom-core, safe, servant + , servant-auth, string-conversions, text, transformers + }: + mkDerivation { + pname = "servant-reflex"; + version = "0.3.4"; + sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive containers data-default exceptions + ghcjs-dom http-api-data http-media jsaddle mtl network-uri reflex + reflex-dom-core safe servant servant-auth string-conversions text + transformers + ]; + description = "servant API generator for reflex apps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-response" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -192354,19 +192844,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server_0_16" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, Cabal, cabal-doctest, containers, directory, doctest + , exceptions, filepath, hspec, hspec-discover, hspec-wai + , http-api-data, http-media, http-types, monad-control, mtl + , network, network-uri, QuickCheck, resourcet, safe, servant + , should-not-typecheck, string-conversions, tagged, temporary, text + , transformers, transformers-base, transformers-compat, wai + , wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.16"; + sha256 = "18rv99hyb448mcv1cjvs0p6cqrkw9f3zpdh18nsd29fskcybsv3b"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant string-conversions tagged + text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory + doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe + servant should-not-typecheck string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage - ({ mkDerivation, base, http-api-data, http-types, named, servant - , servant-namedargs, servant-server, string-conversions, text, wai + ({ mkDerivation, base, bytestring, http-api-data, http-types, named + , servant, servant-namedargs, servant-server, string-conversions + , text, wai }: mkDerivation { pname = "servant-server-namedargs"; - version = "0.1.0.0"; - sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y"; - revision = "1"; - editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7"; + version = "0.1.1.0"; + sha256 = "1i810rw4kncpfyh2q67bqyiw6mh9pbhl4m40x2clwfsxqqpnkyda"; libraryHaskellDepends = [ - base http-api-data http-types named servant servant-namedargs - servant-server string-conversions text wai + base bytestring http-api-data http-types named servant + servant-namedargs servant-server string-conversions text wai ]; description = "Automatically derive API server functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; @@ -192608,6 +193135,8 @@ self: { pname = "servant-swagger"; version = "1.1.7"; sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; + revision = "1"; + editedCabalFile = "0maasfw086a2iy4dyfaap4f1ncq1cg3p2mw6ypqhfr3dipgj5d3v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -192619,7 +193148,7 @@ self: { QuickCheck servant swagger2 template-haskell text time utf8-string ]; testToolDepends = [ hspec-discover ]; - description = "Generate Swagger specification for your servant API"; + description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -192632,8 +193161,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.2.3.19.3"; sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7"; - revision = "1"; - editedCabalFile = "0k2s6y93ii3d1myacq70ifpjf9q0mglxdr97wmxll6ixzsn7fjpl"; + revision = "2"; + editedCabalFile = "1p16lixhl9dbv3xlxpzy784a68xqnhvy91wyl5y183kixjniyf6f"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -192652,8 +193181,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.2"; sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; - revision = "2"; - editedCabalFile = "02yxnvd54wcykhswivhg5sr67njz0p3raxmp5nqmijwwxh0iqdvc"; + revision = "3"; + editedCabalFile = "1di8fz3kcyp395yvjx3i48p68kx3qg83vbjc81c5jdp1i8w0kmww"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -192672,8 +193201,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.2"; sha256 = "1ybkwa6dyi9v1rcqd0gzl1hqkinkmsqwz0ang0cmsa6d8ym3zmii"; - revision = "1"; - editedCabalFile = "1n735zxdkfnhr0vh6r3cgw97pggp0lnpd6bq6fspzv5bbylg3mkc"; + revision = "2"; + editedCabalFile = "0ckx9bvngl65mcg8d16baknvz0637z7griqqwkclcvgksx812kbh"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -192691,8 +193220,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.2.1.22.2"; sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0"; - revision = "1"; - editedCabalFile = "030zf1z5h96d40ifwagxblz1dij2ypbcqyy0wpqvjqbianyqgcim"; + revision = "2"; + editedCabalFile = "160acp4hvwm4m42kx275qr1nkg9s7bjxlk61agvm45hi3lg0lm6f"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -192733,25 +193262,26 @@ self: { }) {}; "servant-waargonaut" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, http-media - , http-types, lens, servant, servant-server, tasty, tasty-wai, text - , transformers, waargonaut, wai, wl-pprint-annotated + ({ mkDerivation, base, bytestring, http-media, http-types, lens + , servant, servant-server, tasty, tasty-wai, text, transformers + , waargonaut, wai, wl-pprint-annotated }: mkDerivation { pname = "servant-waargonaut"; - version = "0.5.0.1"; - sha256 = "05j4d99nl5165fr5799fpfw9xxadn77gmx1zcvsi075piacf0s2k"; + version = "0.6.0.0"; + sha256 = "17igh9s4bmzsx10qscrqpqd8djkmr2krfc660nhdsi7cx5hmlwl3"; libraryHaskellDepends = [ - attoparsec base bytestring http-media lens servant text waargonaut + base bytestring http-media lens servant text waargonaut wl-pprint-annotated ]; testHaskellDepends = [ - attoparsec base bytestring http-media http-types lens servant - servant-server tasty tasty-wai text transformers waargonaut wai + base bytestring http-media http-types lens servant servant-server + tasty tasty-wai text transformers waargonaut wai wl-pprint-annotated ]; description = "Servant Integration for Waargonaut JSON Package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-websockets" = callPackage @@ -192800,6 +193330,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.1"; sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; + revision = "1"; + editedCabalFile = "05j3hqvqiq8wa45jsdx72xa5phbhvn2lxbkbhh1g0j13ky8x2waw"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -194569,6 +195101,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shellmet" = callPackage + ({ mkDerivation, base, markdown-unlit, process, text }: + mkDerivation { + pname = "shellmet"; + version = "0.0.0"; + sha256 = "1mn9m1jdbfb9p273wb9jvdnflhp6569ix6sa1z7yzqr91g7w4017"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process text ]; + executableHaskellDepends = [ base text ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base ]; + description = "Out of the shell solution for scripting in Haskell"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "shellout" = callPackage ({ mkDerivation, async, base, stm, text, typed-process }: mkDerivation { @@ -194714,26 +195262,29 @@ self: { }) {}; "shh" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, mtl - , process, split, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, unix + ({ mkDerivation, async, base, coreutils, deepseq, directory + , filepath, mtl, perl, process, split, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, unix, vault, vim }: mkDerivation { pname = "shh"; - version = "0.2.0.0"; - sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; + version = "0.2.0.2"; + sha256 = "1mva62zp755yk8b1xms19s4gksyl5ad8p7i5scaxnwb4vl3182iy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base deepseq directory filepath mtl process split template-haskell unix ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ async base ]; + executableToolDepends = [ coreutils vault vim ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + testToolDepends = [ perl vim ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) coreutils; inherit (pkgs) perl; + inherit (pkgs) vim;}; "shift" = callPackage ({ mkDerivation, ansi-terminal, base, binary, bytestring @@ -194981,8 +195532,8 @@ self: { }: mkDerivation { pname = "show-prettyprint"; - version = "0.2.2"; - sha256 = "0mdgx484vgf2lif4a58vm8yl8zghxh0533038r76l5xlkc5qczgh"; + version = "0.2.3"; + sha256 = "01wg1bzp6dylysbm9rfq8n0ci7yzg3gw6jkzy8kzmsydgs5c54pd"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -195035,6 +195586,7 @@ self: { ]; description = "Clean up the formatting of 'show' output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shpider" = callPackage @@ -195506,13 +196058,24 @@ self: { ({ mkDerivation, base, directory, filepath, process }: mkDerivation { pname = "simple-cmd"; - version = "0.1.2"; - sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6"; + version = "0.1.3"; + sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; libraryHaskellDepends = [ base directory filepath process ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd-args" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.0.1"; + sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -196561,8 +197124,8 @@ self: { }: mkDerivation { pname = "siren-json"; - version = "0.3.0.0"; - sha256 = "096a4ls4kqpslqsh499ykh7mkvnz3q7n00w1par69kmj4x3g9v0j"; + version = "0.3.1.1"; + sha256 = "0idkblh14jz1l2miphb07lynpw8n1bshxf3q37chclc25wr156zk"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri network-uri-json text unordered-containers @@ -196610,17 +197173,17 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, directory , exceptions, filepath, Glob, lens, lens-aeson, megaparsec , MissingH, mtl, mustache, optparse-applicative, pandoc, parsec - , shelly, text, unordered-containers, yaml + , shelly, text, transformers, unordered-containers, yaml }: mkDerivation { pname = "sitepipe"; - version = "0.3.0.2"; - sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8"; + version = "0.4.0.0"; + sha256 = "0y8llic3imc1zs53glig24vjm59f2dnw4sw32gzkvlzq33689s7s"; libraryHaskellDepends = [ aeson base bytestring containers directory exceptions filepath Glob lens lens-aeson megaparsec MissingH mtl mustache - optparse-applicative pandoc parsec shelly text unordered-containers - yaml + optparse-applicative pandoc parsec shelly text transformers + unordered-containers yaml ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; @@ -197005,6 +197568,30 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_7_7" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, directory, filepath, hxt + , mtl, regex-pcre-builtin, safe, skylighting-core, text + , utf8-string + }: + mkDerivation { + pname = "skylighting"; + version = "0.7.7"; + sha256 = "03nn5z67jg45myrcmbwkz06z4ywy06whbc0jhc3ycpw9wfy5iqvy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe skylighting-core text + utf8-string + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -197037,6 +197624,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_7_7" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.7.7"; + sha256 = "0zd7gsybi02rigbgly63d8asfz8xy1xlnfy90m92zayizkagyg49"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text transformers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -197203,6 +197823,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slack-web_0_2_0_11" = callPackage + ({ mkDerivation, aeson, base, containers, errors, hspec + , http-api-data, http-client, http-client-tls, megaparsec, mtl + , servant, servant-client, servant-client-core, text, time + , transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.2.0.11"; + sha256 = "14ngln71sn5i26041m4v614vq4qhr44pzlgyxliyqw08dxn25la7"; + libraryHaskellDepends = [ + aeson base containers errors http-api-data http-client + http-client-tls megaparsec mtl servant servant-client + servant-client-core text time transformers + ]; + testHaskellDepends = [ + aeson base containers errors hspec http-api-data megaparsec text + time + ]; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "slate" = callPackage ({ mkDerivation, base, directory, filepath, htoml , optparse-applicative, process, string-conversions @@ -197523,6 +198167,8 @@ self: { pname = "smallcheck-series"; version = "0.6.1"; sha256 = "07kjbci4wxi6g9m0k0fqpxm8p2kxspyrcmg175vb3bp008vqb931"; + revision = "2"; + editedCabalFile = "1944nax2aq32cd8i335nc511zis3lcwkclkh5caigsfs34kwwglg"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -197733,6 +198379,7 @@ self: { ]; description = "Command line tool for <https://smith.st/ Smith>."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smith-client" = callPackage @@ -197756,6 +198403,7 @@ self: { ]; description = "API client for <https://smith.st/ Smith>."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smoothie" = callPackage @@ -198023,6 +198671,8 @@ self: { pname = "snap"; version = "1.1.2.0"; sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps"; + revision = "1"; + editedCabalFile = "07k5sq44w09cq7w8y128ifkm7837nyklgp9i1ydnavnhf044ah2n"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist fail filepath hashable @@ -199448,21 +200098,18 @@ self: { }) {}; "snmp" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, async, base - , binary, bytestring, cipher-aes, cipher-des, containers - , crypto-cipher-types, cryptohash, mtl, network, network-info - , random, securemem, text, time + ({ mkDerivation, base, bytestring, containers, cryptonite, ip + , language-asn, memory, network, stm, vector }: mkDerivation { pname = "snmp"; - version = "0.2.1.1"; - sha256 = "1944ffsmw4hamjpzb9prlcnz6l9lgggbsgi6ilj0v84r8bydcdq7"; + version = "0.3.0.0"; + sha256 = "1lpmwl74hg1x5065r1jhgi6rfmyasjmhqaghnckg6rzii0nxym9d"; libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types async base binary bytestring - cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl - network network-info random securemem text time + base bytestring containers cryptonite ip language-asn memory + network stm vector ]; - description = "API for write snmp client"; + description = "SNMP protocol library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -199835,18 +200482,18 @@ self: { }) {}; "sockets" = callPackage - ({ mkDerivation, async, base, ip, posix-api, primitive, tasty - , tasty-hunit + ({ mkDerivation, async, base, bytestring, entropy, ip, posix-api + , primitive, stm, tasty, tasty-hunit, text }: mkDerivation { pname = "sockets"; - version = "0.1.0.0"; - sha256 = "000j2bfjsa33l73pg57g4rignl7dy0jl072r3h9wl4d1f4qc3sim"; + version = "0.3.0.0"; + sha256 = "0l6xvs42wsxlmvm3l8hw0b2xmyiamyq1m81hw0q5p28rnjn9ydfr"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ip posix-api primitive ]; + libraryHaskellDepends = [ base ip posix-api primitive stm text ]; testHaskellDepends = [ async base ip primitive tasty tasty-hunit ]; - benchmarkHaskellDepends = [ base ip primitive ]; + benchmarkHaskellDepends = [ base bytestring entropy ip primitive ]; description = "High-level network sockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -200173,6 +200820,7 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio delay line"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soundgen" = callPackage @@ -200186,6 +200834,7 @@ self: { executableHaskellDepends = [ base split WAVE ]; description = "sound generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "source-code-server" = callPackage @@ -201189,6 +201838,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "split-morphism" = callPackage + ({ mkDerivation, base, invariant, lens, QuickCheck }: + mkDerivation { + pname = "split-morphism"; + version = "0.1.0.0"; + sha256 = "08mrnaj03j5z9ihayqikb06rw1fvrbjrqq0ysz28nlzawhz8x970"; + libraryHaskellDepends = [ base invariant lens ]; + testHaskellDepends = [ base invariant lens QuickCheck ]; + description = "Split Epimorphisms and Monomorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "split-record" = callPackage ({ mkDerivation, base, numeric-prelude, soxlib, storablevector , synthesizer-core, transformers, utility-ht @@ -203719,19 +204380,20 @@ self: { "stdio" = callPackage ({ mkDerivation, base, case-insensitive, deepseq, exceptions , ghc-prim, hashable, hspec, hspec-discover, HUnit, integer-gmp - , primitive, QuickCheck, quickcheck-instances, scientific, stm - , template-haskell, time, transformers, uv, word8 + , libuv, primitive, QuickCheck, quickcheck-instances, scientific + , stm, template-haskell, time, word8 }: mkDerivation { pname = "stdio"; - version = "0.1.0.0"; - sha256 = "1y98y92n30sxn8hk4nwfh8jjrwnc2v0cqd766r5dgd1rq6rlf6yv"; + version = "0.1.1.0"; + sha256 = "1sspnrflqac9clf9h6zwnhlvsw52xx97dlxyl6lhw6czy2qy813d"; + revision = "1"; + editedCabalFile = "1xdw84i0nlc3iz3i01li9p44raxn265kqjd284ifbf83vvhbp897"; libraryHaskellDepends = [ base case-insensitive deepseq exceptions ghc-prim hashable - integer-gmp primitive scientific stm template-haskell time - transformers word8 + integer-gmp primitive scientific stm template-haskell time word8 ]; - librarySystemDepends = [ uv ]; + libraryPkgconfigDepends = [ libuv ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base hashable hspec HUnit integer-gmp primitive QuickCheck @@ -203739,7 +204401,8 @@ self: { ]; description = "A simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; - }) {uv = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libuv;}; "steambrowser" = callPackage ({ mkDerivation, base, directory, parsec, transformers }: @@ -204847,23 +205510,24 @@ self: { }) {}; "streaming-base64" = callPackage - ({ mkDerivation, base, safe-exceptions, streaming - , streaming-bytestring, tasty, tasty-hunit, transformers + ({ mkDerivation, base, base-compat-batteries, filepath + , safe-exceptions, streaming, streaming-bytestring, streaming-with + , tasty, tasty-golden, transformers }: mkDerivation { pname = "streaming-base64"; - version = "0.1.0.0"; - sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6"; - revision = "1"; - editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r"; + version = "0.1.1.0"; + sha256 = "0yyjdld05i4bfx73maf5vzdrp7hx65784sv7bnnw4xfal1k20vlj"; libraryHaskellDepends = [ - base safe-exceptions streaming streaming-bytestring transformers + base base-compat-batteries safe-exceptions streaming + streaming-bytestring transformers ]; testHaskellDepends = [ - base streaming-bytestring tasty tasty-hunit + base base-compat-batteries filepath streaming-bytestring + streaming-with tasty tasty-golden ]; description = "Streaming conversion from/to base64"; - license = stdenv.lib.licenses.cc0; + license = stdenv.lib.licenses.publicDomain; }) {}; "streaming-benchmarks" = callPackage @@ -205522,6 +206186,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-list" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase + , semigroupoids, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "strict-list"; + version = "0.1"; + sha256 = "1bwzcrpwhszn6ir458znb72dcwh1ih4d8ry61nb1q2fw7pamdq2v"; + libraryHaskellDepends = [ base semigroupoids ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Strict linked list"; + license = stdenv.lib.licenses.mit; + }) {}; + "strict-tuple" = callPackage ({ mkDerivation, base, deepseq, hashable }: mkDerivation { @@ -206090,6 +206771,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strongswan-sql" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base + , bytestring, data-default, failable, haskeline, io-streams + , iproute, lens, mtl, mysql-haskell, network, structured-cli, text + , transformers + }: + mkDerivation { + pname = "strongswan-sql"; + version = "1.0.1.0"; + sha256 = "1f3yfbd7cl8k603jc1fy3b7h8nh94mvr15k3j01141zrfzzprimw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + executableHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + testHaskellDepends = [ + asn1-encoding asn1-types attoparsec base bytestring data-default + failable haskeline io-streams iproute lens mtl mysql-haskell + network structured-cli text transformers + ]; + description = "Interface library for strongSwan SQL backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -207179,8 +207891,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.3"; - sha256 = "19mf3sf3smza4yk21k98wb39mk3jg0nxr93nl924ivsyv514flgx"; + version = "1.3.0.1"; + sha256 = "0h6qibvkmslil9jvbzminhpxgz7z95qak3zv5dxj8sfpc3p3lk7g"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -209212,7 +209924,7 @@ self: { description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; + }) {gtk3 = pkgs.gtk3;}; "tag-bits" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -210099,6 +210811,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taskpool" = callPackage @@ -210171,6 +210884,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_1_6" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.1.6"; + sha256 = "13qqpl1prr9dda87dp45mqybay24n8rhxxgvpc9j34kh72g8j5qw"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-auto" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -210337,8 +211068,8 @@ self: { pname = "tasty-hedgehog-coverage"; version = "0.1.0.0"; sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c"; - revision = "1"; - editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f"; + revision = "2"; + editedCabalFile = "10fzklan91gyd3bs5qgyv83v7xflxdfcjlvqgcv15bzwplzngclx"; libraryHaskellDepends = [ base containers hedgehog mtl tagged tasty tasty-hedgehog text transformers wl-pprint-annotated @@ -211256,8 +211987,8 @@ self: { ({ mkDerivation, base, base-prelude, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.1"; - sha256 = "1dgxfcz68h583r15vc3zmj2fchsv5v4n2v55fz2ccw6sl3kyvlp3"; + version = "0.1.1.1"; + sha256 = "0il2bm5bwa4majddlzckc6jlcwx4w1kmymz9szj11hwjchgd1w3l"; libraryHaskellDepends = [ base base-prelude template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; @@ -212062,7 +212793,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;}; + }) {gtk3 = pkgs.gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -213826,6 +214557,21 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "th-abstraction_0_2_11_0" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "th-abstraction"; + version = "0.2.11.0"; + sha256 = "0340w34cqa42m0b9hdys9bfphi13swdp7xc8cwzbj9fq6764p22i"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base containers template-haskell ]; + description = "Nicer interface for reified information about data types"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-alpha" = callPackage ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar @@ -214496,6 +215242,8 @@ self: { pname = "these-skinny"; version = "0.7.4"; sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr"; + revision = "1"; + editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c"; libraryHaskellDepends = [ base deepseq ]; description = "A fork of the 'these' package without the dependency bloat"; license = stdenv.lib.licenses.bsd3; @@ -215020,7 +215768,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; + }) {gtk3 = pkgs.gtk3; inherit (pkgs) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec @@ -216634,6 +217382,8 @@ self: { pname = "to-string-class"; version = "0.1.2"; sha256 = "0l2hj0cbc0dhd7m5bn6xqgzkdf2z4knirmv8c65hsjig9mpsvsxf"; + revision = "1"; + editedCabalFile = "1p5q59gswv86pk7hxpg1n81q4szhwx8rwfx5hsibdz9i9mgz2bbs"; libraryHaskellDepends = [ base ]; description = "Converting string-like types to Strings"; license = stdenv.lib.licenses.bsd3; @@ -217181,32 +217931,34 @@ self: { }) {}; "toodles" = callPackage - ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra - , hspec, hspec-expectations, megaparsec, MissingH, regex-posix - , servant, servant-blaze, servant-server, strict, text, wai, warp + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, cmdargs, directory, extra, hspec, hspec-expectations + , megaparsec, MissingH, process, regex-posix, RSA, servant + , servant-blaze, servant-server, strict, text, time, wai, warp , yaml }: mkDerivation { pname = "toodles"; - version = "1.0.3"; - sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf"; + version = "1.1.1"; + sha256 = "0n1z99f2zr2xj55y90ll9dvqq51sv4r4zyhjx7qilqw34djzfn88"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra megaparsec MissingH process regex-posix RSA servant + servant-blaze servant-server strict text time wai warp yaml ]; executableHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra megaparsec MissingH process regex-posix RSA servant + servant-blaze servant-server strict text time wai warp yaml ]; testHaskellDepends = [ - aeson base blaze-html cmdargs directory extra hspec - hspec-expectations megaparsec MissingH regex-posix servant - servant-blaze servant-server strict text wai warp yaml + aeson base base64-bytestring blaze-html bytestring cmdargs + directory extra hspec hspec-expectations megaparsec MissingH + process regex-posix servant servant-blaze servant-server strict + text time wai warp yaml ]; description = "Manage the TODO entries in your code"; license = stdenv.lib.licenses.mit; @@ -218852,6 +219604,7 @@ self: { executableHaskellDepends = [ base containers parseargs WAVE ]; description = "Audio file compressor-limiter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trurl" = callPackage @@ -224306,6 +225059,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "useragents" = callPackage + ({ mkDerivation, base, random-fu, text }: + mkDerivation { + pname = "useragents"; + version = "1.0.0"; + sha256 = "1n4n4mhikzgx2a9qq8rify5wwhngnz0qip32fnhshham5yyldmy6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random-fu text ]; + executableHaskellDepends = [ base random-fu text ]; + description = "A collection of user agents"; + license = stdenv.lib.licenses.mit; + }) {}; + "userid" = callPackage ({ mkDerivation, aeson, base, boomerang, cereal, safecopy , web-routes, web-routes-th @@ -224695,8 +225462,8 @@ self: { }: mkDerivation { pname = "uuagc"; - version = "0.9.52.1"; - sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq"; + version = "0.9.52.2"; + sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225259,8 +226026,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.9.0.0"; - sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q"; + version = "0.9.0.1"; + sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -226844,6 +227611,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vinyl-generics" = callPackage + ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core + , QuickCheck, records-sop, text, vinyl + }: + mkDerivation { + pname = "vinyl-generics"; + version = "0.1.0.0"; + sha256 = "1rxv1wgckq5a3c65lvniizmv5f55gbnngxx76wa93h8lgrhf6ac0"; + libraryHaskellDepends = [ base generics-sop records-sop vinyl ]; + testHaskellDepends = [ + aeson base generics-sop hspec hspec-core QuickCheck records-sop + text vinyl + ]; + description = "Convert plain records to vinyl (and vice versa), generically"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vinyl-gl" = callPackage ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL , tagged, test-framework, test-framework-hunit, transformers @@ -226882,6 +227666,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vinyl-named-sugar" = callPackage + ({ mkDerivation, base, vinyl }: + mkDerivation { + pname = "vinyl-named-sugar"; + version = "0.1.0.0"; + sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h"; + libraryHaskellDepends = [ base vinyl ]; + description = "Syntax sugar for vinyl records using overloaded labels"; + license = stdenv.lib.licenses.mit; + }) {}; + "vinyl-operational" = callPackage ({ mkDerivation, base, operational, operational-extra, vinyl-plus }: @@ -227259,21 +228054,21 @@ self: { }) {}; "vrpn" = callPackage - ({ mkDerivation, base, vrpn }: + ({ mkDerivation, base, quat, vrpn }: mkDerivation { pname = "vrpn"; - version = "0.2.1.4"; - sha256 = "11iiwzhb9dqhk83p9gcnj4q2ya5m35bnic30a23z3l9lhsnn49b4"; + version = "0.3.0.0"; + sha256 = "1wyp8dnjag53qlbiz83d21046190kf8hv2izqk1alrniva4vz1kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ vrpn ]; + librarySystemDepends = [ quat vrpn ]; executableHaskellDepends = [ base ]; - executableSystemDepends = [ vrpn ]; + executableSystemDepends = [ quat vrpn ]; description = "Bindings to VRPN"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) vrpn;}; + }) {quat = null; inherit (pkgs) vrpn;}; "vt-utils" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring @@ -227470,28 +228265,29 @@ self: { , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers , scientific, semigroupoids, semigroups, tagged, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, text, transformers, vector, witherable - , wl-pprint-annotated, zippers + , tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit + , template-haskell, text, transformers, unordered-containers + , vector, witherable, wl-pprint-annotated, zippers }: mkDerivation { pname = "waargonaut"; - version = "0.5.2.2"; - sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; + version = "0.6.1.0"; + sha256 = "0ygwwiq3nr8szp5vhs9306pwf9mqh7x75vsh1wfh369h6psqqp11"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bifunctors bytestring containers contravariant digit - distributive errors generics-sop hoist-error hw-balancedparens - hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural - parsers scientific semigroupoids semigroups tagged text - transformers vector witherable wl-pprint-annotated zippers + attoparsec base bifunctors bytestring containers contravariant + digit distributive errors generics-sop hoist-error + hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph + mtl nats natural parsers scientific semigroupoids semigroups tagged + text transformers unordered-containers vector witherable + wl-pprint-annotated zippers ]; testHaskellDepends = [ attoparsec base bytestring containers contravariant digit directory distributive doctest filepath generics-sop hedgehog hedgehog-fn lens mtl natural scientific semigroupoids semigroups tagged tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - text vector zippers + tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit + template-haskell text unordered-containers vector zippers ]; description = "JSON wrangling"; license = stdenv.lib.licenses.bsd3; @@ -227641,39 +228437,6 @@ self: { }: mkDerivation { pname = "wai-app-static"; - version = "3.1.6.2"; - sha256 = "0gnwq6ad5m8w8sqq4dzpz23l5rjdphfsf8h9h27lrvv1prkabc6h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring containers cryptonite - directory file-embed filepath http-date http-types memory - mime-types old-locale optparse-applicative template-haskell text - time transformers unix-compat unordered-containers wai wai-extra - warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - mockery network old-locale temporary text time transformers - unix-compat wai wai-extra zlib - ]; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-app-static_3_1_6_3" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , containers, cryptonite, directory, file-embed, filepath, hspec - , http-date, http-types, memory, mime-types, mockery, network - , old-locale, optparse-applicative, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, wai - , wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; version = "3.1.6.3"; sha256 = "0s6bpz5gmjy797bnnw1y5mwy9761h46bjp1srnrh7cxlnvm93c4c"; revision = "2"; @@ -227697,7 +228460,6 @@ self: { ]; description = "WAI application for static serving"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-cli" = callPackage @@ -227881,8 +228643,8 @@ self: { pname = "wai-extra"; version = "3.0.25"; sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; - revision = "1"; - editedCabalFile = "1i26cmmh1qc4krni21ixfhpp12bvkpxiplhdhk8qsksyp31zqmv4"; + revision = "2"; + editedCabalFile = "0gdg5rfxqfgwj922lxz7ya637nj1qhh1imskiaf453hdpj619aaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230573,7 +231335,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome3) webkitgtk;}; + }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib @@ -231118,6 +231880,7 @@ self: { ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -231157,8 +231920,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.9"; - sha256 = "1qj28a53shcr4dq8i1fhyjbr4ybiyfb0kz3w0g439736mrnzsg4y"; + version = "0.1.0.10"; + sha256 = "1j6aizgsf387pm6ajr6zjj1l4nnaq8mryq4vr09jji91ix9zhnw7"; libraryHaskellDepends = [ attoparsec base bytestring scalpel-core text time ]; @@ -231600,8 +232363,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.7"; - sha256 = "0lsasdlznsmfj6b9ky448fdkgvdqhldyzx9fbnj1jgd779hlammb"; + version = "0.0.8"; + sha256 = "123y2xl22gmg28dcj244gk9bsbw0chz32gim48dz4bmqnkmvl7wl"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector @@ -235430,8 +236193,8 @@ self: { }: mkDerivation { pname = "yak"; - version = "0.1.0.0"; - sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a"; + version = "0.2.0.0"; + sha256 = "1k27361n0jbixrshlf9757gvlnm7z3safkl28zg4lqflmfq95mai"; libraryHaskellDepends = [ attoparsec base bytestring lens template-haskell text time ]; @@ -235453,37 +236216,6 @@ self: { }) {}; "yam" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , data-default, fast-logger, hspec, http-client, http-types, lens - , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak - , scientific, servant-client, servant-server, servant-swagger - , servant-swagger-ui, swagger2, text, unliftio-core - , unordered-containers, vault, vector, wai, warp - }: - mkDerivation { - pname = "yam"; - version = "0.5.11"; - sha256 = "0k9y8zg1sbdxb6c3fdmlz0dswb8yam5x812avfw6rg3as8sp1pcf"; - libraryHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - http-client http-types lens monad-logger mtl mwc-random reflection - salak scientific servant-client servant-server servant-swagger - servant-swagger-ui swagger2 text unliftio-core unordered-containers - vault vector wai warp - ]; - testHaskellDepends = [ - base base16-bytestring binary bytestring data-default fast-logger - hspec http-client http-types lens monad-logger mtl mwc-random - QuickCheck reflection salak scientific servant-client - servant-server servant-swagger servant-swagger-ui swagger2 text - unliftio-core unordered-containers vault vector wai warp - ]; - description = "Yam Web"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam_0_5_13" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, fast-logger, hspec, http-client, http-types, lens , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection @@ -235560,22 +236292,6 @@ self: { }: mkDerivation { pname = "yam-datasource"; - version = "0.5.11"; - sha256 = "170xpd1kw403g9zds795zbxkaz0qy7lfgzppx4q0ri42ky59z8pl"; - libraryHaskellDepends = [ - base conduit persistent resource-pool resourcet unliftio-core yam - ]; - description = "Yam DataSource Middleware"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yam-datasource_0_5_13" = callPackage - ({ mkDerivation, base, conduit, persistent, resource-pool - , resourcet, unliftio-core, yam - }: - mkDerivation { - pname = "yam-datasource"; version = "0.5.13"; sha256 = "0vbw575g7qdha9siiyrnv3kpjw6ysz09m4qady90s9j75ymzdgnm"; libraryHaskellDepends = [ @@ -235978,8 +236694,8 @@ self: { ({ mkDerivation, base, gloss, Yampa }: mkDerivation { pname = "yampa-gloss"; - version = "0.1.0.0"; - sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g"; + version = "0.2"; + sha256 = "0dbp5a4mvqvdc6pq9qdaw3656n0pspmjjg5z4a1b5q8s6dbv62zx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gloss Yampa ]; @@ -236567,34 +237283,6 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.5"; - sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup bytestring conduit - conduit-extra containers cryptonite data-default email-validate - file-embed http-client http-client-tls http-conduit http-types - memory network-uri nonce persistent random safe shakespeare - template-haskell text time transformers unliftio unliftio-core - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_6_6" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , cryptonite, data-default, email-validate, file-embed, http-client - , http-client-tls, http-conduit, http-types, memory, network-uri - , nonce, persistent, random, safe, shakespeare, template-haskell - , text, time, transformers, unliftio, unliftio-core - , unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; version = "1.6.6"; sha256 = "0ibmv3ghxrrjjjqb9jg4wnwr7w4hl4lsvwic13ys8fihg40ln6ka"; libraryHaskellDepends = [ @@ -236608,7 +237296,6 @@ self: { ]; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -237064,8 +237751,8 @@ self: { }: mkDerivation { pname = "yesod-content-pdf"; - version = "0.2.0.4"; - sha256 = "1n51prhxbbjrkvnvf2v4nk6vs8zxvwrnb1826r2vkhq0j1pyyi2k"; + version = "0.2.0.5"; + sha256 = "0cfg4jvqq5ix9csla7fzawiiivhcvwh2lqmydz5rii95rfys6kww"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring conduit data-default directory network-uri process temporary transformers yesod-core @@ -237155,42 +237842,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.11"; - sha256 = "1cpl8g2sdvv751vvs68169w9nki43h6rmj2i2wqkfzijwgd8djwr"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_12" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; version = "1.6.12"; sha256 = "1zyvjbphzkhch4wv8lj019dd3jnyicdj514fhy1ggwqkff3kyblj"; libraryHaskellDepends = [ @@ -237212,7 +237863,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -237579,17 +238229,16 @@ self: { }) {}; "yesod-gitrev" = callPackage - ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core + ({ mkDerivation, aeson, base, githash, template-haskell, yesod-core }: mkDerivation { pname = "yesod-gitrev"; - version = "0.2.0.0"; - sha256 = "0lp0zraj6015bl8pcgi9b9w4d1yf0lb4awy25jv5xrcrc173g7yz"; - revision = "1"; - editedCabalFile = "1b0df34lz569gnwbbz0p20dml6bi2nbva9wfdsxyvva0dhvxjaz5"; + version = "0.2.1"; + sha256 = "0wd6xvq9aa11n8y4hna0a5ivqfxnbg8w2bq5lramm895xs7c8d7w"; libraryHaskellDepends = [ - aeson base gitrev template-haskell yesod-core + aeson base githash template-haskell yesod-core ]; + testHaskellDepends = [ base yesod-core ]; description = "A subsite for displaying git information"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -239280,8 +239929,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.7"; - sha256 = "1dvny64v5v3qrahymn647jsjjdraa0mrkpvmqiwihh8n9xbnq1s7"; + version = "0.7.0.1"; + sha256 = "1cmdx2bghp508qm26xydnljswgldvvv5rapmzcivmnn8pzp9g9kl"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -239621,6 +240270,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zenhack-prelude" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zenhack-prelude"; + version = "0.1.1.0"; + sha256 = "07njs4zb976zxyiwg03ijvn1wvmx188ys49gckwybg1kl824x11f"; + libraryHaskellDepends = [ base ]; + description = "@zenhack's personal custom prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "zeno" = callPackage ({ mkDerivation, array, base, containers, directory, ghc, ghc-paths , mtl, parallel, process, random, text, transformers diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch new file mode 100644 index 00000000000..ebadd215cb7 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch @@ -0,0 +1,82 @@ +diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs +index 712007006..6be92ec6d 100644 +--- a/src/Servant/Client/Core/Internal/HasClient.hs ++++ b/src/Servant/Client/Core/Internal/HasClient.hs +@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where + import Prelude () + import Prelude.Compat + ++import Control.Concurrent.MVar ++ (modifyMVar, newMVar) + import qualified Data.ByteString as BS + import qualified Data.ByteString.Lazy as BL + import Data.Foldable +@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H + import Servant.API + ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData, + BuildHeadersTo (..), Capture', CaptureAll, Description, +- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header', +- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender), ++ EmptyAPI, FramingRender (..), FramingUnrender (..), ++ FromSourceIO (..), Header', Headers (..), HttpVersion, ++ IsSecure, MimeRender (mimeRender), + MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag, + QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost, + ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData, +- Vault, Verb, WithNamedContext, contentType, getHeadersHList, +- getResponse, toQueryParam, toUrlPiece) ++ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType, ++ getHeadersHList, getResponse, toQueryParam, toUrlPiece) + import Servant.API.ContentTypes + (contentTypes) + import Servant.API.Modifiers +@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api) + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + + instance +- ( HasClient m api ++ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a + ) => HasClient m (StreamBody' mods framing ctype a :> api) + where + +@@ -547,7 +550,39 @@ instance + hoistClientMonad pm _ f cl = \a -> + hoistClientMonad pm (Proxy :: Proxy api) f (cl a) + +- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody" ++ clientWithRoute pm Proxy req body ++ = clientWithRoute pm (Proxy :: Proxy api) ++ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req ++ where ++ ctypeP = Proxy :: Proxy ctype ++ framingP = Proxy :: Proxy framing ++ ++ sourceIO = framingRender ++ framingP ++ (mimeRender ctypeP :: chunk -> BL.ByteString) ++ (toSourceIO body) ++ ++ -- not pretty. ++ givesPopper :: (IO BS.ByteString -> IO ()) -> IO () ++ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do ++ ref <- newMVar step0 ++ ++ -- Note sure we need locking, but it's feels safer. ++ let popper :: IO BS.ByteString ++ popper = modifyMVar ref nextBs ++ ++ needsPopper popper ++ ++ nextBs S.Stop = return (S.Stop, BS.empty) ++ nextBs (S.Error err) = fail err ++ nextBs (S.Skip s) = nextBs s ++ nextBs (S.Effect ms) = ms >>= nextBs ++ nextBs (S.Yield lbs s) = case BL.toChunks lbs of ++ [] -> nextBs s ++ (x:xs) | BS.null x -> nextBs step' ++ | otherwise -> return (step', x) ++ where ++ step' = S.Yield (BL.fromChunks xs) s + + + diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index b65dfb1d4a1..433271d9c85 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -115,6 +115,6 @@ (stdenv.lib.optionalAttrs (!stdenv.isLinux) { # Work around <https://bugs.gnu.org/14201>. - SHELL = "/bin/sh"; - CONFIG_SHELL = "/bin/sh"; + SHELL = "${stdenv.shell}"; + CONFIG_SHELL = "${stdenv.shell}"; }) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index c95b9e8b8e3..abd1fda47cb 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, buildPackages , name ? "luajit-${version}" , isStable , sha256 @@ -20,24 +20,23 @@ stdenv.mkDerivation rec { luaversion = "5.1"; - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local "$out" - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + postPatch = '' + substituteInPlace Makefile --replace ldconfig : ''; configurePhase = false; + makeFlags = [ + "PREFIX=$(out)" + "DEFAULT_CC=cc" + "CROSS=${stdenv.cc.targetPrefix}" + # TODO: when pointer size differs, we would need e.g. -m32 + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + ]; buildFlags = [ "amalg" ]; # Build highly optimized version enableParallelBuilding = true; - installPhase = '' - make install PREFIX="$out" + postInstall = '' ( cd "$out/include"; ln -s luajit-*/* . ) ln -s "$out"/bin/luajit-* "$out"/bin/lua '' diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5e8f5e2d59b..f6990fd29d0 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages +{ lib, stdenv, fetchurl, buildPackages , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -27,7 +27,7 @@ let name = "perl-${version}"; - src = fetchurlBoot { + src = fetchurl { url = "mirror://cpan/src/5.0/${name}.tar.gz"; inherit sha256; }; @@ -46,7 +46,7 @@ let ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - (fetchurlBoot { + (fetchurl { url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; }) @@ -88,7 +88,10 @@ let enableParallelBuilding = !crossCompiling; - preConfigure = optionalString (!crossCompiling) '' + preConfigure = '' + substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970' + substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system' + '' + optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") @@ -156,7 +159,7 @@ let } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 - perl-cross-src = fetchurlBoot { + perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; }; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 39f8d251410..d26ad077c14 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchurl, flex, bison, autoconf , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: @@ -28,6 +28,7 @@ let , curlSupport ? config.php.curl or true , gettextSupport ? config.php.gettext or true , pcntlSupport ? config.php.pcntl or true + , pdo_odbcSupport ? config.php.pdo_odbc or true , postgresqlSupport ? config.php.postgresql or true , pdo_pgsqlSupport ? config.php.pdo_pgsql or true , readlineSupport ? config.php.readline or true @@ -88,6 +89,7 @@ let ++ optional readlineSupport readline ++ optional sqliteSupport sqlite ++ optional postgresqlSupport postgresql + ++ optional pdo_odbcSupport unixODBC ++ optional pdo_pgsqlSupport postgresql ++ optional pdo_mysqlSupport mysqlBuildInputs ++ optional mysqliSupport mysqlBuildInputs @@ -141,6 +143,7 @@ let ++ optional readlineSupport "--with-readline=${readline.dev}" ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" ++ optional postgresqlSupport "--with-pgsql=${postgresql}" + ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" ++ optionals mysqliSupport [ diff --git a/pkgs/development/interpreters/python/build-python-package-pyproject.nix b/pkgs/development/interpreters/python/build-python-package-pyproject.nix new file mode 100644 index 00000000000..86c450fcf92 --- /dev/null +++ b/pkgs/development/interpreters/python/build-python-package-pyproject.nix @@ -0,0 +1,53 @@ +# This function provides specific bits for building a setuptools-based Python package. + +{ lib +, python +}: + +{ +# passed to "python setup.py build_ext" +# https://github.com/pypa/pip/issues/881 +# Rename to `buildOptions` because it is not setuptools specific? + setupPyBuildFlags ? [] +# Execute before shell hook +, preShellHook ? "" +# Execute after shell hook +, postShellHook ? "" +, ... } @ attrs: + +let + options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags; +in attrs // { + buildPhase = attrs.buildPhase or '' + runHook preBuild + mkdir -p dist + echo "Creating a wheel..." + ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} . + echo "Finished creating a wheel..." + runHook postBuild + ''; + + installCheckPhase = '' + runHook preCheck + echo "No checkPhase defined. Either provide a checkPhase or disable tests in case tests are not available."; exit 1 + runHook postCheck + ''; + + # With Python it's a common idiom to run the tests + # after the software has been installed. + doCheck = attrs.doCheck or true; + + shellHook = attrs.shellHook or '' + ${preShellHook} + # Long-term setup.py should be dropped. + if [ -e pyproject.toml ]; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/${python.pythonForBuild.sitePackages} + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2 + fi + ${postShellHook} + ''; + +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b664cf0b14f..98322312f7f 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -17,6 +17,7 @@ let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; }; + pyproject-specific = import ./build-python-package-pyproject.nix { inherit lib python; }; flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python; }; @@ -37,7 +38,8 @@ format ? "setuptools" let formatspecific = - if format == "setuptools" then common (setuptools-specific attrs) + if format == "pyproject" then common (pyproject-specific attrs) + else if format == "setuptools" then common (setuptools-specific attrs) else if format == "flit" then common (flit-specific attrs) else if format == "wheel" then common (wheel-specific attrs) else if format == "other" then {} diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix index ccb366903c5..9e38e825074 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ lnl7 chaoflow domenkozar ]; + maintainers = with stdenv.lib.maintainers; [ lnl7 domenkozar ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 249c4ac9cf7..505929df8ef 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -79,20 +79,6 @@ let sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; }) - # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self". - # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor." - # https://github.com/python/cpython/pull/6118 - (fetchpatch { - name = "type_getattro.patch"; - url = "file://${./type_getattro.patch}"; - sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd"; - }) - - (fetchpatch { - name = "CVE-2018-1000802.patch"; - url = "https://github.com/python/cpython/pull/8985.patch"; - sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97"; - }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch b/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch deleted file mode 100644 index c69c86b642b..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/Objects/typeobject.c -+++ b/Objects/typeobject.c -@@ -3137,6 +3137,7 @@ - PyTypeObject *metatype = Py_TYPE(type); - PyObject *meta_attribute, *attribute; - descrgetfunc meta_get; -+ PyObject* res; - - if (!PyUnicode_Check(name)) { - PyErr_Format(PyExc_TypeError, -@@ -3158,6 +3159,7 @@ - meta_attribute = _PyType_Lookup(metatype, name); - - if (meta_attribute != NULL) { -+ Py_INCREF(meta_attribute); - meta_get = Py_TYPE(meta_attribute)->tp_descr_get; - - if (meta_get != NULL && PyDescr_IsData(meta_attribute)) { -@@ -3165,10 +3167,11 @@ - * writes. Assume the attribute is not overridden in - * type's tp_dict (and bases): call the descriptor now. - */ -- return meta_get(meta_attribute, (PyObject *)type, -- (PyObject *)metatype); -+ res = meta_get(meta_attribute, (PyObject *)type, -+ (PyObject *)metatype); -+ Py_DECREF(meta_attribute); -+ return res; - } -- Py_INCREF(meta_attribute); - } - - /* No data descriptor found on metatype. Look in tp_dict of this -@@ -3176,6 +3179,7 @@ - attribute = _PyType_Lookup(type, name); - if (attribute != NULL) { - /* Implement descriptor functionality, if any */ -+ Py_INCREF(attribute); - descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get; - - Py_XDECREF(meta_attribute); -@@ -3183,11 +3187,12 @@ - if (local_get != NULL) { - /* NULL 2nd argument indicates the descriptor was - * found on the target object itself (or a base) */ -- return local_get(attribute, (PyObject *)NULL, -- (PyObject *)type); -+ res = local_get(attribute, (PyObject *)NULL, -+ (PyObject *)type); -+ Py_DECREF(attribute); -+ return res; - } - -- Py_INCREF(attribute); - return attribute; - } - ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst -@@ -0,0 +1,2 @@ -+Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a -+descriptor deletes itself from the class. diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1b4a5e75137..ed6c8c9893b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -209,8 +209,8 @@ in with passthru; stdenv.mkDerivation { done # Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668 - find $out/lib/python*/config-* -type f -print -exec nuke-refs '{}' + - find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs '{}' + + find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 3885b43960f..7727b984d96 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/html ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index d8dde17ac66..0c9673b7d7a 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/pdf-a4 ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 32581cd229a..9b0018e7cd7 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/pdf-letter ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 59019238301..b7bcfb51d29 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/python27/text ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index cc92f71bc1e..4a0c84fb272 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { cp -R ./ $out/share/doc/pythonMAJORMINOR/TYPE ''; meta = { - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f1461d784be..5e5877032fe 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -50,10 +50,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "15"; + patch = "16"; suffix = ""; }; - sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -153,4 +153,4 @@ in { ncurses = ncurses5; }; -}) \ No newline at end of file +}) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4951ae4499f..b7477c9b7b7 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -87,6 +87,11 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; + # Enabled to detect some (native)BuildInputs mistakes + strictDeps = true; + + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = doCheck; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 2d4008d69b9..d363996a1c5 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper +, cacert , cairo, coreutils, fontconfig, freefont_ttf , glib, gmp , gtk3 @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 7fecae0a66e..fbf9615f88a 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "CoinMP-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; - sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1"; + sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; hardeningDisable = [ "format" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://projects.coin-or.org/CoinMP/; description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.epl10; }; } diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e2ff66a4708..007cd02957b 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,8 +1,9 @@ { stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv , openglSupport ? libGLSupported, libGL, libGLU -, alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libXext, libICE, libXrandr -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, libXext, libICE, libXrandr +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa , cf-private }: @@ -12,9 +13,6 @@ with stdenv.lib; -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null); - stdenv.mkDerivation rec { name = "SDL-${version}"; version = "1.2.15"; @@ -30,18 +28,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optional stdenv.isLinux libcap ++ optionals openglSupport [ libGL libGLU ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; buildInputs = [ ] - ++ optional (!stdenv.hostPlatform.isMinGW) audiofile + ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL # Needed for NSDefaultRunLoopMode symbols. diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d82b25fb892..8f1b7d93d00 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,12 +1,16 @@ { stdenv, config, libGLSupported, fetchurl, pkgconfig , openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux, alsaLib -, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr -, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? stdenv.isLinux, dbus +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib +, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor +, libXinerama, libXext, libXxf86vm, libXrandr +, waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, wayland, wayland-protocols, libxkbcommon +, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus , udevSupport ? false, udev , ibusSupport ? false, ibus -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL , audiofile, cf-private, libiconv }: @@ -16,9 +20,6 @@ with stdenv.lib; -assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); - stdenv.mkDerivation rec { name = "SDL2-${version}"; version = "2.0.9"; @@ -44,14 +45,14 @@ stdenv.mkDerivation rec { ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] - ++ optional alsaSupport alsaLib + ++ optionals alsaSupport [ alsaLib audiofile ] ++ optional dbusSupport dbus ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; - buildInputs = [ audiofile libiconv ] + buildInputs = [ libiconv ] ++ dlopenBuildInputs ++ optional ibusSupport ibus ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 27997540c06..54c95d6087a 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "06lvy5ylcg4vsc58p1yqr5607n542a57n0whpchmrlab74bagmmi"; + sha256 = "0qs54p2kwkk05nfkijdn0rksjw86bkdk4mnh2nkxgnv32s6wdkv6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 5ccb7f95ee1..5170e384f77 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "3.7.17"; + version = "3.7.18"; name = "afflib-${version}"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "11q20n6p5nvwmd9wwk0addlfxpxagf47ly89scn3jvc7k484ksan"; + sha256 = "0963gw316p4nyxa9zxmgif29p8i99k898av2g78g28dxafqj3w8c"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 8ef8353e4e0..cb22c9ee790 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let version = "5.0.0"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - gnome3.gtk + gtk3 ]; doCheck = stdenv.isLinux; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 9569f51ba79..45ad58819c3 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib , gtk-doc, libarchive, gobject-introspection, libxslt, pngquant , sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42 -, libuuid, json-glib, meson, gperf, ninja +, libuuid, json-glib, meson, gperf, ninja, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.14"; + name = "appstream-glib-0.7.15"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -13,23 +13,23 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "1908ilra1l0m2a224azmj6p4yglzdwwk41rr6rhby959sgw3iaky"; + sha256 = "16cqs1s7nqc551sipgaxbbzwap1km0n12s4lcgfbxzzl9bcjbp9m"; }; nativeBuildInputs = [ - meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 + meson pkgconfig ninja gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 gobject-introspection ]; buildInputs = [ glib gettext sqlite libsoup attr acl libuuid json-glib - libarchive gobject-introspection gperf + libarchive gperf gdk_pixbuf ]; propagatedBuildInputs = [ gtk3 ]; patches = [ (substituteAll { src = ./paths.patch; - pngquant= "${pngquant}/bin/pngquant"; + pngquant = "${pngquant}/bin/pngquant"; }) ]; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index dc98de1c2cb..e147a05d3cd 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -55,7 +55,7 @@ in ++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ]; + ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index d0e93337a39..5c3c6272f83 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, perl +{ stdenv, fetchurl, fetchpatch, fetchzip, perl , searchNixProfiles ? true }: +let + + # Source for u-deva.cmap and u-deva.cset: use the Marathi + # dictionary like Debian does. + devaMapsSource = fetchzip { + name = "aspell-u-deva"; + url = "ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; + sha256 = "1v8cdl8x2j1d4vbvsq1xrqys69bbccd6mi03fywrhkrrljviyri1"; + }; + +in + stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -33,6 +45,13 @@ stdenv.mkDerivation rec { ); ''; + # Include u-deva.cmap and u-deva.cset in the aspell package + # to avoid conflict between 'mr' and 'hi' dictionaries as they + # both include those files. + postInstall = '' + cp ${devaMapsSource}/u-deva.{cmap,cset} $out/lib/aspell/ + ''; + meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 4e23001fc9f..992119faf65 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, aspell, which}: +{lib, stdenv, fetchurl, aspell, which, writeScript}: with lib; @@ -53,6 +53,57 @@ let } // (args.meta or {}); } // removeAttrs args [ "meta" ]); + + buildOfficialDict = + {language, version, filename, fullName, sha256, ...}@args: + let buildArgs = { + shortName = "${language}-${version}"; + + src = fetchurl { + url = "mirror://gnu/aspell/dict/${language}/${filename}-${language}-${version}.tar.bz2"; + inherit sha256; + }; + + /* Remove any instances of u-deva.cmap and u-deva.cset since + they are included in the main aspell package and can + cause conflicts otherwise. */ + postInstall = '' + rm -f $out/lib/aspell/u-deva.{cmap,cset} + ''; + + passthru.updateScript = writeScript "update-aspellDict-${language}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix curl gnused common-updater-scripts + set -eu -o pipefail + + # List tarballs in the dictionary's subdirectory via HTTPS and + # the simple list method of Apache's mod_autoindex. + # + # Catalan dictionary has an exception where an earlier version + # compares as newer because the versioning scheme has changed. + versions=$( + echo '['; + curl -s 'https://ftp.gnu.org/gnu/aspell/dict/${language}/?F=0' | \ + sed -r 's/.* href="${filename}-${language}-([A-Za-z0-9_+.-]+)\.tar\.bz2".*/"\1"/;t;d' | \ + if [ '${language}' = "ca" ]; then grep -v 20040130-1; else cat; fi; \ + echo ']') + + # Sort versions in descending order using Nix's and take the first as the latest. + sortVersions="(with builtins; head (sort (a: b: compareVersions a b > 0) $versions))" + # nix-instantiate outputs Nix strings (with quotes), so remove them to get + # a result similar to `nix eval --raw`. + latestVersion=$(nix-instantiate --eval --expr "$sortVersions" | tr -d '"') + + update-source-version aspellDicts.${language} "$latestVersion" + ''; + + meta = { + homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; + } // (args.meta or {}); + + } // removeAttrs args [ "language" "filename" "sha256" "meta" ]; + in buildDict buildArgs; + /* Function to compile txt dict files into Aspell dictionaries. */ buildTxtDict = {langInputs ? [], ...}@args: @@ -109,206 +160,736 @@ in rec { ### Languages - ca = buildDict rec { - shortName = "ca-2.1.5-1"; + af = buildOfficialDict rec { + language = "af"; + version = "0.50-0"; + fullName = "Afrikaans"; + filename = "aspell"; + sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; + }; + + am = buildOfficialDict rec { + language = "am"; + version = "0.03-1"; + fullName = "Amharic"; + filename = "aspell6"; + sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; + }; + + ar = buildOfficialDict rec { + language = "ar"; + version = "1.2-0"; + fullName = "Arabic"; + filename = "aspell6"; + sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; + }; + + ast = buildOfficialDict rec { + language = "ast"; + version = "0.01"; + fullName = "Asturian"; + filename = "aspell6"; + sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; + }; + + az = buildOfficialDict rec { + language = "az"; + version = "0.02-0"; + fullName = "Azerbaijani"; + filename = "aspell6"; + sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; + }; + + be = buildOfficialDict rec { + language = "be"; + version = "0.01"; + fullName = "Belarusian"; + filename = "aspell5"; + sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; + }; + + bg = buildOfficialDict rec { + language = "bg"; + version = "4.1-0"; + fullName = "Bulgarian"; + filename = "aspell6"; + sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; + }; + + bn = buildOfficialDict rec { + language = "bn"; + version = "0.01.1-1"; + fullName = "Bengali"; + filename = "aspell6"; + sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; + }; + + br = buildOfficialDict rec { + language = "br"; + version = "0.50-2"; + fullName = "Breton"; + filename = "aspell"; + sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; + }; + + ca = buildOfficialDict rec { + language = "ca"; + version = "2.1.5-1"; fullName = "Catalan"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ca/aspell6-${shortName}.tar.bz2"; - sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; - }; + filename = "aspell6"; + sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildDict rec { - shortName = "cs-20040614-1"; + cs = buildOfficialDict rec { + language = "cs"; + version = "20040614-1"; fullName = "Czech"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/cs/aspell6-${shortName}.tar.bz2"; - sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; - }; + filename = "aspell6"; + sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; + }; + + csb = buildOfficialDict rec { + language = "csb"; + version = "0.02-0"; + fullName = "Kashubian"; + filename = "aspell6"; + sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; }; - da = buildDict rec { - shortName = "da-1.4.42-1"; + cy = buildOfficialDict rec { + language = "cy"; + version = "0.50-3"; + fullName = "Welsh"; + filename = "aspell"; + sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; + }; + + da = buildOfficialDict rec { + language = "da"; + version = "1.4.42-1"; fullName = "Danish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/da/aspell5-${shortName}.tar.bz2"; - sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; - }; + filename = "aspell5"; + sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildDict rec { - shortName = "de-20030222-1"; + de = buildOfficialDict rec { + language = "de"; + version = "20030222-1"; fullName = "German"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/de/aspell6-${shortName}.tar.bz2"; - sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; - }; + filename = "aspell6"; + sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; + }; + + de-alt = buildOfficialDict rec { + language = "de-alt"; + version = "2.1-1"; + fullName = "German - Old Spelling"; + filename = "aspell6"; + sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; + }; + + el = buildOfficialDict rec { + language = "el"; + version = "0.08-0"; + fullName = "Greek"; + filename = "aspell6"; + sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; }; - en = buildDict rec { - shortName = "en-2018.04.16-0"; + en = buildOfficialDict rec { + language = "en"; + version = "2018.04.16-0"; fullName = "English"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; - sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; - }; + filename = "aspell6"; + sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; + }; + + eo = buildOfficialDict rec { + language = "eo"; + version = "2.1.20000225a-2"; + fullName = "Esperanto"; + filename = "aspell6"; + sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; - es = buildDict rec { - shortName = "es-1.11-2"; + es = buildOfficialDict rec { + language = "es"; + version = "1.11-2"; fullName = "Spanish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/es/aspell6-${shortName}.tar.bz2"; - sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; - }; + filename = "aspell6"; + sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; - eo = buildDict rec { - shortName = "eo-2.1.20000225a-2"; - fullName = "Esperanto"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/eo/aspell6-${shortName}.tar.bz2"; - sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; - }; + et = buildOfficialDict rec { + language = "et"; + version = "0.1.21-1"; + fullName = "Estonian"; + filename = "aspell6"; + sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; + }; + + fa = buildOfficialDict rec { + language = "fa"; + version = "0.11-0"; + fullName = "Persian"; + filename = "aspell6"; + sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; }; - fr = buildDict rec { - shortName = "fr-0.50-3"; + fi = buildOfficialDict rec { + language = "fi"; + version = "0.7-0"; + fullName = "Finnish"; + filename = "aspell6"; + sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; + }; + + fo = buildOfficialDict rec { + language = "fo"; + version = "0.2.16-1"; + fullName = "Faroese"; + filename = "aspell5"; + sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; + }; + + fr = buildOfficialDict rec { + language = "fr"; + version = "0.50-3"; fullName = "French"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/fr/aspell-${shortName}.tar.bz2"; - sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; - }; + filename = "aspell"; + sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; + }; + + fy = buildOfficialDict rec { + language = "fy"; + version = "0.12-0"; + fullName = "Frisian"; + filename = "aspell6"; + sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; + }; + + ga = buildOfficialDict rec { + language = "ga"; + version = "4.5-0"; + fullName = "Irish"; + filename = "aspell5"; + sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; + }; + + gd = buildOfficialDict rec { + language = "gd"; + version = "0.1.1-1"; + fullName = "Scottish Gaelic"; + filename = "aspell5"; + sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; + }; + + gl = buildOfficialDict rec { + language = "gl"; + version = "0.5a-2"; + fullName = "Galician"; + filename = "aspell6"; + sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; + }; + + grc = buildOfficialDict rec { + language = "grc"; + version = "0.02-0"; + fullName = "Ancient Greek"; + filename = "aspell6"; + sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; + }; + + gu = buildOfficialDict rec { + language = "gu"; + version = "0.03-0"; + fullName = "Gujarati"; + filename = "aspell6"; + sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; + }; + + gv = buildOfficialDict rec { + language = "gv"; + version = "0.50-0"; + fullName = "Manx Gaelic"; + filename = "aspell"; + sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; + }; + + he = buildOfficialDict rec { + language = "he"; + version = "1.0-0"; + fullName = "Hebrew"; + filename = "aspell6"; + sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; + }; + + hi = buildOfficialDict rec { + language = "hi"; + version = "0.02-0"; + fullName = "Hindi"; + filename = "aspell6"; + sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; + }; + + hil = buildOfficialDict rec { + language = "hil"; + version = "0.11-0"; + fullName = "Hiligaynon"; + filename = "aspell5"; + sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; + }; + + hr = buildOfficialDict rec { + language = "hr"; + version = "0.51-0"; + fullName = "Croatian"; + filename = "aspell"; + sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; + }; + + hsb = buildOfficialDict rec { + language = "hsb"; + version = "0.02-0"; + fullName = "Upper Sorbian"; + filename = "aspell6"; + sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; + }; + + hu = buildOfficialDict rec { + language = "hu"; + version = "0.99.4.2-0"; + fullName = "Hungarian"; + filename = "aspell6"; + sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; + }; + + hus = buildOfficialDict rec { + language = "hus"; + version = "0.03-1"; + fullName = "Huastec"; + filename = "aspell6"; + sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; + }; + + hy = buildOfficialDict rec { + language = "hy"; + version = "0.10.0-0"; + fullName = "Armenian"; + filename = "aspell6"; + sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; + }; + + ia = buildOfficialDict rec { + language = "ia"; + version = "0.50-1"; + fullName = "Interlingua"; + filename = "aspell"; + sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; + }; + + id = buildOfficialDict rec { + language = "id"; + version = "1.2-0"; + fullName = "Indonesian"; + filename = "aspell5"; + sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; + }; + + is = buildOfficialDict rec { + language = "is"; + version = "0.51.1-0"; + fullName = "Icelandic"; + filename = "aspell"; + sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; }; - it = buildDict rec { - shortName = "it-2.2_20050523-0"; + it = buildOfficialDict rec { + language = "it"; + version = "2.2_20050523-0"; fullName = "Italian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/it/aspell6-${shortName}.tar.bz2"; - sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; - }; + filename = "aspell6"; + sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; + }; + + kn = buildOfficialDict rec { + language = "kn"; + version = "0.01-1"; + fullName = "Kannada"; + filename = "aspell6"; + sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; }; - la = buildDict rec { - shortName = "la-20020503-0"; + ku = buildOfficialDict rec { + language = "ku"; + version = "0.20-1"; + fullName = "Kurdi"; + filename = "aspell5"; + sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; + }; + + ky = buildOfficialDict rec { + language = "ky"; + version = "0.01-0"; + fullName = "Kirghiz"; + filename = "aspell6"; + sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; + }; + + la = buildOfficialDict rec { + language = "la"; + version = "20020503-0"; fullName = "Latin"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/la/aspell6-${shortName}.tar.bz2"; - sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; - }; + filename = "aspell6"; + sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; - nb = buildDict rec { - shortName = "nb-0.50.1-0"; + lt = buildOfficialDict rec { + language = "lt"; + version = "1.2.1-0"; + fullName = "Lithuanian"; + filename = "aspell6"; + sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; + }; + + lv = buildOfficialDict rec { + language = "lv"; + version = "0.5.5-1"; + fullName = "Latvian"; + filename = "aspell6"; + sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; + }; + + mg = buildOfficialDict rec { + language = "mg"; + version = "0.03-0"; + fullName = "Malagasy"; + filename = "aspell5"; + sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; + }; + + mi = buildOfficialDict rec { + language = "mi"; + version = "0.50-0"; + fullName = "Maori"; + filename = "aspell"; + sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; + }; + + mk = buildOfficialDict rec { + language = "mk"; + version = "0.50-0"; + fullName = "Macedonian"; + filename = "aspell"; + sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; + }; + + ml = buildOfficialDict rec { + language = "ml"; + version = "0.03-1"; + fullName = "Malayalam"; + filename = "aspell6"; + sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; + }; + + mn = buildOfficialDict rec { + language = "mn"; + version = "0.06-2"; + fullName = "Mongolian"; + filename = "aspell6"; + sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; + }; + + mr = buildOfficialDict rec { + language = "mr"; + version = "0.10-0"; + fullName = "Marathi"; + filename = "aspell6"; + sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; + }; + + ms = buildOfficialDict rec { + language = "ms"; + version = "0.50-0"; + fullName = "Malay"; + filename = "aspell"; + sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; + }; + + mt = buildOfficialDict rec { + language = "mt"; + version = "0.50-0"; + fullName = "Maltese"; + filename = "aspell"; + sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; + }; + + nb = buildOfficialDict rec { + language = "nb"; + version = "0.50.1-0"; fullName = "Norwegian Bokmal"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nb/aspell-${shortName}.tar.bz2"; - sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; - }; + filename = "aspell"; + sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; + }; + + nds = buildOfficialDict rec { + language = "nds"; + version = "0.01-0"; + fullName = "Low Saxon"; + filename = "aspell6"; + sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; }; - nl = buildDict rec { - shortName = "nl-0.50-2"; + nl = buildOfficialDict rec { + language = "nl"; + version = "0.50-2"; fullName = "Dutch"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nl/aspell-${shortName}.tar.bz2"; - sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; - }; + filename = "aspell"; + sha256 = "0ffb87yjsh211hllpc4b9khqqrblial4pzi1h9r3v465z1yhn3j4"; # Emacs expects a language called "nederlands". postInstall = '' echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; }; - nn = buildDict rec { - shortName = "nn-0.50.1-1"; + nn = buildOfficialDict rec { + language = "nn"; + version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/nn/aspell-${shortName}.tar.bz2"; - sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; - }; + filename = "aspell"; + sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; + }; + + ny = buildOfficialDict rec { + language = "ny"; + version = "0.01-0"; + fullName = "Chichewa"; + filename = "aspell5"; + sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; + }; + + or = buildOfficialDict rec { + language = "or"; + version = "0.03-1"; + fullName = "Oriya"; + filename = "aspell6"; + sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; + }; + + pa = buildOfficialDict rec { + language = "pa"; + version = "0.01-1"; + fullName = "Punjabi"; + filename = "aspell6"; + sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; }; - pl = buildDict rec { - shortName = "pl-6.0_20061121-0"; + pl = buildOfficialDict rec { + language = "pl"; + version = "6.0_20061121-0"; fullName = "Polish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pl/aspell6-${shortName}.tar.bz2"; - sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; - }; + filename = "aspell6"; + sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildDict rec { - shortName = "pt_BR-20090702-0"; + pt_BR = buildOfficialDict rec { + language = "pt_BR"; + version = "20090702-0"; fullName = "Brazilian Portuguese"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pt_BR/aspell6-${shortName}.tar.bz2"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; - }; + filename = "aspell6"; + sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildDict rec { - shortName = "pt_PT-20070510-0"; + pt_PT = buildOfficialDict rec { + language = "pt_PT"; + version = "20070510-0"; fullName = "Portuguese"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/pt_PT/aspell6-${shortName}.tar.bz2"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; - }; + filename = "aspell6"; + sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; + }; + + qu = buildOfficialDict rec { + language = "qu"; + version = "0.02-0"; + fullName = "Quechua"; + filename = "aspell6"; + sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; }; - ro = buildDict rec { - shortName = "ro-3.3-2"; + ro = buildOfficialDict rec { + language = "ro"; + version = "3.3-2"; fullName = "Romanian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ro/aspell5-${shortName}.tar.bz2"; - sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; - }; + filename = "aspell5"; + sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildDict rec { - shortName = "ru-0.99f7-1"; + ru = buildOfficialDict rec { + language = "ru"; + version = "0.99f7-1"; fullName = "Russian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/ru/aspell6-${shortName}.tar.bz2"; - sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; - }; + filename = "aspell6"; + sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - sv = buildDict rec { - shortName = "sv-0.51-0"; - fullName = "Swedish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/sv/aspell-${shortName}.tar.bz2"; - sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; - }; + rw = buildOfficialDict rec { + language = "rw"; + version = "0.50-0"; + fullName = "Kinyarwanda"; + filename = "aspell"; + sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sk = buildDict rec { - shortName = "sk-2.01-2"; + sc = buildOfficialDict rec { + language = "sc"; + version = "1.0"; + fullName = "Sardinian"; + filename = "aspell5"; + sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; + }; + + sk = buildOfficialDict rec { + language = "sk"; + version = "2.01-2"; fullName = "Slovak"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/sk/aspell6-${shortName}.tar.bz2"; - sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; - }; + filename = "aspell6"; + sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; + }; + + sl = buildOfficialDict rec { + language = "sl"; + version = "0.50-0"; + fullName = "Slovenian"; + filename = "aspell"; + sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; + }; + + sr = buildOfficialDict rec { + language = "sr"; + version = "0.02"; + fullName = "Serbian"; + filename = "aspell6"; + sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; + }; + + sv = buildOfficialDict rec { + language = "sv"; + version = "0.51-0"; + fullName = "Swedish"; + filename = "aspell"; + sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; + }; + + sw = buildOfficialDict rec { + language = "sw"; + version = "0.50-0"; + fullName = "Swahili"; + filename = "aspell"; + sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; + }; + + ta = buildOfficialDict rec { + language = "ta"; + version = "20040424-1"; + fullName = "Tamil"; + filename = "aspell6"; + sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; }; - tr = buildDict rec { - shortName = "tr-0.50-0"; + te = buildOfficialDict rec { + language = "te"; + version = "0.01-2"; + fullName = "Telugu"; + filename = "aspell6"; + sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; + }; + + tet = buildOfficialDict rec { + language = "tet"; + version = "0.1.1"; + fullName = "Tetum"; + filename = "aspell5"; + sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; + }; + + tk = buildOfficialDict rec { + language = "tk"; + version = "0.01-0"; + fullName = "Turkmen"; + filename = "aspell5"; + sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; + }; + + tl = buildOfficialDict rec { + language = "tl"; + version = "0.02-1"; + fullName = "Tagalog"; + filename = "aspell5"; + sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; + }; + + tn = buildOfficialDict rec { + language = "tn"; + version = "1.0.1-0"; + fullName = "Setswana"; + filename = "aspell5"; + sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; + }; + + tr = buildOfficialDict rec { + language = "tr"; + version = "0.50-0"; fullName = "Turkish"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/tr/aspell-${shortName}.tar.bz2"; - sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; - }; + filename = "aspell"; + sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildDict rec { - shortName = "uk-1.4.0-0"; + uk = buildOfficialDict rec { + language = "uk"; + version = "1.4.0-0"; fullName = "Ukrainian"; - src = fetchurl { - url = "mirror://gnu/aspell/dict/uk/aspell6-${shortName}.tar.bz2"; - sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; - }; + filename = "aspell6"; + sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; + }; + + uz = buildOfficialDict rec { + language = "uz"; + version = "0.6-0"; + fullName = "Uzbek"; + filename = "aspell6"; + sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; + }; + + vi = buildOfficialDict rec { + language = "vi"; + version = "0.01.1-1"; + fullName = "Vietnamese"; + filename = "aspell6"; + sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; + }; + + wa = buildOfficialDict rec { + language = "wa"; + version = "0.50-0"; + fullName = "Walloon"; + filename = "aspell"; + sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; + }; + + yi = buildOfficialDict rec { + language = "yi"; + version = "0.01.1-1"; + fullName = "Yiddish"; + filename = "aspell6"; + sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; + }; + + zu = buildOfficialDict rec { + language = "zu"; + version = "0.50-0"; + fullName = "Zulu"; + filename = "aspell"; + sha256 = "15k7gaxrnqnssdyk9l6g27dq317dqp9jz5yzafd25ri01g6mb8iz"; }; ### Jargons diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 623864529f0..497262c04d7 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; + patches = [ + # fix fakechroot: https://github.com/dex4er/fakechroot/issues/57 + (fetchurl { + url = "https://git.savannah.nongnu.org/cgit/attr.git/patch/?id=14adc898a36948267bfe5c63b399996879e94c98"; + sha256 = "0gja54fz79a9ma6b4mprnjxq77l5yg2z9xknlwhmkcrfnam02qxp"; + }) + ]; + postPatch = '' for script in install-sh include/install-sh; do patchShebangs $script diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix new file mode 100644 index 00000000000..dd200304ab6 --- /dev/null +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "aws-c-common"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "169ha105qgcvj93hf1bhlya2nlwh8g5fvypd6whfjs9k0hqddi0c"; + }; + + nativeBuildInputs = [ cmake ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-Wno-nullability-extension" + "-Wno-typedef-redefinition" + ]; + + meta = with lib; { + description = "AWS SDK for C common core"; + homepage = https://github.com/awslabs/aws-c-common; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej eelco ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix new file mode 100644 index 00000000000..47363e12a68 --- /dev/null +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, aws-checksums }: + +stdenv.mkDerivation rec { + pname = "aws-c-event-stream"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "0anjynfghk3inysy21wqvhxha33xsswh3lm8pr7nx7cpj6cmr37m"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ aws-c-common aws-checksums ]; + + cmakeFlags = [ + "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" + ]; + + meta = with lib; { + description = "C99 implementation of the vnd.amazon.eventstream content-type"; + homepage = https://github.com/awslabs/aws-c-event-stream; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej eelco ]; + }; +} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix new file mode 100644 index 00000000000..0e47398b346 --- /dev/null +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "aws-checksums"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "1r21sfs1ik6cb8bz17w6gp6y2xa9rbjxjka0p6airb3qds094iv5"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "HW accelerated CRC32c and CRC32"; + homepage = https://github.com/awslabs/aws-checksums; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej eelco ]; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index a5517a2522d..9ba611b0f96 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib +, aws-c-common, aws-c-event-stream, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] @@ -6,22 +7,15 @@ customMemoryManagement ? true }: -let - loaderVar = - if stdenv.isLinux - then "LD_LIBRARY_PATH" - else if stdenv.isDarwin - then "DYLD_LIBRARY_PATH" - else throw "Unsupported system!"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.6.52"; + version = "1.7.53"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "17hyq6rv1xl3f70p2pfkkxm86gbfimq2pwpakv1wv3xjibmppbrf"; + sha256 = "0ybccffz5nrhp4n4nyb6ykrk9fdi0vqqqhjkaxx3l0xvmqx9rbrv"; }; # FIXME: might be nice to put different APIs in different outputs @@ -30,43 +24,35 @@ in stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; nativeBuildInputs = [ cmake curl ]; - buildInputs = [ zlib curl openssl ] - ++ lib.optionals (stdenv.isDarwin && + + buildInputs = [ + curl openssl zlib + aws-c-common aws-c-event-stream aws-checksums + ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; - cmakeFlags = - lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + cmakeFlags = [ + "-DBUILD_DEPS=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; - enableParallelBuilding = true; - - # Behold the escaping nightmare below on loaderVar o.O - preBuild = - '' - # Ensure that the unit tests can find the *.so files. - for i in testing-resources aws-cpp-sdk-*; do - export ${loaderVar}=$(pwd)/$i:''${${loaderVar}} - done - ''; - preConfigure = '' rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; - __darwinAllowLocalNetworking = true; - meta = { + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; - license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.eelco ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ eelco orivej ]; }; } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index c40fa044cfe..2618d35ff79 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "boehm-gc-${version}"; - version = "8.0.2"; + version = "8.0.4"; src = fetchurl { urls = [ "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; - sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f"; + sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"; }; buildInputs = [ libatomic_ops ]; @@ -24,18 +24,19 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" ''; - patches = [ (fetchpatch { - name = "boehm-gc-7.6.0-sys_select.patch"; - url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch?id=85b6a600996bdd71162b357e9ba93d8559342432"; - sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; - }) ] ++ + patches = # https://github.com/ivmai/bdwgc/pull/208 lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch; configureFlags = [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config" - ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static" + # Configure script can't detect whether C11 atomic intrinsics are available + # when cross-compiling, so it links to libatomic_ops, which has to be + # propagated to all dependencies. To avoid this, assume that the intrinsics + # are available. + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-libatomic-ops=none"; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 8f7a04cbb68..a761b8bd3f2 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libiconv +{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency +, libGLSupported +, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) +, libGL ? null # libGLU_combined is no longer a big dependency , pdfSupport ? true , darwin }: @@ -20,11 +22,27 @@ in stdenv.mkDerivation rec { sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; }; + patches = [ + # Fixes CVE-2018-19876; see Nixpkgs issue #55384 + # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 + # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 + # + # This patch is the merged commit from the above PR. + (fetchpatch { + name = "CVE-2018-19876.patch"; + url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; + sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small nativeBuildInputs = [ pkgconfig + ]; + + buildInputs = [ libiconv libintl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 19f39217fd0..4c311f07e01 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "cdk-${version}"; - version ="5.0-20171209"; + version ="5.0-20190224"; buildInputs = [ ncurses @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" ]; - sha256 = "0jq0dx7gm7gl6lv5mhlfkxhw5362g9dxqdlpjlrag069nns8xdc8"; + sha256 = "0767xqwm377ak909c589vqm0v83slsnkm2ycq7bg545xx5nycncs"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 428114986d1..9577bfe9e8a 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3 }: +{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }: let pname = "clutter-gst"; - version = "3.0.26"; + version = "3.0.27"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq"; + sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy"; }; - propagatedBuildInputs = [ clutter gtk3 glib cogl ]; + propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; postBuild = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 4bc5d7227e1..784a282f6b2 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cutelyst-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "092qzam3inmj3kvn1s0ygwf3jcikifzkk5hv02b5ym18nqz1025d"; + sha256 = "09cgfpr2k1jp98h1ahxqm5lmv3qbk0bcxpqpill6n5wmq2c8kl8b"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 32bce3ba4b3..06801dfb7d2 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, zeromq }: stdenv.mkDerivation rec { - version = "4.1.1"; + version = "4.2.0"; name = "czmq-${version}"; src = fetchurl { url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh"; + sha256 = "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg"; }; # Needs to be propagated for the .pc file to work diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 7c3dd19a479..c4285eadabc 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "epoxy-${version}"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "anholt"; repo = "libepoxy"; rev = "${version}"; - sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3"; + sha256 = "03nrmf161xyj3q9zsigr5qj5vx5dsfxxyjva73cm1mgqqc5d60px"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e0cd1227f7e..53ab9382cde 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.1"; + version = "4.1.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; + sha256 = "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp"; }; prePatch = '' diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 9821357de3b..738411d398d 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1"; - sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; + branch = "4.1.1"; + sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index ebf55dcd194..1c4b6ea8c72 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.1.3"; + version = "1.2.3"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; + sha256 = "0i0dn3w3545lvmjlzqj3j70lk8yrq64r9frp1rk6a161gwq20ixv"; }; patches = [ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 1c88235b925..2ee0af8cfc1 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -4,6 +4,7 @@ runCommand "fc-cache" rec { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; + allowSubstitutes = false; passAsFile = [ "fontDirs" ]; fontDirs = '' <!-- Font directories --> diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 56c52e1e368..693fda99759 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m"; + sha256 = "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m"; }; passthru = { diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 20f05d28bfe..d98d9e8107e 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,28 +4,18 @@ let pname = "gdk-pixbuf"; - version = "2.38.0"; + version = "2.38.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x"; + sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi"; }; patches = [ - # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which requires access to shared-mime-info files during runtime. - # For now, we are patching the build script to avoid the dependency. - ./no-mime-sniffing.patch - # Move installed tests to a separate output ./installed-tests-path.patch - - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch; - sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92"; - }) ]; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; @@ -48,6 +38,7 @@ in stdenv.mkDerivation rec { "-Djasper=true" "-Dx11=true" "-Dgir=${if gobject-introspection != null then "true" else "false"}" + "-Dgio_sniffing=false" ]; postPatch = '' diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index cb7f2621353..0fdf0a09be6 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which , librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw -, libwebp, gnome3, libintl }: +, gexiv2, libwebp, gnome3, libintl }: let version = "0.4.12"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng cairo libjpeg librsvg pango gtk bzip2 - libraw libwebp gnome3.gexiv2 + libraw libwebp gexiv2 ]; propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index 2d308add87a..ebb9b354ff1 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }: +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; }; - nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; - buildInputs = with gnome3; [ glib libsoup json-glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + buildInputs = [ glib libsoup json-glib ]; patches = [ ./installed-tests-path.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 62963283f93..7209bdb3df6 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.58.2"; + version = "2.58.3"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7"; + sha256 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -66,17 +66,6 @@ stdenv.mkDerivation rec { ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch - # https://gitlab.gnome.org/GNOME/glib/issues/1626 - # https://gitlab.gnome.org/GNOME/glib/merge_requests/557 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; - sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; - }) - # https://gitlab.gnome.org/GNOME/glib/issues/1645 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; - sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; - }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 50d8c6e268c..cb4571265af 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -28,7 +28,6 @@ { name , withLinuxHeaders ? false , profilingLibraries ? false -, installLocales ? false , withGd ? false , meta , ... @@ -44,7 +43,7 @@ assert withLinuxHeaders -> linuxHeaders != null; assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ - inherit version installLocales; + inherit version; linuxHeaders = if withLinuxHeaders then linuxHeaders else null; inherit (stdenv) is64bit; @@ -88,9 +87,15 @@ stdenv.mkDerivation ({ less linux-*?/arch/x86/kernel/syscall_table_32.S */ ./allow-kernel-2.6.32.patch + /* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */ + (fetchurl { + url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff"; + sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4"; + }) ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch - ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch + ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; postPatch = '' diff --git a/pkgs/development/libraries/glibc/darwin-cross-build.patch b/pkgs/development/libraries/glibc/darwin-cross-build.patch new file mode 100644 index 00000000000..7b224924104 --- /dev/null +++ b/pkgs/development/libraries/glibc/darwin-cross-build.patch @@ -0,0 +1,103 @@ +enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux) +* increase ulimit for open files: macOS default of 256 is too low for glibc build system +* use host version of ar, which is given by environment variable +* build system uses stamp.os and stamp.oS files, which only differ in case; + this fails on macOS, so replace .oS with .o_S +* libintl.h does not exist (and is not needed) on macOS + +--- glibc-2.27/Makefile.in 2018-02-01 17:17:18.000000000 +0100 ++++ glibc-2.27/Makefile.in 2019-02-15 17:38:27.022965553 +0100 +@@ -6,9 +6,11 @@ + .PHONY: all install bench + + all .DEFAULT: +- $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ ++ ulimit -n 1024; \ ++ $(MAKE) -r AR=$$AR PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ + + install: ++ ulimit -n 1024; \ + LC_ALL=C; export LC_ALL; \ + $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ + +--- glibc-2.27/Makerules 2018-02-01 17:17:18.000000000 +0100 ++++ glibc-2.27/Makerules 2019-02-15 17:43:11.196039000 +0100 +@@ -915,8 +915,8 @@ + ifndef objects + + # Create the stamp$o files to keep the parent makefile happy. +-subdir_lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o) +-$(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o): ++subdir_lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$(subst .oS,.o_S,$o)) ++$(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$(subst .oS,.o_S,$o)): + $(make-target-directory) + rm -f $@; > $@ + else +@@ -927,7 +927,7 @@ + # The parent will then actually add them all to the archive in the + # archive rule, below. + define o-iterator-doit +-$(objpfx)stamp$o: $(o-objects); $$(do-stamp) ++$(objpfx)stamp$(subst .oS,.o_S,$o): $(o-objects); $$(do-stamp) + endef + define do-stamp + $(make-target-directory) +@@ -943,14 +943,14 @@ + # on the stamp files built above. + define o-iterator-doit + $(common-objpfx)$(patsubst %,$(libtype$o),c): \ +- $(subdirs-stamp-o) $(common-objpfx)stamp$o; $$(do-makelib) ++ $(subdirs-stamp-o) $(common-objpfx)stamp$(subst .oS,.o_S,$o); $$(do-makelib) + endef + define do-makelib + cd $(common-objdir) && \ + $(AR) $(CREATE_ARFLAGS) $(@F) `cat $(patsubst $(common-objpfx)%,%,$^)` + endef + subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%) +-subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps)) ++subdirs-stamp-o = $(subst %,$(subst .oS,.o_S,$o),$(subdirs-stamps)) + ifndef subdir + $(subdirs-stamps): subdir_lib; + endif +@@ -961,7 +961,7 @@ + # This makes all the object files. + .PHONY: objects objs libobjs extra-objs + objects objs: libobjs extra-objs +-libobjs: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o) ++libobjs: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$(subst .oS,.o_S,$o)) + extra-objs: $(addprefix $(objpfx),$(extra-objs)) + + # Canned sequence for building an extra library archive. +@@ -1615,7 +1615,7 @@ + $(rmobjs) + define rmobjs + $(foreach o,$(object-suffixes-for-libc), +--rm -f $(objpfx)stamp$o $(o-objects)) ++-rm -f $(objpfx)stamp$(subst .oS,.o_S,$o) $(o-objects)) + endef + + # Also remove the dependencies and generated source files. +--- glibc-2.27/sunrpc/rpc_main.c 2019-02-15 17:32:43.710244513 +0100 ++++ glibc-2.27/sunrpc/rpc_main.c 2019-02-15 17:23:57.139617796 +0100 +@@ -38,7 +38,9 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#ifndef __APPLE__ + #include <libintl.h> ++#endif + #include <locale.h> + #include <ctype.h> + #include <sys/types.h> +--- glibc-2.27/sunrpc/rpc_scan.c 2019-02-15 17:32:54.845490606 +0100 ++++ glibc-2.27/sunrpc/rpc_scan.c 2019-02-15 17:24:54.288066644 +0100 +@@ -37,7 +37,9 @@ + #include <stdio.h> + #include <ctype.h> + #include <string.h> ++#ifndef __APPLE__ + #include <libintl.h> ++#endif + #include "rpc_scan.h" + #include "rpc_parse.h" + #include "rpc_util.h" diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 27a1267f0cf..444d6c458fb 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,14 +1,14 @@ { stdenv, callPackage , withLinuxHeaders ? true -, installLocales ? true , profilingLibraries ? false , withGd ? false +, buildPackages }: callPackage ./common.nix { inherit stdenv; } { name = "glibc" + stdenv.lib.optionalString withGd "-gd"; - inherit withLinuxHeaders profilingLibraries installLocales withGd; + inherit withLinuxHeaders profilingLibraries withGd; # Note: # Things you write here override, and do not add to, @@ -56,10 +56,29 @@ callPackage ./common.nix { inherit stdenv; } { fi ''; - postInstall = '' - if test -n "$installLocales"; then - make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - fi + postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' + echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED + make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales + '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux '' + # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html + # Instead of using their patch to build a build-native localedef, + # we simply use the one from buildPackages + pushd ../glibc-2*/localedata + export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata + mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale + ${stdenv.lib.getBin buildPackages.glibc}/bin/localedef \ + --alias-file=../intl/locale.alias \ + -i locales/C \ + -f charmaps/UTF-8 \ + --prefix $NIX_BUILD_TOP \ + ${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then + "--little-endian" + else + "--big-endian"} \ + C.UTF-8 + cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + popd + '') + '' test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 7090c5cecee..2b20c17d450 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -13,8 +13,6 @@ callPackage ./common.nix { inherit stdenv; } { name = "glibc-locales"; - installLocales = true; - builder = ./locales-builder.sh; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 2da5474eb9d..269071434d5 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook , openblas, gfortran, openssh, openmpi } : @@ -15,11 +15,22 @@ in stdenv.mkDerivation { sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh"; }; - nativeBuildInputs = [ automake autoconf libtool ]; + # upstream patches for openmpi-4 compatibility + patches = [ (fetchpatch { + name = "MPI_Type_struct-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch"; + sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh"; + }) + (fetchpatch { + name = "MPI_Errhandler_set-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch"; + sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; + })]; + + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openmpi openblas gfortran openssh ]; preConfigure = '' - autoreconf -ivf configureFlagsArray+=( "--enable-i8" \ "--with-mpi" \ "--with-mpi3" \ diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 1c6dfc4a852..b373095a814 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index d036140567f..699d2854f3d 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jstedfast/gmime/; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index d1d3c8575b0..75c71632aeb 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv +{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv +, guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake , yacc, texinfo diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index 7fb1af70a28..513f20fd835 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -1,20 +1,22 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.6.2"; + version = "3.6.6"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "07wdffklwmxpa9i50sh5nwrc5ajb47skrldm6rzjc0jf4dxxpmdw"; + sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; }; - # Skip two tests introduced in 3.5.11. Probable reasons of failure: - # - pkgconfig: building against the result won't work before installing - # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox + # Skip some tests: + # - pkgconfig: building against the result won't work before installing (3.5.11) + # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular) + # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) + # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 # Change p11-kit test to use pkg-config to find p11-kit postPatch = '' - sed '2iexit 77' -i tests/pkgconfig.sh - sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c + sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh + sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh ''; }) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 7dc45edd636..086c0560cc4 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv +{ config, lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, perl, gmp, autogen, libidn, p11-kit, libiconv +, guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index a79ce05a38d..a68d544cfbe 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -4,8 +4,8 @@ make_gobject_introspection_find_gir_files() { addToSearchPath GI_TYPELIB_PATH $1/lib/girepository-1.0 fi - # XDG_DATA_DIRS: required for .gir files? - if [ -d "$1/share" ]; then + # XDG_DATA_DIRS: required for finding .gir files + if [ -d "$1/share/gir-1.0" ]; then addToSearchPath XDG_DATA_DIRS $1/share fi } diff --git a/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch deleted file mode 100644 index 7b7c9871133..00000000000 --- a/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini <decathorpe@gmail.com> -Date: Mon, 17 Dec 2018 14:58:14 +0100 -Subject: DateTime: include "clock-format" gsettings key here - ---- - data/io.elementary.granite.gschema.xml | 15 +++++++++++++++ - data/meson.build | 4 ++++ - lib/DateTime.vala | 4 ++-- - meson.build | 11 +++++++++++ - meson/post_install.py | 5 +++++ - 5 files changed, 37 insertions(+), 2 deletions(-) - create mode 100644 data/io.elementary.granite.gschema.xml - create mode 100644 data/meson.build - -diff --git a/data/io.elementary.granite.gschema.xml b/data/io.elementary.granite.gschema.xml -new file mode 100644 -index 0000000..1540fb0 ---- /dev/null -+++ b/data/io.elementary.granite.gschema.xml -@@ -0,0 +1,15 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<schemalist> -+ <enum id="io.elementary.granite.clock-formats"> -+ <value nick="12h" value="0" /> -+ <value nick="24h" value="1" /> -+ <value nick="ISO8601" value="2" /> -+ </enum> -+ <schema id="io.elementary.granite" path="/io/elementary/granite/"> -+ <key name="clock-format" enum="io.elementary.granite.clock-formats"> -+ <default>"12h"</default> -+ <summary>Whether the clock displays in 12h or 24h format</summary> -+ <description>Whether the clock displays in 12h or 24h format</description> -+ </key> -+ </schema> -+</schemalist> -diff --git a/data/meson.build b/data/meson.build -new file mode 100644 -index 0000000..96cc3b1 ---- /dev/null -+++ b/data/meson.build -@@ -0,0 +1,4 @@ -+install_data( -+ rdnn + '.gschema.xml', -+ install_dir: schema_dir -+) -diff --git a/lib/DateTime.vala b/lib/DateTime.vala -index aea2ec6..3d81191 100644 ---- a/lib/DateTime.vala -+++ b/lib/DateTime.vala -@@ -104,13 +104,13 @@ namespace Granite.DateTime { - } - - /** -- * Gets the //clock-format// key from //org.gnome.desktop.interface// schema -+ * Gets the //clock-format// key from //io.elementary.granite// schema - * and determines if the clock format is 12h based - * - * @return true if the clock format is 12h based, false otherwise. - */ - private static bool is_clock_format_12h () { -- var h24_settings = new Settings ("io.elementary.desktop.wingpanel.datetime"); -+ var h24_settings = new Settings ("io.elementary.granite"); - var format = h24_settings.get_string ("clock-format"); - return (format.contains ("12h")); - } -diff --git a/meson.build b/meson.build -index 8b98eeb..f0abcdf 100644 ---- a/meson.build -+++ b/meson.build -@@ -4,6 +4,8 @@ project( - version: '5.2.2' - ) - -+rdnn = 'io.elementary.' + meson.project_name() -+ - if meson.get_compiler('vala').version().version_compare('<0.40.0') - error('vala compiler version 0.40.0 or newer is required.') - endif -@@ -52,10 +54,18 @@ icons_dir = join_paths( - 'hicolor' - ) - -+schema_dir = join_paths( -+ get_option('prefix'), -+ get_option('datadir'), -+ 'glib-2.0', -+ 'schemas' -+) -+ - pkgconfig = import('pkgconfig') - i18n = import('i18n') - - subdir('lib') -+subdir('data') - subdir('demo') - subdir('icons') - subdir('po') -@@ -68,5 +78,6 @@ endif - meson.add_install_script( - join_paths(meson.current_source_dir(), 'meson', 'post_install.py'), - '--iconsdir', icons_dir, -+ '--schemadir', schema_dir, - ) - -diff --git a/meson/post_install.py b/meson/post_install.py -index 1864515..5313f96 100755 ---- a/meson/post_install.py -+++ b/meson/post_install.py -@@ -6,11 +6,16 @@ import subprocess - - parser = argparse.ArgumentParser() - parser.add_argument("--iconsdir", action="store", required=True) -+parser.add_argument("--schemadir", action="store", required=True) - args = vars(parser.parse_args()) - - icons_dir = args["iconsdir"] -+schema_dir = args["schemadir"] - - if not os.environ.get('DESTDIR'): - print('Compiling icon cache ...') - subprocess.run(['gtk-update-icon-cache', icons_dir]) - -+ print('Compiling GSettings schemas ...') -+ subprocess.run(['glib-compile-schemas', schema_dir]) -+ --- -2.20.1 - diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 2c1faac387e..b69ab89df24 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$dev/bin/"*; do - wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + # We can't use --suffix here due to quoting so we craft the export command by hand + wrapProgram "$prog" --run "export GST_PLUGIN_SYSTEM_PATH=\$GST_PLUGIN_SYSTEM_PATH"$\{GST_PLUGIN_SYSTEM_PATH:+:\}"\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c7638ea5fe5..8dad69eb998 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg , gdk_pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux -, cupsSupport ? true, cups ? null +, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index dc0675db2cd..19abca1cabb 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes -, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3 +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -13,20 +13,20 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - version = "3.24.3"; + version = "3.24.5"; in stdenv.mkDerivation rec { name = "gtk+3-${version}"; src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p"; + sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper autoreconfHook ]; patches = [ ./3.0-immodules.cache.patch @@ -35,6 +35,18 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + (fetchpatch { + name = "fix-fribidi-linking.patch"; + url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch; + sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr"; + }) + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged + # but isn't in 3.24.5 + name = "export-missing-symbols.patch"; + url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch; + sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl"; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it @@ -45,7 +57,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 0f9dd30d204..f979be547fe 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,9 +1,7 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 , libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: -let - checkInputs = [ xvfb_run dbus ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "gtksourceview-${version}"; version = "3.24.9"; @@ -21,8 +19,9 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ] - ++ stdenv.lib.optionals doCheck checkInputs; + nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ]; + + checkInputs = [ xvfb_run dbus ]; buildInputs = [ atk cairo glib pango libxml2 gettext ]; @@ -36,7 +35,8 @@ in stdenv.mkDerivation rec { doCheck = stdenv.isLinux; checkPhase = '' - export NO_AT_BRIDGE=1 + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ make check diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 4ff1e999145..acfd2c48081 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,9 +1,7 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40 , libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: -let - checkInputs = [ xvfb_run dbus ]; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "gtksourceview-${version}"; version = "4.0.3"; @@ -21,8 +19,9 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ] - ++ stdenv.lib.optionals doCheck checkInputs; + nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ]; + + checkInputs = [ xvfb_run dbus ]; buildInputs = [ atk cairo glib pango libxml2 ]; @@ -32,7 +31,8 @@ in stdenv.mkDerivation rec { doCheck = stdenv.isLinux; checkPhase = '' - export NO_AT_BRIDGE=1 + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ make check diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 198e26b39dd..7c364c0fcdf 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.3.0"; + version = "2.3.1"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,12 +17,16 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "0r37z5cn04ig0q47y8c26gvadz15z9jj8c8q3r41j7d4anv4sc9v"; + sha256 = "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj"; }; postPatch = '' patchShebangs src/gen-def.py patchShebangs test + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # ApplicationServices.framework headers have cast-align warnings. + substituteInPlace src/hb.hh \ + --replace '#pragma GCC diagnostic error "-Wcast-align"' "" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index 66f10f4abc1..bd105d2b4a9 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch @@ -1,5 +1,5 @@ diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake -index 52b2eb2..a04596c 100644 +index 275fd65..a04596c 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -232,34 +232,6 @@ @@ -14,7 +14,7 @@ index 52b2eb2..a04596c 100644 -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu" --# See http://wiki.debian.org/Multiarch +-# See https://wiki.debian.org/Multiarch -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") - AND NOT CMAKE_CROSSCOMPILING - AND NOT DEFINED ENV{FLATPAK_ID}) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9822bf4f725..8946c697c24 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.53/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.55/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 4b5cc3a3752..6c0b80807cc 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/attica-5.53.0.tar.xz"; - sha256 = "0qn2x5551zv8547v20wcjhf123c4432651rdxz25p398wsm9ixlg"; - name = "attica-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/attica-5.55.0.tar.xz"; + sha256 = "0bsn9mi3nj23k2r3mfgjm9i1mp8qnwf08xn9x757wk3xas0cx98v"; + name = "attica-5.55.0.tar.xz"; }; }; baloo = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/baloo-5.53.0.tar.xz"; - sha256 = "1jvxx7ggraaciw5i6vwda2jh41gqvjy19bjkcqwrmg59ggwzc1g8"; - name = "baloo-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/baloo-5.55.0.tar.xz"; + sha256 = "068ms071639pskhjz37cszylvfzzqhp7x1rmwdfn5nlvzrv6lrxh"; + name = "baloo-5.55.0.tar.xz"; }; }; bluez-qt = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/bluez-qt-5.53.0.tar.xz"; - sha256 = "11i3xjaxqvczh8hky71jq20g2k4ipl0sxnaw8f1xix6h0v79m810"; - name = "bluez-qt-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/bluez-qt-5.55.0.tar.xz"; + sha256 = "1ixad1ya3c339c675w8nwmbga8ydq16db9fk2az3gjm68z3dch8a"; + name = "bluez-qt-5.55.0.tar.xz"; }; }; breeze-icons = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz"; - sha256 = "1612kr0mrns3w5pydvfvcjdpfcvyw35bnzm44y286n99213w3cdf"; - name = "breeze-icons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/breeze-icons-5.55.0.tar.xz"; + sha256 = "03mb7x8mc2h6cjb4mrifrbkbpj3lv9c0mg4m619rqiydg0p1yf49"; + name = "breeze-icons-5.55.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/extra-cmake-modules-5.53.0.tar.xz"; - sha256 = "07dllz7r00jm7n37wnz6zvjin304affaj69d8ji4v2wxhkxpg89d"; - name = "extra-cmake-modules-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/extra-cmake-modules-5.55.0.tar.xz"; + sha256 = "1x868hs9jiqzkqx7gld4mdm5dzfxc5kann22y15a4f7g5a957534"; + name = "extra-cmake-modules-5.55.0.tar.xz"; }; }; frameworkintegration = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/frameworkintegration-5.53.0.tar.xz"; - sha256 = "0a5szgknj96mphiczddl0l4c79ajszhyy3f19rqacj1z1kwrx9pj"; - name = "frameworkintegration-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/frameworkintegration-5.55.0.tar.xz"; + sha256 = "0pfpk268x06pjwciv4jr5v259kjck0sf4xzsgn29ifkmsk74wwmi"; + name = "frameworkintegration-5.55.0.tar.xz"; }; }; kactivities = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kactivities-5.53.0.tar.xz"; - sha256 = "1pjfh8ii4y9kpjr12z3zs9hmc8n5r0phkp40dclsrjsdpm9n8bf6"; - name = "kactivities-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kactivities-5.55.0.tar.xz"; + sha256 = "0dp9vx2nl9fnawzcz04fqa731s3bk2izxrqbvn71aqyrs7fymabg"; + name = "kactivities-5.55.0.tar.xz"; }; }; kactivities-stats = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kactivities-stats-5.53.0.tar.xz"; - sha256 = "0bd6km50h0jlpi8z1dhh9jvx2wqgh3sa473n7bsyd2dgzyibs52n"; - name = "kactivities-stats-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kactivities-stats-5.55.0.tar.xz"; + sha256 = "12n178244ysfak0x9qm9a2k814qi56w8xpkg03na7hlsz2l4y9v6"; + name = "kactivities-stats-5.55.0.tar.xz"; }; }; kapidox = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kapidox-5.53.0.tar.xz"; - sha256 = "1snsql5scq6licrlqf9w77085s4992f1ij6w7rwj8d5x4cyxc9ca"; - name = "kapidox-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kapidox-5.55.0.tar.xz"; + sha256 = "0x41adp3rnvr6njc57ffdyh6d5i5aw13xcjdr4p6kacw9pk63ajf"; + name = "kapidox-5.55.0.tar.xz"; }; }; karchive = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/karchive-5.53.0.tar.xz"; - sha256 = "0jbr19azrkxywf9dwrfdw5qi47g7h5m92m4f93skccr11a1m0hvr"; - name = "karchive-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/karchive-5.55.0.tar.xz"; + sha256 = "1llznxc5wjjnmbjx8iwi3a93gc2z0z344viknsgls1fwdjjfyxc4"; + name = "karchive-5.55.0.tar.xz"; }; }; kauth = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kauth-5.53.0.tar.xz"; - sha256 = "0c41azn8c6wr5rc7f0v1bxvka9i4z3c346814mlim3i62842fz3b"; - name = "kauth-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kauth-5.55.0.tar.xz"; + sha256 = "1w6bp2kbp1sn4cl76fgl2pqrg660ix99qq4h65g090kc934np3zc"; + name = "kauth-5.55.0.tar.xz"; }; }; kbookmarks = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kbookmarks-5.53.0.tar.xz"; - sha256 = "1mrzbwsirma1bzazamilh3r5a04m6x5902gjs1sd7bc0ijs85dr9"; - name = "kbookmarks-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kbookmarks-5.55.0.tar.xz"; + sha256 = "0vsn98znzdbiy8clbl9p3kiag3zvxgc9701gwg2ig8mpv3ci9lkg"; + name = "kbookmarks-5.55.0.tar.xz"; }; }; kcmutils = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcmutils-5.53.0.tar.xz"; - sha256 = "0xsg50pywawzzw2fb0bhhmjp2z3w4572knfq8s4jki3iidixp3kv"; - name = "kcmutils-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcmutils-5.55.0.tar.xz"; + sha256 = "1f49864xpxrbj77n7l474wkn3rw4zy8vkl3psdya7ccdk7ac2s0k"; + name = "kcmutils-5.55.0.tar.xz"; }; }; kcodecs = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcodecs-5.53.0.tar.xz"; - sha256 = "0wmilqkcw1dvvrw56r8virp7zscy0g04ry8j7h812nfzhfz9z4vs"; - name = "kcodecs-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcodecs-5.55.0.tar.xz"; + sha256 = "0491j6l28jwfpgaqs2816qpyggnra2df33iw3fgvb0wd4r4gvmjb"; + name = "kcodecs-5.55.0.tar.xz"; }; }; kcompletion = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcompletion-5.53.0.tar.xz"; - sha256 = "00df0pa28glf4w5zyjmnzasbip1q2cyyyply1f6k0xpfg0qwgxf9"; - name = "kcompletion-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcompletion-5.55.0.tar.xz"; + sha256 = "08ym79fqk7vshsf3jk37d6jvg7ys63kwflcn5dff5ci18jan2ir2"; + name = "kcompletion-5.55.0.tar.xz"; }; }; kconfig = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kconfig-5.53.0.tar.xz"; - sha256 = "0xyxycpbi680sfrfzdzhwi95dqd4xsc42zxn5clzvfbgapbw2db7"; - name = "kconfig-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kconfig-5.55.0.tar.xz"; + sha256 = "06gscipc3914gwiswhp1xx4sy74bpy645ykq2i6r1sb6sm16hmja"; + name = "kconfig-5.55.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kconfigwidgets-5.53.0.tar.xz"; - sha256 = "0bpylj1faki7f55cf82ljmgll17vz1irqna1i9rzkbb28kvqf2kv"; - name = "kconfigwidgets-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kconfigwidgets-5.55.0.tar.xz"; + sha256 = "0npfp6z5lc2h8y6slmz3sbymyyv9k2w73rpsjzl5zswqhzlvrb5k"; + name = "kconfigwidgets-5.55.0.tar.xz"; }; }; kcoreaddons = { - version = "5.53.1"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcoreaddons-5.53.1.tar.xz"; - sha256 = "18rhih779sxrlvg8sxyw31v3h58arvk2vsmvr0bmpnrnnfwv3vak"; - name = "kcoreaddons-5.53.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcoreaddons-5.55.0.tar.xz"; + sha256 = "1j7bc5fhak8db3vdfslbjdffbdclakhfwsni2a855d08yfrl1n1w"; + name = "kcoreaddons-5.55.0.tar.xz"; }; }; kcrash = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kcrash-5.53.0.tar.xz"; - sha256 = "1nnfn71kl97d5ywg2xjacr48mh9khrgszm9cifdn2jdk6vxssmlb"; - name = "kcrash-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kcrash-5.55.0.tar.xz"; + sha256 = "08a8c5mbj6ll0d1ivhcjx5ga1jfbnwxsk618wcfpwwi6mkxrc3f9"; + name = "kcrash-5.55.0.tar.xz"; }; }; kdbusaddons = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdbusaddons-5.53.0.tar.xz"; - sha256 = "05zf41m3j4ckjk68dqv2rw8abg22x6m6bwiwp8rm6ac1p33hqayh"; - name = "kdbusaddons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdbusaddons-5.55.0.tar.xz"; + sha256 = "1sj3cycgci3ih65bkh7bsvbzyp7r654ppcryj4azpcsxqhy5gc7l"; + name = "kdbusaddons-5.55.0.tar.xz"; }; }; kdeclarative = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdeclarative-5.53.0.tar.xz"; - sha256 = "0c7sxz733c9gfarjbrphrvn5v9bkx1i7vhn97xp7b3w22892ab7w"; - name = "kdeclarative-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdeclarative-5.55.0.tar.xz"; + sha256 = "043jl7rn9yawh04fwgaxb8iwksn3z8qb4yfc4s6v1znwcs7ajlda"; + name = "kdeclarative-5.55.0.tar.xz"; }; }; kded = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kded-5.53.0.tar.xz"; - sha256 = "18yh27ddp4aldpmkflj9q6anrpnzawhn7nrykvayxxbgmdg4gn48"; - name = "kded-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kded-5.55.0.tar.xz"; + sha256 = "0kn9kzzji257mppd12jzwiibha8127ajxvng2ls765lylv9nad7q"; + name = "kded-5.55.0.tar.xz"; }; }; kdelibs4support = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kdelibs4support-5.53.0.tar.xz"; - sha256 = "1ai1k1m08zq04rxi5px1agmqzmv59lic7qqiqg4iwnm5i8q2z2i0"; - name = "kdelibs4support-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kdelibs4support-5.55.0.tar.xz"; + sha256 = "1l1gjv06yp9jdiapiypwscbb6y0rfgrnw9rdsl7kkxh9ps8b8j39"; + name = "kdelibs4support-5.55.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdesignerplugin-5.53.0.tar.xz"; - sha256 = "1m0ysmpysjpmnmmmyp5xkfzygi1w0dnn7j707c6nj31y2s7078q6"; - name = "kdesignerplugin-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdesignerplugin-5.55.0.tar.xz"; + sha256 = "114035wil0p5z6h0li8wjzivsdxhqbih54kn4nvhn43b71xnzs3y"; + name = "kdesignerplugin-5.55.0.tar.xz"; }; }; kdesu = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdesu-5.53.0.tar.xz"; - sha256 = "18kd19y95gllyarjlm0768s3b9q67ia6dajdw89rrk1qgvbw42xy"; - name = "kdesu-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdesu-5.55.0.tar.xz"; + sha256 = "1x2gjnmgpcaxvfav2pm92zfgxbn60awpvmn9ycs68rq47p6h9x0f"; + name = "kdesu-5.55.0.tar.xz"; }; }; kdewebkit = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdewebkit-5.53.0.tar.xz"; - sha256 = "1x5b85lr6ck2vklj641ra6sx1fvz2daiy8vsgpziii0752a0ayf2"; - name = "kdewebkit-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdewebkit-5.55.0.tar.xz"; + sha256 = "1mnbdsiih94hlwwff9fs9gnzl3y7ayf1pskmz1rajgjmqd6rm7mm"; + name = "kdewebkit-5.55.0.tar.xz"; }; }; kdnssd = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdnssd-5.53.0.tar.xz"; - sha256 = "0hghpamkxwjvfh87y2qcy20bmxvglzwrzmfg26hycmxgj0l3frhb"; - name = "kdnssd-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdnssd-5.55.0.tar.xz"; + sha256 = "0lljj7mxmqm60kfzr37zb7z58mfyfh7zgykf7a5is1k0lxpgk6zc"; + name = "kdnssd-5.55.0.tar.xz"; }; }; kdoctools = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kdoctools-5.53.0.tar.xz"; - sha256 = "0kjijwc66rg737z6z8c275wfb2gn7xgslgmrys5dxaqqzrinbn1j"; - name = "kdoctools-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kdoctools-5.55.0.tar.xz"; + sha256 = "0dlal0vkxf5yh1hbfhrcrxqqi1w43q7bvv8ws8pb18jjgimzr46l"; + name = "kdoctools-5.55.0.tar.xz"; }; }; kemoticons = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kemoticons-5.53.0.tar.xz"; - sha256 = "0x9jrc5pswmcj36qs3283c5bz63sbgr87m7dn9ykas7a50xgyv0w"; - name = "kemoticons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kemoticons-5.55.0.tar.xz"; + sha256 = "03vx22f9mjd10qm61f6ihr283w2sarrhg0rssxp7g7wahvshcvmh"; + name = "kemoticons-5.55.0.tar.xz"; }; }; kfilemetadata = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz"; - sha256 = "18wgzhg146iscg7nm7xabmzsw73x0by2imkh6wgky87nwry7020s"; - name = "kfilemetadata-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kfilemetadata-5.55.0.tar.xz"; + sha256 = "0fqj266f9f66rfjzg0rl35fac5rn5n3npyfb4gsla3mdc8fjz9mi"; + name = "kfilemetadata-5.55.0.tar.xz"; }; }; kglobalaccel = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kglobalaccel-5.53.0.tar.xz"; - sha256 = "1h60kl309pz4i6jr6a444d14i2dzqhjapga837my2mylsdjj3wqi"; - name = "kglobalaccel-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kglobalaccel-5.55.0.tar.xz"; + sha256 = "1c6dxp6jvbw8l74n1mv0v62yr34b9447szhvd61y4sxmmfjimhz4"; + name = "kglobalaccel-5.55.0.tar.xz"; }; }; kguiaddons = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kguiaddons-5.53.0.tar.xz"; - sha256 = "1kj1jvq7lqlnr00fmlfrj7vkvlwav7b5r4bpifysx1l4285y5y76"; - name = "kguiaddons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kguiaddons-5.55.0.tar.xz"; + sha256 = "190jwhvq2fi8g03saszlaslzxmcbqrbwli9f9vm6h5j9nnc0z6h3"; + name = "kguiaddons-5.55.0.tar.xz"; }; }; kholidays = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kholidays-5.53.0.tar.xz"; - sha256 = "1zn581ibv4wg5c4q97l40wdpj18p5kwxk4zxl3cl4l445ivv04p5"; - name = "kholidays-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kholidays-5.55.0.tar.xz"; + sha256 = "0y44alimywggd4xvis9lz49j0fhgwkggzwpp7bnmcxjnbj9z0vd9"; + name = "kholidays-5.55.0.tar.xz"; }; }; khtml = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/khtml-5.53.0.tar.xz"; - sha256 = "07cmpqk92z4b631q6ngg7sdw4p56r11mdqf2fvbcwmqksx6b11fy"; - name = "khtml-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/khtml-5.55.0.tar.xz"; + sha256 = "0wh9z5xm0gaf1c2s7cq7763jfyv83d58x80nwsvb0ayd6y8id1bq"; + name = "khtml-5.55.0.tar.xz"; }; }; ki18n = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/ki18n-5.53.0.tar.xz"; - sha256 = "052c7rvqqb2hx9wn91sdp4wcz5vdym5iszb1vnpr9wdc3psqq41x"; - name = "ki18n-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/ki18n-5.55.0.tar.xz"; + sha256 = "0kvwjzqibby9fawyfb8bd81abjhsjlyi8xy9mcapnih5x2gx3z92"; + name = "ki18n-5.55.0.tar.xz"; }; }; kiconthemes = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kiconthemes-5.53.0.tar.xz"; - sha256 = "1h54mqda05x4p1kplhxnqa488pvqn354qnk1qg2l851lh69ail9q"; - name = "kiconthemes-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kiconthemes-5.55.0.tar.xz"; + sha256 = "1rgbfklb7xxg7z2zyrsmaxf883ixgfbkqilps3npwk3xac2f66rw"; + name = "kiconthemes-5.55.0.tar.xz"; }; }; kidletime = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kidletime-5.53.0.tar.xz"; - sha256 = "04jbig9mf45mzajwgi66vz3b2zqg4p1gca1jkcl4yk6a4csg43ri"; - name = "kidletime-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kidletime-5.55.0.tar.xz"; + sha256 = "1kq6zh6cjhzffjhxnc7l1pw6g38swxyspp8xl8c860zdhc9xfd1g"; + name = "kidletime-5.55.0.tar.xz"; }; }; kimageformats = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kimageformats-5.53.0.tar.xz"; - sha256 = "0b59sa5x58mxzkv9h9xxfzb89k27cpyqzfgf4kl7zbxklxxszafj"; - name = "kimageformats-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kimageformats-5.55.0.tar.xz"; + sha256 = "0hhxv8m5993vlpi5yf7w3fadzckficn16flshdkby7bwq8agrbz1"; + name = "kimageformats-5.55.0.tar.xz"; }; }; kinit = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kinit-5.53.0.tar.xz"; - sha256 = "14dd165al0gn1y3jhlk3jgz3px8rcccn3hp5isywa2xxzl7v5raw"; - name = "kinit-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kinit-5.55.0.tar.xz"; + sha256 = "11xwiny5sfqbdls249vnq6ssp5pzw1w9wg4ql9nkwwygl4ml8b9y"; + name = "kinit-5.55.0.tar.xz"; }; }; kio = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kio-5.53.0.tar.xz"; - sha256 = "1hr4875v1ph8jbsqbyrhk5vxa908kv7xic7ymk9rmaqrkc0dy83k"; - name = "kio-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kio-5.55.0.tar.xz"; + sha256 = "1k3cn7hvp5z9nirss29v164hahrlvlqivxlk64c8w9ynjx699ira"; + name = "kio-5.55.0.tar.xz"; }; }; kirigami2 = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kirigami2-5.53.0.tar.xz"; - sha256 = "0avr7slzww3fpdyczi0y3djvrccs3jq2jyq82r02xfw8mwb93zii"; - name = "kirigami2-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kirigami2-5.55.0.tar.xz"; + sha256 = "11djxli5cq7pn19lmjz2y7z39mhlr98jskasfzyax546j47v973k"; + name = "kirigami2-5.55.0.tar.xz"; }; }; kitemmodels = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kitemmodels-5.53.0.tar.xz"; - sha256 = "1gkw57fgm6dcy9jssaq9d1mkgd1g6jxk2aqpf4lq1nvqkr7jqzbl"; - name = "kitemmodels-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kitemmodels-5.55.0.tar.xz"; + sha256 = "13609avkqrfi79zyr737662nr8bwcfdya9dxc6gzyqx5i0l2nbw6"; + name = "kitemmodels-5.55.0.tar.xz"; }; }; kitemviews = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kitemviews-5.53.0.tar.xz"; - sha256 = "0r60mp90k7psa9maz3dhhq3npbl95cckvmk51fpljcb8c3rpjymq"; - name = "kitemviews-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kitemviews-5.55.0.tar.xz"; + sha256 = "1mgh7z5xcbhc7a2qq8mqfp7j4amk93hypkpy2zc3rdhc60ps94ad"; + name = "kitemviews-5.55.0.tar.xz"; }; }; kjobwidgets = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kjobwidgets-5.53.0.tar.xz"; - sha256 = "161wq1s1a1cb5a47wswg6g6qrmczgzwikp1cjsgxfykpgrxkp620"; - name = "kjobwidgets-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kjobwidgets-5.55.0.tar.xz"; + sha256 = "1pbx974jpn8n2080gblmbh8q0yb5wxb9xblpm100rbhpg20sc2by"; + name = "kjobwidgets-5.55.0.tar.xz"; }; }; kjs = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kjs-5.53.0.tar.xz"; - sha256 = "1jic7xyfmd829i82kbjin2xf9f3cir2s9v04r7ri7bq6gi2iw4c9"; - name = "kjs-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kjs-5.55.0.tar.xz"; + sha256 = "0c1wyxsgn70jvw7zcjjpw12w9sg9xxvyslgnqlnnyh8sx7rrp70c"; + name = "kjs-5.55.0.tar.xz"; }; }; kjsembed = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kjsembed-5.53.0.tar.xz"; - sha256 = "0j3jzn7qwh9sw9gxk1f435vijkrgnzpsqx3a4yx7w3n93h96h36r"; - name = "kjsembed-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kjsembed-5.55.0.tar.xz"; + sha256 = "0dh9012y9bqj48jp50lrsmd28bbvf4jd93l34vfzmza252yvyw3l"; + name = "kjsembed-5.55.0.tar.xz"; }; }; kmediaplayer = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kmediaplayer-5.53.0.tar.xz"; - sha256 = "1r6cl6paap7hmpqr05mj8qxcb2sa16kdc0zqj8g6gqb32xj6wk0k"; - name = "kmediaplayer-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kmediaplayer-5.55.0.tar.xz"; + sha256 = "0gpfrhgk2l63lyz0bz93cg7mc5g7mjvrkfvpyndmi1v7vhndp5zq"; + name = "kmediaplayer-5.55.0.tar.xz"; }; }; knewstuff = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/knewstuff-5.53.0.tar.xz"; - sha256 = "0d5yszf6fj8qjmr50jfa9f34xcn9k8n4bj4c3h635ccwb7l3i6q3"; - name = "knewstuff-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/knewstuff-5.55.0.tar.xz"; + sha256 = "0a2d9wrhjsjl0klsrn501sp9681v7qmq6hmalw061arjv165dzw2"; + name = "knewstuff-5.55.0.tar.xz"; }; }; knotifications = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/knotifications-5.53.0.tar.xz"; - sha256 = "0fbjg48ck6mr98gl3075vf9mn8fwdrsz0jm9hbnzr2vn9yrg57nz"; - name = "knotifications-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/knotifications-5.55.0.tar.xz"; + sha256 = "1dbrk9r3w8pmg15bhrb8qdk4fiqvc9qggb67zvk1n7ddlfkyarz6"; + name = "knotifications-5.55.0.tar.xz"; }; }; knotifyconfig = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/knotifyconfig-5.53.0.tar.xz"; - sha256 = "1f3hq2l8fkff4dnkf6klj60jv946yfaw84i50q192blwqfkij896"; - name = "knotifyconfig-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/knotifyconfig-5.55.0.tar.xz"; + sha256 = "01hxj6s2sq5k5j6j1y4c5gxyl1886j7ghh0hdc95b7n4gdjwwbci"; + name = "knotifyconfig-5.55.0.tar.xz"; }; }; kpackage = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kpackage-5.53.0.tar.xz"; - sha256 = "1gllbi7y4svlkwhvp0sh3bdhiah2f55spg7wh149sqwmnmvj09ra"; - name = "kpackage-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kpackage-5.55.0.tar.xz"; + sha256 = "175b0lj4qybddjpc25b1p60lr8f9220i9ymk3wk3y3vf4893v833"; + name = "kpackage-5.55.0.tar.xz"; }; }; kparts = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kparts-5.53.0.tar.xz"; - sha256 = "0cfzbf706dn4kjz8mz53b1a0dzk0f540n0j144x4701c4gfajnim"; - name = "kparts-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kparts-5.55.0.tar.xz"; + sha256 = "0gqkgnvkdai8hbg1n32jq4a3yzlkarmw8a7hxlfr0ykgysanjh65"; + name = "kparts-5.55.0.tar.xz"; }; }; kpeople = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kpeople-5.53.0.tar.xz"; - sha256 = "1bsnj5r47azl889izxdlwcbfrfmg921cpapicn7klynmsw58lpdg"; - name = "kpeople-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kpeople-5.55.0.tar.xz"; + sha256 = "0vbgi4l14g4f0klbxqbkjcag6yi0ghhpxn5nik5sssmcx8qyk885"; + name = "kpeople-5.55.0.tar.xz"; }; }; kplotting = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kplotting-5.53.0.tar.xz"; - sha256 = "0cnnzyybzsrdrnhhcc47i6jakhrixdxakfv2ib0fpsiif3fn3jpx"; - name = "kplotting-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kplotting-5.55.0.tar.xz"; + sha256 = "0nn2v1yvvpzpi1y1pm47zvmwsa942c7d9n8iqymqihnp0fqjr8y7"; + name = "kplotting-5.55.0.tar.xz"; }; }; kpty = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kpty-5.53.0.tar.xz"; - sha256 = "01qy5pvd5j014zh455sh0qb8x0g1yc60bbdqh34nk84s8mx3mz9z"; - name = "kpty-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kpty-5.55.0.tar.xz"; + sha256 = "0r5080xl7x13qmjnjssb0d1pk626anaa4xahb7fi869fndr4xhzn"; + name = "kpty-5.55.0.tar.xz"; }; }; kross = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/portingAids/kross-5.53.0.tar.xz"; - sha256 = "1q69pppmnxmjfmi73ks6mrkib76nhhffn0c3j93qq7cq3ingjzjy"; - name = "kross-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/portingAids/kross-5.55.0.tar.xz"; + sha256 = "0p3q36gka6m62nryc3l11d30mlhiqjpghvfcyq6wikiqlv2kqvjs"; + name = "kross-5.55.0.tar.xz"; }; }; krunner = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/krunner-5.53.0.tar.xz"; - sha256 = "09n824q8k1ihfgz6yzb5xv99p241733574yhhv1y47cyrp7d904l"; - name = "krunner-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/krunner-5.55.0.tar.xz"; + sha256 = "0yw2jh9dailhcwkkjl2qggg5k90bwbfsn88a3hzwyj2ng2haypis"; + name = "krunner-5.55.0.tar.xz"; }; }; kservice = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kservice-5.53.0.tar.xz"; - sha256 = "06b35zynmlhidgzxp7mqv20fcw6wvdsszfam1phv7wji1xhhpnk2"; - name = "kservice-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kservice-5.55.0.tar.xz"; + sha256 = "0k8xksmw2ai7m0js7l98rv5v6ykifmnqiyy2yc1xhgn40lf1r89j"; + name = "kservice-5.55.0.tar.xz"; }; }; ktexteditor = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/ktexteditor-5.53.0.tar.xz"; - sha256 = "1hcn4dk6gw96aknh6dn9yi1fwq7s90kjmcvn3wgf4ig1408q6b7g"; - name = "ktexteditor-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/ktexteditor-5.55.0.tar.xz"; + sha256 = "0b5zqhm5aw7jj7dj600xa674ik11gwyzamhyz5962xhvsg5pyjwx"; + name = "ktexteditor-5.55.0.tar.xz"; }; }; ktextwidgets = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/ktextwidgets-5.53.0.tar.xz"; - sha256 = "025z1x7mp7wdm62h6igbsvb99l09jsdzna4m30h586h7rhn8kvdc"; - name = "ktextwidgets-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/ktextwidgets-5.55.0.tar.xz"; + sha256 = "1ymqmb5z4flzrns3wdjagxbzbpighbincwbhy29a0mqg4zcm82xk"; + name = "ktextwidgets-5.55.0.tar.xz"; }; }; kunitconversion = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kunitconversion-5.53.0.tar.xz"; - sha256 = "1yr6dfcqabkv2r7p9f814hd1x8c1bfy2k2f83zj4qlahzb91mw6v"; - name = "kunitconversion-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kunitconversion-5.55.0.tar.xz"; + sha256 = "1v5cfxk5v76w1f1qvrpilrs111wvp8bn2p3bswhqp4lg0qxync0q"; + name = "kunitconversion-5.55.0.tar.xz"; }; }; kwallet = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwallet-5.53.0.tar.xz"; - sha256 = "135vc52zx0ikb684z6ds2hlr39vj2z8g2rp9f51py52pf7fxkwc0"; - name = "kwallet-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwallet-5.55.0.tar.xz"; + sha256 = "1dp072h5r6yd81i69759pj8klfsikrg25za44sry2kh6fxvwmngm"; + name = "kwallet-5.55.0.tar.xz"; }; }; kwayland = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwayland-5.53.0.tar.xz"; - sha256 = "0k6j8w3ccx9kkqnp757z2g5y4jcl2y2ppvx8vvl7z97jjn66563h"; - name = "kwayland-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwayland-5.55.0.tar.xz"; + sha256 = "0m9q13qzgvp03jrsyc59l6pp7jf0dvhx768p21drs46qxw6wla7l"; + name = "kwayland-5.55.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwidgetsaddons-5.53.0.tar.xz"; - sha256 = "1k9y3gcpzgdzd4ps8m4gx3wz166k0jqzccn8z8p2jr2nfjdwp4mc"; - name = "kwidgetsaddons-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwidgetsaddons-5.55.0.tar.xz"; + sha256 = "0kpbvvmjrhxxjqc0cb63zlq06a3xspq43xv3wdingcn28zypynzc"; + name = "kwidgetsaddons-5.55.0.tar.xz"; }; }; kwindowsystem = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kwindowsystem-5.53.0.tar.xz"; - sha256 = "1z89b3my3wsncbq16bqsncbf9grji77sb0j17lj7w5hm36d01clz"; - name = "kwindowsystem-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kwindowsystem-5.55.0.tar.xz"; + sha256 = "10zdxm08d758zbwlrbsn0ghxjpf39ids2s5pnca072gbrbrxv656"; + name = "kwindowsystem-5.55.0.tar.xz"; }; }; kxmlgui = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kxmlgui-5.53.0.tar.xz"; - sha256 = "1acppl4wzqrpa8iys8z2qqxrw4xy61q02vybn0ysspa0yrdxga9f"; - name = "kxmlgui-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kxmlgui-5.55.0.tar.xz"; + sha256 = "0ph67zarf1sccvp7882brrihv4dsmxq0nggan0rnk54qg0zdhgcn"; + name = "kxmlgui-5.55.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/kxmlrpcclient-5.53.0.tar.xz"; - sha256 = "07ns1fj5vq0fzqhrrmbm7cjnnzkl1jlgcf1lv3kfik1y13fd9zkd"; - name = "kxmlrpcclient-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/kxmlrpcclient-5.55.0.tar.xz"; + sha256 = "1573wnv2fbjjzgx3f1qm7y8wlj22bz45mny0rxci90i76nnh4538"; + name = "kxmlrpcclient-5.55.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/modemmanager-qt-5.53.0.tar.xz"; - sha256 = "1lgvj086k21sm6b0pf9k51zv4fy5i4wlnsjwv2zfvapdrndl8kdp"; - name = "modemmanager-qt-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/modemmanager-qt-5.55.0.tar.xz"; + sha256 = "10pkgm4dzsrfnjsf78pssd1wp0y27d1y834chd267hx9vgrv8axm"; + name = "modemmanager-qt-5.55.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/networkmanager-qt-5.53.0.tar.xz"; - sha256 = "11vqmx11lgyagbq9zvaw4s9k7wyyyigpd8d0i3w49h34nyv0p5yi"; - name = "networkmanager-qt-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/networkmanager-qt-5.55.0.tar.xz"; + sha256 = "0j8l4k13vsqh0a8mw8dw5bc78xvxhz2rh7bb870as04i32bvw772"; + name = "networkmanager-qt-5.55.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/oxygen-icons5-5.53.0.tar.xz"; - sha256 = "13pcvzskng2mc8cwwhmq6p428nc9qzllxykx95z2s2k3b8nh726m"; - name = "oxygen-icons5-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/oxygen-icons5-5.55.0.tar.xz"; + sha256 = "0fvm9bq1573xkha4a577s1iik8nwzks8xhrli5mm6rbh53s12wp4"; + name = "oxygen-icons5-5.55.0.tar.xz"; }; }; plasma-framework = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/plasma-framework-5.53.0.tar.xz"; - sha256 = "0swyn04w61dvdkmb2fahb6k93vlggh7xv4k2yygshqrkmwk6ilym"; - name = "plasma-framework-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/plasma-framework-5.55.0.tar.xz"; + sha256 = "1pvxxw52s03i11p5byd2sh8sbvlk6h8q6briq9d4qvjy6c0pmbq4"; + name = "plasma-framework-5.55.0.tar.xz"; }; }; prison = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/prison-5.53.0.tar.xz"; - sha256 = "0ydm36jkwc2x53kf5n0xswh72g2cixd5444xfrhcwiyq905z3db1"; - name = "prison-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/prison-5.55.0.tar.xz"; + sha256 = "1xadc2fq6csml78czg5p572cwvmqmn334a5dxjnd7k1pdx50gi07"; + name = "prison-5.55.0.tar.xz"; }; }; purpose = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/purpose-5.53.0.tar.xz"; - sha256 = "1y6v51p9j9gm9pad38h6dqxav4m7ryxp4h35qjz46wisacgvpfkf"; - name = "purpose-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/purpose-5.55.0.tar.xz"; + sha256 = "1krgjcfjrwvr7widz3rmcbbag4l0940gyzfpxni1p47c76kcb13b"; + name = "purpose-5.55.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/qqc2-desktop-style-5.53.0.tar.xz"; - sha256 = "1f17f3mqwzn5s0a08xh68dmvzkvn2g8ah7810hd25l2hvmkfvm04"; - name = "qqc2-desktop-style-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/qqc2-desktop-style-5.55.0.tar.xz"; + sha256 = "0aj37ldc3ywqap3sz73j54kbzycn529imr15jgl252k04rqpjya5"; + name = "qqc2-desktop-style-5.55.0.tar.xz"; }; }; solid = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/solid-5.53.0.tar.xz"; - sha256 = "1x9qc8vm16vlqws9jb2pynw705mx6xvbb617lkdwdb60fzlrjkln"; - name = "solid-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/solid-5.55.0.tar.xz"; + sha256 = "18dw55g41q34m2qzvybvpsas1dnyryqxnlf2md0xc4r36ib9p2pn"; + name = "solid-5.55.0.tar.xz"; }; }; sonnet = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/sonnet-5.53.0.tar.xz"; - sha256 = "0jk8kcsdzjg7x37cw95n3wdnjg403x3plzw0zwa3r3xkg8vlqv18"; - name = "sonnet-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/sonnet-5.55.0.tar.xz"; + sha256 = "13bb1s2f4kfaikcga297j2fqlyr4qxdcq4v1b3zs1gas4z1wpcg6"; + name = "sonnet-5.55.0.tar.xz"; }; }; syndication = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/syndication-5.53.0.tar.xz"; - sha256 = "0znj8rgdh14ci3nx1h7s9v8kl208z8zlcq3c99bh216rznxvzr6b"; - name = "syndication-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/syndication-5.55.0.tar.xz"; + sha256 = "1p9xwbzlrw4bh5is5i6fq3yalmpsf099rzf6d2qc3a0sc21hxs63"; + name = "syndication-5.55.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/syntax-highlighting-5.53.0.tar.xz"; - sha256 = "1ar50an84pcb090zh50ni2d3ck6dxvbij9d6qa091hd66rwm2cda"; - name = "syntax-highlighting-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/syntax-highlighting-5.55.0.tar.xz"; + sha256 = "00w5nmz9l70znv8q7q1zw3f7gngwfgf41iwbs53zqcv1z7wmrz6m"; + name = "syntax-highlighting-5.55.0.tar.xz"; }; }; threadweaver = { - version = "5.53.0"; + version = "5.55.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.53/threadweaver-5.53.0.tar.xz"; - sha256 = "0wlpbnan5g2nhs0fc9l3p0c1gcs9ak7m83hfcibg7vsq9kqvcs6p"; - name = "threadweaver-5.53.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.55/threadweaver-5.55.0.tar.xz"; + sha256 = "0r0ml5pz7h0vmydcg4gqqkl21lp6c5gqdwyfsnyad02dcjkh4hql"; + name = "threadweaver-5.55.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 6ff6bb95591..a2b78231f74 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -14,12 +14,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.15"; - version = "${majorVersion}.2"; + majorVersion = "1.17"; + version = "${majorVersion}"; src = fetchurl { - url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n"; + url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; + sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index fe2229bcea6..aa4a40cf32d 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw; description = "Library parsing abiword documents"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; }; } diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 57c3e123377..64b3832d335 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped +, fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped , libiberty, zlib }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # We update these ourselves dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ autoreconfHook264 bison ]; + nativeBuildInputs = [ autoreconfHook bison ]; buildInputs = [ libiberty zlib ]; configurePlatforms = [ "build" "host" ]; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index d62d1a80264..f1e57272d0b 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "C++ client library for the CMIS interface"; homepage = https://sourceforge.net/projects/libcmis/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 3d236ab5851..a0bd7d86454 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: stdenv.mkDerivation rec { - name = "libdrm-2.4.96"; + name = "libdrm-2.4.97"; src = fetchurl { url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd"; + sha256 = "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 6c52f2c0b1a..805b1869ac3 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { description = ''Library for import of reflowable e-book formats''; license = stdenv.lib.licenses.lgpl21Plus ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index d77337c912b..922207f1cce 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.24"; + version="4.25"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp"; + sha256 = "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq"; }; meta = { diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 9bf03f25c9c..cab04438dd3 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null @@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; - buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ] + buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] ++ optional (mysqlSupport) mysql.connector-c ++ optional (postgresSupport) postgresql; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f22cc568a97..3f20236d17f 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - buildInputs = with gnome3; - [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ]; propagatedBuildInputs = [ json-glib ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 498858d52e9..e3a6580038a 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "0.27.7"; + version = "0.27.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i"; + sha256 = "0d8rwgf69424ijy6fjbk3m863y9ml5bq7mshlqw7xqk9zngdd6f1"; }; postPatch = '' diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 15efdd4fd4e..c7b76497fa8 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -38,7 +38,11 @@ in stdenv.mkDerivation rec { url = "https://github.com/NVIDIA/libglvnd/commit/0177ade40262e31a80608a8e8e52d3da7163dccf.patch"; sha256 = "1rnz5jw2gvx4i1lcp0k85jz9xgr3dgzsd583m2dlxkaf2a09j89d"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + url = "https://github.com/NVIDIA/libglvnd/commit/294ccb2f49107432567e116e13efac586580a4cc.patch"; + sha256 = "01339wg27cypv93221rhk3885vxbsg8kvbfyia77jmjdcnwrdwm2"; + }); outputs = [ "out" "dev" ]; passthru = { inherit driverLink; }; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 20a9bb91604..0951ab1fe0c 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgnomekbd"; - version = "3.26.0"; + version = "3.26.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; passthru = { diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 05ae29358fa..5038547f5b8 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; - version = "1.33"; + version = "1.34"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1zq3pw93d0ani8bam7f4qjivll1b0zg9qbblwwvcjip7ark84f2x"; + sha256 = "10cc76y7zi6wsdmpy1abf3i0q17bj59q5ysy8cpnpf3ixsfpk006"; }; postPatch = '' diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 4e43ef91e79..e3d7741ba86 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { prePatch = '' # build-time scripts - substituteInPlace run.in --replace '#!/bin/bash' '#!/bin/sh' - substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!/bin/sh' + substituteInPlace run.in --replace '#!/bin/bash' '#!${stdenv.shell}' + substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!${stdenv.shell}' # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml" substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' @@ -85,6 +85,5 @@ stdenv.mkDerivation rec { homepage = http://libguestfs.org/; maintainers = with maintainers; [offline]; platforms = platforms.linux; - hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix new file mode 100644 index 00000000000..d5d35678b4f --- /dev/null +++ b/pkgs/development/libraries/libgumath/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, libndtypes +, libxnd +}: + +stdenv.mkDerivation rec { + name = "libgumath-${version}"; + version = "unstable-2018-11-27"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "gumath"; + rev = "5a9d27883b40432246d6a93cd6133157267fd166"; + sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + }; + + buildInputs = [ libndtypes libxnd ]; + + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + configureFlags = [ + "LD=${stdenv.cc.targetPrefix}cc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; + homepage = https://xnd.io/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1c50a28f0a4..3fad34ce0d0 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ let pname = "libhandy"; - version = "0.0.7"; + version = "0.0.8"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; + sha256 = "04jyllwdrapw24f34pjc2gbmfapjfin8iw0g3qfply7ciy08k1wj"; }; nativeBuildInputs = [ @@ -41,7 +41,8 @@ in stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export NO_AT_BRIDGE=1 + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --print-errorlogs diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index dd8e3c4a4f8..b79cad7cb69 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-${version}"; - version = "2.0.5"; + version = "2.1.1"; src = fetchurl { url = "mirror://gnu/gnu/libidn/${name}.tar.gz"; - sha256 = "1f529jxmhj12q7i1gvw2d9i24zbslz3kj91kbgxac7vgi1q93xjk"; + sha256 = "1cbq439dzf14jjpayk5mk0yyq32k3c27acg1d4ra364j6a060hcm"; }; outputs = [ "bin" "dev" "out" "info" "devdoc" ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 27eba7f4f48..24a708f8277 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.12.5"; + version = "1.12.6"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "08vid3q1la3qiv9d5xcgxznjahzs8w01fhabvxlvzwqf04qnhjvx"; + sha256 = "0pgla0mc6mvyr1ljy10mcqvfz8i5z6yp7dbx2bcd70y67wx05d0j"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index faa070b3468..ad55c6cb18f 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, Carbon, useGTK ? false }: +{ config, stdenv, fetchurl, pkgconfig, gtk2, Carbon +, useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.12"; diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 79718b47745..9203928bd70 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { description = ''Import library for some old mac text documents''; license = stdenv.lib.licenses.mpl20 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 925154e1d45..51e4deed462 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub }: stdenv.mkDerivation rec { name = "libndtypes-${version}"; - version = "0.2.0dev3"; + version = "unstable-2018-11-27"; src = fetchFromGitHub { owner = "plures"; repo = "ndtypes"; - rev = "v${version}"; - sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; + rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; + sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; }; # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { description = "Dynamic types for data description and in-memory computations"; homepage = https://xnd.io/; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 54f1d261728..1723219e859 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = ''A base library for generating ODF documents''; license = stdenv.lib.licenses.mpl20 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index a1db11d9a8e..450b9058d0b 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPackages -, autoreconfHook264, bison, binutils-unwrapped +, autoreconfHook, bison, binutils-unwrapped , libiberty, libbfd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook264 bison ]; + nativeBuildInputs = [ autoreconfHook bison ]; buildInputs = [ libiberty ]; # dis-asm.h includes bfd.h propagatedBuildInputs = [ libbfd ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index d64591273bc..bf1d26cf90d 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" - "ARCH=${stdenv.targetPlatform.uname.processor}" - "SYS=${stdenv.targetPlatform.uname.system}" + "ARCH=${stdenv.hostPlatform.uname.processor}" + "SYS=${stdenv.hostPlatform.uname.system}" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 9c1ed80e51e..765f03d9825 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,21 +3,31 @@ assert zlib != null; let - patchVersion = "1.6.35"; + patchVersion = "1.6.36"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq"; + sha256 = "03ywdwaq1k3pfslvbs2b33z3pdmazz6yp8g56mzafacvfgd367wc"; }; whenPatched = stdenv.lib.optionalString apngSupport; in stdenv.mkDerivation rec { name = "libpng" + whenPatched "-apng" + "-${version}"; - version = "1.6.35"; + version = "1.6.36"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493"; + sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc"; }; + patches = [ + (fetchurl { # https://github.com/glennrp/libpng/issues/266 + url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch"; + sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n"; + }) + (fetchurl { # https://github.com/glennrp/libpng/issues/275 + url = "https://salsa.debian.org/debian/libpng1.6/raw/853d1977/debian/patches/CVE-2019-7317.patch"; + sha256 = "0c8qc176mqh08kcxlnx40rzdggchihkrlzqw6qg6lf0c9ygkf55k"; + }) + ]; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; outputs = [ "out" "dev" "man" ]; @@ -25,14 +35,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = true; passthru = { inherit zlib; }; meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = http://www.libpng.org/pub/png/libpng.html; - license = licenses.libpng; + license = licenses.libpng2; platforms = platforms.all; maintainers = [ maintainers.vcunat maintainers.fuuzetsu ]; }; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 4f9619bdf56..9cd68cacfe7 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -5,14 +5,14 @@ let pname = "librsvg"; - version = "2.44.11"; + version = "2.44.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "17mgl7is0k236i61fnjj9nw5h1ykl4ff6vk30qp49bsg2zp6wnp4"; + sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index c2fa940d59a..2f8f37b3792 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.2"; + version = "0.7.3"; name = "libsolv-${version}"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "03zwf7zqz7ghd0bgs0wvlhnsd828z69kl28q2n6m4z57ai8zzqng"; + sha256 = "13zjk78gc5fyygpsf0n3p9n22gbjd64wgng98253phd3znvzplag"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index b050dede8c6..0986dee0ca0 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurlBoot, openssl, zlib, windows }: +{ stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { name = "libssh2-1.8.0"; - src = fetchurlBoot { + src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; }; diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index f41f6303e01..98096371e40 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ config, stdenv , fetchurl , patchelf -, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 +, cudaSupport ? config.cudaSupport or false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 }: with stdenv.lib; let diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 10a2124199b..0a75fcbeda6 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.24.1"; - name = "libuv-${version}"; + version = "1.26.0"; + pname = "libuv"; src = fetchFromGitHub { - owner = "libuv"; - repo = "libuv"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab"; + sha256 = "08jvjyn5bp4xnzd5g4pi534mklm6hz5pw6wbzbaq3cnwb6a04iwj"; }; postPatch = let diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 52359a3a4cd..a61b3c3f2ac 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libvdpau-${version}"; - version = "1.1.1"; + version = "1.2"; src = fetchurl { - url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; - sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; + url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${name}.tar.bz2"; + sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 0e8533a5639..14be410bd16 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "08nr124aqlfpmdawpfizp56x93pvhr0v741fz78s1zyv49a4lx4c"; + sha256 = "1cb4sm6h1czvk9kqqgld3g5f0d9qv60xnbbv0kl7cr7d826b8irx"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index b0449d8205d..76ac946d618 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; description = "Microsoft Works document format import filter library"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index cce73ba89bc..bdf210a061a 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { "-Dgtkdoc=true" ]; + preCheck = '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share + ''; + doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 6b9375c7381..cb93ec63e67 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -6,23 +6,32 @@ stdenv.mkDerivation rec { name = "libxnd-${version}"; - version = "0.2.0dev3"; + version = "unstable-2018-11-27"; src = fetchFromGitHub { owner = "plures"; repo = "xnd"; - rev = "v${version}"; - sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2"; + rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; + sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; }; buildInputs = [ libndtypes ]; # Override linker with cc (symlink to either gcc or clang) # Library expects to use cc for linking - configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + configureFlags = [ + # Override linker with cc (symlink to either gcc or clang) + # Library expects to use cc for linking + "LD=${stdenv.cc.targetPrefix}cc" + # needed for tests + "--with-includes=${libndtypes}/include" + "--with-libs=${libndtypes}/lib" + ]; + + doCheck = true; meta = { - description = "General container that maps a wide range of Python values directly to memory"; + description = "C library for managing typed memory blocks and Python container module"; homepage = https://xnd.io/; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ costrouc ]; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 695effe2ea9..1413da4a18d 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libzmf"; version = "0.0.2"; - + src = fetchurl { url = "http://dev-www.libreoffice.org/src/libzmf/${name}.tar.xz"; sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = ''A library that parses the file format of Zoner Callisto/Draw documents''; license = stdenv.lib.licenses.mpl20; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = https://wiki.documentfoundation.org/DLP/Libraries/libzmf; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; updateWalker = true; diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 31056d0a4ed..531261a58ca 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2018.12.14"; + version = "2019.02.03"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd"; + sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw"; }; postPatch = '' diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 047a74f0840..9d57d472182 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - makeFlags = [ "prefix=$(out)" "CC=cc" ] + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ] ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so"; doCheck = true; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index 4e35d6ed24d..cb238a6a5ae 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://cgit.freedesktop.org/mesa/glu/; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; + broken = stdenv.hostPlatform.isAndroid; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e54df3562da..5bc1dfaf878 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.3.1"; + version = "18.3.4"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"; + sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index ea94a55a619..e32c83af8a7 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.2"; name = "mpfr-${version}"; src = fetchurl { - url = "mirror://gnu/mpfr/${name}.tar.xz"; - sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7"; + urls = [ + #"https://www.mpfr.org/${name}/${name}.tar.xz" + "mirror://gnu/mpfr/${name}.tar.xz" + ]; + sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx"; }; outputs = [ "out" "dev" "doc" "info" ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index ef3ff13bac6..708ba46b42e 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -13,15 +13,18 @@ }: stdenv.mkDerivation rec { - version = "6.1-20181027"; + # Note the revision needs to be adjusted. + version = "6.1-20190112"; name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; - src = fetchurl { - urls = [ - "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz" - "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz" - ]; - sha256 = "1xn6wpi22jc61158w4ifq6s1fvilhmsy1in2srn3plk8pm0d4902"; + # We cannot use fetchFromGitHub (which calls fetchzip) + # because we need to be able to use fetchurlBoot. + src = let + # Note the version needs to be adjusted. + rev = "acb4184f8f69fddd052a3daa8c8675f4bf8ce369"; + in fetchurl { + url = "https://github.com/mirror/ncurses/archive/${rev}.tar.gz"; + sha256 = "1z8v63cj2y7dxf4m1api8cvk0ns9frif9c60m2sxhibs06pjy4q0"; }; patches = lib.optional (!stdenv.cc.isClang) ./clang.patch; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index fdc21b26271..971c70c4f2c 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.35.1"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam"; + sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch b/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch new file mode 100644 index 00000000000..d7fec73910f --- /dev/null +++ b/pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch @@ -0,0 +1,84 @@ +From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001 +From: Graham Christensen <graham@grahamc.com> +Date: Thu, 7 Mar 2019 08:11:32 -0500 +Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility + +--- + nspr/lib/ds/Makefile.in | 4 ++-- + nspr/lib/libc/src/Makefile.in | 4 ++-- + nspr/lib/prstreams/Makefile.in | 4 ++-- + nspr/pr/src/Makefile.in | 6 +++--- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in +index e737791..d56b0a7 100644 +--- a/nspr/lib/ds/Makefile.in ++++ b/nspr/lib/ds/Makefile.in +@@ -101,8 +101,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in +index e8a6d9f..0485737 100644 +--- a/nspr/lib/libc/src/Makefile.in ++++ b/nspr/lib/libc/src/Makefile.in +@@ -103,8 +103,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in +index aeb2944..83ae423 100644 +--- a/nspr/lib/prstreams/Makefile.in ++++ b/nspr/lib/prstreams/Makefile.in +@@ -105,8 +105,8 @@ ECHO = echo + TINC = $(OBJDIR)/_pl_bld.h + PROD = $(notdir $(SHARED_LIBRARY)) + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(OS_ARCH), WINNT) + SUF = i64 +diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in +index 19c5a69..989cc8c 100644 +--- a/nspr/pr/src/Makefile.in ++++ b/nspr/pr/src/Makefile.in +@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE) + endif + # + # In Solaris 2.6 or earlier, -lrt is called -lposix4. +-# ++# + LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE))) + ifeq (5.7, $(LIBRT_TEST)) + LIBRT=-lrt +@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY)) + endif + + NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now +-SH_DATE = $(shell date "+%Y-%m-%d %T") +-SH_NOW = $(shell $(NOW)) ++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH)) ++SH_NOW = $(SOURCE_DATE_EPOCH)000000 + + ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) + SUF = i64 +-- +2.19.2 + diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 56804d54667..9dfb3d3851f 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation { sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c"; }; + patches = [ + ./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 57eab750695..056f98472be 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.42"; + version = "3.42.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz"; - sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x"; + sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88"; }; buildInputs = [ perl zlib sqlite ] diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix new file mode 100644 index 00000000000..d847f447048 --- /dev/null +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -0,0 +1,42 @@ +{ fetchurl, stdenv, lib +, cmake, libGLU_combined +, freetype, freeimage, zziplib, xorgproto, libXrandr +, libXaw, freeglut, libXt, libpng, boost, ois +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender +, withNvidiaCg ? false, nvidia_cg_toolkit +, withSamples ? false }: + +stdenv.mkDerivation { + name = "ogre-1.10.11"; + + src = fetchurl { + url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz"; + sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; + }; + + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] + ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") + ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; + + enableParallelBuilding = true; + + buildInputs = + [ cmake libGLU_combined + freetype freeimage zziplib xorgproto libXrandr + libXaw freeglut libXt libpng boost ois + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + + meta = { + description = "A 3D engine"; + homepage = https://www.ogre3d.org/; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index d847f447048..cc9353af4dd 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -4,16 +4,18 @@ , libXaw, freeglut, libXt, libpng, boost, ois , libX11, libXmu, libSM, pkgconfig , libXxf86vm, libICE +, unzip , libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: -stdenv.mkDerivation { - name = "ogre-1.10.11"; +stdenv.mkDerivation rec { + name = "ogre-${version}"; + version = "1.11.5"; src = fetchurl { - url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz"; - sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a"; + url = "https://github.com/OGRECave/ogre/archive/v${version}.zip"; + sha256 = "0hs7b81nr7i4wgsb603kkqw33m6cafjrj2zw4yhibwn8k7zzwddp"; }; cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] @@ -32,6 +34,8 @@ stdenv.mkDerivation { libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; + nativeBuildInputs = [ unzip ]; + meta = { description = "A 3D engine"; homepage = https://www.ogre3d.org/; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index cca820e2f37..f1e82c166a1 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -8,13 +8,13 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase +, enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableCuda ? config.cudaSupport or false, cudatoolkit , enableUnfree ? false , enableIpp ? false diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 3f21ee15bf3..8addc150555 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -8,13 +8,13 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase +, enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas , enableContrib ? true -, enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableCuda ? config.cudaSupport or false, cudatoolkit , enableUnfree ? false , enableIpp ? false diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 6a4a033e1c2..c8c66969ef9 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.9"; + version = "1.7.1"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1nlbk7qarz2qv3apz1cxf5avjhlqfq2r8kxad0095kfyqz05jnfy"; + sha256 = "0x9wfcqd8hq4h349s7j77sr60h8xjdfshqw1m3a2n6z5bdr9qkm1"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 345dffa87f5..cd60e0edca1 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gfortran, perl, libnl, rdma-core, zlib -, numactl +{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +, rdma-core, zlib, numactl, libevent, hwloc # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -9,22 +9,30 @@ }: let - version = "3.1.3"; + version = "4.0.0"; in stdenv.mkDerivation rec { name = "openmpi-${version}"; src = with stdenv.lib.versions; fetchurl { url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; - sha256 = "1dks11scivgaskjs5955y9wprsl12wr3gn5r7wfl0l8gq03l7q4b"; + sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; }; + patches = [ (fetchpatch { + # Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch). + # This bug breaks the test from libs, such as scalapack, + # on machines with less than 4 cores. + url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch; + sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj"; + }) ]; + postPatch = '' patchShebangs ./ ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl ] + ++ lib.optionals isLinux [ libnl numactl libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0954e1b70bb..133e9ae8cb8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -120,8 +120,8 @@ let in { openssl_1_0_2 = common { - version = "1.0.2q"; - sha256 = "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p"; + version = "1.0.2r"; + sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf"; patches = [ ./1.0.2/nix-ssl-cert-file.patch @@ -132,8 +132,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1a"; - sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; + version = "1.1.1b"; + sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 614df6fb063..57f1c9830a6 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ config, lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport or false, cudatoolkit , darwin }: diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 981ec2f0a3a..a1e7215fd9a 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }: +{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }: stdenv.mkDerivation rec { name = "osm-gps-map-${version}"; @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - ] ++ (with gnome3; [ - gnome-common gtk libsoup - ]); + gnome3.gnome-common gtk3 gnome3.libsoup + ]; meta = with stdenv.lib; { description = "Gtk+ widget for displaying OpenStreetMap tiles"; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 30f8ad8e8a3..01214878cd8 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx"; + sha256 = "12mlj2j1glidjhiaxlr25qz2vfb865wip1vwwg8vlyd3yzisf533"; }; patches = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { substituteInPlace analyses/Makefile.in \ --replace "!(tmp)" "" substituteInPlace bin/rivet-buildplugin.in \ - --replace '"which"' '"${which}/bin/which"' \ + --replace 'which' '"${which}/bin/which"' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " ''; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 61af6e7fdab..639d6266b5a 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pixman-${version}"; - version = "0.36.0"; + version = "0.38.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; - sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px"; + sha256 = "1a1nnkjv0rqdj26847r0saly0kzckjfp4y3ly30bvpjxi7vy6s5p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 83f19e442c6..737a9a5badf 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { }; patches = [ + # CVE-2019-6133 - See: https://bugs.chromium.org/p/project-zero/issues/detail?id=1692 + (fetchpatch { + url = "https://gitlab.freedesktop.org/polkit/polkit/commit/6cc6aafee135ba44ea748250d7d29b562ca190e3.patch"; + name = "CVE-2019-6133.patch"; + sha256 = "0jjlbjzqcz96xh6w3nv3ss9jl0hhrcd7jg4aa5advf08ibaj29r1"; + }) # CVE-2018-19788 - high UID fixup (fetchpatch { url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5230646dc6876ef6e27f57926b1bad348f636147.patch"; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 1730f9b733c..74c6e8ef1b3 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -1,14 +1,24 @@ -{ stdenv, fetchurl, cmake, shared ? false }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: stdenv.mkDerivation rec { name = "pugixml-${version}"; version = "1.9"; - src = fetchurl { - url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; + src = fetchFromGitHub { + owner = "zeux"; + repo = "pugixml"; + rev = "v${version}"; + sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv"; }; + patches = [ + # To be removed after a version newer than 1.9 is released + (fetchpatch { + url = "https://github.com/zeux/pugixml/pull/193.patch"; + sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 3f3e9158622..dc05251478c 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,7 +6,8 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null -, openglSupport ? false, libGLU_combined ? null, libXmu ? null +, libGLSupported +, openglSupport ? libGLSupported, libGLU_combined ? null, libXmu ? null , xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 59dab2beabd..257e9215246 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -62,8 +62,8 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = - optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + qtwebengine = [ ./qtwebengine-no-build-skip.patch ] + ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; qtwebkit = [ ./qtwebkit.patch ]; }; @@ -94,7 +94,9 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; @@ -123,6 +125,7 @@ let qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtwebview = callPackage ../modules/qtwebview.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; @@ -132,7 +135,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch new file mode 100644 index 00000000000..f332d5e1bb2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch @@ -0,0 +1,12 @@ +diff --git a/qtwebengine.pro b/qtwebengine.pro +--- a/qtwebengine.pro ++++ b/qtwebengine.pro +@@ -5,7 +5,7 @@ runConfigure() + + !isEmpty(skipBuildReason) { + SUBDIRS = +- log($${skipBuildReason}$${EOL}) ++ error($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) + } + diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 22535deb767..e6af24cd8f6 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -60,6 +60,7 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; qtwebkit = [ ./qtwebkit.patch ]; }; @@ -89,7 +90,9 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; @@ -118,6 +121,7 @@ let qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtwebview = callPackage ../modules/qtwebview.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; @@ -127,7 +131,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch new file mode 100644 index 00000000000..f332d5e1bb2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch @@ -0,0 +1,12 @@ +diff --git a/qtwebengine.pro b/qtwebengine.pro +--- a/qtwebengine.pro ++++ b/qtwebengine.pro +@@ -5,7 +5,7 @@ runConfigure() + + !isEmpty(skipBuildReason) { + SUBDIRS = +- log($${skipBuildReason}$${EOL}) ++ error($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) + } + diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index bf0ae42ea1f..e493fc169ab 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -29,6 +29,7 @@ existing packages here and modify it as necessary. stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, + cf-private, # options developerBuild ? false, @@ -132,7 +133,9 @@ let /* qtactiveqt = not packaged */ /* qtandroidextras = not packaged */ /* qtcanvas3d = not packaged */ - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 68c6745bcb5..589f175efd9 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -43,6 +43,7 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; qtwebkit = [ ./qtwebkit.patch ]; qtvirtualkeyboard = [ (fetchpatch { @@ -91,7 +92,9 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch new file mode 100644 index 00000000000..f332d5e1bb2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch @@ -0,0 +1,12 @@ +diff --git a/qtwebengine.pro b/qtwebengine.pro +--- a/qtwebengine.pro ++++ b/qtwebengine.pro +@@ -5,7 +5,7 @@ runConfigure() + + !isEmpty(skipBuildReason) { + SUBDIRS = +- log($${skipBuildReason}$${EOL}) ++ error($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) + } + diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index f5f5c69455f..92ac8a24201 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -301,7 +301,6 @@ stdenv.mkDerivation { then [ "-platform macx-clang" - "-no-use-gold-linker" "-no-fontconfig" "-qt-freetype" "-qt-libpng" @@ -329,9 +328,6 @@ stdenv.mkDerivation { "-glib" "-system-libjpeg" "-system-libpng" - # gold linker of binutils 2.28 generates duplicate symbols - # TODO: remove for newer version of binutils - "-no-use-gold-linker" ] ++ lib.optional withGtk3 "-gtk" ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify" diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index d866edb052b..17e7f0ee7cf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -1,8 +1,8 @@ -{ qtModule, qtbase, qtdeclarative, bluez }: +{ qtModule, stdenv, qtbase, qtdeclarative, bluez, cf-private }: qtModule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ bluez ]; + buildInputs = if stdenv.isDarwin then [ cf-private ] else [ bluez ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix new file mode 100644 index 00000000000..6d5274cbc58 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -0,0 +1,20 @@ +{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }: + +with stdenv.lib; + +qtModule { + name = "qtwebview"; + qtInputs = [ qtdeclarative qtwebengine ]; + buildInputs = optional (stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.WebKit + + # For: + # _OBJC_CLASS_$_NSArray + # _OBJC_CLASS_$_NSDate + # _OBJC_CLASS_$_NSURL + darwin.cf-private + ]; + outputs = [ "out" "dev" "bin" ]; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit"; +} \ No newline at end of file diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 3784d82dcc1..39f7fa91b02 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0w4iqpkagrwvhahdl280ni06b7x1i621n3z740g84ysp2n3dv09l"; + sha256 = "1zpq6wsl57kfx0jf0rkxf15ic22ihazj03i3kfiqb07vcrs2cka9"; }; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; sourceRoot = "source/Kvantum"; diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix new file mode 100644 index 00000000000..99f88091690 --- /dev/null +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "rapidxml"; + version = "1.13"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.zip"; + sha256 = "0w9mbdgshr6sh6a5jr10lkdycjyvapbj7wxwz8hbp0a96y3biw63"; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/include/${pname} + cp * $out/include/${pname} + ''; + + meta = with stdenv.lib; { + description = "Fast XML DOM-style parser in C++"; + homepage = "http://rapidxml.sourceforge.net/"; + license = licenses.boost; + platforms = platforms.unix; + maintainers = with maintainers; [ cpages ]; + }; +} diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index d09e45a2d1e..daa499061c5 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, path }: +{ stdenv, fetchurl, path, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "safefile"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} cd ${toString ./.} ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix ''; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f4a97b7cf85..2ae3bd2b9c8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -126,7 +126,8 @@ stdenv.mkDerivation rec { NO_STATIC = true; CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; - NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform; + # Makefile.system only checks defined status + NO_BINARY_MODE = toString (stdenv.hostPlatform != stdenv.buildPlatform); }); doCheck = true; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3f37bf49de3..53f9af7a98a 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"; }; + # patch to rename outdated MPI functions + patches = [ ./openmpi4.patch ]; + nativeBuildInputs = [ cmake openssh ]; buildInputs = [ mpi gfortran openblasCompat ]; @@ -41,8 +44,8 @@ stdenv.mkDerivation rec { homepage = http://www.netlib.org/scalapack/; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.costrouc ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ costrouc markuskowa ]; }; } diff --git a/pkgs/development/libraries/science/math/scalapack/openmpi4.patch b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch new file mode 100644 index 00000000000..5d0afb58c02 --- /dev/null +++ b/pkgs/development/libraries/science/math/scalapack/openmpi4.patch @@ -0,0 +1,143 @@ +diff --git a/BLACS/SRC/blacs_get_.c b/BLACS/SRC/blacs_get_.c +index e979767..d4b04cf 100644 +--- a/BLACS/SRC/blacs_get_.c ++++ b/BLACS/SRC/blacs_get_.c +@@ -23,7 +23,7 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *val) + case SGET_MSGIDS: + if (BI_COMM_WORLD == NULL) Cblacs_pinfo(val, &val[1]); + iptr = &val[1]; +- ierr=MPI_Attr_get(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); ++ ierr=MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, (BVOID **) &iptr,val); + val[0] = 0; + val[1] = *iptr; + break; +diff --git a/BLACS/SRC/cgamn2d_.c b/BLACS/SRC/cgamn2d_.c +index 2db6ccb..6958f32 100644 +--- a/BLACS/SRC/cgamn2d_.c ++++ b/BLACS/SRC/cgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/cgamx2d_.c b/BLACS/SRC/cgamx2d_.c +index 707c0b6..f802d01 100644 +--- a/BLACS/SRC/cgamx2d_.c ++++ b/BLACS/SRC/cgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC cgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamn2d_.c b/BLACS/SRC/dgamn2d_.c +index dff23b4..a2627ac 100644 +--- a/BLACS/SRC/dgamn2d_.c ++++ b/BLACS/SRC/dgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/dgamx2d_.c b/BLACS/SRC/dgamx2d_.c +index a51f731..2a644d0 100644 +--- a/BLACS/SRC/dgamx2d_.c ++++ b/BLACS/SRC/dgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC dgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamn2d_.c b/BLACS/SRC/igamn2d_.c +index 16bc003..f6a7859 100644 +--- a/BLACS/SRC/igamn2d_.c ++++ b/BLACS/SRC/igamn2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/igamx2d_.c b/BLACS/SRC/igamx2d_.c +index 8165cbe..a7cfcc6 100644 +--- a/BLACS/SRC/igamx2d_.c ++++ b/BLACS/SRC/igamx2d_.c +@@ -218,7 +218,7 @@ F_VOID_FUNC igamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamn2d_.c b/BLACS/SRC/sgamn2d_.c +index d6c95e5..569c797 100644 +--- a/BLACS/SRC/sgamn2d_.c ++++ b/BLACS/SRC/sgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/sgamx2d_.c b/BLACS/SRC/sgamx2d_.c +index 4b0af6f..8897ece 100644 +--- a/BLACS/SRC/sgamx2d_.c ++++ b/BLACS/SRC/sgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC sgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamn2d_.c b/BLACS/SRC/zgamn2d_.c +index 9de2b23..37897df 100644 +--- a/BLACS/SRC/zgamn2d_.c ++++ b/BLACS/SRC/zgamn2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamn2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; +diff --git a/BLACS/SRC/zgamx2d_.c b/BLACS/SRC/zgamx2d_.c +index 414c381..0e9d474 100644 +--- a/BLACS/SRC/zgamx2d_.c ++++ b/BLACS/SRC/zgamx2d_.c +@@ -221,7 +221,7 @@ F_VOID_FUNC zgamx2d_(int *ConTxt, F_CHAR scope, F_CHAR top, int *m, int *n, + { + #endif + i = 2; +- ierr=MPI_Type_struct(i, len, disp, dtypes, &MyType); ++ ierr=MPI_Type_create_struct(i, len, disp, dtypes, &MyType); + ierr=MPI_Type_commit(&MyType); + bp->N = bp2->N = 1; + bp->dtype = bp2->dtype = MyType; diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 0a63f5e778a..5c42f729469 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.26.0"; + version = "3.27.2"; src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0"; + url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip"; + sha256 = "02nz1y22wyb8101d9y6wfdrvp855wvch67js12p5y3riya345g8m"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 100f7fec06a..bacba396c25 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.26.0"; + version = "3.27.2"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx"; + url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "0vpgwszs19pwks2b4dhqwa0n6q5sx6pn1s7rngyyrd98xa2rxhsh"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index b33180cec42..abe444c63c3 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6"; + sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398"; }; preConfigure = '' diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix new file mode 100644 index 00000000000..d7dd0f76cd5 --- /dev/null +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, fetchurl +, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps +, uthash, which }: + +stdenv.mkDerivation rec { + pname = "tpm2-tss"; + version = "2.2.1"; + + src = fetchurl { + url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "194k0gg75ygclwhb205zr26qrnx4hsik7pbazs39yf15js55bksv"; + }; + + nativeBuildInputs = [ + doxygen perl pkgconfig + # For unit tests and integration tests. + ibm-sw-tpm2 iproute procps which + ]; + buildInputs = [ + openssl + # For unit tests and integration tests. + cmocka uthash + ]; + + postPatch = "patchShebangs script"; + + configureFlags = [ + "--enable-unit" + "--enable-integration" + ]; + + doCheck = true; + + postInstall = '' + # Do not install the upstream udev rules, they rely on specific + # users/groups which aren't guaranteed to exist on the system. + rm -R $out/lib/udev + ''; + + meta = with lib; { + description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; + homepage = https://github.com/tpm2-software/tpm2-tss; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 2d3af9b70c5..7121b6fed02 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R44"; + version = "R45.1"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1270cggvk9nvy5g2z289nwhyvl4364yzirfn5jsa9i9ljfp00qml"; + sha256 = "09fj4k75cksx1imivqfyr945swlr8k392kkdgzldwc4404qv82s6"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 25cbde63129..8a5a5dc070e 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"; }; + separateDebugInfo = true; + configureFlags = [ "--disable-documentation" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index aa05161d19c..27f0c4ea0b5 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.22.6"; + version = "2.22.7"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z"; + sha256 = "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 6e7090a9c5b..b6aca6f8216 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,7 +6,7 @@ let pname = "wlroots"; - version = "0.3"; + version = "0.4.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; + sha256 = "1624gasx8k0yy649d65ih4hs290szyxzd3bl0kg1l6njnhlxnr6b"; }; # $out for the library, $bin for rootston, and $examples for the example diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 6d2e25709b5..1b08bb090b4 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, libGLU ? null, libGL ? null +, libGLSupported +, withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 426f5cf92a1..1938b15efbb 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, libGLU ? null, libGL ? null +, libGLSupported +, withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 45bf5f779c2..948b261fe45 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xorgproto, gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, libGLU ? null, libGL ? null +, libGLSupported +, withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index cf331f01456..76c345c6b7e 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -18,6 +18,8 @@ let doCheck = true; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; + # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' @@ -29,7 +31,7 @@ let description = "Search engine library"; homepage = https://xapian.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }; diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch new file mode 100644 index 00000000000..72a7c3e721f --- /dev/null +++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch @@ -0,0 +1,33 @@ +diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc +--- xapian-core.old/tests/api_db.cc ++++ xapian-core.new/tests/api_db.cc +@@ -998,6 +998,7 @@ + + // test for keepalives + DEFINE_TESTCASE(keepalive1, remote) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); + + /* Test that keep-alives work */ +diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc +--- xapian-core.old/tests/api_scalability.cc ++++ xapian-core.new/tests/api_scalability.cc +@@ -53,6 +53,7 @@ + } + + DEFINE_TESTCASE(bigoaddvalue1, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + // O(n*n) is bad, but O(n*log(n)) is acceptable. + test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); + return true; +diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc +--- xapian-core.old/tests/api_serialise.cc ++++ xapian-core.new/tests/api_serialise.cc +@@ -110,6 +110,7 @@ + + // Test for serialising a document obtained from a database. + DEFINE_TESTCASE(serialise_document2, writable) { ++ SKIP_TEST("Fails in darwin nix build environment"); + Xapian::Document origdoc; + origdoc.add_term("foo", 2); + origdoc.add_posting("foo", 10); diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index adace96afad..31c31164e01 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0drw16wm95dqszpl7j33y4gckz0w0107lnz6wkzb66f0dlbv48cf"; }; + enableParallelBuilding = true; + patchPhase = '' patchShebangs configure patchShebangs config.sub @@ -18,7 +20,16 @@ stdenv.mkDerivation rec { patchShebangs tools/patcheck patchShebangs tools/regression-test.pl patchShebangs tools/xavs-format - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace config.guess --replace 'uname -p' 'uname -m' + substituteInPlace configure \ + --replace '-O4' '-O3' \ + --replace ' -s ' ' ' \ + --replace 'LDFLAGS -s' 'LDFLAGS' \ + --replace '-dynamiclib' ' ' \ + --replace '-falign-loops=16' ' ' + substituteInPlace Makefile --replace '-Wl,-soname,' ' ' + ''; configureFlags = [ "--enable-pic" @@ -31,7 +42,7 @@ stdenv.mkDerivation rec { description = "AVS encoder and decoder"; homepage = http://xavs.sourceforge.net/; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; }; } diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f48320148da..28fa6a9ebd9 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f"; + sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 80699188fe2..0fdcb684b2d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.1.0"; + version = "1.2.0"; outputs = [ "out" "installedTests" ]; @@ -10,20 +10,19 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; + sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; }; patches = [ ./respect-path-env-var.patch - # https://github.com/flatpak/xdg-desktop-portal/pull/263 - (fetchpatch { - url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; - sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq"; + (substituteAll { + src = ./fix-paths.patch; + inherit flatpak; }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gsettings-desktop-schemas ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch new file mode 100644 index 00000000000..f4b103eb38b --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/notification.c b/src/notification.c +index 1367114..72ba033 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -401,7 +401,7 @@ validate_icon_more (GVariant *v) + int status; + g_autofree char *err = NULL; + g_autoptr(GError) error = NULL; +- const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon"; ++ const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon"; + const char *args[6]; + + if (G_IS_THEMED_ICON (icon)) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ad1cc2efc87..b4c79d7f816 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchgit, cmake -, cudaSupport ? false, cudatoolkit +{ config, stdenv, lib, fetchgit, cmake +, cudaSupport ? config.cudaSupport or false, cudatoolkit , ncclSupport ? false, nccl , llvmPackages }: diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index cbe32da6445..51f883a020b 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.4.20171222"; + version = "0.6.5"; src = fetchFromGitHub { - sha256 = "1az5vm14rdc3pa3l0wj180wpii14if16diril3gz8q9ip1215gwj"; - rev = "7caf8bd76440c75dfe1070d3acfbd7891aea8fca"; - repo = "xxHash"; owner = "Cyan4973"; + repo = "xxHash"; + rev = "v${version}"; + sha256 = "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 063d64c6905..82b53402fc7 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "OPTIMIZE=yes" ]; - enableParallelBuilding = true; + # cannot find -lIceXML (linking bin/transformdb) + #enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.zeroc.com/ice.html; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index bc130af4c6a..9fc0c4ac230 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "12a2l6dzxkk1x8yl8bihnfs6gi2vgyi4jm9q8acj46f6niryhsmr"; + sha256 = "0z7ka82ihlsncqmf8jj4lnjyr418dzxfs0psx5mccqb09yx9shgm"; }; nativeBuildInputs = [ cmake asciidoc ]; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 21d8a7babb3..d3dc41371de 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://hardysimpson.github.com/zlog; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; }; } diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 390e0e06112..49eb9c40344 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -41,7 +41,7 @@ let mkdir -p "$(dirname "$launch_script")" touch "$launch_script" chmod a+x "$launch_script" - echo "#! /bin/sh" >> "$launch_script" + echo "#! ${stdenv.shell}" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index e78ec34a0a9..0987d83ea64 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -95,6 +95,7 @@ let-plus lev lisp-namespace local-time +lparallel lquery marshal misc-extensions diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index df370082782..4e8cb6ebe03 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -1224,6 +1224,16 @@ let quicklisp-to-nix-packages = rec { })); + "lparallel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lparallel" or (x: {})) + (import ./quicklisp-to-nix-output/lparallel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + "local-time" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."local-time" or (x: {})) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7da4a9eeddf..8a9618e1f1e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,7 +5,7 @@ nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modul These packages are manually refined in lua-overrides.nix */ -{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +{ self, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: self: super: with self; { diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 692f61cec74..c88b780d164 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, runtimeShell }: stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { mkdir -p $out/{nix-support,bin} mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support cat >> $out/bin/avr8-burn-omat << EOF - #!/bin/sh - cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar + #!${runtimeShell} + cd $out/nix-support; exec java -jar AVR8_Burn_O_Mat.jar EOF chmod +x $out/bin/avr8-burn-omat ''; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 92560105422..8d57f737c34 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,6 +1,6 @@ -{ pkgs ? import <nixpkgs> {} +{ config, pkgs ? import <nixpkgs> {} , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } -, licenseAccepted ? false +, licenseAccepted ? config.android_sdk.accept_license or false }: rec { diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 31820eff7e5..89ba7cec32f 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -2,50 +2,50 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-deintegrate (1.0.3) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) + cocoapods-stats (1.1.0) cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -55,11 +55,11 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.2.0) + ruby-macho (1.4.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.6.0) + xcodeproj (1.8.1) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -73,4 +73,4 @@ DEPENDENCIES cocoapods BUNDLED WITH - 1.16.3 + 1.17.2 diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index 5fcbe59603b..8cd829d56ab 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -1,12 +1,14 @@ { activesupport = { dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + sha256 = "0pqr25wmhvvlg8av7bi5p5c7r5464clhhhhv45j63bh7xw4ad6n4"; type = "gem"; }; - version = "4.2.10"; + version = "4.2.11"; }; atomos = { source = { @@ -34,37 +36,45 @@ }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5cz19p0j9k1hvn35lxnv3dn8i65n4qvi5nzjaf53pdgh52401h"; + sha256 = "0sjipdbybs2ikjz9drpwfq1msisha3cbf3508ywaj5w3i481av37"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.1"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnxcd2xnvf60f8w27glq5jcn9wdhzch9nkdb24ihhmpxfgj3f39"; + sha256 = "03g31gn8k9q8ky1qhg9i2xawg6xdpl8x3mq4fdah17jclsg8y0sh"; type = "gem"; }; - version = "1.5.3"; + version = "1.6.1"; }; cocoapods-deintegrate = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10b49glw3jd0r1vj36zb0vz2idwgziq8qgzf7yjkrsm41xm098zz"; + sha256 = "0m3hi4va9cr7anxkjf44as14j1hsrvw00bzvz7c906hyb8qcm4fp"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods-downloader = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g1v3k52g2mjlml8miq06c61764lqdy0gc0h2f4ymajz0pqg1zik"; + sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -84,12 +94,14 @@ version = "1.0.0"; }; cocoapods-stats = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -117,12 +129,14 @@ version = "3.1.2"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.4"; }; escape = { source = { @@ -133,12 +147,14 @@ version = "0.0.4"; }; fourflusher = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3"; type = "gem"; }; - version = "2.0.1"; + version = "2.2.0"; }; fuzzy_match = { source = { @@ -206,12 +222,14 @@ version = "0.11.0"; }; ruby-macho = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi0ll217h3caiamplqaypmipmrkriqrvmq207ngyzhgmh1jfc8q"; + sha256 = "0lhdjn91jkifsy2hzq2hgcm0pp8pbik87m58zmw1ifh6hkp9adjb"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; thread_safe = { source = { @@ -232,11 +250,13 @@ }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; + sha256 = "13z3109lwq632vhazndqjlccpwadljg58sflbyl0m57j9d4blv2y"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; } \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 58a7bd4a453..8215d1abe4f 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -1,10 +1,11 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash ruby bundler bundix -rm Gemfile.lock -bundler install -bundix +BUNDIX_CACHE="$(mktemp -d)" -if [ "clean" == "$1" ]; then - rm -rf ~/.gem -fi +rm -f Gemfile.lock +bundler package --path "$BUNDIX_CACHE" +bundix --bundle-pack-path="$BUNDIX_CACHE" + +rm -rf "$BUNDIX_CACHE" +rm -rf .bundle diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index aac94fe6130..b3c8d380819 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products ${stdenv.lib.optionalString enableWirelessDistribution '' - appname="$(basename "$out/*.ipa" .ipa)" + appname="$(basename $out/*.ipa .ipa)" bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g') version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g') diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b88f806d586..05ddf5366c7 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ <string>${codeSignIdentity}</string> <key>provisioningProfiles</key> <dict> - <key>${stdenv.lib.toLower bundleId}</key> + <key>${bundleId}</key> <string>$PROVISIONING_PROFILE</string> </dict> <key>signingStyle</key> @@ -129,9 +129,9 @@ stdenv.mkDerivation ({ ${stdenv.lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations - appname="$(basename "$out/*.ipa" .ipa)" - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + appname="$(basename "$(echo $out/*.ipa)" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html + echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} ${stdenv.lib.optionalString generateXCArchive '' diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index fc71c183240..76edc76f445 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -40,6 +40,7 @@ , "htmlhint" , "html-minifier" , "http-server" +, "hueadm" , "ionic" , "ios-deploy" , "imapnotify" @@ -91,6 +92,7 @@ , "pulp" , "react-tools" , "react-native-cli" +, "reveal.js" , "s3http" , "scuttlebot" , "semver" @@ -108,6 +110,7 @@ , "three" , "tiddlywiki" , "triton" +, "tsun" , "ttf2eot" , "typescript" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index b63a0a9e869..b0580d49c3f 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,31 +13,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.13.1" = { + "@angular-devkit/architect-0.13.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.1.tgz"; - sha512 = "QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.3.tgz"; + sha512 = "89VL75bq3+h3m0jhzWNqXqW+HQcrihnM3i6eiUE6P81LcllP159JMlusAvB1LHLNc6Cc62wTq4BJr7KDILkPOA=="; }; }; - "@angular-devkit/core-7.3.1" = { + "@angular-devkit/core-7.3.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "7.3.1"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.1.tgz"; - sha512 = "56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.3.tgz"; + sha512 = "fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ=="; }; }; - "@angular-devkit/schematics-7.3.1" = { + "@angular-devkit/schematics-7.3.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "7.3.1"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.1.tgz"; - sha512 = "cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.3.tgz"; + sha512 = "SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg=="; }; }; "@apollographql/apollo-tools-0.3.3" = { @@ -85,13 +85,13 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/core-7.3.3" = { + "@babel/core-7.3.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.3.3.tgz"; - sha512 = "w445QGI2qd0E0GlSnq6huRZWPMmQGCp5gd5ZWS4hagn0EiwzxD5QMFkpchyusAyVC1n27OKXzQ0/88aVU9n4xQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz"; + sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -103,13 +103,13 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.3.3" = { + "@babel/generator-7.3.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.3.3.tgz"; - sha512 = "aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.3.4.tgz"; + sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; }; }; "@babel/helper-annotate-as-pure-7.0.0" = { @@ -148,13 +148,13 @@ let sha512 = "YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.3.2" = { + "@babel/helper-create-class-features-plugin-7.3.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.3.2"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz"; - sha512 = "tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.4.tgz"; + sha512 = "uFpzw6L2omjibjxa8VGZsJUPL5wJH0zzGKpoz0ccBkzIa6C8kWNUbiBmQ0rgOKWlHJ6qzmfa6lTiGchiV8SC+g=="; }; }; "@babel/helper-define-map-7.1.0" = { @@ -265,13 +265,13 @@ let sha512 = "3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg=="; }; }; - "@babel/helper-replace-supers-7.2.3" = { + "@babel/helper-replace-supers-7.3.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.2.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz"; - sha512 = "GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz"; + sha512 = "pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A=="; }; }; "@babel/helper-simple-access-7.1.0" = { @@ -319,13 +319,13 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; - "@babel/parser-7.3.3" = { + "@babel/parser-7.3.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.3.3.tgz"; - sha512 = "xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.3.4.tgz"; + sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -346,13 +346,13 @@ let sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.3.3" = { + "@babel/plugin-proposal-class-properties-7.3.4" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.3.tgz"; - sha512 = "XO9eeU1/UwGPM8L+TjnQCykuVcXqaO5J1bkRPIygqZ/A2L1xVMJ9aZXrY31c0U4H2/LHKL4lbFQLsxktSrc/Ng=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.4.tgz"; + sha512 = "lUf8D3HLs4yYlAo8zjuneLvfxN7qfKv1Yzbj5vjqaqMJxgJA3Ipwp4VUJ+OrOdz53Wbww6ahwB8UhB2HQyLotA=="; }; }; "@babel/plugin-proposal-json-strings-7.2.0" = { @@ -364,13 +364,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.3.2" = { + "@babel/plugin-proposal-object-rest-spread-7.3.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.3.2"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz"; - sha512 = "DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz"; + sha512 = "j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -454,13 +454,13 @@ let sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.2.0" = { + "@babel/plugin-transform-async-to-generator-7.3.4" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.2.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz"; - sha512 = "CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz"; + sha512 = "Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.2.0" = { @@ -472,22 +472,22 @@ let sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w=="; }; }; - "@babel/plugin-transform-block-scoping-7.2.0" = { + "@babel/plugin-transform-block-scoping-7.3.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.2.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz"; - sha512 = "vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz"; + sha512 = "blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA=="; }; }; - "@babel/plugin-transform-classes-7.3.3" = { + "@babel/plugin-transform-classes-7.3.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.3.tgz"; - sha512 = "n0CLbsg7KOXsMF4tSTLCApNMoXk0wOPb0DYfsOO1e7SfIb9gOyfbpKI2MZ+AXfqvlfzq2qsflJ1nEns48Caf2w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz"; + sha512 = "J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA=="; }; }; "@babel/plugin-transform-computed-properties-7.2.0" = { @@ -535,13 +535,13 @@ let sha512 = "umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.2.3" = { + "@babel/plugin-transform-flow-strip-types-7.3.4" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.2.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.2.3.tgz"; - sha512 = "xnt7UIk9GYZRitqCnsVMjQK1O2eKZwFB3CvvHjf5SGx6K6vr/MScCKQDnf1DxRaj501e3pXjti+inbSXX2ZUoQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.3.4.tgz"; + sha512 = "PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA=="; }; }; "@babel/plugin-transform-for-of-7.2.0" = { @@ -589,13 +589,13 @@ let sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.2.0" = { + "@babel/plugin-transform-modules-systemjs-7.3.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.2.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz"; - sha512 = "aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz"; + sha512 = "VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw=="; }; }; "@babel/plugin-transform-modules-umd-7.2.0" = { @@ -652,22 +652,22 @@ let sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; }; }; - "@babel/plugin-transform-regenerator-7.0.0" = { + "@babel/plugin-transform-regenerator-7.3.4" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.0.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz"; - sha512 = "sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz"; + sha512 = "hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA=="; }; }; - "@babel/plugin-transform-runtime-7.2.0" = { + "@babel/plugin-transform-runtime-7.3.4" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.2.0"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz"; - sha512 = "jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz"; + sha512 = "PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -724,22 +724,22 @@ let sha512 = "m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA=="; }; }; - "@babel/polyfill-7.0.0" = { + "@babel/polyfill-7.2.5" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.0.0"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.0.0.tgz"; - sha512 = "dnrMRkyyr74CRelJwvgnnSUDh2ge2NCTyHVwpOdvRMHtJUyxLtMAfhBN3s64pY41zdw0kgiLPh6S20eb1NcX6Q=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz"; + sha512 = "8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug=="; }; }; - "@babel/preset-env-7.3.1" = { + "@babel/preset-env-7.3.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.3.1"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz"; - sha512 = "FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz"; + sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -751,15 +751,6 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; - "@babel/register-7.0.0" = { - name = "_at_babel_slash_register"; - packageName = "@babel/register"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.0.0.tgz"; - sha512 = "f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g=="; - }; - }; "@babel/runtime-7.3.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -769,6 +760,15 @@ let sha512 = "7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA=="; }; }; + "@babel/runtime-7.3.4" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz"; + sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; + }; + }; "@babel/template-7.2.2" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -778,13 +778,13 @@ let sha512 = "zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g=="; }; }; - "@babel/traverse-7.2.3" = { + "@babel/traverse-7.3.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.2.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz"; - sha512 = "Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.3.4.tgz"; + sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -796,13 +796,13 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.3.3" = { + "@babel/types-7.3.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.3.3"; + version = "7.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz"; - sha512 = "2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.3.4.tgz"; + sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -913,13 +913,13 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@iarna/toml-2.2.1" = { + "@iarna/toml-2.2.3" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.1.tgz"; - sha512 = "I2EjI9TbEFJNLziNPFfpo64PNanOaK17iL2kTW/jGlGOa4bvHw4VEied83kOEB7NJjXf1KfvmsQ2aEjy3xjiGg=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz"; + sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; "@ionic/cli-framework-1.6.1" = { @@ -1489,13 +1489,13 @@ let sha512 = "5YRqYNZOAaL7+nt7w3Scp6Sz4P2g7wKFP9npx1xdExMomk8/M/ICXVLYVam2wzxeY0cIc6wcKpjC5KI4jiNbGw=="; }; }; - "@octokit/rest-16.15.0" = { + "@octokit/rest-16.16.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.15.0"; + version = "16.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.15.0.tgz"; - sha512 = "Un+e7rgh38RtPOTe453pT/KPM/p2KZICimBmuZCd2wEo8PacDa4h6RqTPZs+f2DPazTTqdM7QU4LKlUjgiBwWw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.16.0.tgz"; + sha512 = "Q6L5OwQJrdJ188gLVmUHLKNXBoeCU0DynKPYW8iZQQoGNGws2hkP/CePVNlzzDgmjuv7o8dCrJgecvDcIHccTA=="; }; }; "@parcel/fs-1.11.0" = { @@ -1633,22 +1633,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-7.3.1" = { + "@schematics/angular-7.3.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "7.3.1"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.1.tgz"; - sha512 = "0Ne8APPlTAjKg5CSZqluwCuW/5yPjr3ALCWzqwPxN0suE745usThtasBmqrjw0RMIt8nRqRgtg54Z7lCPO9ZFg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.3.tgz"; + sha512 = "HbH8vajYPka0xGcFAN5IUBx8n8SFMQLFb9di2dJCOBaEakbKVkk8qtOpil54oFQbx7DFCvutq/p0u42JfEbuMQ=="; }; }; - "@schematics/update-0.13.1" = { + "@schematics/update-0.13.3" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.1.tgz"; - sha512 = "EHOqolT/d/jRGuVTCUESLpk8JNpuaPlsVHfeK7Kdp/t0wSEnmtOelZX4+leS25lGXDaDUF3138ntjrZR4n6bGw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.3.tgz"; + sha512 = "sCOFQ62dd7VdEGiSUJNZshNI31ODwpJjn2WIvFgZLt6sdHHun67s/JOvOUq4mxx6I74oD6RPJPF4AP5sigVxxg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1669,22 +1669,22 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@snyk/dep-graph-1.1.2" = { + "@snyk/dep-graph-1.4.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.1.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.1.2.tgz"; - sha512 = "mCoAFKtmezBL61JOzLMzqqd/sXXxp0iektEwf4zw+sM3zuG4Tnmhf8OqNO6Wscn84bMIfLlI/nvECdxvSS7MTw=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.0.tgz"; + sha512 = "dz4Fo4L9sN0Rt8hMe+zMYZ4mAiljtyIeWvujLyCxhIT5iHSlceUYlba5TDsOFuKyuZKkuhVjORWY1oFEuRzCcA=="; }; }; - "@snyk/gemfile-1.1.0" = { + "@snyk/gemfile-1.2.0" = { name = "_at_snyk_slash_gemfile"; packageName = "@snyk/gemfile"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.1.0.tgz"; - sha512 = "mLwF+ccuvRZMS0SxUAxA3dAp8mB3m2FxIsBIUWFTYvzxl+E4XTZb8uFrUqXHbcxhZH1Z8taHohNTbzXZn3M8ag=="; + url = "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz"; + sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -1903,22 +1903,31 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.12.26" = { + "@types/node-10.12.27" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.12.26"; + version = "10.12.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.12.26.tgz"; - sha512 = "nMRqS+mL1TOnIJrL6LKJcNZPB8V3eTfRo9FQA2b5gDvrHurC8XbSA86KNe0dShlEL7ReWJv/OU9NL7Z0dnqWTg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz"; + sha512 = "e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg=="; }; }; - "@types/node-11.9.4" = { + "@types/node-11.9.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.9.4"; + version = "11.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.9.4.tgz"; - sha512 = "Zl8dGvAcEmadgs1tmSPcvwzO1YRsz38bVJQvH1RvRqSR9/5n61Q1ktcDL0ht3FXWR+ZpVmXVwN1LuH4Ax23NsA=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.9.5.tgz"; + sha512 = "vVjM0SVzgaOUpflq4GYBvCpozes8OgIIS5gVXVka+OfK3hvnkC1i93U8WiY2OtNE4XUWyyy/86Kf6e0IHTQw1Q=="; + }; + }; + "@types/node-6.14.3" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "6.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-6.14.3.tgz"; + sha512 = "V2VrQBCKo4U0rni6tW4AASRDqIO5ZTLDN/Xzrm4mNBr9SGQYZ+7zZJn+hMs89Q8ZCIHzp4aWQPyCpK+rux1YGA=="; }; }; "@types/node-8.10.40" = { @@ -1993,40 +2002,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.4.0" = { + "@vue/cli-shared-utils-3.4.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.0.tgz"; - sha512 = "w9j2qIroUUC2ym4Lb0lLMdlGmYThhwV0OizOEVigB5eZOEUEBV2Mv43K+nWJ6OyRBACnvhJTDi1gIwJo8zUvOw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.1.tgz"; + sha512 = "IbAQP1J48+q1ChjcHGnE06SdcCEeO77BERcPapjqZl3qJ6aPnq7z8VrNrZxo6oOnBJm7elGOvz4kJ6hirK9aPA=="; }; }; - "@vue/cli-ui-3.4.0" = { + "@vue/cli-ui-3.4.1" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.0.tgz"; - sha512 = "o3ZtY53qstqyHTcLpuL4dRBXZKNRUr/9lrypYD8Bj+nOKLk1hr2E8kwI+hV/bZc+QjgaFqjlG8GxPYhwtpOsfw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.1.tgz"; + sha512 = "VzYw+pWlzK9U3SbNFQiAnaVbtNRtb7bIuHjmistZmnipo5GQYt8i5JwxtjP3ZvqojBBOWmU5Mb9S8JYfE6B0Lg=="; }; }; - "@vue/cli-ui-addon-webpack-3.4.0" = { + "@vue/cli-ui-addon-webpack-3.4.1" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.0.tgz"; - sha512 = "CobtNRoXLUgTLzLtTekG6y39qQKFV6ebuSkZ8l2aEWv7ISRlj/wluuN47X9TrViJexIFJeh28XW1/vefwt4RgQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.1.tgz"; + sha512 = "pNpnu04fHDE+h8I+L6tz16uT3zKEjqZN4rqyWyIHyE6Dcpjk4Ru8/ge0bMfz89AOoYwpuBPh28FSJWtkSxTlAw=="; }; }; - "@vue/cli-ui-addon-widgets-3.4.0" = { + "@vue/cli-ui-addon-widgets-3.4.1" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.0.tgz"; - sha512 = "9efXj/83sw9Cq0is52NusQRf0u810KhNo38sAyBd7wlh2DZqU84thse7FvK+npppYkOz244zR0SNtwR2n41kgg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.1.tgz"; + sha512 = "E41HRQep+KfOye7LqHl+WiAQmS7noaJUxtVek6IjbWXrzNj4xmZvi7tW7FMj2l3ezZpwUU6mGTSCPz8Ct0EN+A=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -2047,6 +2056,15 @@ let sha512 = "xy3m06+Iu4D32+6soz6zLnwznigXJRuFNTovBX2M4GqVqLb0dnyWLbPnpcXvUSdEN+9DVyDeaq2jyH1eIL2LZQ=="; }; }; + "@webassemblyjs/ast-1.8.5" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz"; + sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ=="; + }; + }; "@webassemblyjs/floating-point-hex-parser-1.8.1" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -2065,6 +2083,15 @@ let sha512 = "vq1TISG4sts4f0lDwMUM0f3kpe0on+G3YyV5P0IySHFeaLKRYZ++n2fCFfG4TcCMYkqFeTUYFxm75L3ddlk2xA=="; }; }; + "@webassemblyjs/floating-point-hex-parser-1.8.5" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; + sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="; + }; + }; "@webassemblyjs/helper-api-error-1.8.1" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -2083,6 +2110,15 @@ let sha512 = "BmWEynI4FnZbjk8CaYZXwcv9a6gIiu+rllRRouQUo73hglanXD3AGFJE7Q4JZCoVE0p5/jeX6kf5eKa3D4JxwQ=="; }; }; + "@webassemblyjs/helper-api-error-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; + sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="; + }; + }; "@webassemblyjs/helper-buffer-1.8.1" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; @@ -2119,22 +2155,31 @@ let sha512 = "K1UxoJML7GKr1QXR+BG7eXqQkvu+eEeTjlSl5wUFQ6W6vaOc5OwSxTcb3oE9x/3+w4NHhrIKD4JXXCZmLdL2cg=="; }; }; - "@webassemblyjs/helper-compiler-1.8.3" = { + "@webassemblyjs/helper-code-frame-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; + sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ=="; + }; + }; + "@webassemblyjs/helper-compiler-1.8.5" = { name = "_at_webassemblyjs_slash_helper-compiler"; packageName = "@webassemblyjs/helper-compiler"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.8.3.tgz"; - sha512 = "yDhlzgS/g3eJWPu4NKwnyas9+3mFPmPlKvjkXX3C/ZNJDWkRz4AzeLjdph1Y8GpvKYlbBaWSN8/aIIFWADj81g=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.8.5.tgz"; + sha512 = "SncfVBE+k6kh+y274kZvmbuga/cLrD2Q8J5ow20fhARnDCfMVLeGAgIX6jEPuk7DmOwci3tEBi44YGM+F3Ee9A=="; }; }; - "@webassemblyjs/helper-flatten-ast-1.8.3" = { + "@webassemblyjs/helper-flatten-ast-1.8.5" = { name = "_at_webassemblyjs_slash_helper-flatten-ast"; packageName = "@webassemblyjs/helper-flatten-ast"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.8.3.tgz"; - sha512 = "/z+Qus3FdaJnmpyTH0JWUSvwku8EJErdKQXdRXaamOnKnLE/DNoT4iAuaGXDa7eHL/qgXIYdpeqJRrb0tj7uWA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.8.5.tgz"; + sha512 = "YVjROehZKPvxfBEmfHMTajRPQCZ39Mji/08DmulzH8d1+BasLLmcykeyu7ukayt/fmQe6MUYqlL8ep2oHNxM+w=="; }; }; "@webassemblyjs/helper-fsm-1.8.1" = { @@ -2155,6 +2200,15 @@ let sha512 = "387zipfrGyO77/qm7/SDUiZBjQ5KGk4qkrVIyuoubmRNIiqn3g+6ijY8BhnlGqsCCQX5bYKOnttJobT5xoyviA=="; }; }; + "@webassemblyjs/helper-fsm-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; + sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="; + }; + }; "@webassemblyjs/helper-module-context-1.8.1" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -2173,6 +2227,15 @@ let sha512 = "lPLFdQfaRssfnGEJit5Sk785kbBPPPK4ZS6rR5W/8hlUO/5v3F+rN8XuUcMj/Ny9iZiyKhhuinWGTUuYL4VKeQ=="; }; }; + "@webassemblyjs/helper-module-context-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; + sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g=="; + }; + }; "@webassemblyjs/helper-wasm-bytecode-1.8.1" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; @@ -2191,6 +2254,15 @@ let sha512 = "R1nJW7bjyJLjsJQR5t3K/9LJ0QWuZezl8fGa49DZq4IVaejgvkbNlKEQxLYTC579zgT4IIIVHb5JA59uBPHXyw=="; }; }; + "@webassemblyjs/helper-wasm-bytecode-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; + sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="; + }; + }; "@webassemblyjs/helper-wasm-section-1.8.1" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; @@ -2227,6 +2299,15 @@ let sha512 = "UD4HuLU99hjIvWz1pD68b52qsepWQlYCxDYVFJQfHh3BHyeAyAlBJ+QzLR1nnS5J6hAzjki3I3AoJeobNNSZlg=="; }; }; + "@webassemblyjs/ieee754-1.8.5" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; + sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g=="; + }; + }; "@webassemblyjs/leb128-1.8.1" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -2245,6 +2326,15 @@ let sha512 = "XXd3s1BmkC1gpGABuCRLqCGOD6D2L+Ma2BpwpjrQEHeQATKWAQtxAyU9Z14/z8Ryx6IG+L4/NDkIGHrccEhRUg=="; }; }; + "@webassemblyjs/leb128-1.8.5" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; + sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A=="; + }; + }; "@webassemblyjs/utf8-1.8.1" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -2263,13 +2353,22 @@ let sha512 = "Wv/WH9Zo5h5ZMyfCNpUrjFsLZ3X1amdfEuwdb7MLdG3cPAjRS6yc6ElULlpjLiiBTuzvmLhr3ENsuGyJ3wyCgg=="; }; }; - "@webassemblyjs/validation-1.8.3" = { + "@webassemblyjs/utf8-1.8.5" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; + sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="; + }; + }; + "@webassemblyjs/validation-1.8.5" = { name = "_at_webassemblyjs_slash_validation"; packageName = "@webassemblyjs/validation"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.8.3.tgz"; - sha512 = "UH0JDAy3Wyx9R3+VqCsCUQqkQJqVYIis7Suck++FoIRKPPOdM0cHBzLshVIDpF7mmLcw0k3Crfs6Hczb2gO3qw=="; + url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.8.5.tgz"; + sha512 = "nEpaI0D9A9IgaRfqPlG/8/hyZ91q62US/36gRsl7gFOZuJykL/5UI37OVFm8uL5V120amdiN6s+yCzIzmefvkg=="; }; }; "@webassemblyjs/wasm-edit-1.8.3" = { @@ -2326,6 +2425,15 @@ let sha512 = "NBI3SNNtRoy4T/KBsRZCAWUzE9lI94RH2nneLwa1KKIrt/2zzcTavWg6oY05ArCbb/PZDk3OUi63CD1RYtN65w=="; }; }; + "@webassemblyjs/wasm-parser-1.8.5" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; + sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw=="; + }; + }; "@webassemblyjs/wast-parser-1.8.1" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -2344,6 +2452,15 @@ let sha512 = "gZPst4CNcmGtKC1eYQmgCx6gwQvxk4h/nPjfPBbRoD+Raw3Hs+BS3yhrfgyRKtlYP+BJ8LcY9iFODEQofl2qbg=="; }; }; + "@webassemblyjs/wast-parser-1.8.5" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; + sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg=="; + }; + }; "@webassemblyjs/wast-printer-1.8.1" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -2362,6 +2479,15 @@ let sha512 = "DTA6kpXuHK4PHu16yAD9QVuT1WZQRT7079oIFFmFSjqjLWGXS909I/7kiLTn931mcj7wGsaUNungjwNQ2lGQ3Q=="; }; }; + "@webassemblyjs/wast-printer-1.8.5" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; + sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg=="; + }; + }; "@xtuc/ieee754-1.2.0" = { name = "_at_xtuc_slash_ieee754"; packageName = "@xtuc/ieee754"; @@ -2695,13 +2821,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.4.1" = { + "addons-linter-1.6.1" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.4.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.4.1.tgz"; - sha512 = "AX8nCD/gy/6DoX4B7vTMQV6pcP8tG0BjxB3Jv44VZrUTYG+ojHx26abRDyUn+fDqWGf8qzeVn0Vss/NMNjMouA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.6.1.tgz"; + sha512 = "3+N8cskdXHpId0dhfsldgbYGXamtgfGywvU4oPVb1M7imG3pHFoK+VcAr/kPk1VeYGkSmBl2LxnwGHcw1ERvmA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -2857,31 +2983,22 @@ let sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg=="; }; }; - "ajv-6.5.5" = { - name = "ajv"; - packageName = "ajv"; - version = "6.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz"; - sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; - }; - }; - "ajv-6.7.0" = { + "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; - version = "6.7.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"; - sha512 = "RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; + sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "ajv-errors-1.0.1" = { @@ -3010,6 +3127,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-cyan-0.1.1" = { name = "ansi-cyan"; packageName = "ansi-cyan"; @@ -3244,13 +3370,13 @@ let sha512 = "JKFHijwkhXpcQ3jOat+ctwiXyjDhQgy0p6GSaj7zG+or+ZSalPqUnPzFRgRwFLVbYxBKJgHCkWX+2VkxWTZzQQ=="; }; }; - "apollo-cache-control-0.5.1" = { + "apollo-cache-control-0.5.2" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.1.tgz"; - sha512 = "82hzX7/fFiu5dODLS8oGieEE4jLjMIhIkQ4JTsWj9drv8PZJltl0xqORtU2jA/FottjxfYab8+ebi3BgGPOaqw=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.5.2.tgz"; + sha512 = "uehXDUrd3Qim+nzxqqN7XT1YTbNSyumW3/FY5BxbKZTI8d4oPG4eyVQKqaggooSjswKQnOoIQVes3+qg9tGAkw=="; }; }; "apollo-cache-inmemory-1.4.3" = { @@ -3352,13 +3478,13 @@ let sha512 = "qdEUeonc9pPZvYwXK36h2NZoT7Pddmy0HYOzdV0ON5pcG1YtNmUyyYi83Q60V5wTWjuaCjyJ9hOY6wr0BMvQuA=="; }; }; - "apollo-engine-reporting-1.0.2" = { + "apollo-engine-reporting-1.0.5" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.2.tgz"; - sha512 = "g6JkO5WaMuqXfn3WoZMQyyFzpxfHsw/f7P7XTHSEqTSd/M4uk7/uih/xcqmgBGt4ET30KbaGFz2l4FJzO06A5w=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.5.tgz"; + sha512 = "G4KcA6/eKWtH/WwvOtLoH7o4c1l3EuZsX6ZscBIEPYI78LmhjztG+UI+i3FW1BodURsqimBrbSM+h/JsYIrj+Q=="; }; }; "apollo-engine-reporting-protobuf-0.2.1" = { @@ -3460,13 +3586,13 @@ let sha512 = "mfxzikYXbB/OoEms77AGYwRh7FF3Oim5v5XWAL+VL49FrkbZt5lopVa4bABi7Mz8Nt3Htl9EBJN8765s/yh8IA=="; }; }; - "apollo-server-core-2.4.2" = { + "apollo-server-core-2.4.6" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.2.tgz"; - sha512 = "IOWhqjjI1sH38sj7ycjke0dXXEgaqOkb2hDpLBTSiVWKBIqFfo4gchWK5wcWW9jReDpf/+G2wogH+UvONs2ejg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.6.tgz"; + sha512 = "sz/a9AKCx5ifnQAehmgXhnmEWv43LCbRnL1V1Z2P5C8xSmWubCskgu6jKPMc2cG1QFLWAXaA8cF4gD9sNGOFTQ=="; }; }; "apollo-server-env-2.2.0" = { @@ -3478,40 +3604,40 @@ let sha512 = "wjJiI5nQWPBpNmpiLP389Ezpstp71szS6DHAeTgYLb/ulCw3CTuuA+0/E1bsThVWiQaDeHZE0sE3yI8q2zrYiA=="; }; }; - "apollo-server-errors-2.2.0" = { + "apollo-server-errors-2.2.1" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.0.tgz"; - sha512 = "gV9EZG2tovFtT1cLuCTavnJu2DaKxnXPRNGSTo+SDI6IAk6cdzyW0Gje5N2+3LybI0Wq5KAbW6VLei31S4MWmg=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.2.1.tgz"; + sha512 = "wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g=="; }; }; - "apollo-server-express-2.4.2" = { + "apollo-server-express-2.4.6" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.2.tgz"; - sha512 = "Q5/unCAi6a2dT39LQaIiLC1d8O4fmBDU2CrRhVhPWP8I344xPgNOcrs7MsNN7Ecb56UGbgDKxBoWowFG65ulKw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.6.tgz"; + sha512 = "YlWUjxrveKFSOCyExTa5rTwePeELhjolzP6cAlFIak+kJTnOiJWoTCYzaftkpwmK+c4IyA5XUgC0YhowcrIgEw=="; }; }; - "apollo-server-plugin-base-0.3.2" = { + "apollo-server-plugin-base-0.3.5" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.3.2"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.2.tgz"; - sha512 = "yzXrkVSPBoux2uPgbTGROGh7W0axRWopMZM+KT9aF9H/+yMCwtt0EhGOGyNUDMOFA4rT3z+cLVvYuZr1rSQWcg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.5.tgz"; + sha512 = "z6xAgQip1RAXf0lQ2T8szCAbD8bCcbcwq4gGJ37ELcMGGTCTp2XOAz/PwIe9Re2Hzuk+OPlKK0AZng7qpXtDkg=="; }; }; - "apollo-tracing-0.5.1" = { + "apollo-tracing-0.5.2" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.1.tgz"; - sha512 = "5gb8OWzkGaJFsmQdyMyZnOjcq6weMTkqJSGj0hfR7uX99X4SBFAzZV4nTeK4z0XkXO2I12xSTJoS4gxbFjgeaA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.5.2.tgz"; + sha512 = "2FdwRvPIq9uuF6OzONroXep6VBGqzHOkP6LlcFQe7SdwxfRP+SD/ycHNSC1acVg2b8d+am9Kzqg2vV54UpOIKA=="; }; }; "apollo-upload-client-10.0.0" = { @@ -3811,6 +3937,15 @@ let sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; }; }; + "array-equal-1.0.0" = { + name = "array-equal"; + packageName = "array-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + }; "array-filter-0.0.1" = { name = "array-filter"; packageName = "array-filter"; @@ -4198,6 +4333,15 @@ let sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; }; }; + "async-0.8.0" = { + name = "async"; + packageName = "async"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.8.0.tgz"; + sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; + }; + }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -4396,6 +4540,15 @@ let sha512 = "/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA=="; }; }; + "autocast-0.0.4" = { + name = "autocast"; + packageName = "autocast"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/autocast/-/autocast-0.0.4.tgz"; + sha1 = "ece7d92527ca37ea502f99e8f41fe44daf00dbce"; + }; + }; "autoprefixer-6.7.7" = { name = "autoprefixer"; packageName = "autoprefixer"; @@ -4414,13 +4567,22 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.404.0" = { + "aws-sdk-2.410.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.404.0"; + version = "2.410.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.404.0.tgz"; - sha512 = "eQ+hv2hOpcyHUoUUIXcb7TVItzFfgTC0HIribcaDlbF4Kc1p9PSg+2jnK7ibjT6iMcoERx9Hr/vt6Cfc3Sgh5w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.410.0.tgz"; + sha512 = "1ekVT5gr1m2yJXHZbHb8TAJogLA3Xj//b7yffHNXScAjFx2KNE+hmJ29J716372C0HDNgIPTKqWBp+lsYhvrjA=="; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; }; }; "aws-sign2-0.6.0" = { @@ -4900,15 +5062,6 @@ let sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; }; }; - "babel-polyfill-6.26.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; - sha1 = "379937abc67d7895970adc621f284cd966cf2153"; - }; - }; "babel-preset-jest-23.2.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; @@ -5350,13 +5503,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.41" = { + "big-integer-1.6.42" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.41"; + version = "1.6.42"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.41.tgz"; - sha512 = "d5AT9lMTYJ/ZE/4gzxb+5ttPcRWljVsvv7lF1w9KzkPhVUhBtHrjDo1J8swfZKepfLsliDhYa31zRYwcD0Yg9w=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.42.tgz"; + sha512 = "3UQFKcRMx+5Z+IK5vYTMYK2jzLRJkt+XqyDdacgWgtMjjuifKpKTFneJLEgeBElOE2/lXZ1LcMcb5s8pwG2U8Q=="; }; }; "big.js-5.2.2" = { @@ -5782,6 +5935,15 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -6115,13 +6277,13 @@ let sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; }; }; - "browserslist-4.4.1" = { + "browserslist-4.4.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz"; - sha512 = "pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz"; + sha512 = "ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg=="; }; }; "btoa-lite-1.0.0" = { @@ -6745,22 +6907,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-db-1.0.30000938" = { + "caniuse-db-1.0.30000939" = { name = "caniuse-db"; packageName = "caniuse-db"; - version = "1.0.30000938"; + version = "1.0.30000939"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000938.tgz"; - sha512 = "1lbcoAGPQFUYOdY7sxpsl8ZDBfn5cyn80XuYnZwk7N4Qp7Behw7uxZCH5jjH2qWTV2WM6hgjvDVpP/uV3M/l9g=="; + url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000939.tgz"; + sha512 = "nB5tLf3hOs+biXl1lhKjHRgNC0J1I7H52h/t1FP7qxARKKwpB0z+P/JewJLYAlxCBP/q7rxJzQzHHrQMl0viKg=="; }; }; - "caniuse-lite-1.0.30000938" = { + "caniuse-lite-1.0.30000939" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30000938"; + version = "1.0.30000939"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz"; - sha512 = "ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz"; + sha512 = "oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg=="; }; }; "capture-stack-trace-1.0.1" = { @@ -6916,15 +7078,6 @@ let sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g=="; }; }; - "chalk-2.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz"; - sha512 = "Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw=="; - }; - }; "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; @@ -7123,13 +7276,13 @@ let sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; }; }; - "chokidar-2.1.1" = { + "chokidar-2.1.2" = { name = "chokidar"; packageName = "chokidar"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.1.tgz"; - sha512 = "gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz"; + sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; "chownr-0.0.2" = { @@ -7276,6 +7429,15 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; + "clean-css-2.2.23" = { + name = "clean-css"; + packageName = "clean-css"; + version = "2.2.23"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-2.2.23.tgz"; + sha1 = "0590b5478b516c4903edc2d89bd3fdbdd286328c"; + }; + }; "clean-css-3.4.28" = { name = "clean-css"; packageName = "clean-css"; @@ -7303,6 +7465,15 @@ let sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; }; }; + "cli-0.6.6" = { + name = "cli"; + packageName = "cli"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; + }; + }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -7672,6 +7843,15 @@ let sha1 = "4345bb5498f2b096ba85ec8c5579a8cb252f7c70"; }; }; + "cmdln-4.4.0" = { + name = "cmdln"; + packageName = "cmdln"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cmdln/-/cmdln-4.4.0.tgz"; + sha1 = "b8b3dd37c1918fcc1d534a6b4b50eebb181b628b"; + }; + }; "co-3.1.0" = { name = "co"; packageName = "co"; @@ -7843,6 +8023,15 @@ let sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; + "color-convert-2.0.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.0.tgz"; + sha512 = "hzTicsCJIHdxih9+2aLR1tNGZX5qSJGRHDPVwSY26tVrEf55XNajLOBWz2UuWSIergszA09/bqnOiHyqx9fxQg=="; + }; + }; "color-name-1.1.3" = { name = "color-name"; packageName = "color-name"; @@ -7852,6 +8041,15 @@ let sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; "color-string-0.3.0" = { name = "color-string"; packageName = "color-string"; @@ -8077,15 +8275,6 @@ let sha512 = "b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="; }; }; - "commander-2.15.1" = { - name = "commander"; - packageName = "commander"; - version = "2.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; - }; - }; "commander-2.17.1" = { name = "commander"; packageName = "commander"; @@ -8113,6 +8302,15 @@ let sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; }; }; + "commander-2.2.0" = { + name = "commander"; + packageName = "commander"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.2.0.tgz"; + sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df"; + }; + }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -8185,13 +8383,13 @@ let sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; }; }; - "compact2string-1.4.0" = { + "compact2string-1.4.1" = { name = "compact2string"; packageName = "compact2string"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; - sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; + url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.1.tgz"; + sha512 = "3D+EY5nsRhqnOwDxveBv5T8wGo4DEvYxjDtPGmdOX+gfr5gE92c2RC0w2wa+xEefm07QuVqqcF3nZJUZ92l/og=="; }; }; "compare-at-paths-1.0.0" = { @@ -8257,13 +8455,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.15" = { + "compressible-2.0.16" = { name = "compressible"; packageName = "compressible"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz"; - sha512 = "4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw=="; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz"; + sha512 = "JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA=="; }; }; "compression-1.5.2" = { @@ -8923,15 +9121,6 @@ let sha512 = "3Xl1D5eyiQlY5ow6Kn/say0us2TqSw/zgQmyTLxbewTngQZ1CIqxmqD7EFGoCNBrB4HsdPmpiSpFCitybKQN9g=="; }; }; - "core-js-2.3.0" = { - name = "core-js"; - packageName = "core-js"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"; - sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; - }; - }; "core-js-2.5.7" = { name = "core-js"; packageName = "core-js"; @@ -9274,6 +9463,15 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -9337,6 +9535,15 @@ let sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; }; }; + "css-color-names-1.0.1" = { + name = "css-color-names"; + packageName = "css-color-names"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz"; + sha512 = "/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA=="; + }; + }; "css-declaration-sorter-4.0.1" = { name = "css-declaration-sorter"; packageName = "css-declaration-sorter"; @@ -9436,6 +9643,15 @@ let sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="; }; }; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; + }; + }; "csslint-1.0.5" = { name = "csslint"; packageName = "csslint"; @@ -9715,6 +9931,15 @@ let sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; }; }; + "dash-ast-1.0.0" = { + name = "dash-ast"; + packageName = "dash-ast"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz"; + sha512 = "Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="; + }; + }; "dashdash-1.10.1" = { name = "dashdash"; packageName = "dashdash"; @@ -9778,13 +10003,13 @@ let sha512 = "PET9PlGt6ejgqU07hbPLx3tP2siDMMFumUe+xwmm4+5W+0cOlpzreCPoMVUBzxWeR4sPdxL+AS53odQTBtzEqA=="; }; }; - "dat-ignore-2.1.1" = { + "dat-ignore-2.1.2" = { name = "dat-ignore"; packageName = "dat-ignore"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.1.tgz"; - sha512 = "jRCfWtLh+wtbqJMuge+wZV/2kSL1TKMRWXFgUaT7r0O1OnChKUDG4wqLJo4SjzJjXo7f3V8CVN/u5wYltgSd1Q=="; + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.1.2.tgz"; + sha512 = "27xyi8MzFCJ6qlB8AMGAjI/ec1q9AKT18Qe+8E8AxrG3Axpf4GHa+rWXBE9vTA5T1Mi4cPnhboiGLhiR4r0JAA=="; }; }; "dat-json-1.0.2" = { @@ -10165,15 +10390,6 @@ let sha1 = "deaaccdfd14aeaf85578f733ae8210f9b4848f69"; }; }; - "decompress-zip-0.3.0" = { - name = "decompress-zip"; - packageName = "decompress-zip"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; - sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; - }; - }; "dedent-0.7.0" = { name = "dedent"; packageName = "dedent"; @@ -10282,6 +10498,15 @@ let sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="; }; }; + "deepmerge-3.1.0" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-3.1.0.tgz"; + sha512 = "/TnecbwXEdycfbsM2++O3eGiatEFHjjNciHEwJclM+T5Kd94qD1AP+2elP/Mq0L5b9VZJao5znR01Mz6eX8Seg=="; + }; + }; "deepmerge-3.2.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -10435,6 +10660,15 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; + "del-3.0.0" = { + name = "del"; + packageName = "del"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-3.0.0.tgz"; + sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + }; + }; "delayed-stream-0.0.5" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -10841,13 +11075,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.27.0" = { + "dispensary-0.30.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.27.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.27.0.tgz"; - sha512 = "bG9pSBPH8wTEaugUIBAbBvBHynqOoGxefOT4YXlPoUc9AxQGDUO1uFHafDVWnsGWiSYvTUga0aZ9xThzfGQtlQ=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.30.0.tgz"; + sha512 = "ZZipc2xaDky03RD3s1UJOM6zgygo2ncEzmjuqpPR6pT7jMo0cxH/FTzGarD3Pw2naAsBOXVGG10Fwxth9OrW0g=="; }; }; "diveSync-0.3.0" = { @@ -11336,13 +11570,13 @@ let sha1 = "7c98afab245f6df32290473c0abee2f2d39334c7"; }; }; - "ecdsa-sig-formatter-1.0.10" = { + "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"; - sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ecstatic-3.3.1" = { @@ -11913,13 +12147,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.47" = { + "es5-ext-0.10.48" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.47"; + version = "0.10.48"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz"; - sha512 = "/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.48.tgz"; + sha512 = "CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw=="; }; }; "es5-ext-0.8.2" = { @@ -11985,15 +12219,6 @@ let sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; - "es6-promise-3.0.2" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; - sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; - }; - }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -12120,13 +12345,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.11.0" = { + "escodegen-1.11.1" = { name = "escodegen"; packageName = "escodegen"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz"; - sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; + sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; }; }; "escodegen-1.9.1" = { @@ -12156,22 +12381,22 @@ let sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; }; }; - "eslint-5.0.1" = { + "eslint-5.13.0" = { name = "eslint"; packageName = "eslint"; - version = "5.0.1"; + version = "5.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz"; - sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.13.0.tgz"; + sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; }; - "eslint-5.14.0" = { + "eslint-5.14.1" = { name = "eslint"; packageName = "eslint"; - version = "5.14.0"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.14.0.tgz"; - sha512 = "jrOhiYyENRrRnWlMYANlGZTqb89r2FuRT+615AabBoajhNjeh9ywDNlh2LU9vTqf0WYN+L3xdXuIi7xuj/tK9w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz"; + sha512 = "CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -12219,13 +12444,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.5" = { + "esm-3.2.6" = { name = "esm"; packageName = "esm"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.5.tgz"; - sha512 = "rukU6Nd3agbHQCJWV4rrlZxqpbO3ix8qhUxK1BhKALGS2E465O0BFwgCOqJjNnYfO/I2MwpUBmPsW8DXoe8tcA=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.6.tgz"; + sha512 = "3wWjSurKSczMzYyHiBih3VVEQYCoZa6nfsqqcM2Tx6KBAQAeor0SZUfAol+zeVUtESLygayOi2ZcMfYZy7MCsg=="; }; }; "espree-3.5.4" = { @@ -12237,13 +12462,13 @@ let sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; }; - "espree-4.1.0" = { + "espree-5.0.0" = { name = "espree"; packageName = "espree"; - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz"; - sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; + url = "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz"; + sha512 = "1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA=="; }; }; "espree-5.0.1" = { @@ -12858,6 +13083,15 @@ let sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }; }; + "extend-2.0.2" = { + name = "extend"; + packageName = "extend"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-2.0.2.tgz"; + sha512 = "AgFD4VU+lVLP6vjnlNfF7OeInLTyeyckCNPEsuxz1vi786UuK/nk6ynPuhn/h+Ju9++TQyr5EpLRI14fc1QtTQ=="; + }; + }; "extend-3.0.0" = { name = "extend"; packageName = "extend"; @@ -13110,15 +13344,6 @@ let sha512 = "0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w=="; }; }; - "fast-json-parse-1.0.3" = { - name = "fast-json-parse"; - packageName = "fast-json-parse"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; - sha512 = "FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="; - }; - }; "fast-json-patch-2.0.7" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -13488,15 +13713,6 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; - "find-cache-dir-1.0.0" = { - name = "find-cache-dir"; - packageName = "find-cache-dir"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; - sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; - }; - }; "find-cache-dir-2.0.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -13587,6 +13803,15 @@ let sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; }; }; + "findup-sync-0.2.1" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz"; + sha1 = "e0a90a450075c49466ee513732057514b81e878c"; + }; + }; "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -13659,6 +13884,15 @@ let sha512 = "AHe4x/k9xHlSNPRya0FOCd42qa6ggmW4gtdy6mR0R1vdWtNq9zMd8nmMR5LB7fTNOA1f1nOU+uqaQHP7NMWmVA=="; }; }; + "flagged-respawn-0.3.2" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; + sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; + }; + }; "flagged-respawn-1.0.1" = { name = "flagged-respawn"; packageName = "flagged-respawn"; @@ -13668,6 +13902,15 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; + "flat-4.1.0" = { + name = "flat"; + packageName = "flat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; "flat-cache-1.3.4" = { name = "flat-cache"; packageName = "flat-cache"; @@ -13758,13 +14001,13 @@ let sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; }; }; - "fluent-syntax-0.7.0" = { + "fluent-syntax-0.10.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.7.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.7.0.tgz"; - sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg=="; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.10.0.tgz"; + sha512 = "6qRhwQXDTgJjS9DW3IiXZWzUMUPqNPzqh+bZZyUOr6t8xYwkIe+5JONYZuvfvbOUk65paAno0kd8s8kUD2ptNA=="; }; }; "flumecodec-0.0.0" = { @@ -13920,6 +14163,15 @@ let sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; }; }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -13947,6 +14199,15 @@ let sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; }; }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; "form-data-1.0.0-rc3" = { name = "form-data"; packageName = "form-data"; @@ -14109,13 +14370,13 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-capacitor-2.0.0" = { + "fs-capacitor-2.0.1" = { name = "fs-capacitor"; packageName = "fs-capacitor"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.0.tgz"; - sha512 = "CIJZpxbVWhO+qyODeCR55Q+6vj0p2oL8DAWd/DZi3Ev+25PimUoScw07K0fPgluaH3lFoqNvwW13BDYfHWFQJw=="; + url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.1.tgz"; + sha512 = "kyV2oaG1/pu9NPosfGACmBym6okgzyg6hEtA5LSUq0dGpGLe278MVfMwVnSHDA/OBcTCHkPNqWL9eIwbPN6dDg=="; }; }; "fs-chunk-store-1.7.0" = { @@ -14388,13 +14649,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.9" = { + "fx-runner-1.0.10" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.9.tgz"; - sha1 = "7b23f3773dc76aacc42f11d9aff2769675cb63f0"; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.10.tgz"; + sha512 = "tXj0lMnSey89Dx7R3Lq+HMUy3ODmOmj5lhRYBgMWNOqbh7Vx8vPUiWMbyJ3HIzGuLnNeXAPH0x/GdFZ7h6h0vQ=="; }; }; "gauge-1.2.7" = { @@ -14424,6 +14685,24 @@ let sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; }; }; + "gear-0.9.7" = { + name = "gear"; + packageName = "gear"; + version = "0.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/gear/-/gear-0.9.7.tgz"; + sha1 = "1ead19eee639319d8e2e655494c61bd8956e777f"; + }; + }; + "gear-lib-0.9.2" = { + name = "gear-lib"; + packageName = "gear-lib"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gear-lib/-/gear-lib-0.9.2.tgz"; + sha1 = "bc8d461ebc81ecaffe99c1da82abe0f56eb93540"; + }; + }; "generate-function-1.1.0" = { name = "generate-function"; packageName = "generate-function"; @@ -14487,6 +14766,15 @@ let sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; + "get-caller-file-2.0.1" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.1.tgz"; + sha512 = "SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg=="; + }; + }; "get-func-name-2.0.0" = { name = "get-func-name"; packageName = "get-func-name"; @@ -14784,6 +15072,15 @@ let sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }; }; + "glob-4.3.5" = { + name = "glob"; + packageName = "glob"; + version = "4.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz"; + sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3"; + }; + }; "glob-4.5.3" = { name = "glob"; packageName = "glob"; @@ -15001,6 +15298,15 @@ let sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; }; }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; "globby-8.0.2" = { name = "globby"; packageName = "globby"; @@ -15263,13 +15569,22 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.5.2" = { + "graphql-extensions-0.5.4" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.5.2"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.2.tgz"; - sha512 = "D/FAvjYEZ8GM3vfALxRvItozy5iLUfzyoauE2lli+0OuUBCAZDLP0fgqeTFK93NnQX/XSjBVGhcuDWBB7JesEw=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.4.tgz"; + sha512 = "qLThJGVMqcItE7GDf/xX/E40m/aeqFheEKiR5bfra4q5eHxQKGjnIc20P9CVqjOn9I0FkEiU9ypOobfmIf7t6g=="; + }; + }; + "graphql-extensions-0.5.5" = { + name = "graphql-extensions"; + packageName = "graphql-extensions"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.5.tgz"; + sha512 = "jCUt/WVayiQvmXVPMetmq3wpV3RyzXOXFfssoTz9/YFuoSg1Y7BwzgNuilSybQqMPRdfGAsqf/OIa1DZwrnggw=="; }; }; "graphql-import-0.4.5" = { @@ -15299,13 +15614,13 @@ let sha512 = "yOYFwwSMBL0MwufeL8bkrNDgRE7eF/kTHiwrqn9FiR9KLcNIl1xw9l9a+6yIRZM56JReQOHpbQFXTZn1IuSKRg=="; }; }; - "graphql-playground-middleware-express-1.7.11" = { + "graphql-playground-middleware-express-1.7.12" = { name = "graphql-playground-middleware-express"; packageName = "graphql-playground-middleware-express"; - version = "1.7.11"; + version = "1.7.12"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.11.tgz"; - sha512 = "sKItB4s3FxqlwCgXdMfwRAfssSoo31bcFsGAAg/HzaZLicY6CDlofKXP8G5iPDerB6NaoAcAaBLutLzl9sd4fQ=="; + url = "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.12.tgz"; + sha512 = "17szgonnVSxWVrgblLRHHLjWnMUONfkULIwSunaMvYx8k5oG3yL86cyGCbHuDFUFkyr2swLhdfYl4mDfDXuvOA=="; }; }; "graphql-request-1.8.2" = { @@ -15515,6 +15830,15 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; + "handlebars-2.0.0" = { + name = "handlebars"; + packageName = "handlebars"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; + }; + }; "handlebars-4.1.0" = { name = "handlebars"; packageName = "handlebars"; @@ -15794,15 +16118,6 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hasbin-1.2.3" = { - name = "hasbin"; - packageName = "hasbin"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; - sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -15866,6 +16181,15 @@ let sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; }; }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; "hawk-3.1.3" = { name = "hawk"; packageName = "hawk"; @@ -15884,15 +16208,6 @@ let sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2"; }; }; - "he-1.1.1" = { - name = "he"; - packageName = "he"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; - }; - }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -15947,13 +16262,13 @@ let sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; - "highlight.js-9.14.2" = { + "highlight.js-9.15.5" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.14.2"; + version = "9.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.14.2.tgz"; - sha512 = "Nc6YNECYpxyJABGYJAyw7dBAYbXEuIzwzkqoJnwbc1nIpCiN+3ioYf0XrBnLiyyG0JLuJhpPtt2iTSbXiKLoyA=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.5.tgz"; + sha512 = "rxTzkHOur3JzJGHuKKfd9xoE5cBMkMPsAck1LcchT7WbMe4NjT2o1JQtpSrT2/k6iAsfRCgPOlv8FpZob67g7g=="; }; }; "hiredis-0.4.1" = { @@ -15974,6 +16289,15 @@ let sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; "hoek-2.16.3" = { name = "hoek"; packageName = "hoek"; @@ -16010,22 +16334,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "home-or-tmp-3.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-3.0.0.tgz"; - sha1 = "57a8fe24cf33cdd524860a15821ddc25c86671fb"; - }; - }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hoox-0.0.1" = { @@ -16181,13 +16496,13 @@ let sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; }; }; - "http-errors-1.7.1" = { + "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.1.tgz"; - sha512 = "jWEUgtZWGSMba9I1N3gc1HmvpBUaNC9vDdA46yScAdp+C5rdEuKWUBLWTQpW9FwSWSbYYs++b6SDCxf9UEJzfw=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-headers-3.0.2" = { @@ -16235,6 +16550,15 @@ let sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -16289,6 +16613,15 @@ let sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; }; }; + "hue-sdk-0.1.0" = { + name = "hue-sdk"; + packageName = "hue-sdk"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hue-sdk/-/hue-sdk-0.1.0.tgz"; + sha512 = "Rz+tFQZs4n+7atl2mukSgXzi0EPGYwlN0Z4clFMQM9ktOyX+sIZ3fC8y9+8LMXMYQpUvdsweFQM6MGGoolOtLw=="; + }; + }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -17054,6 +17387,15 @@ let sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; + "ip-address-5.8.9" = { + name = "ip-address"; + packageName = "ip-address"; + version = "5.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-address/-/ip-address-5.8.9.tgz"; + sha512 = "7ay355oMN34iXhET1BmCJVsHjOTSItEEIIpOs38qUC23AIhOy+xIPnkrTuEFjeLMrTJ7m8KMXWgWfy/2Vn9sDw=="; + }; + }; "ip-regex-1.0.3" = { name = "ip-regex"; packageName = "ip-regex"; @@ -17243,6 +17585,15 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-buffer-2.0.3" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"; + sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="; + }; + }; "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; @@ -17657,6 +18008,24 @@ let sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; }; }; + "is-path-cwd-1.0.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; + sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + }; + }; + "is-path-in-cwd-1.0.1" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; + sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; + }; + }; "is-path-inside-1.0.1" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -18404,6 +18773,15 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; + "jsbn-1.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz"; + sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -18413,6 +18791,15 @@ let sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; + "jsdom-9.2.1" = { + name = "jsdom"; + packageName = "jsdom"; + version = "9.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-9.2.1.tgz"; + sha1 = "061cbccc6e563d14493f653af92eadc3c0d39910"; + }; + }; "jsesc-0.5.0" = { name = "jsesc"; packageName = "jsesc"; @@ -18449,6 +18836,24 @@ let sha512 = "9GpPfKeffYBl7oBDX2lHPG16j0AM7D2bn3aLy9DaWTr6CWa0i/7UGhX8WLZ7V14QQnnr4hXbjauTLYg06F+HYw=="; }; }; + "jshint-2.5.11" = { + name = "jshint"; + packageName = "jshint"; + version = "2.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz"; + sha1 = "e2d95858bbb1aa78300108a2e81099fb095622e0"; + }; + }; + "jslint-0.3.4" = { + name = "jslint"; + packageName = "jslint"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jslint/-/jslint-0.3.4.tgz"; + sha1 = "fb768ac8de0641fcc570c87ca1fbd28e293c8d75"; + }; + }; "json-buffer-2.0.11" = { name = "json-buffer"; packageName = "json-buffer"; @@ -18746,13 +19151,13 @@ let sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; }; }; - "jsonwebtoken-8.4.0" = { + "jsonwebtoken-8.5.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.4.0"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz"; - sha512 = "coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz"; + sha512 = "IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA=="; }; }; "jsprim-0.3.0" = { @@ -18800,13 +19205,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.1.5" = { + "jszip-3.2.0" = { name = "jszip"; packageName = "jszip"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz"; - sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.2.0.tgz"; + sha512 = "4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -18846,13 +19251,13 @@ let sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; }; }; - "jwa-1.2.0" = { + "jwa-1.3.0" = { name = "jwa"; packageName = "jwa"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; - sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; + sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; }; }; "jws-3.2.1" = { @@ -19062,13 +19467,22 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "knockout-3.5.0-rc2" = { + "knockout-3.5.0" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0-rc2"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0.tgz"; + sha512 = "vBUF/IsBDzaejHkNpiquKdc5uPrImXuQ4Mb9lEfNNJ5cyHGI8ThDupR+h3eMFZhfmPE/brfwcIAn/fm0yOvJUg=="; + }; + }; + "knox-0.8.10" = { + name = "knox"; + packageName = "knox"; + version = "0.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc2.tgz"; - sha512 = "ncKkcfOX5hV6QyvNLMLe+s9uYbP+jRKljj01Fcg/BPk3PvfcdZF3dV52qkfpR0IC0iRh0AAP7NXFJEt0ofy14g=="; + url = "https://registry.npmjs.org/knox/-/knox-0.8.10.tgz"; + sha1 = "6a2edcdac1d2ae379d1e1994d559b95c283b2588"; }; }; "kuler-1.0.1" = { @@ -19125,6 +19539,15 @@ let sha1 = "45b96942c17b1c79c772198259ba943bebf8ca5b"; }; }; + "latest-0.2.0" = { + name = "latest"; + packageName = "latest"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest/-/latest-0.2.0.tgz"; + sha1 = "ea47eb8f4b2bb0cf91716efaa896c2e16237587b"; + }; + }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -19233,6 +19656,15 @@ let sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; + "less-1.7.5" = { + name = "less"; + packageName = "less"; + version = "1.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-1.7.5.tgz"; + sha1 = "4f220cf7288a27eaca739df6e4808a2d4c0d5756"; + }; + }; "less-2.7.3" = { name = "less"; packageName = "less"; @@ -19431,13 +19863,22 @@ let sha512 = "axKkW01L0q+urLeE7UMSZKWwk4LrRbi6s5pjKBAvbgDBYnsSaolK1oN/Syilm1dqJFkJQNi6qodwOp8dzSoc9Q=="; }; }; - "lie-3.1.1" = { + "lie-3.3.0" = { name = "lie"; packageName = "lie"; - version = "3.1.1"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz"; + sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; + }; + }; + "liftoff-2.0.3" = { + name = "liftoff"; + packageName = "liftoff"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; - sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.0.3.tgz"; + sha1 = "fbab25362a506ac28a3db0c55cde9562fbd70456"; }; }; "liftoff-2.5.0" = { @@ -20088,6 +20529,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; + }; + }; "lodash.flatten-4.4.0" = { name = "lodash.flatten"; packageName = "lodash.flatten"; @@ -20304,6 +20754,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.max-4.0.1" = { + name = "lodash.max"; + packageName = "lodash.max"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; + sha1 = "8735566c618b35a9f760520b487ae79658af136a"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -20412,6 +20871,15 @@ let sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; + "lodash.repeat-4.1.0" = { + name = "lodash.repeat"; + packageName = "lodash.repeat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz"; + sha1 = "fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"; + }; + }; "lodash.restparam-3.6.1" = { name = "lodash.restparam"; packageName = "lodash.restparam"; @@ -21231,6 +21699,15 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; + "mdn-browser-compat-data-0.0.66" = { + name = "mdn-browser-compat-data"; + packageName = "mdn-browser-compat-data"; + version = "0.0.66"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.66.tgz"; + sha512 = "Exx+o05KYCltHmY2thfCoufBaHeqbIzqZHQPDtmcC+nkeFG++ONzwddBtgDBAKeI0IFFKqGIbRT1QBRwmk9QKA=="; + }; + }; "mdn-data-1.1.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -21690,6 +22167,15 @@ let sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -21798,6 +22284,15 @@ let sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; }; + "minimatch-1.0.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; + sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; + }; + }; "minimatch-2.0.10" = { name = "minimatch"; packageName = "minimatch"; @@ -21834,6 +22329,24 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; + "minimist-0.1.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }; + }; + "minimist-1.1.3" = { + name = "minimist"; + packageName = "minimist"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz"; + sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; + }; + }; "minimist-1.2.0" = { name = "minimist"; packageName = "minimist"; @@ -21870,6 +22383,15 @@ let sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; }; }; + "mired-0.0.0" = { + name = "mired"; + packageName = "mired"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mired/-/mired-0.0.0.tgz"; + sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; + }; + }; "mirror-folder-3.0.0" = { name = "mirror-folder"; packageName = "mirror-folder"; @@ -21933,15 +22455,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkpath-0.1.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; - sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; - }; - }; "mkpath-1.0.0" = { name = "mkpath"; packageName = "mkpath"; @@ -21951,15 +22464,6 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mksnapshot-0.3.4" = { - name = "mksnapshot"; - packageName = "mksnapshot"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.4.tgz"; - sha512 = "FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg=="; - }; - }; "mocha-2.5.3" = { name = "mocha"; packageName = "mocha"; @@ -22329,13 +22833,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.1.2" = { + "multiserver-3.2.0" = { name = "multiserver"; packageName = "multiserver"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.1.2.tgz"; - sha512 = "6jXoKH0vGfm5NxwaSkReuD+3VB9mq25WYsdMgB7YC43XboVCufhmFQ724DVz0Jx8Z8RNPKvjVfCiuXpsKgwV0Q=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.2.0.tgz"; + sha512 = "cJ9nnh/+aMwOpegTPSLC1zFRFJKn6f3va6WI0WPV84R55Llh8TinhpH8ZrpYfRofETykRWIvWhX6sQRZg04F1Q=="; }; }; "multiserver-address-1.0.1" = { @@ -23026,6 +23530,15 @@ let sha512 = "obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw=="; }; }; + "node-color-readline-1.0.1" = { + name = "node-color-readline"; + packageName = "node-color-readline"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-color-readline/-/node-color-readline-1.0.1.tgz"; + sha1 = "e57063e6101c8387160ac2aa359d6427e1e26886"; + }; + }; "node-elm-compiler-5.0.1" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; @@ -23035,6 +23548,15 @@ let sha512 = "Li9NfZTL83/URoUEWly+iHJeOcZRBYUaeIL4MImnB4r21oe/xpkR6JRHjdNjLf1rMtO0tgPyOvuGW4Beytaaow=="; }; }; + "node-environment-flags-1.0.4" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz"; + sha512 = "M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q=="; + }; + }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -23134,15 +23656,6 @@ let sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA=="; }; }; - "node-modules-regexp-1.0.0" = { - name = "node-modules-regexp"; - packageName = "node-modules-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; - }; - }; "node-notifier-5.2.1" = { name = "node-notifier"; packageName = "node-notifier"; @@ -23224,13 +23737,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.7" = { + "node-releases-1.1.8" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.7.tgz"; - sha512 = "bKdrwaqJUPHqlCzDD7so/R+Nk0jGv9a11ZhLrD9f6i947qGLrGAhU3OxRENa19QQmwzGy/g6zCDEuLGDO8HPvA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz"; + sha512 = "gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -23512,6 +24025,15 @@ let sha1 = "bc61cbb456d79cb32207ce47ca05136ff2e7d6ee"; }; }; + "npm-2.15.12" = { + name = "npm"; + packageName = "npm"; + version = "2.15.12"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz"; + sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; + }; + }; "npm-3.10.10" = { name = "npm"; packageName = "npm"; @@ -23575,13 +24097,13 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npm-path-2.0.4" = { @@ -23837,6 +24359,15 @@ let sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; + "oauth-sign-0.3.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }; + }; "oauth-sign-0.8.2" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -24134,6 +24665,15 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; "on-wakeup-1.0.1" = { name = "on-wakeup"; packageName = "on-wakeup"; @@ -24341,6 +24881,15 @@ let sha1 = "e981ab7e268b457948593b55674c099a815cac31"; }; }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; "optimist-0.6.0" = { name = "optimist"; packageName = "optimist"; @@ -24503,15 +25052,6 @@ let sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; }; - "os-locale-3.0.1" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz"; - sha512 = "7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw=="; - }; - }; "os-locale-3.1.0" = { name = "os-locale"; packageName = "os-locale"; @@ -24881,13 +25421,13 @@ let sha512 = "WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w=="; }; }; - "pacote-9.4.1" = { + "pacote-9.5.0" = { name = "pacote"; packageName = "pacote"; - version = "9.4.1"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.4.1.tgz"; - sha512 = "YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.0.tgz"; + sha512 = "aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg=="; }; }; "pad-0.0.5" = { @@ -24980,13 +25520,13 @@ let sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw=="; }; }; - "parse-entities-1.2.0" = { + "parse-entities-1.2.1" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.0.tgz"; - sha512 = "XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g=="; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.1.tgz"; + sha512 = "NBWYLQm1KSoDKk7GAHyioLTvCZ5QjdH/ASBBQTD3iLiAWJXS5bg1jEWI8nIJ+vgVvsceBVBcDGRWSo0KVQBvvg=="; }; }; "parse-filepath-1.0.2" = { @@ -25034,13 +25574,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.1" = { + "parse-headers-2.0.2" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz"; - sha1 = "6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536"; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz"; + sha512 = "/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg=="; }; }; "parse-help-1.0.0" = { @@ -25205,6 +25745,15 @@ let sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; }; }; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; + }; + }; "parserlib-1.1.1" = { name = "parserlib"; packageName = "parserlib"; @@ -25313,15 +25862,6 @@ let sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; }; }; - "path-0.12.7" = { - name = "path"; - packageName = "path"; - version = "0.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path/-/path-0.12.7.tgz"; - sha1 = "d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"; - }; - }; "path-browserify-0.0.0" = { name = "path-browserify"; packageName = "path-browserify"; @@ -25745,22 +26285,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.8.1" = { - name = "pino"; - packageName = "pino"; - version = "5.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.8.1.tgz"; - sha512 = "7bVFzUw3ffIfOM3t7MuQ9KsH+wX5bdGdQhGfccKgleoY7qG4FO3CmVSjywlFmmYGyMOISi1LDGC6JMEH7XkZJg=="; - }; - }; - "pino-5.9.0" = { + "pino-5.11.1" = { name = "pino"; packageName = "pino"; - version = "5.9.0"; + version = "5.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.9.0.tgz"; - sha512 = "6sHy38gWsZbrmYq6vk343VCThy93ZdVfmLsHDVzbl/j621SjSaxCcS/ySmxK/hRmq8jpQb3n44dNRIeqbbQw6A=="; + url = "https://registry.npmjs.org/pino/-/pino-5.11.1.tgz"; + sha512 = "NIua0mGb9Adknq35ONvQmvh93LCUVUjp2+1q1EcvIkJmpJnSd3E5rHVKlKNjzMXFl/z3fI+QA0xXCjPEKNiLvQ=="; }; }; "pino-std-serializers-2.3.0" = { @@ -25772,15 +26303,6 @@ let sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw=="; }; }; - "pirates-4.0.1" = { - name = "pirates"; - packageName = "pirates"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz"; - sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; - }; - }; "pkg-dir-2.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -26016,15 +26538,6 @@ let sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; - "postcss-7.0.6" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.6.tgz"; - sha512 = "Nq/rNjnHFcKgCDDZYO0lNsl6YWe6U7tTy+ESN+PnLxebL8uBtYX59HZqvrj7YLK5UCyll2hqDsJOo3ndzEW8Ug=="; - }; - }; "postcss-calc-5.3.1" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -27771,6 +28284,15 @@ let sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }; }; + "qs-1.0.2" = { + name = "qs"; + packageName = "qs"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz"; + sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768"; + }; + }; "qs-1.2.0" = { name = "qs"; packageName = "qs"; @@ -28014,13 +28536,13 @@ let sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; }; }; - "randombytes-2.0.6" = { + "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; - version = "2.0.6"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -28149,13 +28671,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "react-is-16.8.2" = { + "react-is-16.8.3" = { name = "react-is"; packageName = "react-is"; - version = "16.8.2"; + version = "16.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.8.2.tgz"; - sha512 = "D+NxhSR2HUCjYky1q1DwpNUD44cDpUXzSmmFyC3ug1bClcU/iDNy0YNn1iwme28fn+NFhpA13IndOd42CrFb+Q=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz"; + sha512 = "Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA=="; }; }; "read-1.0.7" = { @@ -28518,15 +29040,6 @@ let sha512 = "s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -28545,6 +29058,15 @@ let sha512 = "odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="; }; }; + "regenerator-runtime-0.13.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.1.tgz"; + sha512 = "5KzMIyPLvfdPmvsdlYsHqITrDfK9k7bmvf97HvHSN4810i254ponbxCQ1NukpRWlu6en2MBWzAlhDExEKISwAA=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -28554,13 +29076,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.13.3" = { + "regenerator-transform-0.13.4" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.13.3"; + version = "0.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz"; - sha512 = "5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz"; + sha512 = "T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A=="; }; }; "regex-cache-0.4.4" = { @@ -28581,31 +29103,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.4" = { + "regexp-tree-0.1.5" = { name = "regexp-tree"; packageName = "regexp-tree"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.4.tgz"; - sha512 = "DohP6WXzgrc7gFs9GsTQgigUfMXZqXkPk+20qkMF6YCy0Qk0FsHL1/KtxTycGR/62DHRtJ1MHQF2g8YzywP4kA=="; - }; - }; - "regexp.prototype.flags-1.2.0" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA=="; - }; - }; - "regexpp-1.1.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "1.1.0"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; - sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz"; + sha512 = "nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ=="; }; }; "regexpp-2.0.1" = { @@ -28860,6 +29364,15 @@ let sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e"; }; }; + "request-2.40.0" = { + name = "request"; + packageName = "request"; + version = "2.40.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.40.0.tgz"; + sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67"; + }; + }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -28977,6 +29490,15 @@ let sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; "require-uncached-1.0.3" = { name = "require-uncached"; packageName = "require-uncached"; @@ -29697,6 +30219,15 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; + "sax-0.5.8" = { + name = "sax"; + packageName = "sax"; + version = "0.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; + }; + }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -30210,6 +30741,15 @@ let sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -30318,15 +30858,6 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.3" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; - }; - }; "shellsubstitute-1.2.0" = { name = "shellsubstitute"; packageName = "shellsubstitute"; @@ -30741,6 +31272,15 @@ let sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "sntp-1.0.9" = { name = "sntp"; packageName = "sntp"; @@ -30750,40 +31290,13 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-1.110.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.110.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.110.2.tgz"; - sha512 = "SQE4sudrscd48EoRJqy5h5S6c8YBiOw0r0Se3rfg1l6ElJGgCB9je6XEzfe+UmfES06D7ueFYepiQPxTwH4Qww=="; - }; - }; - "snyk-1.133.0" = { - name = "snyk"; - packageName = "snyk"; - version = "1.133.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.133.0.tgz"; - sha512 = "/6xQISFy08oWJasSye77eOaRScPkTIzD7AZYlSWfyS+flYJHgUhNJcTimXGcDwwBmfPtESpDtFpB1LBA16NUOg=="; - }; - }; - "snyk-config-2.2.0" = { + "snyk-config-2.2.1" = { name = "snyk-config"; packageName = "snyk-config"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.0.tgz"; - sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; - }; - }; - "snyk-docker-plugin-1.12.3" = { - name = "snyk-docker-plugin"; - packageName = "snyk-docker-plugin"; - version = "1.12.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.3.tgz"; - sha512 = "ZbvaFCPCd0wxhqxjzU/iyf39tKlq2nvI9nPW32uZV3RGdHrkQH55BzCtBCF9d0dapxX+PKgae/4u2BKNw8hd9Q=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.1.tgz"; + sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; }; }; "snyk-docker-plugin-1.22.0" = { @@ -30795,15 +31308,6 @@ let sha512 = "bykxNtfeWQNFjF6gv8u8w+TOa4fdr+teLm+DkvYlWkdlvaw5m4yywRI5USve4X6S9p4G+Fw4/wfjXx7LgCcxrQ=="; }; }; - "snyk-go-plugin-1.6.0" = { - name = "snyk-go-plugin"; - packageName = "snyk-go-plugin"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.6.0.tgz"; - sha512 = "E6aYw7XAXSs2wJR3fU+vGQ1lVyjAw8PHIQYQwBwMkTHByhJIWPcu6Hy/jT5LcjJHlhYXlpOuk53HeLVK+kcXrQ=="; - }; - }; "snyk-go-plugin-1.6.1" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; @@ -30813,15 +31317,6 @@ let sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA=="; }; }; - "snyk-gradle-plugin-2.1.1" = { - name = "snyk-gradle-plugin"; - packageName = "snyk-gradle-plugin"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.1.tgz"; - sha512 = "aFeVC5y3XkJ5BxknHhtYo76as3xJbzSQlXACGZrQZGQ/w/UhNdM8VI1QB6Eq4uEzexleB/hcJwYxNmhI2CNCeA=="; - }; - }; "snyk-gradle-plugin-2.1.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; @@ -30840,15 +31335,6 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.0.0" = { - name = "snyk-mvn-plugin"; - packageName = "snyk-mvn-plugin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.0.tgz"; - sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg=="; - }; - }; "snyk-mvn-plugin-2.0.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; @@ -30867,49 +31353,22 @@ let sha512 = "eTdq5VcaHJwGoApejebTChi5hRcIDdNbO6lMwncS0zz9ZxXskoQ0C+VMdep8ELmJa0Gcz6es1sSkABPZs7frrg=="; }; }; - "snyk-nodejs-lockfile-parser-1.7.1" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.7.1.tgz"; - sha512 = "0gHELqMhzUxb/t3Tg6d6G9LTDioOXCrEMt9aetOeV8wD/ZRL5VFNjwcdrm8qILLqzDFaFjFIyMc66c0OL4zFAQ=="; - }; - }; - "snyk-nuget-plugin-1.6.5" = { - name = "snyk-nuget-plugin"; - packageName = "snyk-nuget-plugin"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.5.tgz"; - sha512 = "3qIndzkxCxiaGvAwMkqChbChGdwhNePPyfi0WjhC/nJGwecqU3Fb/NeTW7lgyT+xoq/dFnzW0DgBJ4+AyNA2gA=="; - }; - }; - "snyk-nuget-plugin-1.7.1" = { + "snyk-nuget-plugin-1.7.2" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.7.1.tgz"; - sha512 = "j4VavJ9HtDDnLZgqJRFzXfBLErC3YtIwAwvECL2xs3q2mVQlw3GpWH+6gQJVfzRm8CWZpbDNdr1DD5lkXxTXXg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.7.2.tgz"; + sha512 = "zmYD9veH7OeIqGnZHiGv8c8mKtmYrxo2o7P4lNUkpHdCMMsar7moRJxGgO9WlcIrwAGjIhMdP9fUvJ+jVDEteQ=="; }; }; - "snyk-paket-parser-1.4.1" = { + "snyk-paket-parser-1.4.3" = { name = "snyk-paket-parser"; packageName = "snyk-paket-parser"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.4.1.tgz"; - sha512 = "JabIAWwbjfSOkR0os6/KkdkLt7MN6ILFbyP5KgPxGP26V+1bJyXP24/h1blq/0dQY8UOiCQ62eP6Ycv+lfzCBg=="; - }; - }; - "snyk-php-plugin-1.5.1" = { - name = "snyk-php-plugin"; - packageName = "snyk-php-plugin"; - version = "1.5.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz"; - sha512 = "g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw=="; + url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.4.3.tgz"; + sha512 = "6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A=="; }; }; "snyk-php-plugin-1.5.2" = { @@ -30921,15 +31380,6 @@ let sha512 = "s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg=="; }; }; - "snyk-policy-1.13.1" = { - name = "snyk-policy"; - packageName = "snyk-policy"; - version = "1.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.13.1.tgz"; - sha512 = "l9evS3Yk70xyvajjg+I6Ij7fr7gxpVRMZl0J1xNpWps/IVu4DSGih3aMmXi47VJozr4A/eFyj7R1lIr2GhqJCA=="; - }; - }; "snyk-policy-1.13.3" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -30939,15 +31389,6 @@ let sha512 = "6J2a+Wt9zgvTtCwi4x8rLtkDQzFNPqubfIgs3aR35ZsEXPwI4XHGo0cxnJPDriqncp2JK72vnRpNfIZ7v0L1Mw=="; }; }; - "snyk-python-plugin-1.9.0" = { - name = "snyk-python-plugin"; - packageName = "snyk-python-plugin"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.9.0.tgz"; - sha512 = "zlyOHoCpmyVym9AwkboeepzEGrY3gHsM7eWP/nJ85TgCnQO5H5orKm3RL57PNbWRY+BnDmoQQ+udQgjym2+3sg=="; - }; - }; "snyk-python-plugin-1.9.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; @@ -30975,15 +31416,6 @@ let sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA=="; }; }; - "snyk-sbt-plugin-2.0.0" = { - name = "snyk-sbt-plugin"; - packageName = "snyk-sbt-plugin"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.0.tgz"; - sha512 = "bOUqsQ1Lysnwfnvf4QQIBfC0M0ZVuhlshTKd7pNwgAJ41YEPJNrPEpzOePl/HfKtwilEEwHh5YHvjYGegEKx0A=="; - }; - }; "snyk-sbt-plugin-2.0.1" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; @@ -31173,13 +31605,13 @@ let sha512 = "+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA=="; }; }; - "socks-2.3.1" = { + "socks-2.3.2" = { name = "socks"; packageName = "socks"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.3.1.tgz"; - sha512 = "srMrPbfQnLOVRDv/sQvBeM4rvFvKT4ErhdcXejaLHLQFPmCMt5XPF0TeE9Uv3iVa+GpXDevs1VgqZgwykr78Yw=="; + url = "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz"; + sha512 = "pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ=="; }; }; "socks-proxy-agent-3.0.1" = { @@ -31200,6 +31632,33 @@ let sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; }; }; + "socks5-client-1.2.6" = { + name = "socks5-client"; + packageName = "socks5-client"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-client/-/socks5-client-1.2.6.tgz"; + sha512 = "6ly0ZYGQaX8vBZvnRnRKT5yixfFEuQVxvYL5UGb7EFarP2d1yoWRJRBVfLKkBK5nOzX862EhhzOYwgZxRARwlQ=="; + }; + }; + "socks5-http-client-1.0.4" = { + name = "socks5-http-client"; + packageName = "socks5-http-client"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-http-client/-/socks5-http-client-1.0.4.tgz"; + sha512 = "K16meYkltPtps6yDOqK9Mwlfz+pdD2kQQQ/TCO/gu2AImUmfO6nF2uXX1YWrPs4NCfClQNih19wqLXmuUcZCrA=="; + }; + }; + "socks5-https-client-1.2.1" = { + name = "socks5-https-client"; + packageName = "socks5-https-client"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks5-https-client/-/socks5-https-client-1.2.1.tgz"; + sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; + }; + }; "sodium-browserify-1.2.4" = { name = "sodium-browserify"; packageName = "sodium-browserify"; @@ -31254,13 +31713,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.6.3" = { + "sonic-boom-0.7.3" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.6.3"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.3.tgz"; - sha512 = "TMhj6kDJk9LLzCTTL8+HPCfFn4MwkE4P6k2Up89Rz949+DSRw90V62upRKC99rJEOmu4E9ljH5Otu2JSRmx+bg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.3.tgz"; + sha512 = "A9EyoIeLD+g9vMLYQKjNCatJtAKdBQMW03+L8ZWWX/A6hq+srRCwdqHrBD1R8oSMLXov3oHN13dljtZf12q2Ow=="; }; }; "sorcery-0.10.0" = { @@ -31362,6 +31821,15 @@ let sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }; }; + "source-map-0.1.34" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.34"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; + sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; + }; + }; "source-map-0.4.4" = { name = "source-map"; packageName = "source-map"; @@ -31443,15 +31911,6 @@ let sha512 = "eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w=="; }; }; - "source-map-support-0.5.6" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz"; - sha512 = "N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g=="; - }; - }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -31641,6 +32100,15 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; + "sprintf-js-1.1.0" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.0.tgz"; + sha1 = "cffcaf702daf65ea39bb4e0fa2b299cec1a1be46"; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -31668,13 +32136,13 @@ let sha512 = "huR2ABWAbPZEyol5m9qkO29S+vnGx0epKXpxQkqbj7ATIC8abia7hLIISpQkNrCv2NtdPGJOERZPNbkaiCzGgg=="; }; }; - "ssb-client-4.6.3" = { + "ssb-client-4.7.0" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.6.3"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.3.tgz"; - sha512 = "i9nfkSIBMI2FdRHRYqVoB2jEvnNDVE6KccYPK2EjGFSa2o7+7wyb1bJoCH9jPXtwoAUyp6xELin8VwO21+hsFA=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.0.tgz"; + sha512 = "jMuPSdAwcOoWbgwR/CnyU2MyP6FxGwyPHxa+trWIg+oobs3lryGwgm8BfM0Rdgw9ywdvJJO0xHJ8Hc5ROCe8Aw=="; }; }; "ssb-config-2.3.9" = { @@ -32127,6 +32595,15 @@ let sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg=="; }; }; + "stream-counter-0.1.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz"; + sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b"; + }; + }; "stream-counter-0.2.0" = { name = "stream-counter"; packageName = "stream-counter"; @@ -32397,15 +32874,6 @@ let sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; }; }; - "string.prototype.matchall-2.0.0" = { - name = "string.prototype.matchall"; - packageName = "string.prototype.matchall"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz"; - sha512 = "WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q=="; - }; - }; "string.prototype.padstart-3.0.0" = { name = "string.prototype.padstart"; packageName = "string.prototype.padstart"; @@ -32874,22 +33342,22 @@ let sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg=="; }; }; - "supports-color-5.4.0" = { + "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-5.5.0" = { + "supports-color-6.0.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.5.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "supports-color-6.1.0" = { @@ -32919,13 +33387,13 @@ let sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; }; - "svgo-1.1.1" = { + "svgo-1.2.0" = { name = "svgo"; packageName = "svgo"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz"; - sha512 = "GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz"; + sha512 = "xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw=="; }; }; "swagger-converter-0.1.7" = { @@ -33036,15 +33504,6 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "table-4.0.3" = { - name = "table"; - packageName = "table"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; - }; - }; "table-5.2.3" = { name = "table"; packageName = "table"; @@ -33280,13 +33739,13 @@ let sha512 = "JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow=="; }; }; - "terser-webpack-plugin-1.2.2" = { + "terser-webpack-plugin-1.2.3" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz"; - sha512 = "1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz"; + sha512 = "GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA=="; }; }; "test-exclude-4.2.3" = { @@ -33595,6 +34054,15 @@ let sha1 = "93d9decffc8805bd57eae4310f0b745e9b6fb3a7"; }; }; + "tiny-worker-2.1.2" = { + name = "tiny-worker"; + packageName = "tiny-worker"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-worker/-/tiny-worker-2.1.2.tgz"; + sha512 = "t8xrlrw0ScBnJ1K5ziHcD6u2SgWpE9Tozv4EIqpXMnCfEVc3pWzMx+ZFwqpXk20C4WTRoLZVBi9v1tLkaciCTg=="; + }; + }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -33622,15 +34090,6 @@ let sha512 = "rUwGDruKq1gX+FFHbTl5qjI7teVO7eOe+C8IcQ7QT+1BK3eEUXJqbZcBOeaRP4FwSC/C1A5jDoIVta0nIQ9yew=="; }; }; - "tmp-0.0.28" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"; - sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; - }; - }; "tmp-0.0.29" = { name = "tmp"; packageName = "tmp"; @@ -33667,6 +34126,15 @@ let sha512 = "NQPUaywaVC2hzWkBBsTX3sV2XfxU0mc409rJyrA7iCu5DSTjMLUqI+U4KJVSy/Ltp0zgbWMWua471R7zMql9Pw=="; }; }; + "tmp-promise-1.0.5" = { + name = "tmp-promise"; + packageName = "tmp-promise"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.0.5.tgz"; + sha512 = "hOabTz9Tp49wCozFwuJe5ISrOqkECm6kzw66XTP23DuzNU7QS/KiZq5LC9Y7QSy8f1rPSLy4bKaViP0OwGI1cA=="; + }; + }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -33910,15 +34378,6 @@ let sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; }; }; - "touch-0.0.3" = { - name = "touch"; - packageName = "touch"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz"; - sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d"; - }; - }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -33955,6 +34414,15 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; + "tough-cookie-3.0.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; + }; + }; "township-client-1.3.2" = { name = "township-client"; packageName = "township-client"; @@ -34387,6 +34855,24 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; + "uglify-js-2.3.6" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + }; + "uglify-js-2.4.24" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; + sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; + }; + }; "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; @@ -34549,13 +35035,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "undeclared-identifiers-1.1.2" = { + "undeclared-identifiers-1.1.3" = { name = "undeclared-identifiers"; packageName = "undeclared-identifiers"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; - sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; + url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz"; + sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; "undefsafe-2.0.2" = { @@ -34927,13 +35413,13 @@ let sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg=="; }; }; - "unorm-1.4.1" = { + "unorm-1.5.0" = { name = "unorm"; packageName = "unorm"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz"; - sha1 = "364200d5f13646ca8bcd44490271335614792300"; + url = "https://registry.npmjs.org/unorm/-/unorm-1.5.0.tgz"; + sha512 = "sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw=="; }; }; "unpipe-1.0.0" = { @@ -36079,13 +36565,13 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; - "webassemblyjs-1.8.3" = { + "webassemblyjs-1.8.5" = { name = "webassemblyjs"; packageName = "webassemblyjs"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.8.3.tgz"; - sha512 = "HBAmsgCj2NmMe3u5zV4/pJDSDyHYSsY75kg5cdox/aE1jS5hPUi41Z+DuIeSJOjjikOGY/t71ygAifmFr07ZFg=="; + url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.8.5.tgz"; + sha512 = "xszt6h1pm7h4OJHkG04l/tEob4bEYA3QYlYnPv2Vn09MJK6jDGv0aRAV34dEH24Y+LjuXIe9VJf6UAXxXacsUA=="; }; }; "webidl-conversions-2.0.1" = { @@ -36097,6 +36583,15 @@ let sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; }; }; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + }; + }; "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -36187,6 +36682,15 @@ let sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; }; }; + "whatwg-url-3.1.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-3.1.0.tgz"; + sha1 = "7bdcae490f921aef6451fb6739ec6bbd8e907bf6"; + }; + }; "whatwg-url-7.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -36763,6 +37267,15 @@ let sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; }; }; + "xml2js-0.2.8" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; + }; + }; "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; @@ -36998,6 +37511,15 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; + "yamljs-0.3.0" = { + name = "yamljs"; + packageName = "yamljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz"; + sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -37016,15 +37538,6 @@ let sha512 = "ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig=="; }; }; - "yargs-12.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz"; - sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ=="; - }; - }; "yargs-12.0.4" = { name = "yargs"; packageName = "yargs"; @@ -37043,6 +37556,15 @@ let sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; }; }; + "yargs-13.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz"; + sha512 = "1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -37061,6 +37583,15 @@ let sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; }; }; + "yargs-3.5.4" = { + name = "yargs"; + packageName = "yargs"; + version = "3.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; + sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; + }; + }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -37106,6 +37637,15 @@ let sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; }; }; + "yargs-parser-13.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz"; + sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -37142,6 +37682,15 @@ let sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ=="; }; }; + "yargs-unparser-1.5.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz"; + sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -37160,15 +37709,6 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; - "yauzl-2.9.2" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "4fb1bc7ae1fc2f57037b54af6acc8fe1031c5b77"; - }; - }; "yeast-0.1.2" = { name = "yeast"; packageName = "yeast"; @@ -37301,22 +37841,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "7.3.1"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.1.tgz"; - sha512 = "8EvXYRhTqTaTk5PKv7VZxIWJiyG51R9RC9gtpRFx4bbnurqBHdEUxGMmaRsGT8QDbfvVsWnuakE0eeW1CrfZAQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.3.tgz"; + sha512 = "dw1iBOYbQRN2l/BH21zDItDFC9KXgqeK0A/koDLDukjrUAnW/XVATjxGi+7EPlTpABTFhqu/rHZDy8aBglLDXQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.13.1" - sources."@angular-devkit/core-7.3.1" - sources."@angular-devkit/schematics-7.3.1" - sources."@schematics/angular-7.3.1" - sources."@schematics/update-0.13.1" + sources."@angular-devkit/architect-0.13.3" + sources."@angular-devkit/core-7.3.3" + sources."@angular-devkit/schematics-7.3.3" + sources."@schematics/angular-7.3.3" + sources."@schematics/update-0.13.3" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.2" - sources."ajv-6.7.0" + sources."ajv-6.9.1" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -37532,7 +38072,7 @@ in sources."normalize-path-2.1.1" sources."npm-bundled-1.0.6" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npm-pick-manifest-2.2.3" (sources."npm-registry-fetch-3.9.0" // { dependencies = [ @@ -37739,107 +38279,32 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.6.tgz"; - sha512 = "ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg=="; + url = "https://registry.npmjs.org/asar/-/asar-1.0.0.tgz"; + sha512 = "MBiDU5cDr9UWuY2F0zq2fZlnyRq1aOPmJGMas22Qa14K1odpRXL3xkMHPN3uw2hAK5mD89Q+/KidOUtpi4V0Cg=="; }; dependencies = [ - sources."abbrev-1.1.1" - sources."ajv-6.9.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" + sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" - sources."buffers-0.1.1" - sources."caseless-0.12.0" - sources."chainsaw-0.1.0" sources."chromium-pickle-js-0.2.0" - sources."combined-stream-1.0.7" sources."commander-2.19.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" sources."cuint-0.2.2" - sources."dashdash-1.14.1" - sources."decompress-zip-0.3.0" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-6.0.4" - sources."graceful-fs-4.1.15" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."http-signature-1.2.0" + sources."glob-7.1.3" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."klaw-1.3.1" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."mkpath-0.1.0" - sources."mksnapshot-0.3.4" - sources."nopt-3.0.6" - sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."psl-1.1.31" - sources."punycode-2.1.1" - sources."q-1.5.1" - sources."qs-6.5.2" - sources."readable-stream-1.1.14" - sources."request-2.88.0" - (sources."rimraf-2.6.3" // { - dependencies = [ - sources."glob-7.1.3" - ]; - }) - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sshpk-1.16.1" - sources."string_decoder-0.10.31" - sources."tmp-0.0.28" - (sources."touch-0.0.3" // { - dependencies = [ - sources."nopt-1.0.10" - ]; - }) - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."traverse-0.3.9" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" + sources."pify-4.0.1" + sources."tmp-0.0.33" + sources."tmp-promise-1.0.5" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -37854,16 +38319,16 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.4.317"; + version = "2.4.401"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.4.317.tgz"; - sha512 = "Q4CMahxN7AOLEIhmA+mm81V91VXKvTlcIgodMcBE4wnn/H61Kc3LUGJBu4ibHuC5ZPShmS3R8luavmm7UfgpUQ=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.4.401.tgz"; + sha512 = "Tj2xiWe38/KGUuYwojVujA1UiLvMfqUtTpp31/XzWnK3GwjNb8srL0mDIGxj3ssU2RSmgFtetQVCuXnUhZ4o9g=="; }; dependencies = [ sources."agent-base-4.2.1" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.0" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -38130,6 +38595,7 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" + sources."dash-ast-1.0.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" @@ -38191,7 +38657,7 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.6" // { @@ -38226,7 +38692,7 @@ in sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.2" + sources."undeclared-identifiers-1.1.3" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -38258,7 +38724,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -38314,7 +38780,7 @@ in sources."colour-0.7.1" sources."combined-stream-1.0.7" sources."commander-2.19.0" - sources."compact2string-1.4.0" + sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ @@ -38509,7 +38975,7 @@ in }) sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" (sources."rc-0.4.0" // { dependencies = [ @@ -38812,7 +39278,7 @@ in ]; }) sources."acorn-walk-6.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -38840,7 +39306,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.3" @@ -38894,7 +39360,7 @@ in sources."color-name-1.1.3" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.7" - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.7.3" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { @@ -38948,6 +39414,7 @@ in sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" + sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."debug-2.6.9" @@ -39127,7 +39594,7 @@ in sources."object-assign-4.1.1" sources."object-keys-1.1.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-1.1.0" sources."opener-1.5.1" @@ -39169,7 +39636,7 @@ in sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" sources."raw-body-2.3.3" @@ -39273,10 +39740,10 @@ in sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.2" + sources."undeclared-identifiers-1.1.3" sources."underscore-1.9.1" sources."unique-string-1.0.0" - sources."unorm-1.4.1" + sources."unorm-1.5.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" (sources."update-notifier-2.5.0" // { @@ -39662,7 +40129,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -39691,7 +40158,7 @@ in sources."d-1.0.0" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -39954,13 +40421,13 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" - sources."anymatch-1.3.2" + sources."anymatch-2.0.0" sources."ap-0.1.0" (sources."append-tree-2.4.4" // { dependencies = [ @@ -39968,18 +40435,26 @@ in sources."varint-5.0.0" ]; }) - sources."arr-diff-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" sources."array-lru-1.1.1" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" sources."async-0.9.2" sources."asynckit-0.4.0" + sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bencode-1.0.0" (sources."bitfield-rle-2.2.1" // { @@ -39997,7 +40472,11 @@ in sources."body-0.1.0" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-equals-1.0.4" @@ -40005,6 +40484,7 @@ in sources."buffer-from-1.1.1" sources."bulk-write-stream-1.1.4" sources."bytes-3.1.0" + sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" @@ -40012,20 +40492,40 @@ in sources."chalk-2.4.2" sources."ci-info-1.6.0" sources."circular-append-file-1.0.1" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."cli-boxes-1.0.0" sources."cli-spinners-1.3.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" sources."codecs-1.2.1" + sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.3" sources."combined-stream-1.0.7" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-3.1.2" sources."connections-1.4.2" sources."content-types-0.1.0" + sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."corsify-2.1.0" sources."count-trailing-zeros-1.0.1" @@ -40041,7 +40541,7 @@ in ]; }) sources."dat-encoding-5.0.1" - sources."dat-ignore-2.1.1" + sources."dat-ignore-2.1.2" (sources."dat-json-1.0.2" // { dependencies = [ sources."dat-encoding-4.0.2" @@ -40059,9 +40559,12 @@ in sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" sources."debug-4.1.1" + sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-0.2.2" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."diffy-2.1.0" sources."directory-index-html-2.1.0" @@ -40088,12 +40591,42 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) sources."extend-3.0.2" - sources."extglob-0.3.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-bitfield-1.2.2" @@ -40102,28 +40635,39 @@ in sources."fd-lock-1.0.2" sources."fd-read-stream-1.1.0" sources."figures-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."flat-tree-1.6.0" sources."for-each-0.3.3" sources."for-in-1.0.2" - sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-stream-3.0.0" + sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.3" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."http-methods-0.1.0" sources."http-signature-1.2.0" (sources."hypercore-6.25.0" // { @@ -40153,32 +40697,38 @@ in sources."ini-1.3.5" sources."inspect-custom-symbol-1.1.0" sources."ip-1.1.5" + sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" sources."is-callable-1.1.4" sources."is-ci-1.2.1" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.1" - sources."is-glob-2.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - sources."is-number-2.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-options-1.0.1" sources."is-path-inside-1.0.1" - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" sources."is-string-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."iterators-0.1.0" sources."jsbn-0.1.1" @@ -40198,7 +40748,7 @@ in ]; }) sources."keypress-0.2.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."last-one-wins-1.0.4" sources."latest-version-3.1.0" sources."length-prefixed-message-3.0.3" @@ -40207,11 +40757,12 @@ in sources."lru-3.1.0" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" - sources."math-random-1.0.4" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" sources."memory-pager-1.5.0" sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" - sources."micromatch-2.3.11" + sources."micromatch-3.1.10" sources."mime-2.4.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -40220,6 +40771,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mirror-folder-3.0.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -40234,6 +40790,7 @@ in sources."nan-2.12.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" + sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."napi-macros-1.8.2" @@ -40248,21 +40805,36 @@ in sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" - sources."object.omit-2.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-glob-3.0.4" - sources."parse-headers-2.0.1" + sources."parse-headers-2.0.2" + sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."pkginfo-0.4.1" + sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."preserve-0.2.0" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" sources."process-0.5.2" @@ -40282,19 +40854,13 @@ in sources."random-access-file-2.1.0" sources."random-access-memory-3.1.1" sources."random-access-storage-1.3.0" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" - sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."remove-array-items-1.1.1" @@ -40302,13 +40868,21 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.6.3" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."semver-diff-2.1.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -40322,15 +40896,66 @@ in sources."simple-sha1-2.1.1" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."sodium-javascript-0.5.5" sources."sodium-native-2.3.0" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.2.0" sources."sorted-indexof-1.0.0" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" + sources."split-string-3.1.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."stream-collector-1.0.1" sources."stream-each-1.2.3" (sources."stream-parser-0.3.1" // { @@ -40341,6 +40966,7 @@ in }) sources."stream-shift-1.0.0" sources."string-width-2.1.1" + sources."string.prototype.trim-1.1.2" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" @@ -40357,6 +40983,13 @@ in sources."thunky-1.0.3" sources."timed-out-4.0.1" sources."to-buffer-1.1.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" (sources."toiletdb-1.4.1" // { dependencies = [ sources."debug-2.6.9" @@ -40368,22 +41001,44 @@ in sources."punycode-1.4.1" ]; }) - sources."township-client-1.3.2" - sources."trim-0.0.1" + (sources."township-client-1.3.2" // { + dependencies = [ + sources."is-number-2.1.0" + sources."kind-of-3.2.2" + ]; + }) sources."ttl-1.3.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" sources."uint64be-2.0.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) sources."unique-string-1.0.0" sources."unixify-1.0.0" sources."unordered-array-remove-1.0.2" sources."unordered-set-1.1.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) sources."untildify-3.0.3" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."uri-js-4.2.2" + sources."urix-0.1.0" sources."url-parse-lax-1.0.0" + sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" sources."utp-native-1.7.3" @@ -40582,19 +41237,19 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.4.0.tgz"; - sha512 = "9LWHAlPqaGFuh9n6uEIHBBuQ2+G7R3y4MkqGiA7guTUDkCUPRcSfJEOL3P0RHEV6i8v4U1F9LYsTQB4FklHPrw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.6.0.tgz"; + sha512 = "AUHAYzYJNV6QlCxHlZt40iNXc00ibi2pLGwEjcIpXiNW7w28C57SW2bbVa8e+mYwgSr89GRi8RnihooOsZmOcg=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.404.0" + sources."aws-sdk-2.410.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -40623,6 +41278,11 @@ in sources."ieee754-1.1.8" sources."inherits-2.0.3" sources."ini-1.3.5" + (sources."ip-address-5.8.9" // { + dependencies = [ + sources."jsbn-1.1.0" + ]; + }) sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -40634,6 +41294,11 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.11" + sources."lodash.find-4.6.0" + sources."lodash.max-4.0.1" + sources."lodash.merge-4.6.1" + sources."lodash.padstart-4.6.1" + sources."lodash.repeat-4.1.0" sources."lossless-json-1.0.3" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -40653,6 +41318,10 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" + sources."socks5-client-1.2.6" + sources."socks5-http-client-1.0.4" + sources."socks5-https-client-1.2.1" + sources."sprintf-js-1.1.0" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."through-2.3.8" @@ -40767,7 +41436,7 @@ in ]; }) sources."encodeurl-1.0.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-promisify-6.0.1" sources."es6-symbol-3.1.1" @@ -41132,13 +41801,13 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev4"; + version = "0.19.0-rev5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev4.tgz"; - sha512 = "PWRg9rOc7R2W1lREG5ZaVDywORXO9TYCJzfkK3KEcyiqBr+NpBONp25VhPQKm5mfQvXEtiCWVvqn54/q0bKx9g=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev5.tgz"; + sha512 = "D/LS6Db9VIuaM3UffbBkrHmR6oLpm68EYVSru9CeHkVqUQwedVuLmZX6d0jvnU0C8I/dLSEdXlGueaPgTGhNnA=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-styles-3.2.1" sources."anymatch-1.3.2" sources."arr-diff-2.0.0" @@ -41234,6 +41903,7 @@ in (sources."find-elm-dependencies-2.0.0" // { dependencies = [ sources."firstline-1.2.0" + sources."lodash-4.17.10" ]; }) sources."find-parent-dir-0.3.0" @@ -41318,7 +41988,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."klaw-1.3.1" - sources."lodash-4.17.10" + sources."lodash-4.17.11" sources."lru-cache-4.1.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -41349,7 +42019,11 @@ in sources."kind-of-6.0.2" ]; }) - sources."node-elm-compiler-5.0.1" + (sources."node-elm-compiler-5.0.1" // { + dependencies = [ + sources."lodash-4.17.10" + ]; + }) sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -41453,11 +42127,7 @@ in sources."repeat-string-1.6.1" sources."request-2.88.0" sources."request-promise-4.2.4" - (sources."request-promise-core-1.1.2" // { - dependencies = [ - sources."lodash-4.17.11" - ]; - }) + sources."request-promise-core-1.1.2" sources."resolve-url-0.2.1" sources."ret-0.1.15" (sources."rimraf-2.6.3" // { @@ -41749,7 +42419,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.8.2" + sources."react-is-16.8.3" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -41824,17 +42494,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.14.0"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.14.0.tgz"; - sha512 = "jrOhiYyENRrRnWlMYANlGZTqb89r2FuRT+615AabBoajhNjeh9ywDNlh2LU9vTqf0WYN+L3xdXuIi7xuj/tK9w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz"; + sha512 = "CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" @@ -41977,7 +42647,7 @@ in sources."@babel/highlight-7.0.0" sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" sources."ansi-styles-3.2.1" @@ -41999,7 +42669,7 @@ in sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-5.14.0" + sources."eslint-5.14.1" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -42136,7 +42806,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -42957,45 +43627,251 @@ in sha512 = "xH6KEeJaUJDB8FAov4OdYxb4GuMOTcKdJ+xW5SUGLEuXfBLgyS0zUeeYVIUS8qvM3gf7w+W35WRwwK4d0InqxQ=="; }; dependencies = [ + sources."@types/node-10.12.27" + sources."@types/semver-5.5.0" + sources."abab-1.0.4" + sources."abbrev-1.1.1" + sources."acorn-2.7.0" + sources."acorn-globals-1.0.9" + sources."ajv-6.9.2" + sources."amdefine-1.0.1" + sources."array-equal-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."asn1-0.1.11" + sources."assert-plus-0.1.5" + sources."async-0.8.0" + sources."asynckit-0.4.0" sources."asyncmemo-1.0.0" + sources."aws-sign2-0.5.0" + sources."aws4-1.8.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-3.5.3" + sources."boom-0.4.2" + sources."brace-expansion-1.1.11" + sources."camelcase-1.2.1" + sources."caseless-0.12.0" sources."chloride-2.2.10" sources."chloride-test-1.2.2" + (sources."clean-css-2.2.23" // { + dependencies = [ + sources."commander-2.2.0" + ]; + }) + (sources."cli-0.6.6" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-0.3.0" + ]; + }) + sources."combined-stream-0.0.7" sources."commander-2.19.0" + sources."concat-map-0.0.1" + sources."config-chain-1.1.12" + sources."console-browserify-1.1.0" + sources."core-util-is-1.0.2" + sources."cryptiles-0.2.2" + sources."csslint-0.10.0" + sources."cssom-0.3.6" + sources."cssstyle-0.2.37" + sources."ctype-0.5.3" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."date-now-0.1.4" + sources."debug-0.7.4" + sources."decamelize-1.2.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."del-3.0.0" + sources."delayed-stream-0.0.5" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" + (sources."dom-serializer-0.1.1" // { + dependencies = [ + sources."entities-1.1.2" + ]; + }) + sources."domelementtype-1.3.1" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + sources."ecc-jsbn-0.1.2" sources."ed2curve-0.1.4" + (sources."editorconfig-0.15.2" // { + dependencies = [ + sources."lru-cache-4.1.5" + ]; + }) sources."emoji-named-characters-1.0.2" + sources."entities-1.0.0" + (sources."escodegen-1.11.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."esprima-3.1.3" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."exit-0.1.2" sources."explain-error-1.0.4" + sources."extend-2.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + (sources."findup-sync-0.2.1" // { + dependencies = [ + sources."glob-4.3.5" + ]; + }) + sources."flagged-respawn-0.3.2" + sources."forever-agent-0.5.2" + (sources."form-data-0.1.4" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."fs.realpath-1.0.0" + sources."gear-0.9.7" + (sources."gear-lib-0.9.2" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-0.3.0" + ]; + }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."git-packidx-parser-1.0.0" sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" + (sources."glob-7.1.3" // { + dependencies = [ + sources."minimatch-3.0.4" + ]; + }) + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."graceful-fs-3.0.11" + (sources."handlebars-2.0.0" // { + dependencies = [ + sources."async-0.2.10" + sources."uglify-js-2.3.6" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."hashlru-2.3.0" - sources."highlight.js-9.14.2" + sources."hawk-1.1.1" + sources."highlight.js-9.15.5" + sources."hoek-0.9.1" + sources."htmlparser2-3.8.3" + sources."http-signature-0.10.1" + sources."iconv-lite-0.4.24" sources."increment-buffer-1.0.1" + sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ip-1.1.5" + sources."ip-regex-2.1.0" sources."is-canonical-base64-1.1.1" sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" + sources."is-path-inside-1.0.1" sources."is-property-1.0.2" + sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.7" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + (sources."js-beautify-1.8.9" // { + dependencies = [ + sources."nopt-4.0.1" + ]; + }) + sources."jsbn-0.1.1" + (sources."jsdom-9.2.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."aws-sign2-0.7.0" + sources."combined-stream-1.0.7" + sources."delayed-stream-1.0.0" + sources."extend-3.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."http-signature-1.2.0" + sources."oauth-sign-0.9.0" + sources."punycode-1.4.1" + sources."qs-6.5.2" + (sources."request-2.88.0" // { + dependencies = [ + sources."tough-cookie-2.4.3" + ]; + }) + sources."sax-1.2.4" + (sources."tough-cookie-2.5.0" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."tunnel-agent-0.6.0" + ]; + }) + (sources."jshint-2.5.11" // { + dependencies = [ + sources."minimatch-1.0.0" + ]; + }) + (sources."jslint-0.3.4" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-0.3.0" + ]; + }) sources."json-buffer-2.0.11" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.0.1" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."knox-0.8.10" sources."kvgraph-0.1.0" sources."kvset-1.0.0" + sources."less-1.7.5" + sources."levn-0.3.0" sources."libsodium-0.7.4" sources."libsodium-wrappers-0.7.4" + (sources."liftoff-2.0.3" // { + dependencies = [ + sources."minimist-1.1.3" + ]; + }) + sources."lodash-4.17.11" sources."looper-4.0.0" + sources."lru-cache-2.7.3" sources."lrucache-1.0.3" + sources."mime-1.2.11" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."minimist-1.2.0" + sources."minimatch-2.0.10" + sources."minimist-0.1.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -43003,23 +43879,56 @@ in }) sources."moment-2.24.0" sources."moo-0.4.3" + sources."ms-2.1.1" sources."multicb-1.2.2" - sources."multiserver-3.1.2" + (sources."multiserver-3.2.0" // { + dependencies = [ + sources."debug-4.1.1" + ]; + }) sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" sources."nan-2.12.1" + sources."natives-1.1.6" sources."nearley-2.16.0" sources."node-gyp-build-3.8.0" sources."node-polyglot-1.0.0" + sources."node-uuid-1.4.8" sources."non-private-ip-1.4.4" + sources."nopt-1.0.10" + sources."nwmatcher-1.4.4" + sources."oauth-sign-0.3.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."optimist-0.3.7" + (sources."optionator-0.8.2" // { + dependencies = [ + sources."wordwrap-1.0.0" + ]; + }) sources."options-0.0.6" sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-map-1.2.0" sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" sources."pako-1.0.8" + sources."parse5-1.5.1" + sources."parserlib-0.2.5" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prelude-ls-1.1.2" sources."private-box-0.3.0" sources."progress-1.1.8" + sources."proto-list-1.2.4" + sources."pseudomap-1.0.2" + sources."psl-1.1.31" sources."pull-block-filter-1.0.0" sources."pull-box-stream-1.0.13" sources."pull-buffered-0.3.4" @@ -43064,19 +43973,39 @@ in ]; }) sources."pull-ws-3.3.2" + sources."punycode-2.1.1" + sources."qs-1.0.2" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + sources."strip-json-comments-2.0.1" + ]; + }) + sources."readable-stream-1.1.14" sources."relative-url-1.0.2" sources."remove-markdown-0.1.0" + (sources."request-2.40.0" // { + dependencies = [ + sources."mime-types-1.0.2" + ]; + }) + sources."resolve-1.1.7" sources."ret-0.1.15" + sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-0.5.8" sources."secret-handshake-1.1.16" sources."semver-5.6.0" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" + sources."shelljs-0.3.0" + sources."sigmund-1.0.1" sources."smart-buffer-4.0.2" - sources."socks-2.3.1" + sources."sntp-0.2.4" + sources."socks-2.3.2" sources."sodium-browserify-1.2.4" (sources."sodium-browserify-tweetnacl-0.2.3" // { dependencies = [ @@ -43085,9 +44014,10 @@ in }) sources."sodium-chloride-1.1.2" sources."sodium-native-2.3.0" + sources."source-map-0.1.34" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" - sources."ssb-client-4.6.3" + sources."ssb-client-4.7.0" sources."ssb-config-2.3.9" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" @@ -43107,18 +44037,60 @@ in sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" sources."ssb-ref-2.13.9" + (sources."sshpk-1.16.1" // { + dependencies = [ + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + ]; + }) + (sources."stream-counter-0.1.0" // { + dependencies = [ + sources."readable-stream-1.0.34" + ]; + }) (sources."stream-to-pull-stream-1.7.2" // { dependencies = [ sources."looper-3.0.0" ]; }) - sources."strip-json-comments-2.0.1" + sources."string_decoder-0.10.31" + sources."stringstream-0.0.6" + sources."strip-json-comments-1.0.4" + sources."symbol-tree-3.2.2" sources."through-2.2.7" + sources."tiny-worker-2.1.2" + sources."tough-cookie-3.0.1" + sources."tr46-0.0.3" + sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" + sources."type-check-0.3.2" + (sources."uglify-js-2.4.24" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."uglify-to-browserify-1.0.2" sources."ultron-1.0.2" + sources."underscore-1.6.0" + sources."uri-js-4.2.2" + sources."uuid-3.3.2" + (sources."verror-1.10.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."webidl-conversions-3.0.1" + sources."whatwg-url-3.1.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.2" + sources."wrappy-1.0.2" sources."ws-1.1.5" + sources."xml-name-validator-2.0.1" + sources."xml2js-0.2.8" sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."yargs-3.5.4" ]; buildInputs = globalBuildInputs; meta = { @@ -43149,10 +44121,10 @@ in graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.10.tgz"; - sha512 = "K5O4njRjxwWxAylSgHHqnctGgUQyjVG5pwJenhQWkaDnmDp3qFZ/+5NjCpp/bJ8RGbmYTjBeieCg77ZjL3O5Tg=="; + url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-3.0.11.tgz"; + sha512 = "VK2lehlwL/PAA7aiUIouomV4ITIjjBA/Xxwr0AOvpAS0nE2q0STKBsGZ/ScMeS7Qv0bCyxKWXJ1dti8Hrfzd+Q=="; }; dependencies = [ sources."@babel/generator-7.0.0-beta.38" @@ -43169,7 +44141,7 @@ in }) sources."accepts-1.3.5" sources."agent-base-4.2.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -43284,7 +44256,7 @@ in sources."dotenv-6.2.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" + sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."encoding-0.1.12" @@ -43366,7 +44338,7 @@ in sources."graphql-config-extension-prisma-0.3.0" sources."graphql-import-0.4.5" sources."graphql-playground-html-1.6.12" - sources."graphql-playground-middleware-express-1.7.11" + sources."graphql-playground-middleware-express-1.7.12" sources."graphql-request-1.8.2" sources."graphql-schema-linter-0.2.0" sources."graphql-static-binding-0.9.3" @@ -43374,7 +44346,7 @@ in sources."har-validator-5.1.3" sources."has-flag-3.0.0" sources."header-case-1.0.1" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" (sources."http-proxy-agent-2.1.0" // { @@ -43444,13 +44416,13 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - (sources."jsonwebtoken-8.4.0" // { + (sources."jsonwebtoken-8.5.0" // { dependencies = [ sources."ms-2.1.1" ]; }) sources."jsprim-1.4.1" - sources."jwa-1.2.0" + sources."jwa-1.3.0" sources."jws-3.2.1" sources."latest-version-3.1.0" sources."lcid-1.0.0" @@ -43850,7 +44822,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -44077,7 +45049,7 @@ in sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - (sources."chokidar-2.1.1" // { + (sources."chokidar-2.1.2" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -44136,7 +45108,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -44216,7 +45188,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -44541,7 +45513,7 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" (sources."expand-brackets-2.1.4" // { @@ -44593,7 +45565,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -44819,91 +45791,35 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.1.tgz"; - sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.11.0.tgz"; + sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."@snyk/dep-graph-1.1.2" - sources."@snyk/gemfile-1.1.0" - sources."@yarnpkg/lockfile-1.1.0" - sources."abbrev-1.1.1" - sources."agent-base-4.2.1" - sources."ajv-6.9.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" - sources."archy-1.0.0" - sources."argparse-1.0.10" - sources."asap-2.0.6" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."ast-types-0.12.2" sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" - sources."bytes-3.0.0" - sources."camelcase-2.1.1" - sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."chardet-0.4.2" - sources."ci-info-1.6.0" sources."cli-1.0.1" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."clone-2.1.2" - sources."clone-deep-0.3.0" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" sources."colors-1.3.2" sources."combined-stream-1.0.7" sources."commander-2.17.1" sources."concat-map-0.0.1" - sources."configstore-3.1.2" sources."console-browserify-1.1.0" - sources."core-js-2.3.0" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" sources."csslint-1.0.5" sources."dashdash-1.14.1" - sources."data-uri-to-buffer-1.2.0" sources."date-now-0.1.4" - sources."debug-3.2.6" - sources."decamelize-1.2.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" - sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."diff-4.0.1" - sources."dockerfile-ast-0.0.12" (sources."dom-serializer-0.1.1" // { dependencies = [ sources."entities-1.1.2" @@ -44912,108 +45828,32 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.3.0" sources."domutils-1.5.1" - sources."dot-prop-4.2.0" - sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."email-validator-2.0.4" sources."entities-1.0.0" - sources."es6-promise-4.2.6" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" - sources."esprima-3.1.3" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."execa-0.7.0" sources."exit-0.1.2" sources."extend-3.0.2" - sources."external-editor-2.2.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."fast-levenshtein-2.0.6" - sources."figures-2.0.0" - sources."file-uri-to-path-1.0.0" - sources."for-in-1.0.2" - sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."get-stream-3.0.0" - (sources."get-uri-2.0.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) sources."getpass-0.1.7" sources."glob-7.1.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."global-dirs-0.1.1" - sources."got-6.7.1" - sources."graceful-fs-4.1.15" - sources."graphlib-2.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" - sources."hosted-git-info-2.7.1" - (sources."htmlparser2-3.8.3" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."htmlparser2-3.8.3" sources."http-signature-1.2.0" - sources."https-proxy-agent-2.2.1" - sources."iconv-lite-0.4.24" - sources."immediate-3.0.6" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."inquirer-3.3.0" - sources."invert-kv-1.0.0" - sources."ip-1.1.5" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" sources."is-dotfile-1.0.3" - sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."is-glob-2.0.1" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."isstream-0.1.2" - (sources."js-yaml-3.12.1" // { - dependencies = [ - sources."esprima-4.0.1" - ]; - }) sources."jsbn-0.1.1" (sources."jshint-2.10.1" // { dependencies = [ @@ -45024,215 +45864,40 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - (sources."jszip-3.1.5" // { - dependencies = [ - sources."es6-promise-3.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - ]; - }) - sources."kind-of-3.2.2" - sources."latest-version-3.1.0" - sources."lazy-cache-0.2.7" - sources."lcid-1.0.0" - sources."levn-0.3.0" - sources."lie-3.1.1" sources."lodash-4.17.11" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" - sources."lodash.set-4.3.2" - sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."macos-release-1.1.0" - sources."make-dir-1.3.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) - sources."ms-2.1.1" - sources."mute-stream-0.0.7" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - (sources."needle-2.2.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."netmask-1.0.6" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opn-5.4.0" - sources."optionator-0.8.2" - sources."os-locale-1.4.0" - sources."os-name-2.0.1" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."pac-proxy-agent-2.0.2" - sources."pac-resolver-3.0.0" - sources."package-json-4.0.1" - sources."pako-1.0.8" sources."parse-glob-3.0.4" sources."parserlib-1.1.1" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."prelude-ls-1.1.2" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.0" - sources."promise-7.3.1" - sources."proxy-agent-2.3.1" - sources."proxy-from-env-1.0.0" - sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) - sources."rc-1.2.8" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."string_decoder-1.1.1" - ]; - }) - sources."recursive-readdir-2.2.2" - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" + sources."readable-stream-1.1.14" sources."request-2.88.0" - sources."restore-cursor-2.0.0" - sources."run-async-2.3.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."secure-keys-1.0.0" - sources."semver-5.6.0" - sources."semver-diff-2.1.0" - sources."setprototypeof-1.1.0" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."shelljs-0.3.0" - sources."signal-exit-3.0.2" - sources."smart-buffer-1.1.15" - sources."snyk-1.133.0" - sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.22.0" - sources."snyk-go-plugin-1.6.1" - sources."snyk-gradle-plugin-2.1.3" - sources."snyk-module-1.9.1" - sources."snyk-mvn-plugin-2.0.1" - sources."snyk-nodejs-lockfile-parser-1.11.0" - sources."snyk-nuget-plugin-1.7.1" - sources."snyk-paket-parser-1.4.1" - sources."snyk-php-plugin-1.5.2" - sources."snyk-policy-1.13.3" - sources."snyk-python-plugin-1.9.1" - sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.2" - sources."snyk-sbt-plugin-2.0.1" - sources."snyk-tree-1.0.0" - sources."snyk-try-require-1.3.1" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."source-map-0.6.1" - sources."source-map-support-0.5.10" - sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."statuses-1.5.0" - sources."string-width-2.1.1" sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" - sources."term-size-1.2.0" - sources."then-fs-2.0.0" - sources."through-2.3.8" - sources."thunkify-2.1.2" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."toml-2.3.6" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."unique-string-1.0.0" - sources."unpipe-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" sources."uri-js-4.2.2" - sources."url-parse-lax-1.0.0" - sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."vscode-languageserver-types-3.14.0" - sources."which-1.3.1" - sources."widest-line-2.0.1" - sources."win-release-1.1.1" - sources."window-size-0.1.4" - sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.2" - sources."xdg-basedir-3.0.0" sources."xml-1.0.1" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."xregexp-2.0.0" - sources."y18n-3.2.1" - sources."yallist-2.1.2" - (sources."yargs-3.32.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { @@ -45326,6 +45991,61 @@ in production = true; bypassCache = true; }; + hueadm = nodeEnv.buildNodePackage { + name = "hueadm"; + packageName = "hueadm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hueadm/-/hueadm-1.2.0.tgz"; + sha512 = "U195U0rkLkOuqeG02DRdl/yG2ulNkiMdQnrgAIy2nBn/QXCqyxjFXG1cnbHX7gPXA7d+Qv6kzWDn0K/yn/z+BQ=="; + }; + dependencies = [ + sources."argparse-1.0.10" + sources."assert-plus-1.0.0" + sources."autocast-0.0.4" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cmdln-4.4.0" + sources."color-convert-2.0.0" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."css-color-names-1.0.1" + sources."dashdash-1.14.1" + sources."deepmerge-3.2.0" + sources."extsprintf-1.4.0" + sources."fs.realpath-1.0.0" + sources."fuzzyset.js-0.0.1" + sources."glob-7.1.3" + sources."hue-sdk-0.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."latest-0.2.0" + sources."lstream-0.0.4" + sources."minimatch-3.0.4" + sources."mired-0.0.0" + sources."npm-2.15.12" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."readable-stream-3.1.1" + sources."safe-buffer-5.1.2" + sources."sprintf-js-1.0.3" + sources."string_decoder-1.2.0" + sources."tabula-1.10.0" + sources."util-deprecate-1.0.2" + sources."verror-1.10.0" + sources."wrappy-1.0.2" + sources."yamljs-0.3.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A command line management interface to phillips hue"; + homepage = "https://github.com/bahamas10/hueadm#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; @@ -45400,7 +46120,7 @@ in sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -45988,7 +46708,7 @@ in sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA=="; }; dependencies = [ - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" sources."balanced-match-1.0.0" @@ -46056,10 +46776,10 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.3.tgz"; - sha512 = "3F9MMFWpZmb8A9VEOAo1xll+z0JGPLN/2mclRm9NyfPi8cynkTNwzqTDw1MZpadEnEHcCtDy6mzReM4O0BLIEA=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.4.tgz"; + sha512 = "q5Xmx9QXNOzOzIlMoYtLrLiu4Jl/Ce2bn0CNcv54PhyH89CI4GWlGVDye8ei2Ijt9R3U+vsWPsXpLUNob8bs8Q=="; }; dependencies = [ sources."cli-color-0.1.7" @@ -46142,7 +46862,7 @@ in }; dependencies = [ sources."accepts-1.3.5" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -46168,7 +46888,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.7.3" sources."configstore-3.1.2" sources."connect-pause-0.1.1" @@ -46296,7 +47016,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" (sources."os-locale-3.1.0" // { dependencies = [ @@ -46488,7 +47208,7 @@ in sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."circular-json-0.5.9" (sources."class-utils-0.3.6" // { dependencies = [ @@ -46962,7 +47682,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -47010,7 +47730,7 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" @@ -47268,12 +47988,12 @@ in sources."@octokit/endpoint-3.1.3" sources."@octokit/plugin-enterprise-rest-2.1.1" sources."@octokit/request-2.3.0" - sources."@octokit/rest-16.15.0" + sources."@octokit/rest-16.16.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -47712,7 +48432,7 @@ in sources."npm-bundled-1.0.6" sources."npm-lifecycle-2.1.0" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npm-pick-manifest-2.2.3" (sources."npm-registry-fetch-3.9.0" // { dependencies = [ @@ -47764,7 +48484,7 @@ in sources."p-reduce-1.0.0" sources."p-try-2.0.0" sources."p-waterfall-1.0.0" - sources."pacote-9.4.1" + sources."pacote-9.5.0" sources."parallel-transform-1.1.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" @@ -48050,7 +48770,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -48185,7 +48905,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -48332,7 +49052,7 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."opn-5.4.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" @@ -48477,7 +49197,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -48977,12 +49697,12 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.3.3" - sources."@babel/generator-7.3.3" + sources."@babel/core-7.3.4" + sources."@babel/generator-7.3.4" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-call-delegate-7.1.0" - sources."@babel/helper-create-class-features-plugin-7.3.2" + sources."@babel/helper-create-class-features-plugin-7.3.4" sources."@babel/helper-define-map-7.1.0" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" @@ -48995,18 +49715,18 @@ in sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.0.0" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.2.3" + sources."@babel/helper-replace-supers-7.3.4" sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.0.0" sources."@babel/helper-wrap-function-7.2.0" sources."@babel/helpers-7.3.1" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.3.3" + sources."@babel/parser-7.3.4" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.3.3" + sources."@babel/plugin-proposal-class-properties-7.3.4" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.3.2" + sources."@babel/plugin-proposal-object-rest-spread-7.3.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.2.0" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -49014,10 +49734,10 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.2.0" + sources."@babel/plugin-transform-async-to-generator-7.3.4" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.2.0" - sources."@babel/plugin-transform-classes-7.3.3" + sources."@babel/plugin-transform-block-scoping-7.3.4" + sources."@babel/plugin-transform-classes-7.3.4" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.3.2" sources."@babel/plugin-transform-dotall-regex-7.2.0" @@ -49028,26 +49748,26 @@ in sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" sources."@babel/plugin-transform-modules-commonjs-7.2.0" - sources."@babel/plugin-transform-modules-systemjs-7.2.0" + sources."@babel/plugin-transform-modules-systemjs-7.3.4" sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" sources."@babel/plugin-transform-new-target-7.0.0" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.3.3" - sources."@babel/plugin-transform-regenerator-7.0.0" - sources."@babel/plugin-transform-runtime-7.2.0" + sources."@babel/plugin-transform-regenerator-7.3.4" + sources."@babel/plugin-transform-runtime-7.3.4" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.3.1" + sources."@babel/preset-env-7.3.4" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.3.1" + sources."@babel/runtime-7.3.4" sources."@babel/template-7.2.2" - sources."@babel/traverse-7.2.3" - sources."@babel/types-7.3.3" + sources."@babel/traverse-7.3.4" + sources."@babel/types-7.3.4" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -49055,7 +49775,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/estree-0.0.39" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@webassemblyjs/ast-1.8.3" sources."@webassemblyjs/floating-point-hex-parser-1.8.3" sources."@webassemblyjs/helper-api-error-1.8.3" @@ -49079,7 +49799,7 @@ in sources."ace.improved-0.2.1" sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" sources."amdefine-1.0.1" @@ -49244,7 +49964,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.4.1" + sources."browserslist-4.4.2" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -49267,7 +49987,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.0.0" - sources."caniuse-lite-1.0.30000938" + sources."caniuse-lite-1.0.30000939" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -49276,7 +49996,7 @@ in ]; }) sources."cherow-1.6.9" - (sources."chokidar-2.1.1" // { + (sources."chokidar-2.1.2" // { dependencies = [ sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -49624,7 +50344,7 @@ in sources."hash-base-3.0.4" sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.7.1" sources."http-cache-semantics-3.8.1" sources."https-browserify-1.0.0" @@ -49782,7 +50502,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.7" + sources."node-releases-1.1.8" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -49900,7 +50620,7 @@ in sources."kind-of-6.0.2" ]; }) - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" (sources."read-pkg-4.0.1" // { dependencies = [ @@ -49960,10 +50680,10 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-7.0.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.3" + sources."regenerator-transform-0.13.4" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp-tree-0.1.4" + sources."regexp-tree-0.1.5" sources."regexpu-core-4.4.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -50162,7 +50882,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.2.2" // { + (sources."terser-webpack-plugin-1.2.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -50358,7 +51078,7 @@ in sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -50666,7 +51386,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -50846,7 +51566,7 @@ in }) sources."hawk-3.1.3" sources."hoek-2.16.3" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."http-signature-1.1.1" sources."image-size-0.5.5" sources."indx-0.2.3" @@ -51217,35 +51937,350 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.2.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz"; + sha512 = "RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ=="; }; dependencies = [ + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."browser-stdout-1.3.1" - sources."commander-2.15.1" + sources."cache-base-1.0.1" + sources."camelcase-5.0.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."debug-3.1.0" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" sources."diff-3.5.0" + sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-3.0.0" + sources."findup-sync-2.0.0" + (sources."flat-4.1.0" // { + dependencies = [ + sources."is-buffer-2.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" sources."growl-1.10.5" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."he-1.1.1" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."homedir-polyfill-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-2.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.4" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.12.0" + sources."kind-of-6.0.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.11" + sources."log-symbols-2.2.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."mem-4.1.0" + sources."micromatch-3.1.10" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.4" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."supports-color-5.4.0" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pump-3.0.0" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-regex-1.1.0" + sources."semver-5.6.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + sources."yargs-unparser-1.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -51375,7 +52410,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -51533,7 +52568,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -51686,7 +52721,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."block-stream-0.0.9" sources."body-parser-1.18.3" sources."boom-2.10.1" @@ -51996,7 +53031,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -52082,7 +53117,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -52395,10 +53430,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.19.5"; + version = "0.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.19.5.tgz"; - sha512 = "Bwt5RYc77MqQjw9tSGFQHgfn6/3PTy0f9v4I4Nw4waJutGdxuAhdQJuPy6ouJpFt6CRI1ChmfJvC2ZBUMnaUCQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.19.6.tgz"; + sha512 = "JSXgkh/PlLSDAvplfFqRmTyDKgKRK9rjuTGjiAX5hM9BbMLiJnNGMWjt6qkJmRGzzND7x+stgwvdDODJExW5zQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -52505,7 +53540,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.6" @@ -52559,7 +53594,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.3" // { dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" ]; }) sources."hash-sum-1.0.2" @@ -52851,7 +53886,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -53225,7 +54260,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."big-integer-1.6.41" + sources."big-integer-1.6.42" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -53261,7 +54296,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."compact2string-1.4.0" + sources."compact2string-1.4.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."consume-http-header-1.0.0" @@ -53408,7 +54443,7 @@ in }) sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."re-emitter-1.1.3" @@ -53512,7 +54547,7 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."archiver-3.0.0" sources."archiver-utils-2.0.0" sources."arraybuffer.slice-0.0.6" @@ -53567,7 +54602,7 @@ in sources."caseless-0.12.0" sources."combined-stream-1.0.7" sources."commander-2.6.0" - sources."compact2string-1.4.0" + sources."compact2string-1.4.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -53576,7 +54611,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -53691,7 +54726,7 @@ in }) sources."has-cors-1.1.0" sources."hat-0.0.3" - sources."http-errors-1.7.1" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.11" sources."ieee754-1.1.12" @@ -53764,7 +54799,7 @@ in sources."object-assign-4.1.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."options-0.0.6" (sources."parse-torrent-4.1.0" // { @@ -53800,7 +54835,7 @@ in sources."random-access-storage-1.3.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" (sources."raw-body-2.1.7" // { dependencies = [ @@ -53850,7 +54885,7 @@ in sources."statuses-1.2.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" @@ -53979,13 +55014,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - (sources."@babel/core-7.3.3" // { + (sources."@babel/core-7.3.4" // { dependencies = [ sources."json5-2.1.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.3.3" // { + (sources."@babel/generator-7.3.4" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -54006,16 +55041,16 @@ in sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.0.0" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.2.3" + sources."@babel/helper-replace-supers-7.3.4" sources."@babel/helper-simple-access-7.1.0" sources."@babel/helper-split-export-declaration-7.0.0" sources."@babel/helper-wrap-function-7.2.0" sources."@babel/helpers-7.3.1" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.3.3" + sources."@babel/parser-7.3.4" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.3.2" + sources."@babel/plugin-proposal-object-rest-spread-7.3.4" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" sources."@babel/plugin-proposal-unicode-property-regex-7.2.0" sources."@babel/plugin-syntax-async-generators-7.2.0" @@ -54025,41 +55060,41 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.2.0" + sources."@babel/plugin-transform-async-to-generator-7.3.4" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.2.0" - sources."@babel/plugin-transform-classes-7.3.3" + sources."@babel/plugin-transform-block-scoping-7.3.4" + sources."@babel/plugin-transform-classes-7.3.4" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.3.2" sources."@babel/plugin-transform-dotall-regex-7.2.0" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-flow-strip-types-7.2.3" + sources."@babel/plugin-transform-flow-strip-types-7.3.4" sources."@babel/plugin-transform-for-of-7.2.0" sources."@babel/plugin-transform-function-name-7.2.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" sources."@babel/plugin-transform-modules-commonjs-7.2.0" - sources."@babel/plugin-transform-modules-systemjs-7.2.0" + sources."@babel/plugin-transform-modules-systemjs-7.3.4" sources."@babel/plugin-transform-modules-umd-7.2.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" sources."@babel/plugin-transform-new-target-7.0.0" sources."@babel/plugin-transform-object-super-7.2.0" sources."@babel/plugin-transform-parameters-7.3.3" sources."@babel/plugin-transform-react-jsx-7.3.0" - sources."@babel/plugin-transform-regenerator-7.0.0" + sources."@babel/plugin-transform-regenerator-7.3.4" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.3.1" - sources."@babel/runtime-7.3.1" + sources."@babel/preset-env-7.3.4" + sources."@babel/runtime-7.3.4" sources."@babel/template-7.2.2" - sources."@babel/traverse-7.2.3" - sources."@babel/types-7.3.3" - sources."@iarna/toml-2.2.1" + sources."@babel/traverse-7.3.4" + sources."@babel/types-7.3.4" + sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -54067,7 +55102,7 @@ in sources."@parcel/utils-1.11.0" sources."@parcel/watcher-1.11.0" sources."@parcel/workers-1.11.0" - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" sources."@types/q-1.5.1" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" @@ -54150,7 +55185,7 @@ in sources."pako-1.0.8" ]; }) - sources."browserslist-4.4.1" + sources."browserslist-4.4.2" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -54166,10 +55201,10 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-db-1.0.30000938" - sources."caniuse-lite-1.0.30000938" + sources."caniuse-db-1.0.30000939" + sources."caniuse-lite-1.0.30000939" sources."chalk-2.4.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."cipher-base-1.0.4" (sources."clap-1.2.3" // { dependencies = [ @@ -54538,7 +55573,7 @@ in sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" sources."node-libs-browser-2.2.0" - sources."node-releases-1.1.7" + sources."node-releases-1.1.8" sources."nopt-4.0.1" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -54722,7 +55757,7 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."quote-stream-1.0.2" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" (sources."readable-stream-2.3.6" // { @@ -54744,14 +55779,14 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-7.0.0" sources."regenerator-runtime-0.12.1" - sources."regenerator-transform-0.13.3" + sources."regenerator-transform-0.13.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.4" + sources."regexp-tree-0.1.5" sources."regexpu-core-4.4.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -54839,7 +55874,7 @@ in ]; }) sources."supports-color-5.5.0" - sources."svgo-1.1.1" + sources."svgo-1.2.0" (sources."terser-3.16.1" // { dependencies = [ sources."commander-2.17.1" @@ -55027,7 +56062,7 @@ in sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -55061,6 +56096,7 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" + sources."dash-ast-1.0.0" sources."date-now-0.1.4" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" @@ -55251,7 +56287,7 @@ in sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" @@ -55364,7 +56400,7 @@ in sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."undeclared-identifiers-1.1.2" + sources."undeclared-identifiers-1.1.3" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -55526,6 +56562,23 @@ in production = true; bypassCache = true; }; + "reveal.js" = nodeEnv.buildNodePackage { + name = "reveal.js"; + packageName = "reveal.js"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-3.7.0.tgz"; + sha512 = "HTOTNhF5mQAw6fcsptk4oql/DEEUwTG0YHk/LzTNNx0/3IgvOQZqKzvlK/zNpqqKMLlhn1gH9Nvp+FFoc/e5/w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The HTML Presentation Framework"; + homepage = http://revealjs.com/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; s3http = nodeEnv.buildNodePackage { name = "s3http"; packageName = "s3http"; @@ -55535,7 +56588,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -56010,7 +57063,12 @@ in sources."multiblob-1.13.3" sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - sources."multiserver-3.1.2" + (sources."multiserver-3.2.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.1" + ]; + }) sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" @@ -56089,7 +57147,7 @@ in sources."osenv-0.1.5" sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" - sources."parse-entities-1.2.0" + sources."parse-entities-1.2.1" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" @@ -56305,7 +57363,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.3.1" + sources."socks-2.3.2" sources."sodium-browserify-1.2.4" (sources."sodium-browserify-tweetnacl-0.2.3" // { dependencies = [ @@ -56325,7 +57383,7 @@ in sources."ms-2.1.1" ]; }) - sources."ssb-client-4.6.3" + sources."ssb-client-4.7.0" sources."ssb-config-2.3.9" sources."ssb-db-18.6.5" sources."ssb-ebt-5.4.1" @@ -56506,7 +57564,7 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.7.3" sources."concat-map-0.0.1" sources."content-disposition-0.5.2" @@ -56537,7 +57595,7 @@ in sources."ms-2.0.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -56593,7 +57651,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.5" sources."after-0.8.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -57191,14 +58249,14 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.133.0"; + version = "1.134.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.133.0.tgz"; - sha512 = "/6xQISFy08oWJasSye77eOaRScPkTIzD7AZYlSWfyS+flYJHgUhNJcTimXGcDwwBmfPtESpDtFpB1LBA16NUOg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.134.2.tgz"; + sha512 = "WGR3TTZxXOdALEEcQtADFEOHaanhbzwLvS6gyg5vF6Akj7qRAwIIXYBUycbNdAax1mylAsXCzR352dkTwKD9lg=="; }; dependencies = [ - sources."@snyk/dep-graph-1.1.2" - sources."@snyk/gemfile-1.1.0" + sources."@snyk/dep-graph-1.4.0" + sources."@snyk/gemfile-1.2.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -57244,10 +58302,9 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."configstore-3.1.2" - sources."core-js-2.3.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-1.2.0" sources."debug-3.2.6" @@ -57264,11 +58321,11 @@ in sources."es6-promise-4.2.6" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" + sources."escodegen-1.11.1" sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."execa-0.7.0" + sources."execa-0.10.0" sources."extend-3.0.2" sources."external-editor-2.2.0" sources."fast-levenshtein-2.0.6" @@ -57333,20 +58390,13 @@ in sources."esprima-4.0.1" ]; }) - (sources."jszip-3.1.5" // { - dependencies = [ - sources."es6-promise-3.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - ]; - }) + sources."jszip-3.2.0" sources."kind-of-3.2.2" sources."latest-version-3.1.0" sources."lazy-cache-0.2.7" sources."lcid-1.0.0" sources."levn-0.3.0" - sources."lie-3.1.1" + sources."lie-3.3.0" sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" @@ -57357,7 +58407,7 @@ in sources."lodash.set-4.3.2" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-1.1.0" + sources."macos-release-2.0.0" sources."make-dir-1.3.0" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -57377,13 +58427,14 @@ in ]; }) sources."netmask-1.0.6" + sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."onetime-2.0.1" sources."opn-5.4.0" sources."optionator-0.8.2" sources."os-locale-1.4.0" - sources."os-name-2.0.1" + sources."os-name-3.0.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."pac-proxy-agent-2.0.2" @@ -57425,6 +58476,7 @@ in sources."secure-keys-1.0.0" sources."semver-5.6.0" sources."semver-diff-2.1.0" + sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -57435,15 +58487,15 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-config-2.2.0" + sources."snyk-config-2.2.1" sources."snyk-docker-plugin-1.22.0" sources."snyk-go-plugin-1.6.1" sources."snyk-gradle-plugin-2.1.3" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" sources."snyk-nodejs-lockfile-parser-1.11.0" - sources."snyk-nuget-plugin-1.7.1" - sources."snyk-paket-parser-1.4.1" + sources."snyk-nuget-plugin-1.7.2" + sources."snyk-paket-parser-1.4.3" sources."snyk-php-plugin-1.5.2" sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" @@ -57466,7 +58518,12 @@ in sources."supports-color-5.5.0" sources."temp-dir-1.0.0" sources."tempfile-2.0.0" - sources."term-size-1.2.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + ]; + }) sources."then-fs-2.0.0" sources."through-2.3.8" sources."thunkify-2.1.2" @@ -57485,8 +58542,8 @@ in sources."vscode-languageserver-types-3.14.0" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."win-release-1.1.1" sources."window-size-0.1.4" + sources."windows-release-3.1.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -57616,10 +58673,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz"; - sha512 = "GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g=="; + url = "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz"; + sha512 = "xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw=="; }; dependencies = [ sources."@types/q-1.5.1" @@ -57630,7 +58687,6 @@ in sources."coa-2.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.1.2" sources."css-select-2.0.2" sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.28" @@ -57760,7 +58816,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -58487,7 +59543,7 @@ in sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."parse-entities-1.2.0" + sources."parse-entities-1.2.1" sources."parse-json-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -58802,6 +59858,44 @@ in production = true; bypassCache = true; }; + tsun = nodeEnv.buildNodePackage { + name = "tsun"; + packageName = "tsun"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsun/-/tsun-0.4.0.tgz"; + sha512 = "DM9diPumksx/2837NoyRXq97PxSpqt9zhCnHaoeqmX2ItgksNE+QCXO6bczNAEtVVbQYML9LAxl/iawYKyMZng=="; + }; + dependencies = [ + sources."@types/node-6.14.3" + sources."ansi-0.3.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."colors-1.3.3" + sources."diff-2.2.3" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."minimist-0.0.10" + sources."node-color-readline-1.0.1" + sources."optimist-0.6.1" + sources."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."temp-0.8.3" + sources."tslib-1.9.3" + sources."wordwrap-0.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "TSUN: a repl for TypeScript Upgraded Node"; + homepage = https://github.com/HerringtonDarkholme/typescript-repl; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; @@ -58827,10 +59921,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.3.3"; + version = "3.3.3333"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3.tgz"; - sha512 = "Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz"; + sha512 = "JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw=="; }; buildInputs = globalBuildInputs; meta = { @@ -58874,7 +59968,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -59056,7 +60150,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."just-detect-adblock-1.0.0" - sources."knockout-3.5.0-rc2" + sources."knockout-3.5.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" @@ -59098,7 +60192,7 @@ in sources."object-component-0.0.3" sources."octicons-3.5.0" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" sources."opn-5.4.0" sources."os-homedir-1.0.2" @@ -59271,7 +60365,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -59554,10 +60648,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.0.tgz"; - sha512 = "DM31N9pYph1hcsVwrRXvCKx8MuQmhduvZ2SWS97iiGftMEzbR9wl5Adb09TJg1arsHvsr39/lWytHrqIjy0wqg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.1.tgz"; + sha512 = "aV5jWDgeVFrtafJN4Txkx3X36TcEL1uhBiwejKJDG3mXiqWWZAXis7nXaAqt4aI0N7YmL9IvZNDuTjLVuj4B1g=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -59584,23 +60678,23 @@ in sources."@types/express-serve-static-core-4.16.1" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" - sources."@types/node-11.9.4" + sources."@types/node-11.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.4.0" - (sources."@vue/cli-ui-3.4.0" // { + sources."@vue/cli-shared-utils-3.4.1" + (sources."@vue/cli-ui-3.4.1" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.4.0" - sources."@vue/cli-ui-addon-widgets-3.4.0" + sources."@vue/cli-ui-addon-webpack-3.4.1" + sources."@vue/cli-ui-addon-widgets-3.4.1" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."aggregate-error-1.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.0.0" @@ -59611,11 +60705,15 @@ in ]; }) sources."apollo-cache-1.1.26" - sources."apollo-cache-control-0.5.1" + (sources."apollo-cache-control-0.5.2" // { + dependencies = [ + sources."graphql-extensions-0.5.4" + ]; + }) sources."apollo-cache-inmemory-1.4.3" sources."apollo-client-2.4.13" sources."apollo-datasource-0.3.1" - sources."apollo-engine-reporting-1.0.2" + sources."apollo-engine-reporting-1.0.5" sources."apollo-engine-reporting-protobuf-0.2.1" sources."apollo-env-0.3.3" sources."apollo-graphql-0.1.1" @@ -59627,12 +60725,16 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.14" sources."apollo-server-caching-0.3.1" - sources."apollo-server-core-2.4.2" + sources."apollo-server-core-2.4.6" sources."apollo-server-env-2.2.0" - sources."apollo-server-errors-2.2.0" - sources."apollo-server-express-2.4.2" - sources."apollo-server-plugin-base-0.3.2" - sources."apollo-tracing-0.5.1" + sources."apollo-server-errors-2.2.1" + sources."apollo-server-express-2.4.6" + sources."apollo-server-plugin-base-0.3.5" + (sources."apollo-tracing-0.5.2" // { + dependencies = [ + sources."graphql-extensions-0.5.4" + ]; + }) sources."apollo-upload-client-10.0.0" sources."apollo-utilities-1.1.3" sources."argparse-1.0.10" @@ -59674,6 +60776,7 @@ in dependencies = [ sources."debug-2.6.9" sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" ]; }) sources."boxen-1.3.0" @@ -59696,7 +60799,7 @@ in sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -59809,7 +60912,7 @@ in sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.2.5" + sources."esm-3.2.6" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -59842,6 +60945,7 @@ in (sources."express-4.16.4" // { dependencies = [ sources."debug-2.6.9" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) @@ -59887,7 +60991,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" - sources."fs-capacitor-2.0.0" + sources."fs-capacitor-2.0.1" sources."fs-constants-1.0.0" sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" @@ -59922,7 +61026,7 @@ in sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" sources."graphql-anywhere-4.1.28" - sources."graphql-extensions-0.5.2" + sources."graphql-extensions-0.5.5" sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" @@ -59944,8 +61048,8 @@ in }) sources."hash.js-1.1.7" sources."hoek-6.1.2" - sources."homedir-polyfill-1.0.1" - sources."http-errors-1.7.1" + sources."homedir-polyfill-1.0.3" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" sources."ieee754-1.1.12" @@ -60158,7 +61262,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.12.26" + sources."@types/node-10.12.27" ]; }) sources."proxy-addr-2.0.4" @@ -60173,6 +61277,7 @@ in (sources."raw-body-2.3.3" // { dependencies = [ sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" ]; }) sources."rc-1.2.8" @@ -60223,12 +61328,13 @@ in dependencies = [ sources."debug-2.6.9" sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) sources."serve-static-1.13.2" sources."set-value-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -60448,32 +61554,32 @@ in "@webassemblyjs/cli" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.8.3.tgz"; - sha512 = "7/DlFYNCI/UEkngJSseIA7dUiy67dNBFUm6BD0ejZWJvJGFxG7GqICKnIshXgYo5nYzQCIgROZ40jR/D94ZdAQ=="; + url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.8.5.tgz"; + sha512 = "a71z4lI97NHUwmz7Q6e5SN7lJYl1+AYfWuvrhV/tmjUylcw+VlmtPDI1SaKCmw+f4mi8RTqvUwNxT5nRvTLYcQ=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-compiler-1.8.3" - sources."@webassemblyjs/helper-flatten-ast-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/validation-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-compiler-1.8.5" + sources."@webassemblyjs/helper-flatten-ast-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/ieee754-1.8.5" + sources."@webassemblyjs/leb128-1.8.5" + sources."@webassemblyjs/utf8-1.8.5" + sources."@webassemblyjs/validation-1.8.5" + sources."@webassemblyjs/wasm-parser-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" - sources."webassemblyjs-1.8.3" + sources."webassemblyjs-1.8.5" ]; buildInputs = globalBuildInputs; meta = { @@ -60486,32 +61592,32 @@ in "@webassemblyjs/repl" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; packageName = "@webassemblyjs/repl"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.8.3.tgz"; - sha512 = "Yzn3nOKQv5UOk0W7socTGfG/QYOEBrS7yJfZxH9ZUkqDQEwqB//E1/KBgP7zVNnIPewNQ+huwxGpUMdsYIeG0g=="; + url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.8.5.tgz"; + sha512 = "rLV45Mx+NbcaXycrrLcYI22c7+M685DeioV/7fL9abW+USiU1XmkeCKGAN0v2nxi3hyR9HW1tcfXOEH+L3z3Mw=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-compiler-1.8.3" - sources."@webassemblyjs/helper-flatten-ast-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/validation-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-compiler-1.8.5" + sources."@webassemblyjs/helper-flatten-ast-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/ieee754-1.8.5" + sources."@webassemblyjs/leb128-1.8.5" + sources."@webassemblyjs/utf8-1.8.5" + sources."@webassemblyjs/validation-1.8.5" + sources."@webassemblyjs/wasm-parser-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" - sources."webassemblyjs-1.8.3" + sources."webassemblyjs-1.8.5" ]; buildInputs = globalBuildInputs; meta = { @@ -60560,31 +61666,31 @@ in "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; packageName = "@webassemblyjs/wasm-text-gen"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.8.3.tgz"; - sha512 = "lPLruy11K0+/PHy+MmuICeYtv2wolOablgirZZlBT2KI1Q9R2qgL8xAVshMebU/iLyh0lNmVVfnu/JpBzB6R5g=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.8.5.tgz"; + sha512 = "yeYV4sTOLCWEjbJrR/g43vUFAKj73813JV2cN60AIf7Bcikzao3scoUKvPvMQxgUC2dTYSvEpdzp2KGS3c/sUg=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.3.3" + sources."@babel/generator-7.3.4" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.3.3" + sources."@babel/parser-7.3.4" sources."@babel/template-7.2.2" - sources."@babel/types-7.3.3" - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@babel/types-7.3.4" + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/ieee754-1.8.5" + sources."@webassemblyjs/leb128-1.8.5" + sources."@webassemblyjs/utf8-1.8.5" + sources."@webassemblyjs/wasm-parser-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ansi-styles-3.2.1" @@ -60615,21 +61721,21 @@ in "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; packageName = "@webassemblyjs/wast-refmt"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.8.3.tgz"; - sha512 = "rclaRL+cYHD23lszpAiduB7sPsGBjya9o1bGj5dgPbaCVsUsJ6Wv9BnvIeKxtMFhFkphQNhuJkPCD074U8Tj3Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.8.5.tgz"; + sha512 = "NbxFqkoXIFM2M9GEVkvBgQbMsxCdlvHncz1/MmDfdMhWsBokPiU5WgkSy/jDY2Qd/dgyROYiEEyGdosneXXohQ=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/long-4.2.2" sources."mamacro-0.0.3" ]; @@ -60672,7 +61778,7 @@ in sources."@xtuc/long-4.2.2" sources."acorn-6.1.0" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" (sources."anymatch-2.0.0" // { @@ -60725,7 +61831,7 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-11.3.2" sources."cache-base-1.0.1" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."chownr-1.1.1" sources."chrome-trace-event-1.0.0" sources."cipher-base-1.0.4" @@ -60955,7 +62061,7 @@ in sources."punycode-2.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" @@ -61046,7 +62152,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.2.2" // { + (sources."terser-webpack-plugin-1.2.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61235,7 +62341,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."import-local-2.0.0" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -61518,7 +62624,7 @@ in sources."clivas-0.2.0" sources."closest-to-2.0.0" sources."colour-0.7.1" - sources."compact2string-1.4.0" + sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -61651,7 +62757,7 @@ in sources."random-access-file-2.1.0" sources."random-access-storage-1.3.0" sources."random-iterate-1.0.1" - sources."randombytes-2.0.6" + sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" sources."readable-stream-3.1.1" @@ -61751,24 +62857,20 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.9.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.3.tgz"; - sha512 = "aZnlxuYOMUUBS5C8NBhhAj7T0ouJexlW5Cx5ObtOheoguG3fqXUl+KTY19L1Am/bJoyHC8otGTgew9Z0WHeTtg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-3.0.0.tgz"; + sha512 = "pUT2YYSnECH/SqKXB0m92HWzAAOt97wJpkSHu7AddyxzclN3R9A2IHq+KUzaXEjiwWzVs/+yUOSpmuwCDouNNg=="; }; dependencies = [ - sources."@babel/polyfill-7.0.0" - (sources."@babel/register-7.0.0" // { - dependencies = [ - sources."source-map-support-0.5.10" - ]; - }) + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" + sources."@babel/polyfill-7.2.5" + sources."@babel/runtime-7.3.1" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-11.9.4" - sources."@yarnpkg/lockfile-1.1.0" + sources."@types/node-11.9.5" sources."JSONSelect-0.2.1" - sources."abbrev-1.1.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { dependencies = [ @@ -61778,28 +62880,31 @@ in sources."adbkit-2.11.0" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.4.1" // { + (sources."addons-linter-1.6.1" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."source-map-support-0.5.6" - sources."yargs-12.0.2" - sources."yargs-parser-10.1.0" + sources."ansi-regex-4.0.0" + sources."camelcase-5.0.0" + sources."decamelize-1.2.0" + sources."es6-promisify-6.0.1" + sources."get-caller-file-2.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."regenerator-runtime-0.13.1" + sources."require-main-filename-2.0.0" + sources."source-map-support-0.5.10" + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + sources."yargs-13.1.0" + sources."yargs-parser-13.0.0" ]; }) sources."adm-zip-0.4.13" - sources."agent-base-4.2.1" - sources."ajv-6.5.5" - sources."ajv-keywords-3.4.0" + sources."ajv-6.9.1" + sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" sources."any-promise-1.3.0" sources."anymatch-2.0.0" (sources."archiver-2.1.1" // { @@ -61815,7 +62920,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."archy-1.0.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -61829,11 +62933,10 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-1.0.1" - sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.12.2" + sources."astral-regex-1.0.0" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -61844,15 +62947,20 @@ in dependencies = [ sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."js-tokens-3.0.2" sources."supports-color-2.0.0" ]; }) - (sources."babel-polyfill-6.26.0" // { + (sources."babel-polyfill-6.16.0" // { dependencies = [ - sources."regenerator-runtime-0.10.5" + sources."regenerator-runtime-0.9.6" + ]; + }) + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" ]; }) - sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -61875,6 +62983,7 @@ in (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."buffer-5.2.1" @@ -61885,17 +62994,20 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bunyan-1.8.12" - sources."bytes-3.0.0" sources."cache-base-1.0.1" - sources."caller-path-0.1.0" - sources."callsites-0.2.0" + (sources."caller-path-0.1.0" // { + dependencies = [ + sources."callsites-0.2.0" + ]; + }) + sources."callsites-3.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.4.0" - sources."chardet-0.4.2" + sources."chalk-2.4.2" + sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.2" - (sources."chokidar-2.1.1" // { + (sources."chokidar-2.1.2" // { dependencies = [ sources."fsevents-1.2.7" sources."normalize-path-3.0.0" @@ -61929,7 +63041,6 @@ in ]; }) sources."clone-1.0.4" - sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" @@ -61940,7 +63051,6 @@ in sources."combined-stream-1.0.7" sources."commander-2.19.0" sources."common-tags-1.8.0" - sources."commondir-1.0.1" sources."component-emitter-1.2.1" (sources."compress-commons-1.2.2" // { dependencies = [ @@ -61974,45 +63084,26 @@ in sources."css-what-2.1.3" sources."d-1.0.0" sources."dashdash-1.14.1" - (sources."data-uri-to-buffer-2.0.0" // { - dependencies = [ - sources."@types/node-8.10.40" - ]; - }) sources."debounce-1.1.0" sources."debug-2.6.9" - (sources."decamelize-2.0.0" // { - dependencies = [ - sources."xregexp-4.0.0" - ]; - }) + sources."decamelize-2.0.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" - sources."deepmerge-2.2.1" + sources."deepmerge-3.1.0" sources."defaults-1.0.3" - sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - (sources."dispensary-0.27.0" // { + (sources."dispensary-0.30.0" // { dependencies = [ sources."async-2.6.2" sources."decamelize-1.2.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.1.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."pino-5.8.1" sources."source-map-support-0.5.10" sources."yargs-12.0.5" ]; }) - sources."dockerfile-ast-0.0.12" sources."doctrine-2.1.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -62022,15 +63113,13 @@ in sources."dtrace-provider-0.8.7" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" - sources."email-validator-2.0.4" + sources."ecdsa-sig-formatter-1.0.11" + sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.13.0" - sources."es-to-primitive-1.2.0" - sources."es5-ext-0.10.47" + sources."es5-ext-0.10.48" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -62044,12 +63133,11 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.0" sources."escope-3.6.0" - (sources."eslint-5.0.1" // { + (sources."eslint-5.13.0" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."debug-3.2.6" + sources."debug-4.1.1" sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -62057,7 +63145,6 @@ in (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" sources."ansi-styles-2.2.1" @@ -62067,14 +63154,13 @@ in sources."espree-3.5.4" sources."figures-1.7.0" sources."globals-9.18.0" + sources."ignore-3.3.10" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-2.0.0" sources."onetime-1.1.0" - sources."pluralize-1.2.1" sources."progress-1.1.8" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" - sources."shelljs-0.7.8" sources."slice-ansi-0.0.4" sources."string-width-1.0.2" sources."strip-ansi-4.0.0" @@ -62087,8 +63173,9 @@ in ]; }) sources."eslint-scope-4.0.0" + sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" - (sources."espree-4.1.0" // { + (sources."espree-5.0.0" // { dependencies = [ sources."acorn-6.1.0" sources."acorn-jsx-5.0.1" @@ -62101,7 +63188,7 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-0.10.0" + sources."execa-1.0.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -62118,25 +63205,22 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" ]; }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."external-editor-2.2.0" + sources."extend-shallow-3.0.2" + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-parse-1.0.3" sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -62145,14 +63229,13 @@ in sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" - sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."find-cache-dir-1.0.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" @@ -62166,9 +63249,8 @@ in }) sources."flat-cache-1.3.4" sources."flatstr-1.0.9" - sources."fluent-syntax-0.7.0" + sources."fluent-syntax-0.10.0" sources."for-in-1.0.2" - sources."for-own-1.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fragment-cache-0.2.1" @@ -62176,33 +63258,18 @@ in sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.0.1" - (sources."ftp-0.3.10" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.9" // { + (sources."fx-runner-1.0.10" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" - sources."lodash-4.17.10" sources."which-1.2.4" ]; }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-stream-3.0.0" - (sources."get-uri-2.0.3" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.1" - ]; - }) + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" @@ -62220,85 +63287,53 @@ in }) sources."global-dirs-0.1.1" sources."globals-11.11.0" - sources."got-6.7.1" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" - sources."graphlib-2.1.7" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - (sources."hasbin-1.2.3" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - sources."home-or-tmp-3.0.0" sources."hosted-git-info-2.7.1" sources."htmlparser2-3.10.1" - sources."http-errors-1.6.3" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.12" - sources."ignore-3.3.10" - sources."immediate-3.0.6" + sources."ignore-4.0.6" + sources."import-fresh-3.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-5.2.0" // { + (sources."inquirer-6.2.2" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-4.0.0" + sources."strip-ansi-5.0.0" ]; }) sources."interpret-1.2.0" sources."invert-kv-2.0.0" - sources."ip-1.1.5" sources."is-absolute-0.1.7" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-date-object-1.0.1" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-extendable-0.1.1" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.0" @@ -62307,19 +63342,21 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" sources."is-npm-1.0.0" - sources."is-number-3.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -62331,7 +63368,7 @@ in sources."jed-1.1.1" sources."jetpack-id-1.0.0" sources."js-select-0.6.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" (sources."js-yaml-3.12.1" // { dependencies = [ sources."esprima-4.0.1" @@ -62354,20 +63391,11 @@ in ]; }) sources."jsprim-1.4.1" - (sources."jszip-3.1.5" // { - dependencies = [ - sources."core-js-2.3.0" - sources."es6-promise-3.0.2" - sources."process-nextick-args-1.0.7" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) - sources."jwa-1.2.0" + sources."jszip-2.6.1" + sources."jwa-1.3.0" sources."jws-3.2.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."latest-version-3.1.0" - sources."lazy-cache-0.2.7" (sources."lazystream-1.0.0" // { dependencies = [ sources."readable-stream-2.3.6" @@ -62376,7 +63404,6 @@ in }) sources."lcid-2.0.0" sources."levn-0.3.0" - sources."lie-3.1.1" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -62384,14 +63411,8 @@ in sources."strip-bom-2.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.11" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -62399,36 +63420,22 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" - sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-1.1.0" sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + sources."mdn-browser-compat-data-0.0.66" sources."mem-4.1.0" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."micromatch-3.1.10" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mixin-object-2.0.1" // { - dependencies = [ - sources."for-in-0.1.8" - ]; - }) + sources."mixin-deep-1.3.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -62446,35 +63453,14 @@ in }) sources."mz-2.7.0" sources."nan-2.12.1" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."async-1.5.2" - sources."camelcase-2.1.1" - sources."cliui-3.2.0" - sources."decamelize-1.2.0" - sources."invert-kv-1.0.0" - sources."lcid-1.0.0" - sources."os-locale-1.4.0" - sources."string-width-1.0.2" - sources."y18n-3.2.1" - sources."yargs-3.32.0" - ]; - }) sources."ncp-2.0.0" - sources."needle-2.2.4" sources."neo-async-2.6.0" - sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" - sources."node-modules-regexp-1.0.0" sources."node-notifier-5.2.1" (sources."nomnom-1.8.1" // { dependencies = [ @@ -62500,9 +63486,9 @@ in sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) - sources."object-keys-1.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -62510,29 +63496,21 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-3.0.1" - sources."os-name-2.0.1" + sources."os-locale-3.1.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - (sources."pac-proxy-agent-2.0.2" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."pac-resolver-3.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" sources."package-json-4.0.1" sources."pako-1.0.8" + sources."parent-module-1.0.0" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" - sources."path-0.12.7" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -62549,43 +63527,31 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pino-5.9.0" + sources."pino-5.11.1" sources."pino-std-serializers-2.3.0" - sources."pirates-4.0.1" - sources."pkg-dir-2.0.0" - sources."pluralize-7.0.0" + sources."pluralize-1.2.1" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.6" // { + (sources."postcss-7.0.14" // { dependencies = [ - sources."chalk-2.4.2" + sources."supports-color-6.1.0" ]; }) sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" - sources."probe-image-size-4.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.0" - sources."progress-2.0.3" - sources."promise-7.3.1" - (sources."proxy-agent-2.3.1" // { + (sources."probe-image-size-4.0.0" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" + sources."deepmerge-2.2.1" ]; }) - sources."proxy-from-env-1.0.0" + sources."process-nextick-args-2.0.0" + sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."quick-format-unescaped-3.0.2" - (sources."raw-body-2.3.3" // { - dependencies = [ - sources."iconv-lite-0.4.23" - ]; - }) sources."rc-1.2.8" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { @@ -62607,11 +63573,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."recursive-readdir-2.2.2" - sources."regenerator-runtime-0.11.1" + sources."regenerator-runtime-0.12.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.2.0" - sources."regexpp-1.1.0" + sources."regexpp-2.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { @@ -62627,47 +63591,43 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."require-uncached-1.0.3" + (sources."require-uncached-1.0.3" // { + dependencies = [ + sources."resolve-from-1.0.1" + ]; + }) sources."resolve-1.10.0" - sources."resolve-from-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.3.0" sources."rx-lite-3.1.2" - sources."rx-lite-aggregates-4.0.8" - sources."rxjs-5.5.12" + sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."secure-keys-1.0.0" sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."setprototypeof-1.1.0" sources."sha.js-2.4.11" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.8.3" + sources."shelljs-0.7.8" sources."shellwords-0.1.1" (sources."sign-addon-0.3.1" // { dependencies = [ sources."ajv-5.5.2" - sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" sources."fast-deep-equal-1.1.0" sources."har-validator-5.0.3" @@ -62675,7 +63635,6 @@ in sources."mz-2.5.0" sources."oauth-sign-0.8.2" sources."punycode-1.4.1" - sources."regenerator-runtime-0.9.6" sources."request-2.87.0" sources."source-map-0.5.7" sources."source-map-support-0.4.6" @@ -62683,12 +63642,11 @@ in ]; }) sources."signal-exit-3.0.2" - (sources."slice-ansi-1.0.0" // { + (sources."slice-ansi-2.1.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."smart-buffer-1.1.15" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -62704,6 +63662,7 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" sources."source-map-0.5.7" ]; @@ -62713,88 +63672,12 @@ in sources."define-property-1.0.0" ]; }) - sources."snapdragon-util-3.0.1" - (sources."snyk-1.110.2" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."debug-3.2.6" - sources."inquirer-3.3.0" - sources."ms-2.1.1" - sources."rx-lite-4.0.8" - sources."source-map-support-0.5.10" - sources."strip-ansi-4.0.0" - ]; - }) - (sources."snyk-config-2.2.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-docker-plugin-1.12.3" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-go-plugin-1.6.0" - sources."snyk-gradle-plugin-2.1.1" - (sources."snyk-module-1.9.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.7.1" // { - dependencies = [ - sources."lodash-4.17.10" - sources."source-map-support-0.5.10" - ]; - }) - (sources."snyk-nuget-plugin-1.6.5" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-php-plugin-1.5.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-policy-1.13.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-python-plugin-1.9.0" - (sources."snyk-resolve-1.0.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - (sources."snyk-resolve-deps-4.0.2" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."snyk-sbt-plugin-2.0.0" - sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.3.1" // { + (sources."snapdragon-util-3.0.1" // { dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" + sources."kind-of-3.2.2" ]; }) - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" - sources."sonic-boom-0.6.3" + sources."sonic-boom-0.7.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-support-0.5.3" @@ -62825,7 +63708,6 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { @@ -62841,7 +63723,6 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.matchall-2.0.0" sources."string_decoder-1.2.0" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -62850,35 +63731,41 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."symbol-observable-1.0.1" - sources."table-4.0.3" + (sources."table-5.2.3" // { + dependencies = [ + sources."ansi-regex-4.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.0.0" + sources."strip-ansi-5.0.0" + ]; + }) (sources."tar-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; }) - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" (sources."term-size-1.2.0" // { dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.7.0" + sources."get-stream-3.0.0" ]; }) sources."text-table-0.2.0" - sources."then-fs-2.0.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."to-object-path-0.3.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."toml-2.3.6" sources."tosource-1.0.0" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -62892,17 +63779,16 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."undefsafe-2.0.2" sources."underscore-1.6.0" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -62921,12 +63807,10 @@ in sources."url-parse-lax-1.0.0" sources."use-3.1.1" sources."user-home-2.0.0" - sources."util-0.10.4" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" - sources."vscode-languageserver-types-3.14.0" sources."watchpack-1.5.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" @@ -62935,8 +63819,6 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-2.0.1" - sources."win-release-1.1.1" - sources."window-size-0.1.4" sources."winreg-0.0.12" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { @@ -62951,7 +63833,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xregexp-2.0.0" + sources."xregexp-4.0.0" sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -62975,11 +63857,10 @@ in sources."decamelize-1.2.0" ]; }) - sources."yauzl-2.9.2" + sources."yauzl-2.10.0" (sources."zip-dir-1.0.2" // { dependencies = [ sources."async-1.5.2" - sources."jszip-2.6.1" ]; }) (sources."zip-stream-1.2.0" // { @@ -63045,7 +63926,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index bed3e10b5a1..0f72522ce48 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "ansi-regex-2.1.1" = { @@ -760,13 +760,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "http-signature-1.2.0" = { @@ -1309,13 +1309,13 @@ let sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npmlog-4.1.2" = { @@ -2216,7 +2216,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -2391,7 +2391,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2561,7 +2561,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 16384d7440b..add1dbd00f7 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; - "ajv-6.9.1" = { + "ajv-6.9.2" = { name = "ajv"; packageName = "ajv"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz"; - sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; + sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; }; }; "amdefine-1.0.1" = { @@ -1363,13 +1363,13 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "ecdsa-sig-formatter-1.0.10" = { + "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz"; - sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; }; }; "ejs-2.5.7" = { @@ -1957,13 +1957,13 @@ let sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; }; }; - "homedir-polyfill-1.0.1" = { + "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; - sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "http-basic-2.5.1" = { @@ -2515,13 +2515,13 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "jwa-1.2.0" = { + "jwa-1.3.0" = { name = "jwa"; packageName = "jwa"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.2.0.tgz"; - sha512 = "Grku9ZST5NNQ3hqNUodSkDfEBqAmGA1R8yiyPHOnLzEKI0GaCQC/XhFmsheXYuXzFQJdILbh+lYBiliqG5R/Vg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; + sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; }; }; "jws-3.2.1" = { @@ -2974,13 +2974,13 @@ let sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; }; }; - "npm-packlist-1.3.0" = { + "npm-packlist-1.4.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz"; - sha512 = "qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; }; }; "npmlog-4.1.2" = { @@ -4554,7 +4554,7 @@ in sources."has-ansi-2.0.0" sources."has-color-0.1.7" sources."home-or-tmp-2.0.0" - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."invariant-2.2.4" sources."is-3.3.0" @@ -4635,7 +4635,7 @@ in sources."@types/node-8.10.40" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -4787,7 +4787,7 @@ in sources."duplexer-0.1.1" sources."easy-table-1.1.0" sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.10" + sources."ecdsa-sig-formatter-1.0.11" sources."envconf-0.0.4" sources."escape-string-regexp-1.0.5" sources."event-stream-3.1.5" @@ -4857,7 +4857,7 @@ in ]; }) sources."jsrsasign-4.8.2" - sources."jwa-1.2.0" + sources."jwa-1.3.0" sources."jws-3.2.1" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" @@ -5165,7 +5165,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.1" + sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."interpret-1.1.0" sources."is-absolute-1.0.0" @@ -5340,7 +5340,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -5510,7 +5510,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" - sources."npm-packlist-1.3.0" + sources."npm-packlist-1.4.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -5579,7 +5579,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.9.1" + sources."ajv-6.9.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index e3e056f5442..c6047f4ea1b 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "atd"; version = "2.0.0"; + minimumOCamlVersion = "4.02"; + src = fetchFromGitHub { owner = "mjambon"; repo = pname; diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index fd3e7d58ae3..38673fb9ddc 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,7 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: buildDunePackage rec { + minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; propagatedBuildInputs = [ ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index a5164ab7fa9..87d9ac7a324 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "dtoa"; version = "0.3.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 9f2227327e4..8da00b76393 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,27 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, ocaml, findlib, gtk3, gtkspell3, gtksourceview }: +{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "lablgtk3 is not available for OCaml ${ocaml.version}" else +# This package uses the dune.configurator library +# It thus needs said library to be compiled with this OCaml compiler +let __dune = dune; in +let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in + stdenv.mkDerivation rec { - version = "3.0.beta3"; - name = "ocaml${ocaml.version}-lablgtk3-${version}"; - src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1775/lablgtk-3.0.beta3.tar.gz; - sha256 = "174mwwdz1s91a6ycbas7nc0g87c2l6zqv68zi5ab33yb76l46a6w"; + version = "3.0.beta4"; + pname = "lablgtk3"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "1lppb7k4xb1a35i7klm9mz98hw8l2f8s7rivgzysi1sviqy1ds5d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gtk3 gtkspell3 gtksourceview ]; + buildInputs = [ ocaml findlib dune gtk3 ]; + propagatedBuildInputs = [ cairo2 ]; - buildFlags = "world"; + buildPhase = "dune build -p ${pname}"; + inherit (dune) installPhase; meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix new file mode 100644 index 00000000000..7e898be7490 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -0,0 +1,8 @@ +{ buildDunePackage, gtkspell3, lablgtk3 }: + +buildDunePackage rec { + pname = "lablgtk3-gtkspell3"; + buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs; +} diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix new file mode 100644 index 00000000000..7e8807576ee --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -0,0 +1,9 @@ +{ stdenv, ocaml, gtksourceview, lablgtk3 }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; + buildPhase = "dune build -p lablgtk3-sourceview3"; + buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; + propagatedBuildInputs = [ lablgtk3 ]; + inherit (lablgtk3) src version meta nativeBuildInputs installPhase; +} diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 9c9912cfb8c..1a46c1e939b 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -2,25 +2,23 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-mlgmpidl-${version}"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "nberth"; repo = "mlgmpidl"; rev = version; - sha256 = "063hy1divbiabqm5x307iamw942sivzw9fr8vczy3kgndfp12nic"; + sha256 = "1csqplyxi5gq6ma7g4la2x20mhz1plmjallsankv0mn0x69zb1id"; }; buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; - configurePhase = '' - echo CAML_PREFIX = ${ocaml} > Makefile.config - cat Makefile.config.model >> Makefile.config - sed -i Makefile.config \ - -e 's|^MLGMPIDL_PREFIX.*$|MLGMPIDL_PREFIX = $out|' \ - -e 's|^GMP_PREFIX.*$|GMP_PREFIX = ${gmp.dev}|' \ - -e 's|^MPFR_PREFIX.*$|MPFR_PREFIX = ${mpfr.dev}|' \ - -e 's|^CAMLIDL_DIR.*$|CAMLIDL_DIR = ${camlidl}/lib/ocaml/${ocaml.version}/site-lib/camlidl|' - echo HAS_NATIVE_PLUGINS = 1 >> Makefile.config + prefixKey = "-prefix "; + configureFlags = [ + "--gmp-prefix ${gmp.dev}" + "--mpfr-prefix ${mpfr.dev}" + ]; + + postConfigure = '' sed -i Makefile \ -e 's|^ /bin/rm | rm |' ''; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index 7b084e61688..f6552d57683 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "opti"; version = "1.0.3"; + minimumOCamlVersion = "4.02"; + src = fetchurl { url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index c09cf5a77c1..57f1a832f56 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -5,14 +5,14 @@ then throw "psmt2-frontend is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "0.1"; + version = "0.2"; name = "ocaml${ocaml.version}-psmt2-frontend-${version}"; src = fetchFromGitHub { owner = "Coquera"; repo = "psmt2-frontend"; rev = version; - sha256 = "0k7jlsbkdyg7hafmvynp0ik8xk7mfr00wz27vxn4ncnmp20yz4vn"; + sha256 = "097zmbrx4gp2gnrxdmsm9lkkp5450gwi0blpxqy3833m6k5brx3n"; }; prefixKey = "-prefix "; diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 7f3686abb51..4c820d13808 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "wtf8"; version = "1.0.1"; - minimumOCamlVersion = "4.01"; + minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index dfef72835cc..75810a79e28 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,15 +2,16 @@ let pname = "yojson"; param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.4.1"; - sha256 = "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9"; + if stdenv.lib.versionAtLeast ocaml.version "4.02" then rec { + version = "1.6.0"; + url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; + sha256 = "1h73zkgqs6cl9y7p2l0cgjwyqa1fzcrnzv3k6w7wyq2p1q5m84xh"; buildInputs = [ dune ]; extra = { inherit (dune) installPhase; }; - } else { + } else rec { version = "1.2.3"; + url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz"; sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; - buildInputs = []; extra = { createFindlibDestdir = true; @@ -25,11 +26,10 @@ stdenv.mkDerivation ({ name = "ocaml${ocaml.version}-${pname}-${param.version}"; src = fetchzip { - url = "https://github.com/mjambon/${pname}/archive/v${param.version}.tar.gz"; - inherit (param) sha256; + inherit (param) url sha256; }; - buildInputs = [ ocaml findlib ] ++ param.buildInputs; + buildInputs = [ ocaml findlib ] ++ (param.buildInputs or []); propagatedBuildInputs = [ cppo easy-format biniou ]; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index c67e5a9489b..47773c20954 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -13,6 +13,7 @@ , libuuid , autoreconfHook , gcc48 +, runtimeShell , ... }: { name, src, version, source-date, source-url, ... }: @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { # Create the script cat > "$out/bin/${cmd}" <<EOF - #!/bin/sh + #!${runtimeShell} set -f LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@" EOF diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 19065f972a4..0e65a9b990e 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -17,6 +17,7 @@ , gcc48 , fetchFromGitHub , makeWrapper +, runtimeShell } @args: let @@ -62,4 +63,3 @@ rec { }; } - diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 90a605063b0..9a2925dcaf1 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.2"; + version = "0.29.5"; src = fetchPypi { inherit pname version; - sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e"; + sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index f3f1eed265d..83075f33c42 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -4,7 +4,7 @@ , markupsafe , nose , mock -, pytest +, pytest_3 , isPyPy }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"; }; - checkInputs = [ markupsafe nose mock pytest ]; + checkInputs = [ markupsafe nose mock pytest_3 ]; propagatedBuildInputs = [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 @@ -29,4 +29,4 @@ buildPythonPackage rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ domenkozar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 329fa696acf..55c6c6ec95f 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -31,11 +31,12 @@ , pyyaml , toml , notebook +, ruamel_yaml }: buildPythonPackage rec { pname = "Nikola"; - version = "8.0.1"; + version = "8.0.2"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -47,17 +48,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen Logbook blinker setuptools natsort requests piexif markdown phpserialize - jinja2 doit Babel pyyaml toml notebook + jinja2 doit Babel pyyaml toml notebook ruamel_yaml ]; src = fetchPypi { inherit pname version; - sha256 = "18bq68f9v7xk9ahjl6x4k77yysq5g6g07ng2ndbg35kcsdnw4nk6"; - }; - - patches = fetchpatch { - url = https://github.com/getnikola/nikola/commit/d40be74a86af71b5206dc22beb82fcd0d08ea2f6.patch; - sha256 = "0disr8bxbfjymwlbm82mxkal3ynnv8zfiqsgfh9fkqhb35bn4l8j"; + sha256 = "1a5y1qriy76hl4yxvbf365b1ggsxybm06mi1pwb5jkgbkwk2gkrf"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index d05bd081e0d..92c8f6223d5 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.2.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv"; + sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index a884b9eb7fb..0e25734cb7c 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj"; + sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3"; }; postPatch = '' diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index e67d81eccf7..670e07e55d4 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "WazeRouteCalculator"; - version = "0.6"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "0zmnw4198a2kvqvsz1i4a3aa20r4afp2lai6fxbpq1ppv120h857"; + sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 41318347e53..99da64268ee 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -1,12 +1,17 @@ -{lib, buildPythonPackage, fetchPypi}: +{lib, buildPythonPackage, fetchFromGitHub}: buildPythonPackage rec { + pname = "XlsxWriter"; - version = "1.1.2"; + version = "1.1.5"; - src = fetchPypi { - inherit pname version; - sha256 = "0dmznx6q3b5xkvlqpw4vqinxh5ynzz8i7hlpz9syiff51y56a8mf"; + # PyPI release tarball doesn't contain tests so let's use GitHub. See: + # https://github.com/jmcnamara/XlsxWriter/issues/327 + src = fetchFromGitHub{ + owner = "jmcnamara"; + repo = pname; + rev = "RELEASE_${version}"; + sha256 = "13250y53mr0pki93sqscy2bx01fxh6b6wvvj6m95ky0wqrrbmg39"; }; meta = { @@ -15,4 +20,5 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; }; + } diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 0ee617a1be6..d75511f8d4c 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = https://launchpad.net/aafigure/; license = licenses.bsd2; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index a80cd99f73f..1e4f2f76b0b 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6"; + sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index 7b26d5c07a5..7f54af28bd8 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,21 +3,20 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.0.post1"; + version = "0.2.0.post2"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "738218db41ff1b1f932eabb700e400d84141af6f29392aab5f7be1b19758f806"; + sha256 = "c0ca4d7ca67fd867c3a7e34232a98a1fc210ee7ff845f3d2eed445a01737b2ff"; }; - # Tests look in wrong place for test data - doCheck = false; - checkPhase = '' - py.test tests + pushd tests + py.test ./. + popd ''; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 27a9a455c47..34d4c2a37a7 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 003bd516657..9f764df3376 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms"; + sha256 = "b6edd095be66561382bdaa59d40b04490e93149fb3b7fa44c1fa5504eed5b8b9"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix new file mode 100644 index 00000000000..83dab71e221 --- /dev/null +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, libusb1 +, rsa +, pycryptodome +, pytest +, mock +}: +buildPythonPackage rec { + pname = "adb-homeassistant"; + version = "1.3.1"; + + # pypi does not contain tests, using github sources instead + src = fetchFromGitHub { + owner = "JeffLIrion"; + repo = "python-adb"; + rev = "5949bf432307cbba7128e84d7bc6add7f054a078"; + sha256 = "0s3fazvbzchn1fsvjrd1jl8w9y4dvvgq6q8m8p5lr2gri0npr581"; + + }; + + propagatedBuildInputs = [ + libusb1 + rsa + pycryptodome + ]; + + checkInputs = [ pytest mock ]; + checkPhase = '' + py.test test + ''; + + meta = with lib; { + description = "A pure python implementation of the Android ADB and Fastboot protocols"; + homepage = https://github.com/JeffLIrion/python-adb/tree/adb-homeassistant; + license = licenses.asl20; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index bbfd08e03aa..afe9c6fb29c 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.11"; + version = "0.1.13"; src = fetchPypi { inherit pname version; - sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c"; + sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f"; }; # hardcodes a test dependency on an old version of pytest-asyncio diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 204f7bfc0df..f7ac236a520 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,17 +1,16 @@ { stdenv, buildPythonPackage, fetchPypi -, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }: +, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }: buildPythonPackage rec { pname = "aiodns"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea"; + sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares ] - ++ optional isPy33 asyncio + propagatedBuildInputs = with stdenv.lib; [ pycares typing ] ++ optional (isPy27 || isPyPy) trollius; checkPhase = '' diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index d5572bb6d1d..2b719ddf063 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.7.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "26989babdc3f38575164b60b9536309271d58db005a03045b6e9cca4fc5201d8"; + sha256 = "3c23aed8e82f398b732279f5f7ee7ed00949ff2db7009f7a2dc705f7c2d16783"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 59401269393..9003618a0fd 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -1,24 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder, isPy36 , nose, asynctest, mock, pytz, tzlocal, imaplib2, docutils, pyopenssl }: buildPythonPackage rec { pname = "aioimaplib"; - version = "0.7.14"; + version = "0.7.15"; # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "150v3czh53sqakfqgjyj1w39mdfcxmpnrk2pbmq63jkq7r6njl0l"; + sha256 = "15nny3y8pwaizq1zmkg43ym5jszk2hs010z12yn2d0j1fibymwbj"; }; - disabled = pythonOlder "3.4"; + disabled = !(isPy3k && pythonOlder "3.7"); checkInputs = [ nose asynctest mock pytz tzlocal imaplib2 docutils pyopenssl ]; # https://github.com/bamthomas/aioimaplib/issues/35 - doCheck = false; + doCheck = !isPy36; meta = with lib; { description = "Python asyncio IMAP4rev1 client library"; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix new file mode 100644 index 00000000000..cee5c2606e0 --- /dev/null +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, aiohttp }: + +buildPythonPackage rec { + pname = "aiounifi"; + version = "4"; + + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0594nb8mpfhnnk9jadbdnbn9v7p4sh3430kcgfyhsh7ayw2mpb9m"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # upstream has no tests + doCheck = false; + + meta = with lib; { + description = "An asynchronous Python library for communicating with Unifi Controller API"; + homepage = https://pypi.python.org/pypi/aiounifi/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index b93843acea1..ff9901765fb 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "35660f7e6159288e2be111126be148ef04cbf7306da73c8b8bd4400837bb08e3"; + sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index a16d54af260..c462c41822a 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeWrapper +{ stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder, pyyaml , python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2 }: buildPythonPackage rec { pname = "alerta-server"; - version = "6.3.2"; + version = "6.7.5"; src = fetchPypi { inherit pname version; - sha256 = "0mp97scdz2scdzi9va99hghmjz25zssgwg07i6cldzkc8j71kax5"; + sha256 = "e8dc3428248a5b20c4fe8da76c2d353b715d515bd4879928c499671d4360a90f"; }; - buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ]; + propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server @@ -19,6 +19,8 @@ buildPythonPackage rec { wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH" ''; + disabled = pythonOlder "3.5"; + meta = with stdenv.lib; { homepage = https://alerta.io; description = "Alerta Monitoring System server"; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 47125894e5b..c366fc770b3 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -1,17 +1,17 @@ { stdenv, buildPythonPackage, fetchPypi, makeWrapper -, six, click, requests, pytz, tabulate +, six, click, requests, pytz, tabulate, pythonOlder }: buildPythonPackage rec { pname = "alerta"; - version = "6.3.1"; + version = "6.5.0"; src = fetchPypi { inherit pname version; - sha256 = "08l366g0arpd23bm7bzk0hpmfd3z6brb8p24rjwkb3gvafhk7cz9"; + sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881"; }; - buildInputs = [ six click requests pytz tabulate ]; + propagatedBuildInputs = [ six click requests pytz tabulate ]; doCheck = false; @@ -19,6 +19,8 @@ buildPythonPackage rec { wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH" ''; + disabled = pythonOlder "3.5"; + meta = with stdenv.lib; { homepage = https://alerta.io; description = "Alerta Monitoring System command-line interface"; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 5f21f4662cb..544be4f67dd 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -5,24 +5,23 @@ buildPythonPackage rec { pname = "altair"; - version = "2.2.2"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c158699026eb5a19f95c1ca742e2e82bc20c27013ef5785f10836283e2233f8a"; + sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6"; }; + postPatch = '' + # Tests require network + rm altair/examples/boxplot_max_min.py altair/examples/line_percent.py + ''; + checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ]; propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; - # hack to prevent typing from being required for python > 3.5 - postPatch = '' - substituteInPlace requirements.txt \ - --replace "typing" "" - ''; - checkPhase = '' export LANG=en_US.UTF-8 py.test altair --doctest-modules @@ -33,6 +32,6 @@ buildPythonPackage rec { homepage = https://github.com/altair-viz/altair; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index fc984d40cc6..54b6e87a1ce 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.3.2"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb"; + sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb"; }; checkInputs = [ pytest case pytest-sugar ]; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 6cd4c030767..7525df60575 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -2,12 +2,12 @@ asn1crypto, click, pydot, ipython, pyqt5, pyperclip }: buildPythonPackage rec { - version = "3.3.4"; + version = "3.3.5"; pname = "androguard"; src = fetchPypi { inherit pname version; - sha256 = "1hinfbvha7f1py1jnvxih7lx0p4z2nyaiq9bvg8v3bykwrd9jff2"; + sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix new file mode 100644 index 00000000000..34e360d2c1a --- /dev/null +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, writeText +, ipywidgets +, six +, docopt +, tqdm +, jupyter +, psutil +, pyyaml +, ansible-runner +, ansible +, python +}: + +let + kernelSpecFile = writeText "kernel.json" (builtins.toJSON { + argv = [ "${python.interpreter}" "-m" "ansible_kernel" "-f" "{connection_file}" ]; + codemirror_mode = "yaml"; + display_name = "Ansible"; + language = "ansible"; + }); +in +buildPythonPackage rec { + pname = "ansible-kernel"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "a59039a1724c0f4f4435316e2ad3383f2328ae61f190e74414a66cc8c4637636"; + }; + + propagatedBuildInputs = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; + + postPatch = '' + # remove when merged + # https://github.com/ansible/ansible-jupyter-kernel/pull/82 + touch LICENSE.md + + # remove custom install + sed -i "s/cmdclass={'install': Installer},//" setup.py + ''; + + # tests hang with launched kernel + doCheck = false; + + # install kernel manually + postInstall = '' + mkdir -p $out/share/jupyter/kernels/ansible/ + ln -s ${kernelSpecFile} $out/share/jupyter/kernels/ansible/kernel.json + ''; + + meta = with lib; { + description = "An Ansible kernel for Jupyter"; + homepage = https://github.com/ansible/ansible-jupyter-kernel; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix new file mode 100644 index 00000000000..ed5b35e8344 --- /dev/null +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchPypi +, buildPythonPackage +, ansible +, pyyaml +, six +, nose +, setuptools_scm +, ruamel_yaml +}: + +buildPythonPackage rec { + pname = "ansible-lint"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9430ea6e654ba4bf5b9c6921efc040f46cda9c4fd2896a99ff71d21037bcb123"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ]; + checkInputs = [ nose ]; + + postPatch = '' + patchShebangs bin/ansible-lint + substituteInPlace setup.cfg \ + --replace "setuptools_scm_git_archive>=1.0" "" + ''; + + # give a hint to setuptools_scm on package version + preBuild = '' + export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" + ''; + + checkPhase = '' + PATH=$out/bin:$PATH HOME=$(mktemp -d) nosetests test + ''; + + meta = with lib; { + homepage = "https://github.com/willthames/ansible-lint"; + description = "Best practices checker for Ansible"; + license = licenses.mit; + maintainers = [ maintainers.sengaya ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix new file mode 100644 index 00000000000..fbe9589478c --- /dev/null +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +, pexpect +, python-daemon +, pyyaml +, six +, ansible +, pytest +, mock +}: + +buildPythonPackage rec { + pname = "ansible-runner"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "9c2fc02bd22ac831138bfd2241e1664d7700bbb2c61f96b8b1f2d83ab4ea59a7"; + }; + + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ + ansible + psutil + pexpect + python-daemon + pyyaml + six + ]; + + checkPhase = '' + HOME=$(mktemp -d) pytest --ignore test/unit/test_runner.py -k "not test_prepare" + ''; + + meta = with lib; { + description = "Helps when interfacing with Ansible"; + homepage = https://github.com/ansible/ansible-runner; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix new file mode 100644 index 00000000000..1daff95d3a8 --- /dev/null +++ b/pkgs/development/python-modules/ansible/default.nix @@ -0,0 +1,53 @@ +{ lib +, fetchurl +, buildPythonPackage +, pycrypto +, paramiko +, jinja2 +, pyyaml +, httplib2 +, boto +, six +, netaddr +, dnspython +, jmespath +, dopy +, windowsSupport ? false +, pywinrm +}: + +buildPythonPackage rec { + pname = "ansible"; + version = "2.7.8"; + + src = fetchurl { + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + sha256 = "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + postInstall = '' + for m in docs/man/man1/*; do + install -vD $m -t $out/share/man/man1 + done + ''; + + propagatedBuildInputs = [ + pycrypto paramiko jinja2 pyyaml httplib2 boto + six netaddr dnspython jmespath dopy + ] ++ lib.optional windowsSupport pywinrm; + + # dificult to test + doCheck = false; + + meta = with lib; { + homepage = http://www.ansible.com; + description = "Radically simple IT automation"; + license = [ licenses.gpl3 ] ; + maintainers = with maintainers; [ jgeerds joamaki costrouc ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 8e6fc668204..bd535a972d1 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm }: +, pytest_3, setuptools_scm }: buildPythonPackage rec { pname = "apipkg"; @@ -10,8 +10,8 @@ buildPythonPackage rec { sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; }; - buildInputs = [ setuptools_scm ]; - checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytest_3 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 78cd2fca837..a0acadd8db7 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -23,9 +23,8 @@ buildPythonPackage rec { ./tests.patch ]; postPatch = "rm testParser2.py"; - buildInputs = [ + nativeBuildInputs = [ sphinx - pytest py3to2 ]; propagatedBuildInputs = [ @@ -33,7 +32,7 @@ buildPythonPackage rec { isodate numpy openpyxl - ] ++ lib.optional gui [ + ] ++ lib.optionals gui [ tkinter ]; @@ -53,7 +52,11 @@ buildPythonPackage rec { (cd apidocs && make html && cp -r _build $doc) ''; - doCheck = if gui then true else false; + doCheck = false; + + checkPhase = '' + py.test + ''; meta = with lib; { description = '' diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 120928656b4..187e795416c 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -1,30 +1,33 @@ { cffi , six +, enum34 , hypothesis , pytest , wheel , buildPythonPackage , fetchPypi +, isPy3k +, lib }: buildPythonPackage rec { pname = "argon2_cffi"; - version = "18.3.0"; - name = "${pname}-${version}"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d"; + sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26"; }; - propagatedBuildInputs = [ cffi six ]; + propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ hypothesis pytest wheel ]; checkPhase = '' pytest tests ''; - meta = { + meta = with lib; { description = "Secure Password Hashes for Python"; homepage = https://argon2-cffi.readthedocs.io/; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 65f4ae79f4b..0a8e7e6f482 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,21 +1,22 @@ { stdenv, buildPythonPackage, fetchPypi , nose, chai, simplejson, backports_functools_lru_cache -, dateutil }: +, dateutil, pytz +}: buildPythonPackage rec { pname = "arrow"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd"; + sha256 = "6f54d9f016c0b7811fac9fb8c2c7fa7421d80c54dbdd75ffb12913c55db60b8a"; }; checkPhase = '' nosetests --cover-package=arrow ''; - checkInputs = [ nose chai simplejson ]; + checkInputs = [ nose chai simplejson pytz ]; propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; postPatch = '' diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index 29dae1fd663..6af5b3da880 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for translating ASN.1 into other forms"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ leenaars ]; }; } diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 4f07c09e159..c6d06772c9b 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aspy.yaml"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ajb97kn044ximkzq2090h4yblrhw77540pwiw345cp7mwzy4xqa"; + sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 3c5839267bd..75f0b632e87 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.9.2"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b"; + sha256 = "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1"; }; propagatedBuildInputs = [ pytz requests ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix new file mode 100644 index 00000000000..3aba3a37c9e --- /dev/null +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchPypi, buildPythonPackage, astroid, six, coverage +, lazy-object-proxy, nose, wrapt +}: + +buildPythonPackage rec { + pname = "asttokens"; + version = "1.1.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m"; + }; + + propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ]; + + checkInputs = [ coverage nose ]; + + meta = with lib; { + homepage = https://github.com/gristlabs/asttokens; + description = "Annotate Python AST trees with source text and token information"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 703a6e68167..8dbb4da7060 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "astunparse"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca"; + sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67"; }; propagatedBuildInputs = [ six wheel ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 82723163a5e..bea0857f0cf 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.14.0"; + version = "1.15.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0f1i5a760a3jylkj00bxkshnylzyhyqz50v8mb8s9ygllpzja058"; + sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 0a7dbf561a0..fdaebda089f 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv"; + sha256 = "ce96fb50326a3bfa084463dbde1cf2e02c92735e5bc324d836355c25af87e0ae"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 44eb1b09d83..e34f937b509 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atomicwrites"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee"; + sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index ce4408b8441..d2a25cf738a 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { - version = "1.2.3"; + version = "1.2.4"; pname = "atomman"; src = fetchPypi { inherit pname version; - sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c"; + sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index c6a9151d911..29e3ca09cc5 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "attrdict"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6"; + sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70"; }; propagatedBuildInputs = [ coverage nose six ]; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 633daab7d4e..bbba8deb459 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "audio-metadata"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7"; + sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 0174bb3a029..d2d1e48b4c6 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "18.10.1"; + version = "19.1.1"; src = fetchPypi { inherit pname version; - sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40"; + sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index f736b9f8623..84c9b21f933 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,24 +2,25 @@ , buildPythonPackage , fetchPypi , nose -, pillow , numpy , ffmpeg_4 -, git , libav , pkgconfig }: buildPythonPackage rec { pname = "av"; - version = "6.1.0"; + version = "6.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z"; + sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f"; }; - buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ]; + checkInputs = [ nose numpy ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg_4 ]; # Tests require downloading files from internet doCheck = false; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index d02ffc4770c..28e1d60113f 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.5.6"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f"; + sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2"; }; buildInputs = [ pytestrunner h5py ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index dc7e3148400..9e761b3698d 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -2,12 +2,12 @@ , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: buildPythonPackage rec { - version = "1.12.2"; + version = "1.12.3"; pname = "aws-adfs"; src = fetchPypi { inherit pname version; - sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3"; + sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831"; }; # Relax version constraint diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 917a9379882..56d183988dc 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d"; + sha256 = "1008d149599d5d629b0c7bdfaa249d59eaab6d194faf5f0f941fa7209e68e6f2"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 10511c9f439..1a17d2650b5 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a"; + sha256 = "bb74e1cc2388bd29c45e2e3eb31d0416d0f53d83baafca7b72ca9c945a2e249a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 5ea04cd19c8..d6d1ba832d6 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "1.1.17"; + version = "1.1.18"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be"; + sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 462c9e615a1..69f4313a149 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.1"; + version = "4.4.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a"; + sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index fd47f8895fd..d8e9e7eb179 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.1"; + version = "2.5.1"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; + sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index aa037b48b4f..cf977539d5d 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "3.0.2"; pname = "azure-mgmt-nspkg"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; + sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52"; }; propagatedBuildInputs = [ azure-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index b60e3aee340..afcc58ec7e4 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { - version = "0.20.1"; + version = "2.1.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; + sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 2e0523bb25c..4dd4c692490 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.20.0"; + version = "3.1.1"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; + sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix index 1dbca3943a9..013fe9f446f 100644 --- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix +++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "backports.ssl_match_hostname"; - version = "3.5.0.1"; + version = "3.7.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh"; + sha256 = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index 9ac9cf831eb..e83a9f67789 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchFromGitHub, buildPythonPackage }: buildPythonPackage rec { pname = "beanstalkc"; - version = "0.4.0"; + version = "0.5.2"; - src = fetchPypi { - inherit pname version; - sha256 = "98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280"; + src = fetchFromGitHub { + owner = "bosondata"; + repo = "beanstalkc"; + rev = "v${version}"; + sha256 = "1dpb1yimp2pfnikmgsb2fr9x6h8riixlsx3xfqphnfvrid49vw5s"; }; + doCheck = false; + meta = { description = "A simple beanstalkd client library for Python"; maintainers = with stdenv.lib.maintainers; [ aanderse ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index f230d5e4c05..1b9ba31f035 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -1,19 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }: buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.6.3"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10"; + sha256 = "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests build + py.test $out/${python.sitePackages}/bs4/tests ''; + propagatedBuildInputs = [ soupsieve ]; + meta = with stdenv.lib; { homepage = http://crummy.com/software/BeautifulSoup/bs4/; description = "HTML and XML parser"; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index ed99686ed27..61dc1db1a48 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.17.5"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c"; + sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 3e301e03993..dd4b548563c 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }: +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }: buildPythonPackage rec { pname = "billiard"; - version = "3.5.0.5"; + version = "3.6.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2"; + sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84"; }; - buildInputs = [ pytest case ]; + checkInputs = [ pytest case psutil ]; meta = with stdenv.lib; { homepage = https://github.com/celery/billiard; diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index 2f0b01a5c23..77f1ff7cbd0 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { }; prePatch = '' - # See https://github.com/audreyr/binaryornot/issues/40 + # TypeError: binary() got an unexpected keyword argument 'average_size' substituteInPlace tests/test_check.py \ - --replace "average_size=512" "average_size=128" + --replace "average_size=512" "" ''; propagatedBuildInputs = [ chardet ]; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 8e54e3bbde7..23f4257a357 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { description = "Module for binary data manipulation"; homepage = "https://github.com/scott-griffiths/bitstring"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 7cd55c9e647..c2b0db61cbb 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "bleach"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718"; + sha256 = "3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index da06b15f5b4..03a1181a014 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -9,6 +9,13 @@ buildPythonPackage rec { sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9"; }; + patches = [ + (fetchpatch { + url = "https://github.com/BlockIo/block_io-python/commit/8ec0a0cd1afcfcb439d6dc306d8497dd9e4a0993.patch"; + sha256 = "1i6c153wvkr5ncm3cpn34faxvavz534x5kndwn4adlaxlzq30snn"; + }) + ]; + propagatedBuildInputs = [ base58 ecdsa diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 56036fc97b3..823b9ab8c6a 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "18.9.1"; + version = "19.1.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b828ad2b3b3a40956ef866e462e4c82faf83be79348af3945d4e7cede8a53913"; + sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a"; }; buildInputs = [ cython cmake ]; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 85b752409ea..8ee8b2c9fd5 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -3,26 +3,26 @@ let wheel_source = fetchPypi { pname = "wheel"; - version = "0.32.2"; + version = "0.33.1"; format = "wheel"; - sha256 = "1216licil12jjixfqvkb84xkync5zz0fdc2kgzhl362z3xqjsgn9"; + sha256 = "8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668"; }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "40.6.3"; + version = "40.8.0"; format = "wheel"; - sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b"; + sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab"; }; in stdenv.mkDerivation rec { pname = "pip"; - version = "18.1"; + version = "19.0.3"; name = "${python.libPrefix}-bootstrapped-${pname}-${version}"; src = fetchPypi { inherit pname version; format = "wheel"; - sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550"; + sha256 = "bd812612bbd8ba84159d9ddc0266b7fbce712fc9bc98c82dee5750546ec8ec64"; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index ba7f4393dbd..e62936a9288 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.80"; # N.B: if you change this, change botocore too + version = "1.9.96"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b"; + sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 7eb9f3d44af..801977a9620 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d"; + sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index c76a930c965..70dd13cf3b4 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.12.2"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043"; + sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index ede09373f90..755c39287f1 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.12.2"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043"; + sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index d4b9195c555..2581ba9c95f 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "2.1.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3"; + sha256 = "9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index bdd11fb3de6..80b23e43380 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cairocffi"; - version = "0.9.0"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"; + sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index dadd55ab040..8e6c9044121 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -1,29 +1,37 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder , wrapt +, typing , pyserial , nose , mock +, hypothesis +, future , pytest , pytest-timeout }: buildPythonPackage rec { pname = "python-can"; - version = "3.0.0"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0d2ddb3b663af51b11a4c7fb7a577c63302a831986239f82bb6af65efc065b07"; + # PyPI tarball is missing some tests and is missing __init__.py in test + # directory causing the tests to fail. See: + # https://github.com/hardbyte/python-can/issues/518 + src = fetchFromGitHub { + repo = pname; + owner = "hardbyte"; + rev = "v${version}"; + sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis"; }; - propagatedBuildInputs = [ wrapt pyserial ]; - checkInputs = [ nose mock pytest pytest-timeout ]; + propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing; + checkInputs = [ nose mock pytest pytest-timeout hypothesis future ]; + # Add the scripts to PATH checkPhase = '' - pytest -k "not test_writer_and_reader \ - and not test_reader \ - and not test_socketcan_on_ci_server" + PATH=$out/bin:$PATH pytest -c /dev/null ''; meta = with lib; { diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 9a89fff08f8..05fe33f7e2e 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,4 +1,5 @@ { stdenv +, libev , buildPythonPackage , fetchPypi , pkgs @@ -28,7 +29,10 @@ buildPythonPackage rec { }; buildInputs = [ - pkgs.libev + libev + ]; + + nativeBuildInputs = [ # NOTE: next version will work with cython 0.29 # Requires 'Cython!=0.25,<0.29,>=0.20' (cython.overridePythonAttrs(old: rec { diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 498729bb132..c22bb427a34 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,39 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect, - pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet +{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect +, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet }: buildPythonPackage rec { pname = "celery"; - version = "4.2.1"; + version = "4.3.0rc1"; src = fetchPypi { inherit pname version; - sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"; + sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf"; }; - # See https://github.com/celery/celery/issues/4500 - # TODO: Remove once upgraded to 4.3 - disabled = isPy37; - - patches = [ - # Skip test_RedisBackend.test_timeouts_in_url_coerced - # See https://github.com/celery/celery/pull/4847 - (fetchpatch { - url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch; - sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq"; - }) - # Allow usage of a newer pytest version - # See https://github.com/celery/celery/pull/4912 - (fetchpatch { - url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch; - sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594"; - }) - ]; - - postPatch = '' - substituteInPlace requirements/test.txt --replace ",<3.9" "" - ''; - # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ @@ -43,7 +20,7 @@ buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - checkInputs = [ pytest case ]; + checkInputs = [ case pytest boto3 moto ]; propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 2f634bf21e5..7eca740953f 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.11.5"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4"; + sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 2b9441b7662..42e24dedba2 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "chainer"; - version = "5.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee"; + sha256 = "cc8390a7f445a14a1bc71d54de348be247158fe2813a5ef11c5046265001c8c4"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index a3e945bc916..f982ffefb2a 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f"; + sha256 = "98a1237bf77f18761d8f964cb3c3b794e2d377a261b5e1640268608ec94336fa"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 6719c666902..ef8456d376c 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.1.6"; + version = "2.1.7"; src = fetchPypi { inherit pname version; - sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd"; + sha256 = "e13ba874d854ac493ece329dcd9947e82357c15437ac1a90ed1040d0e5b87aad"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index 1c42b1283ee..f082510713a 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -13,6 +13,10 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + postPatch = '' + substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" + ''; + meta = { description = "Python attributes without boilerplate"; homepage = https://characteristic.readthedocs.org; diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 1f452fb461a..3509a646993 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestrunner, hypothesis }: +, pytest_3, pytestrunner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest_3 pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 1763ccbce85..4a860c5510c 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , cheroot, contextlib2, portend, routes, six -, setuptools_scm, zc_lockfile +, setuptools_scm, zc_lockfile, more-itertools , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov -, backports_functools_lru_cache, requests_toolbelt +, backports_functools_lru_cache, requests_toolbelt, pytest-services }: let srcInfo = if isPy3k then { - version = "18.0.1"; - sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520"; + version = "18.1.0"; + sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615"; } else { version = "17.4.1"; sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; @@ -22,14 +22,29 @@ in buildPythonPackage rec { inherit (srcInfo) version sha256; }; - propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ]; + propagatedBuildInputs = if isPy3k then [ + # required + cheroot portend more-itertools zc_lockfile + # optional + routes + ] else [ + cheroot contextlib2 portend routes six zc_lockfile + ]; buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; + checkInputs = if isPy3k then [ + objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + ] else [ + backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + ]; checkPhase = '' - LANG=en_US.UTF-8 pytest + # 3 out of 5 SignalHandlingTests need network access + # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306 + # ...and skipping it makes 2 other tests fail + LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \ + and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index feb215a6e7a..548317a9835 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "0.6.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1"; + sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 66626cb76f4..ff9e70b4146 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.7"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379"; + sha256 = "00d68374abe02363a417160e5836022be5c8f8bdac1da5dd101fadb6f8e96619"; }; LC_ALL="en_US.UTF-8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { postPatch = stdenv.lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin - echo '#/bin/sh' > bin/pbpaste - echo '#/bin/sh' > bin/pbcopy + echo '#${stdenv.shell}' > bin/pbpaste + echo '#${stdenv.shell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix index 7778e73f92f..8f75170c58c 100644 --- a/pkgs/development/python-modules/cmd2/old.nix +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -2,6 +2,7 @@ , pyperclip, six, pyparsing, vim , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales +, runtimeShell }: buildPythonPackage rec { pname = "cmd2"; @@ -19,8 +20,8 @@ buildPythonPackage rec { postPatch = stdenv.lib.optional stdenv.isDarwin '' # Fake the impure dependencies pbpaste and pbcopy mkdir bin - echo '#/bin/sh' > bin/pbpaste - echo '#/bin/sh' > bin/pbcopy + echo '#${runtimeShell}' > bin/pbpaste + echo '#${runtimeShell}' > bin/pbcopy chmod +x bin/{pbcopy,pbpaste} export PATH=$(realpath bin):$PATH ''; diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 1f8d913aa2a..cf0cff1f155 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cmdline"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7"; + sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a"; }; # No tests, https://github.com/rca/cmdline/issues/1 diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 5cfa1862f48..896ee51537b 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.5.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq"; + sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index bce14db7704..e85c95b85bd 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorama"; - version = "0.3.9"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8"; + sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"; }; # No tests in archive diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 14bae27592a..2e57ea538c9 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colorlover"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi"; + sha256 = "b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2"; }; # no tests included in distributed archive diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 7bef3e82935..93b5e58a774 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,22 +2,23 @@ buildPythonPackage rec { pname = "configparser"; - version = "3.5.0"; + version = "3.7.3"; src = fetchPypi { inherit pname version; - sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k"; + sha256 = "27594cf4fc279f321974061ac69164aaebd2749af962ac8686b20503ac0bcf2d"; }; # No tests available doCheck = false; - # Fix issue when used together with other namespace packages - # https://github.com/NixOS/nixpkgs/issues/23855 - patches = [ - ./0001-namespace-fix.patch - ]; + preConfigure = '' + export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + ''; meta = with stdenv.lib; { + description = "Updated configparser from Python 3.7 for Python 2.6+."; + license = licenses.mit; + homepage = https://github.com/jaraco/configparser; }; } diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix index 12914617b8f..27ee2fc82f9 100644 --- a/pkgs/development/python-modules/contextvars/default.nix +++ b/pkgs/development/python-modules/contextvars/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93"; }; + # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9 + patches = [ ./immutables_version.patch ]; propagatedBuildInputs = [ immutables ]; meta = { diff --git a/pkgs/development/python-modules/contextvars/immutables_version.patch b/pkgs/development/python-modules/contextvars/immutables_version.patch new file mode 100644 index 00000000000..733c0502a66 --- /dev/null +++ b/pkgs/development/python-modules/contextvars/immutables_version.patch @@ -0,0 +1,11 @@ +--- ./setup.py 2018-07-30 15:40:14.000000000 +0000 ++++ ./setup.py 2019-02-12 18:33:24.984430303 +0000 +@@ -17,7 +17,7 @@ + packages=['contextvars'], + provides=['contextvars'], + install_requires=[ +- 'immutables==0.6', ++ 'immutables>=0.6', + ], + license='Apache License, Version 2.0', + classifiers=[ diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 5a341168e8d..2b0c0665fa3 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.4.4"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb"; + sha256 = "e95dceaee9ce16a09564c1226977a0fe62f1399701581b59c4188f5c91a86687"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index a58591f4b05..dfbb14eb7e6 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -4,7 +4,6 @@ , openssl , cryptography_vectors , darwin -, idna , asn1crypto , packaging , six @@ -23,11 +22,11 @@ buildPythonPackage rec { # also bump cryptography_vectors pname = "cryptography"; - version = "2.4.2"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5"; + sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9"; }; outputs = [ "out" "dev" ]; @@ -35,7 +34,6 @@ buildPythonPackage rec { buildInputs = [ openssl cryptography_vectors ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ - idna asn1crypto packaging six diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix index 00c726cee89..f02a986ec02 100644 --- a/pkgs/development/python-modules/cryptography_vectors/default.nix +++ b/pkgs/development/python-modules/cryptography_vectors/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { # also bump cryptography pname = "cryptography_vectors"; - version = "2.4.2"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi"; + sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik"; }; # No tests included diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 908506bcd9c..d23d5bef0e4 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "5.0.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d"; + sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 2411e8251a0..4847d57b67b 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.2"; + version = "1.2.3"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00"; + sha256 = "ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21"; }; # similar to Gsl, glpk, fftw there is also a dsdp interface diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index cd61c8b4ac7..58126c7d1e6 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.0.0"; + version = "7.1.1"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828"; + sha256 = "17d760bdf89e364fc7c964c5640c1b38cbb22ab49b53830883f21fda92c59131"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index bf46bf9a182..1e1248591f0 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -29,8 +29,11 @@ buildPythonPackage rec { ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . ''; - buildInputs = [ + nativeBuildInputs = [ pari + ]; + + buildInputs = [ gmp ]; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix new file mode 100644 index 00000000000..1bba260e2a0 --- /dev/null +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, dask +, distributed +, mpi4py +, pytest +, requests +}: + +buildPythonPackage rec { + version = "1.0.2"; + pname = "dask-mpi"; + + src = fetchPypi { + inherit pname version; + sha256 = "1apzzh90gl9jx43z0gjmgpniplhvqziafi2l8688a0g01vw7ibjv"; + }; + + checkInputs = [ pytest requests ]; + propagatedBuildInputs = [ dask distributed mpi4py ]; + + checkPhase = '' + py.test dask_mpi + ''; + + # hardcoded mpirun path in tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/dask/dask-mpi; + description = "Deploy Dask using mpi4py"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 86fc85f8d69..93351de1125 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "dask"; - version = "0.20.2"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3"; + sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 51809aeccac..2c3cd4a3e01 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1"; + sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79"; }; postPatch = '' diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 4fcb38e7b36..63191aa224e 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -42,5 +42,7 @@ in buildPythonPackage rec { description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; + # Package is no longer maintained upstream, and more and more tests are failing. + broken = true; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index fc8f5671490..63366d93056 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,15 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }: +{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }: buildPythonPackage rec { pname = "python-dateutil"; - version = "2.7.5"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02"; + sha256 = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ six setuptools_scm ]; + checkPhase = '' + py.test dateutil/test + ''; + + # Requires fixing + doCheck = false; + meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; homepage = https://pypi.python.org/pypi/python-dateutil; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 13465f1af2c..f686f067e7a 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -6,12 +6,16 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa version = "1.2.4"; format = "other"; + outputs = [ "out" "dev" "doc" ]; + src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz"; sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2"; }; - postPatch = "patchShebangs ."; + patches = [ + ./fix-includedir.patch + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] diff --git a/pkgs/development/python-modules/dbus/fix-includedir.patch b/pkgs/development/python-modules/dbus/fix-includedir.patch new file mode 100644 index 00000000000..e3bb0682b5c --- /dev/null +++ b/pkgs/development/python-modules/dbus/fix-includedir.patch @@ -0,0 +1,8 @@ +--- a/dbus-python.pc.in ++++ b/dbus-python.pc.in +@@ -9,4 +9,4 @@ + Description: Python bindings for D-Bus + Requires: dbus-1 >= 1.0 + Version: @VERSION@ +-Cflags: -I${includedir} ++Cflags: -I${includedir}/dbus-1.0 diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index e3b1bebcccb..f4395245a81 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.3.0"; + version = "4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c"; + sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e"; }; meta = { diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 6e79119b6a8..477468a0eb3 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb"; + sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 3a0ecffe526..84f30b7edf6 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "derpconf"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f"; + sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix index 00cea5180cd..9fbeef2488c 100644 --- a/pkgs/development/python-modules/detox/default.nix +++ b/pkgs/development/python-modules/detox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "detox"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "1yvfhnkw6zpm11yrl2shl794yi68jcfqj8m5n596gqxxbiq6gp90"; + sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3"; }; buildInputs = [ pytest ]; @@ -23,5 +23,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "What is detox?"; homepage = https://bitbucket.org/hpk42/detox; + license = licenses.mit; + # detox is unmaintained and incompatible with tox > 3.6 + broken = true; }; } diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 062fb00e48b..cf1bebad144 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20121119"; + version = "20181111"; meta = { homepage = https://code.google.com/p/google-diff-match-patch/; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx"; + sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb"; }; } diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 3f01d56ac91..af24ad8ed04 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "dill"; - version = "0.2.8.2"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3"; + sha256 = "f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f"; }; # Messy test suite. Even when running the tests like tox does, it fails diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index e69b6366a80..b13954e8263 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,18 +2,17 @@ buildPythonPackage rec { pname = "distro"; - version = "1.3.0"; + version = "1.4.0"; - checkInputs = [ pytest pytestcov tox]; + checkInputs = [ pytest pytestcov ]; checkPhase = '' - touch tox.ini - tox + py.test ''; src = fetchPypi { inherit pname version; - sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742"; + sha256 = "362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57"; }; meta = with stdenv.lib; { @@ -21,5 +20,7 @@ buildPythonPackage rec { description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; maintainers = with maintainers; [ nand0p ]; + # Many failing tests + broken = true; }; } diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 694b11c6ca8..683c0bc0ceb 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "1.1.0"; + version = "2.0"; meta = { description = "A pickled object field for Django"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf"; + sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24"; }; } diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index ab2e83e3370..e15f2213f14 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.5"; + version = "2.1.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1hwqqsfg8jgnn039yxrq6xrksk11y7vwpfvba6lk01c3v8c3jffn"; + sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index f850350ee16..96c63738eb7 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "689f3f80ff7ea8ab9f712ae5fe17ffa2ee8babbf8d75229ee8acc7bad461dfef"; + sha256 = "61b051d7bc3ff593e86b41a1ed5e969423cf55cc92768598af3315e2528e0890"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 4e256a38c86..5c8dab79f00 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "1.4.9"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191"; + sha256 = "9e144bbdfa67f523dc6f70768653a19c0aac29394f947a80dcb8eb7900840637"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 0b0ddf5f0f2..7f89335c192 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "4.2"; + version = "4.3"; src = fetchPypi { inherit pname version; - sha256 = "42bd7fa91af9996d7dfd34e6b027445acbece188d371d63abd19dde4c7ac8fc8"; + sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9"; }; doCheck = false; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index cf37c9de4e0..74b49d1fa5a 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "dnspython"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0"; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; }; # needs networking for some tests diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index 491ab814e3b..e47196df07a 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "docker-pycreds"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff"; + sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4"; }; # require docker-credential-helpers binaries diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 961b0125c1a..3bf2e62d699 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,12 +3,12 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.7.0"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e"; + sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 9f739aae4ba..b44597b8d13 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, Mako +, pytest, pytestcov, mock, Mako, decorator }: buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.8"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0"; + sha256 = "691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31"; }; # Disable concurrency tests that often fail, @@ -19,12 +19,13 @@ buildPythonPackage rec { rm tests/cache/test_memcached_backend.py ''; - buildInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytestcov mock Mako ]; + + propagatedBuildInputs = [ decorator ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; homepage = https://bitbucket.org/zzzeek/dogpile.cache; - platforms = platforms.unix; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index e852076d8a2..5ab65ace69f 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.10"; + version = "0.19.11"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4"; + sha256 = "afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 83b35dc8c89..dae1df69562 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.5"; + version = "2.6"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95"; + sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 97e486a0532..3f276374d9e 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; checkPhase = '' cmake . # utf_8_char fails with python3 diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 3f79e663455..77d20876fe1 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -4,31 +4,23 @@ , configparser , pytest , isPy3k -, isPy27 }: buildPythonPackage rec { pname = "entrypoints"; - version = "0.2.3"; + version = "0.3"; src = fetchPypi { inherit pname version; - sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f"; + sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"; }; checkInputs = [ pytest ]; propagatedBuildInputs = lib.optional (!isPy3k) configparser; - checkPhase = let - # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad - # test fails. It tests that a warning (exectly one) is thrown on a "bad" - # path. The pytest upgrade added some warning, resulting in two warnings - # being thrown. - # upstream: https://github.com/takluyver/entrypoints/issues/23 - pyTestArgs = if isPy27 then "-k 'not test_bad'" else ""; - in '' - py.test ${pyTestArgs} tests + checkPhase = '' + py.test tests ''; meta = { diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 43446b407af..e39292049da 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "envs"; - version = "1.2.6"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba"; + sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; }; checkInputs = [ click jinja2 terminaltables ]; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 070923c8385..fee2156e67d 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "1.3.0"; + version = "2.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0703z7vlsfa3dvgcq22f9rzmj0svyp2a8wc7h73d0aac28ydhpv9"; + sha256 = "017rshrz9kzax851hdbd3924jmr06h2sx3xdq7m4dwhgz3pgqfcy"; }; # setuptools-markdown uses pypandoc which is broken at the moment diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index cae3f34f0c9..5fb83126d1c 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.2.1"; + version = "1.4.1"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0g8f5vdjh7qd8kgsqqd9qkm6m79rx3w9yp0rf9vpdsv3xfzrkh1w"; + sha256 = "1bwn7b5f0nzvwiw9zs63wy3qhaxvz2fhjp4wj9djp2337d7195h4"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 64686d94813..d6f533a58bf 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "1.12.0"; + version = "1.12.2"; # tests are not present in the PyPI version src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "003c4flgsz6my64qm3mf9cb3wfxw0480aj9glf9wdz7xkwaq2l43"; + sha256 = "1p24fq6f46j0qd0ccb64mncxbnm2n9w0sqpl4zk113caaaxkpjil"; }; # one test is failing due to it trying to send a request to example.com diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 6f97a2cb6bf..df78bff6f1d 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytest_3 , setuptools_scm , apipkg }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ apipkg ]; @@ -31,6 +31,9 @@ buildPythonPackage rec { py.test testing ''; + # not yet compatible with pytest 4 + doCheck = false; + __darwinAllowLocalNetworking = true; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 88a75d29fd1..40a1d759c12 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -7,19 +7,17 @@ buildPythonPackage rec { pname = "fb-re2"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c"; + sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf"; }; buildInputs = [ re2 ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + # no tests in PyPI tarball + doCheck = false; meta = { description = "Python wrapper for Google's RE2"; diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 8e95d1e413e..d0d324fb977 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { downloadPage = https://pypi.python.org/pypi/filebrowser_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index c8359322752..34f7ac4e4a9 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "366c50d0211798e696626f125134163ac2fff25a70131eec80a1d1a6196c1027"; + sha256 = "17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 4f6d8d0dc17..5ac7ccd1adc 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,13 +2,13 @@ requests, mt-940, sepaxml, bleach, isPy3k }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.0.1"; pname = "fints"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1"; + sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78"; }; propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index c5505efc168..ff6f0716d71 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,6 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, - six, cligj, munch, click-plugins, enum34, pytest, nose, - gdal +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, attrs, click, cligj, click-plugins, six, munch, enum34 +, pytest, boto3 +, gdal }: buildPythonPackage rec { @@ -14,24 +15,35 @@ buildPythonPackage rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + nativeBuildInputs = [ + gdal # for gdal-config + ]; + buildInputs = [ gdal ]; propagatedBuildInputs = [ - six + attrs + click cligj - munch click-plugins - enum34 - ]; + six + munch + ] ++ stdenv.lib.optional (!isPy3k) enum34; checkInputs = [ pytest - nose + boto3 ]; - doCheck = false; + checkPhase = '' + rm -r fiona # prevent importing local fiona + # Some tests access network, others test packaging + pytest -k "not test_*_http \ + and not test_*_https \ + and not test_*_wheel" + ''; meta = with stdenv.lib; { description = "OGR's neat, nimble, no-nonsense API for Python"; diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix new file mode 100644 index 00000000000..21e44bb4581 --- /dev/null +++ b/pkgs/development/python-modules/firetv/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, adb-homeassistant +, flask +, pure-python-adb-homeassistant +, pycryptodome +, pyyaml +, rsa +}: +buildPythonPackage rec { + pname = "firetv"; + version = "1.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "602de77411c2caffb322e4ff63fa6cc4eeb9a50c5f4b14e13930ed7cd87cf513"; + }; + + propagatedBuildInputs = [ + adb-homeassistant + flask + pure-python-adb-homeassistant + pycryptodome + pyyaml + rsa + ]; + + # No Tests + doCheck = false; + + meta = with lib; { + description = "Communicate with an Amazon Fire TV device via ADB over a network"; + homepage = https://github.com/happyleavesaoc/python-firetv/; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 9d9d211dbfa..966bf5877bd 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,52 +1,26 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes +, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing }: buildPythonPackage rec { pname = "flake8"; - version = "3.5.0"; + version = "3.7.6"; src = fetchPypi { inherit pname version; - sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0"; + sha256 = "6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048"; }; - # Allow newer version of pycodestyle and pyflakes - patches = [ - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch; - sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676"; - excludes = [ "setup.cfg" ]; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch; - sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb"; - excludes = [ "setup.cfg" ]; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch; - sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch; - sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch; - sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y"; - }) - (fetchpatch { - url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch; - sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x"; - excludes = [ "setup.cfg" ]; - }) - ]; - - buildInputs = [ pytest mock pytestrunner ]; - propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] + checkInputs = [ pytest mock pytestrunner ]; + propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ] + ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] - ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ]; + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + checkPhase = '' + py.test tests + ''; meta = with stdenv.lib; { description = "Code checking using pep8 and pyflakes"; diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 00f4fe8488c..523e6ac53e6 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "flaky"; - version = "3.4.0"; + version = "3.5.3"; src = fetchPypi { inherit pname version; - sha256 = "4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2"; + sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da"; }; buildInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 8b20146f212..d61f5a77600 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.14.0"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "133s9js7j1b2m6vv56a2xd9in0rmx5zrdp4r005qwbvr5qxld39s"; + sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3"; }; propagatedBuildInputs = [ flask pyjwt werkzeug ]; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 7af4aa2b8dd..a2c372c8bee 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn"; + sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index f9f23859748..c2f7caf1b81 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "3.1.2"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1hcl0qnhfqc9x4y6fnvsrablim8yfqfg2i097b2v3srlz69vdyr6"; + sha256 = "ee8e2954ec3ae0abf19f50fce5ec8b7b9ff937c5353c0a72c7e1cfb86df1195d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 7c64d9bd183..64decd9c41c 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "flit"; - version = "1.2.1"; + version = "1.3"; src = fetchPypi { inherit pname version; - sha256 = "6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1"; + sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 58df04c17c8..21780ccb9fc 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.37.0"; + version = "3.37.3"; src = fetchPypi { inherit pname version; - sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1"; + sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 926ad05156a..80a6f439de8 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ dateutil six ]; - buildInputs = [ mock nose ]; + checkInputs = [ mock nose ]; meta = with stdenv.lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 156b0fdd76e..26277161b0b 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fs-s3fs"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak"; + sha256 = "49bfa4572bb11e37324dd43be935ab99376259eff652365aef0e4a747bb11418"; }; propagatedBuildInputs = [ fs six boto3 ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1ab01cf7d89..cdbdcf7d16e 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.1.3"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d"; + sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index f2e92d96f57..de45a1404f5 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , nose -, nosejs -, sphinx , isPy3k }: @@ -17,8 +15,7 @@ buildPythonPackage rec { sha256 = "1p7g6hv9qxscbzjv2n5pczpkkp55mp3s56adfc912w9qpf3rv4nr"; }; - buildInputs = [ nose nosejs ]; - propagatedBuildInputs = [ sphinx ]; + checkInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 7cbf09fa49f..0b2d0fbc91d 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.14.9"; + version = "0.14.12"; pname = "gdrivefs"; disabled = isPy3k; src = fetchurl { url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz"; - sha256 = "1mc2r35nf5k8vzwdcdhi0l9rb97amqd5xb53lhydj8v8f4rndk7a"; + sha256 = "0m45z77idy0bs5fqlz0y534fy28ikamrd321hmqsc3q7d39kqzv0"; }; buildInputs = [ gipc greenlet httplib2 six ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 5cd6ad8bf87..8c7b96e66dd 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -10,10 +10,11 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.6.0"; + version = "3.7.1"; + src = fetchPypi { inherit pname version; - sha256 = "24adaca52e8d821a2f5d5e6fe2e37cf321b1fafb505926ea79a7c2f019ce5b07"; + sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index b3767fd2dbd..da338648e4c 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "geopy"; - version = "1.17.0"; + version = "1.18.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "1bbea0efc5af91e0a7d4c2b31650f61667bcc1d0d717784d78c03f0ed13bb374"; + sha256 = "07a21f699b3daaef726de7278f5d65f944609306ab8a389e9f56e09abf86eac8"; }; doCheck = false; # too much diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 09cc5d573db..a8caf650016 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gevent"; - version = "1.3.7"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c"; + sha256 = "1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 4be26fe0e12..140f93f33f8 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonOlder @@ -15,24 +15,28 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "3.0.0"; - format = "flit"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1ebe79cf80ad64cb78c880efc7f30ac664e18b80dfd18ee201bf8685cf029628"; + sha256 = "52119435ba73ddd5e697dae7bec8b93a048bc738720b81691ebd4b4d81d2d762"; }; - buildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "extras_require=extras_require," "extras_require=None," + ''; + # requires network (reqests github.com) doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "An async GitHub API library"; homepage = https://github.com/brettcannon/gidgethub; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 893f7bf5875..8701751e3a0 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gin-config"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a4e8a2537320240859157870ab58df60e979d936a3c9b17a8b2fa686fc31b287"; + sha256 = "07843fde2917f1a44f808fceb3c0227bb02ff7c4ebba8de6642206c03e7e8ba2"; }; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 4b174468a7a..e2065e632d2 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -7,13 +7,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "0.6.0"; - disabled = isPy3k; + version = "1.0.1"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "0pd9by719qh882hqs6xpby61sn1x5h98hms5p2p8yqnycrf1s0h2"; + sha256 = "1zg5bm30lqqd8x0jqbvr4yi8i4rzzk2hdnh280qnj2bwm5nqpghi"; }; propagatedBuildInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index d8fc12b1c42..ec58825878a 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch -, utillinux, pygit2, gitMinimal, git-annex +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll +, python, utillinux, pygit2, gitMinimal, git-annex }: buildPythonPackage rec { @@ -16,22 +16,22 @@ buildPythonPackage rec { sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; }; - prePatch = '' - substituteInPlace git_annex_adapter/process.py \ - --replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \ - --replace "'git-annex'" "'${git-annex}/bin/git-annex'" - ''; + patches = [ + (substituteAll { + src = ./git-annex-path.patch; + gitAnnex = "${git-annex}/bin/git-annex"; + }) + ]; checkInputs = [ + gitMinimal utillinux # `rev` is needed in tests/test_process.py ]; - propagatedBuildInputs = [ pygit2 gitMinimal ]; - - buildInputs = [ git-annex ]; + propagatedBuildInputs = [ pygit2 ]; checkPhase = '' - python -m unittest + ${python.interpreter} -m unittest ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch new file mode 100644 index 00000000000..8b1b854058b --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch @@ -0,0 +1,75 @@ +diff --git a/git_annex_adapter/process.py b/git_annex_adapter/process.py +index 6ddb985..bbd0ab8 100644 +--- a/git_annex_adapter/process.py ++++ b/git_annex_adapter/process.py +@@ -389,7 +389,7 @@ class GitAnnexBatchProcess: + _procclass = Process + + def __init__(self, args, workdir): +- self.args = ('git', 'annex', *args) ++ self.args = ('@gitAnnex@', *args) + self.workdir = workdir + self._process = None + self._dead_process = None +@@ -586,7 +586,7 @@ class ProcessRunner: + class GitAnnexRunner(ProcessRunner): + """Helper class to run git-annex commands.""" + def __init__(self, args_prefix, workdir): +- args_prefix = ('git-annex', *args_prefix) ++ args_prefix = ('@gitAnnex@', *args_prefix) + super().__init__(args_prefix, workdir) + + def __call__(self, *args_suffix): +diff --git a/tests/test_process.py b/tests/test_process.py +index ed619bb..9335078 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -181,7 +181,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_process_annex_metadata_batch(self): + """Process should be able to read one line""" + with Process( +- ['git', 'annex', 'metadata', '--batch', '--json'], ++ ['@gitAnnex@', 'metadata', '--batch', '--json'], + str(self.tempdir), + ) as proc: + proc.writeline( +@@ -202,7 +202,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_jsonprocess_annex_metadata_batch(self): + """JsonProcess should encode and decode properly""" + with JsonProcess( +- ['git', 'annex', 'metadata', '--batch', '--json'], ++ ['@gitAnnex@', 'metadata', '--batch', '--json'], + str(self.tempdir), + ) as proc: + obj = proc({'key':'SHA256E-s0--0'}) +@@ -218,7 +218,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase): + def test_process_annex_info_batch(self): + """Process should be able to read multiple lines""" + with Process( +- ['git', 'annex', 'info', '--batch'], ++ ['@gitAnnex@', 'info', '--batch'], + str(self.tempdir), + ) as proc: + proc.writeline('here') +diff --git a/tests/utils.py b/tests/utils.py +index 281ee3f..969aedc 100644 +--- a/tests/utils.py ++++ b/tests/utils.py +@@ -107,7 +107,7 @@ class TempAnnexTestCase(TempRepoTestCase): + # Have to uninit before cleaning directory, since git-annex + # marks its objects read-only so that they don't get deleted. + subprocess.run( +- ['git', 'annex', 'uninit'], ++ ['@gitAnnex@', 'uninit'], + cwd=self.repo.workdir, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +@@ -122,7 +122,7 @@ class TempAnnexTestCase(TempRepoTestCase): + path.write_text(text) + + subprocess.run( +- ['git', 'annex', 'add', '--quiet', relpath], ++ ['@gitAnnex@', 'add', '--quiet', relpath], + cwd=self.repo.workdir, + check=True, + ) diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index cab7ca68ef6..a57c9c3353a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af"; + sha256 = "15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda"; }; checkInputs = [ betamax pytest betamax-matchers ] diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 02ad8f0f6fb..e42cf5756f1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.6.1"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "aae6142ec8136d835f0f5c48824a65df5eb964863e155a5d90ce7ee8b84b0f8a"; + sha256 = "d96f7ed1887c8f55f2bc8d493cd8ec73ff9f3361f0a134203e34e2e57bedd964"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index f24dd2b7249..ac193e61dcb 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "18.4.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rfikq27a9wwfkd4k3bk7x4fssw6r7z138g9i3wpzvjc7anlzk24"; + sha256 = "5c47dc6dc97bb1c20e5607f3d58eac81e13b16880a284b52d503eea92d7b5fc2"; }; propagatedBuildInputs = [ boltons attrs face ]; diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index d2bf002cd5f..f8dfc4ff2d3 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "gmusicapi"; - version = "11.0.4"; + version = "12.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b0345df8119c4721cabafff765fe9ded1a246886f5a67b1b306c656b685650b8"; + sha256 = "6e066f38bbfce068e0e89f34ccdbc7056fd5fdc446d3c33c70f53b26078eb78b"; }; propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ]; diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index b2196c8748c..6a882e29c19 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.2.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc"; + sha256 = "798ac14408593525d1865f608b30f71cce291b1a239f4d63f14bb4dcf79d7528"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index fde773e738b..b0b6bfaa5ef 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.5.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "9ca363facbf2622d9ba828017536ccca2e0f58bd15e659b52f312172f8815530"; + sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4"; }; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 5e33b1b51ea..1646888b36a 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2"; + sha256 = "169ffdb1b677f69f1f9d032bd38f724aed73e0565153ac17199472c083a3852f"; }; checkInputs = [ pytest mock ipython ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index b36f651e2f7..9475c792fb9 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2"; + sha256 = "e6a6c380757e22e9a45cf5b261be6d6a4262f87ee172a6c21f6f7ad6013827cd"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index cf5476f7d1d..d4052a227bb 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "0.2.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45"; + sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index d59f281c59a..9d6461168d4 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "f8884619fed4c77234c7293939be5a696869f61a5dc2ca47193cff630cee179f"; + sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index c2bf189c237..74c9370dad3 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "39d2c83ee198ec1995c03faf5d557089e7027a8356802302dee08b18380c8250"; + sha256 = "ec1d049cb54fc036887d946ce0391bde481a3da7263e55908eaf9694079ec46f"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index cc689acc48f..33dfc6e83cf 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.5.6"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "6de6de98e895f4266caefa768778533bdea98abbead6972d35c8a0f57409eea2"; + sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index e49012d4502..199f568322a 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "1.8.5"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1jvwq7qjr2iazmwdzkmr82iza7snylpm6x0kr9p0z5mkicg1l38l"; + sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index bbba074b3f5..7c115b58d32 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { downloadPage = http://pypi.python.org/pypi/grappelli_safe/; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 94332616b1e..1493c78df83 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "green"; - version = "2.13.0"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "fe937dab641e7bb8b7b0a3678bc1372f1759282934767b035de681a40da7033b"; + sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index ad777cf4435..4e548577f90 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.16.1"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd"; + sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e170c14949d..3ecc0b3294f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; - version = "1.16.1"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1"; + sha256 = "abe825aa49e6239d5edf4e222c44170d2c7f6f4b1fd5286b4756a62d8067e112"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 04dc793a717..c0ad2dc3ac9 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.5"; + version = "1.6.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "b80487a8269ba55201390353fd46d1904ec16f5488c8daaf7ff87154e09cca42"; + sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index c197c265230..a2597b2e6e7 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.1.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "1cc06b22c6a1b6726925defcd41c19ce6cd5ab939252e72759bdf0353e36f552"; + sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 698da6dc91a..14d27e7442e 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -1,5 +1,5 @@ -{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, -nose, shouldbe, gss, krb5Full, which, darwin }: +{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator, +nose, gss, krb5Full, darwin }: buildPythonPackage rec { pname = "gssapi"; @@ -16,13 +16,15 @@ buildPythonPackage rec { --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'" ''; - LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib"; + LD_LIBRARY_PATH = "${krb5Full}/lib"; - buildInputs = [ krb5Full which nose shouldbe ] + nativeBuildInputs = [ krb5Full ] ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] ); propagatedBuildInputs = [ decorator enum34 six ]; + checkInputs = [ nose ]; + doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 2b9703452dc..a26b02ee030 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} ''; - nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ]; mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix new file mode 100644 index 00000000000..b066f323d68 --- /dev/null +++ b/pkgs/development/python-modules/gumath/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, numba +, ndtypes +, xnd +, libndtypes +, libxnd +, libgumath +, isPy27 +}: + +buildPythonPackage { + pname = "gumath"; + disabled = isPy27; + inherit (libgumath) src version meta; + + checkInputs = [ numba ]; + propagatedBuildInputs = [ ndtypes xnd ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'add_include_dirs = [".", "libgumath", "ndtypes/python/ndtypes", "xnd/python/xnd"] + INCLUDES' \ + 'add_include_dirs = [".", "${libndtypes}/include", "${libxnd}/include", "${libgumath}/include"]' \ + --replace 'add_library_dirs = ["libgumath", "ndtypes/libndtypes", "xnd/libxnd"] + LIBS' \ + 'add_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' \ + --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ + 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' + ''; +} diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 2e4b58ae3ff..fe4cf01a8df 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.10.9"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0"; + sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 015ad38d0c1..910080e679f 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj"; + sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 4259b7ad053..0b702901ae7 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "1.9"; + version = "1.11"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8"; + sha256 = "386cc5bbec3a341d8bafec1c524bd8e64f41f9be8195808dec80f76661bf1cc3"; }; buildInputs = [ ffmpeg ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 27d83d9c6c2..cbe5afcc8ed 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.18"; + version = "0.8.19"; src = fetchPypi { inherit pname version; - sha256 = "4d6782f08872f4c54983873a41759daae680d6247b0db363f3510cb001108f02"; + sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index 3a159e6d349..347cd94c8f5 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -13,12 +13,15 @@ buildPythonPackage rec { sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; checkPhase = '' nosetests ''; + # no tests in PyPI tarball + doCheck = false; + meta = with stdenv.lib; { description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)"; homepage = "https://github.com/casebeer/python-hkdf"; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix new file mode 100644 index 00000000000..ea8885def3e --- /dev/null +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -0,0 +1,47 @@ +{ buildPythonPackage +, fetchPypi +, lib +, param +, numpy +, pyviz-comms +, ipython +, notebook +, pandas +, matplotlib +, bokeh +, scipy +, panel +}: + +buildPythonPackage rec { + pname = "holoviews"; + version = "1.11.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0902wzzz73ikkdy0jfhg1lx97y1gk7v1nr3d3jqqdfzaa7bmhqwj"; + }; + + propagatedBuildInputs = [ + param + numpy + pyviz-comms + ipython + notebook + pandas + matplotlib + bokeh + scipy + panel + ]; + + # tests not fully included with pypi release + doCheck = false; + + meta = with lib; { + description = "Python data analysis and visualization seamless and simple"; + homepage = http://www.holoviews.org/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 3c67bccaa7f..bbea01f4900 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,5 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi -, six, requests-cache, pygments, pyquery }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, requests-cache +, pygments +, pyquery +, python +}: buildPythonPackage rec { pname = "howdoi"; @@ -12,9 +19,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests-cache pygments pyquery ]; - meta = with stdenv.lib; { + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { description = "Instant coding answers via the command line"; homepage = https://pypi.python.org/pypi/howdoi; license = licenses.mit; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 97d2854ca22..5a59b63cea4 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -24,6 +24,9 @@ buildPythonPackage rec { ]; checkPhase = '' + # remove test causing error + # https://github.com/html5lib/html5lib-python/issues/411 + rm html5lib/tests/test_stream.py py.test ''; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 197e646027c..ab9e65d78cb 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,13 +2,16 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.11.3"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1pyb0hmc0j0kcy27yiw38gq9pk7f1fkny5k1vd13cdz6l3csw7g7"; + sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4"; }; + # Needs setting up + doCheck = false; + meta = with lib; { homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix new file mode 100644 index 00000000000..dfec9ffc200 --- /dev/null +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bokeh +, holoviews +, pandas +, pytest +, parameterized +, nbsmoke +, flake8 +, coveralls +, xarray +, networkx +, streamz +}: + +buildPythonPackage rec { + pname = "hvplot"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bce169cf2d1b3ff9ce607d1787f608758e72a498434eaa2bece31eea1f51963a"; + }; + + checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ]; + propagatedBuildInputs = [ + bokeh + holoviews + pandas + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # many tests require a network connection + doCheck = false; + + meta = with lib; { + description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; + homepage = https://hvplot.pyviz.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 70c50c1f663..a8f847c53bb 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "hyperframe"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2"; + sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 71eced5c7ee..3575ee03963 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "3.79.3"; + version = "3.88.3"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "1ay0kwh5315scv7yz9xxrr7shynyx6flgplc1qzbz3j21cyx3yn7"; + sha256 = "03l4hp0p7i2k04arnqkav0ygc23ml46dy3cfrlwviasrj7yzk5hc"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index e433cd51c20..ea6e449947c 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Tools for i3 users and developers"; homepage = "https://github.com/ziberna/i3-py"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 991edee90e5..d47f5ce39fe 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.1.8"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "08826e68e39e7de53cc2ddd8f6228a4e463b4bacb20565e5301c3ec690e68d27"; + sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 9ce3ba3f668..5e5d623ff10 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"; + sha256 = "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"; }; meta = { diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index db0b8301f00..5bc281d2be1 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -7,24 +7,18 @@ }: buildPythonPackage rec { - version = "0.1.4"; + version = "0.1.6"; pname = "ifaddr"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b"; + sha256 = "c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93"; }; - # ipaddress is provided in python stdlib > 3.3 - postPatch = if pythonOlder "3.4" then "" else '' - sed -i "s/'ipaddress'//" setup.py - ''; - propagatedBuildInputs = [ ipaddress ]; checkPhase = '' - ${python.interpreter} ifaddr/test_ifaddr.py + ${python.interpreter} -m unittest discover ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix new file mode 100644 index 00000000000..f72698fd0d1 --- /dev/null +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "imageio-ffmpeg"; + version = "0.2.0"; + + src = fetchPypi { + sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib"; + inherit pname version; + }; + + disabled = !isPy3k; + + # No test infrastructure in repository. + doCheck = false; + + meta = with lib; { + description = "FFMPEG wrapper for Python"; + homepage = https://github.com/imageio/imageio-ffmpeg; + license = licenses.bsd2; + maintainers = [ maintainers.pmiddend ]; + }; + +} diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index de838028067..f7b3ff63c53 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,28 +1,34 @@ { stdenv , buildPythonPackage +, pathlib , fetchPypi , pillow , psutil +, imageio-ffmpeg , pytest , numpy , isPy3k +, ffmpeg , futures , enum34 }: buildPythonPackage rec { pname = "imageio"; - version = "2.4.1"; + version = "2.5.0"; src = fetchPypi { - sha256 = "0jjiwf6wjipmykh33prjh448qv8mpgngfi77ndc7mym5r1xhgf0n"; + sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2"; inherit pname version; }; - checkInputs = [ pytest psutil ]; + checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ + imageio-ffmpeg ffmpeg + ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures enum34 + pathlib ]; checkPhase = '' @@ -34,8 +40,12 @@ buildPythonPackage rec { # For some reason, importing imageio also imports xml on Nix, see # https://github.com/imageio/imageio/issues/395 + + # Also, there are tests that test the downloading of ffmpeg if it's not installed. + # "Uncomment" those by renaming. postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"" + substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," + substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 678614912a8..0c5ce54a229 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "imgaug"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "7ca6bce4dcfd3e40330b593fe8e55018bf475983cc6777f8ebf5422c722fffb8"; + sha256 = "03dcbb3d7485de372eacde4b890b676e0c7a992524ee4bc72bd05a9a1cc5f9a4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 9a67568d9e5..d65010732ca 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { homepage = https://imread.readthedocs.io/en/latest/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 9d3511e41d1..147cc8753eb 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflect"; - version = "1.0.2"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "98cf5d82952ed8bf1cf9236c6058e9a21bc66172ecb907969d907741f91388b5"; + sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix new file mode 100644 index 00000000000..4434ea0edc1 --- /dev/null +++ b/pkgs/development/python-modules/intake/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, dask +, holoviews +, jinja2 +, msgpack-numpy +, msgpack-python +, numpy +, pandas +, python-snappy +, requests +, ruamel_yaml +, six +, tornado +, pytest +, pythonOlder +, isPy27 +}: + +buildPythonPackage rec { + pname = "intake"; + version = "0.4.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "f47e53aa764eeadf6adcc667b9817b1ad32496477476da0b982d4fc0744b40ef"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + appdirs + dask + holoviews + jinja2 + msgpack-numpy + msgpack-python + numpy + pandas + python-snappy + requests + ruamel_yaml + six + tornado + ]; + + checkPhase = '' + # single test assumes python for executable name + PATH=$out/bin:$PATH HOME=$(mktemp -d) pytest --ignore=intake/catalog/tests/test_default.py + ''; + + meta = with lib; { + description = "Data load and catalog system"; + homepage = https://github.com/ContinuumIO/intake; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index b4daf5a6ecb..043f58cfa5d 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -32,8 +32,9 @@ buildPythonPackage rec { }) ]; + # For failing tests, see https://github.com/ipython/ipykernel/issues/387 checkPhase = '' - HOME=$(mktemp -d) pytest ipykernel + HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)" ''; meta = { diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index e4a56f85e81..5aa4b15f462 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.1.1"; + version = "7.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd"; + sha256 = "6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 012bab56ab6..10d57d7264b 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.5"; + version = "3.9.6"; src = fetchPypi { inherit pname version; - sha256 = "f500a0561b83a2982d3424d640243d05bda9716f4fe9a655e331f3a07ca02710"; + sha256 = "d4ae098cb31d6c678a6eac074a24f8ba4adfe7df65db13b0b2ab7355f28d6e3b"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 21d098eb31b..c65c5f21e56 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 62f2c259140..c0b30edb9ad 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "1.6.0"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "332fd500cf13dbaf7ef239741302329b947ba82ce40f5a5e47e790c8714ae0b3"; + sha256 = "eb43fb9a7b29cff20767caf838c14bdf80a89395aba67a97d61c8f16e0e22c97"; }; doCheck = false; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index cbff3f8b45a..7fc90d63f69 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "1.20"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b"; + sha256 = "35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345"; }; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 249054581fa..4057d7ad275 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.0.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl"; + sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 5788a52dfff..492d903f24d 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "1.2"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "06qsjyab56vi0ikr819ghb7f8ymf09n92vla7gcn8j12113m2mib"; + sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4"; }; doCheck = false; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 01309e0c4d9..222a92e60fb 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "1.10.1"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh"; + sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa"; }; doCheck = false; buildInputs =[ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 03aa9d0d0f8..675dba0ea72 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.0.2"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "21824ab1e29e9ccbca85e77562a090067882976880603c41af8d9c4cffc1d4fc"; + sha256 = "42d0d08c0d36dcf1c4e1ddb1d10338d0dffb94105a02d74b6ea655ee8dd93cc2"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 67f115a9cc7..1b14074fad7 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,24 +9,28 @@ , six , stevedore , isPy27 +, fasteners +, jinja2 }: buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "2.6.0"; + version = "2.9.1"; disabled = !isPy27; src = fetchPypi { inherit pname version; - sha256 = "1768b278efa8825d2549c03de6ef1d2458e741b9b7984d94db0ef3c22e608938"; + sha256 = "fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0"; }; - patchPhase = '' + postPatch = '' export HOME=$TMPDIR ''; - buildInputs = [ pip ]; - propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ]; + propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ]; + + # Need to fix test deps + doCheck = false; meta = with stdenv.lib; { description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git"; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index e5956d31b61..a6ef8e3e1fb 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d43ede55b3d9b5524a8e11566ea0b11c9c8109116ef6a509a1b619d2041e7397"; + sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1"; }; doCheck = false; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 0413a5badba..a400dd4d18c 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { - version = "0.6.0"; + version = "0.7.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27"; + sha256 = "cf93ddf283de8c6b8f4ad983f8bf9b7b2a2c37812e387c245f8ba229d4f180c4"; }; checkInputs = [ pytest pyyaml wheel pytestcov ]; diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index f7712ff6200..7d384ba7cc3 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.5.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd"; + sha256 = "4a73c2c62a7163ca1c4aef82aa042d795560497cc81034f212ef13cc037cc783"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 9d620233744..96c38f3cd89 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.0.8"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d"; + sha256 = "5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 5714c242af5..041fafaf08c 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "keyring"; - version = "16.0.2"; + version = "18.0.0"; src = fetchPypi { inherit pname version; - sha256 = "95e4f1d0342d0bf5d137d1d2352d59f7abbebb1507bec1ac26831c411ac23150"; + sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 86e677a0337..033ab821135 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = { maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 2a8c59be420..b70228b6835 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,19 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }: +{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, Pyro4, amqp }: buildPythonPackage rec { - pname = "kombu"; - version = "4.2.2.post1"; + pname = "kombu"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "3c9dca2338c5d893f30c151f5d29bfb81196748ab426d33c362ab51f1e8dbf78"; + sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8"; }; postPatch = '' substituteInPlace requirements/test.txt --replace "pytest-sugar" "" ''; - checkInputs = [ pytest case pytz ]; + checkInputs = [ pytest case pytz Pyro4 ]; propagatedBuildInputs = [ amqp ]; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index 1fb69e816bb..460d743b1ed 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "ldappool-${version}"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { pname = "ldappool"; inherit version; - sha256 = "3ef502e65b396a917dbee9035db5d5a5aae6a94897dac2bc253c8257ca1c31a6"; + sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index f3e030084d2..9eba46cd303 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.22"; + version = "0.1.23"; src = fetchPypi { inherit pname version; - sha256 = "15206e92220d96512b357a9a740bc91b8b33b42b9164fe3b56c4c3aedf882cdc"; + sha256 = "476a1d1f6d9e7f72befff0ea4e631461882c9c1c620b92878503bf46383c8d20"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index eb58cc0b2d5..939e4f18898 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi{ inherit pname version; - sha256 = "f21515a217125b7c8cbb1f53327d1d4363c1b980a7e246feabf91aed9b1c51e5"; + sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5261a7b6564..2fbe7207f4f 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = https://github.com/schwehr/libais; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; - platforms = platforms.linux; # It currently fails to build on darwin + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index c575e5594be..54b98cf2136 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ libsodium ]; postPatch = diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index aca69066592..258c2d6932d 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "2aa868b8aade749b9904eeb7034fcf44115601c367969b6d01f5e1b4b9b6031d"; + sha256 = "b332225ac29bfae1ba386deca2b6566271576de3ab17617ad0a71892c799b118"; }; propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ]; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 9f78b999450..52760420b83 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { description = "C++ implementation of 3mf loading with SIP python bindings"; homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar orivej ]; }; } diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index e5a03f78355..03797575a83 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }: buildPythonPackage rec { pname = "libsexy"; @@ -10,14 +10,14 @@ buildPythonPackage rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig pygtk ]; propagatedBuildInputs = [ - pygtk libsexy gtk2 glib pango libxml2 + pygtk libsexy glib pango libxml2 ]; postInstall = '' - ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/ + ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages} ''; meta = { diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 58f2d2a9694..cce640cce36 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2018.09.09"; + version = "2018.12.19"; src = fetchPypi { inherit pname version; - sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y"; + sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 59abefb0538..10d7eda9e04 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.3.4"; + version = "0.5.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c298ea749ff4eec6a95e04023f9068d017acb02133f1fdcc38eb98e5ebc69442"; + sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index a37a22318ec..117a9699e01 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.2.6"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2"; + sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d"; }; nativeBuildInputs = [ libxml2.dev libxslt.dev ]; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 9ba6698e4a0..34e2260109b 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = http://mahotas.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 1dc90e66683..c8b77e9668f 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m"; + sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42"; }; # test_help expects architecture-dependent Linux signal numbers. diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 069b71de00d..7a7d7f0287b 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "MarkupSafe"; - version = "1.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6"; + sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 1bf78bc2084..8582f8a29f9 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.15.0"; + version = "0.16.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1phqbbrq1xjvc7cwasy5zws4bdb050qikfp1qg8f1hqhmipkpiaz"; + sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 9b8f1c0e530..513c277bcac 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "2.16.3"; + version = "2.18.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e1b79eb3b815b49918c64114dda691b8767b48a1f66dd1d8c0cd5842b74257c2"; + sha256 = "6eeaf1301a5f5942bfe8ab2c2eaf03feb793072b56d5fae563638bddd7bb62e6"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 6334d2e4f79..fb433be8d99 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -34,13 +34,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix index 1420f1880a3..f181b5f4f99 100644 --- a/pkgs/development/python-modules/mautrix-appservice/default.nix +++ b/pkgs/development/python-modules/mautrix-appservice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mautrix-appservice"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c"; + sha256 = "b5752c6d84bf952698aec500b16542f6d2aacea37efd5be59087b5d9ea38c98f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 110d1a57c82..1a2cce8f110 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "0.7"; + version = "0.996.1"; src = fetchPypi { inherit pname version; - sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy"; + sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d"; }; propagatedBuildInputs = [ mecab ]; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 1a7478b266a..a831618134b 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { downloadPage = https://github.com/stephenmcd/mezzanine/releases; license = licenses.free; maintainers = with maintainers; [ prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 3425440390d..e3dffbfcb48 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.3.8"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "2e128db870cf3a351f5c680b6d1ae7e097a7ff6c70c8ba78c7d3be8e3d3c20bd"; + sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e"; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index e53098f6f23..4675a386054 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,33 +1,42 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, numpy +, six +, ruamel_yaml +, msgpack-python +, coverage +, coveralls +, pymongo +, lsof +}: buildPythonPackage rec { pname = "monty"; - version = "1.0.2"; + version = "1.0.4"; # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg"; + sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6"; }; - propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ]; - + checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo]; + propagatedBuildInputs = [ six ruamel_yaml ]; + preCheck = '' substituteInPlace tests/test_os.py \ - --replace 'def test_which(self):' '#' \ - --replace 'py = which("python")' '#' \ - --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \ - --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " - Monty implements supplementary useful functions for Python that are not part of the - standard library. Examples include useful utilities like transparent support for zipped files, useful design + Monty implements supplementary useful functions for Python that are not part of the + standard library. Examples include useful utilities like transparent support for zipped files, useful design patterns such as singleton and cached_class, and many more. "; homepage = https://github.com/materialsvirtuallab/monty; @@ -35,4 +44,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix new file mode 100644 index 00000000000..e0786aefa2c --- /dev/null +++ b/pkgs/development/python-modules/more-itertools/2.7.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, six +, stdenv +}: + + +buildPythonPackage rec { + pname = "more-itertools"; + version = "5.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; + + # iterable = range(10 ** 10) # Is efficiently reversible + # OverflowError: Python int too large to convert to C long + doCheck = !stdenv.hostPlatform.is32bit; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index b7131902962..999708697a9 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "4.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e"; + sha256 = "590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index b5f5c1379bc..9cb56b1f912 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = https://bitbucket.org/userzimmermann/python-moretools; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 960fb604ec9..693d5cf5d7f 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "moviepy"; - version = "0.2.3.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1jrdpnzyk373zlh8lvjdabyvljz3sahshbdgbpk6w9vx5hfacvjk"; + sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d"; }; # No tests diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6d3897475ad..d3535589911 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,11 +13,18 @@ buildPythonPackage rec { inherit mpi; }; - patches = [ (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + patches = [ + (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; }) + (fetchpatch { + # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; + sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; + }) + ]; postPatch = '' @@ -48,7 +55,7 @@ buildPythonPackage rec { setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - buildInputs = [ mpi openssh ]; + nativeBuildInputs = [ mpi openssh ]; meta = { description = diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 8280ecec4a4..9da56cad881 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "mpmath"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c"; + sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6"; }; # error: invalid command 'test' diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 3068a31f1e2..d48d0995a76 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "msgpack"; - version = "0.5.6"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; + sha256 = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index d097224e52d..2693e350112 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, stdenv, pyyaml, pytest, enum34 -, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales +, pytestpep8, pytest-flakes, fetchFromGitHub, isPy3k, lib, glibcLocales }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ]; + checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest glibcLocales ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index c5c53577505..a98697039a8 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.6.1"; + version = "0.70.7"; src = fetchPypi { inherit pname version; - sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq"; + sha256 = "46479a327388df8e77ad268892f2e73eac06d6271189b868ce9d4f95474e58e3"; }; propagatedBuildInputs = [ dill ]; diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index b3cea69c098..2e826ab61e8 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -6,13 +6,17 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q"; + sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2"; }; + postPatch = '' + substituteInPlace setup.py --replace "'wheel>=0.32.0,<0.33.0'" "" + ''; + buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 78271de6f69..0bd08a82b93 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , hypothesis , pycodestyle , pyflakes @@ -10,11 +11,17 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.41.1"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "2ea9c900a05fa7f5f4c5bd9fc1475d7d576532e13b2f79b694452b997ff67200"; + sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c"; + }; + + # fix tests with updated pycodestyle + patches = fetchpatch { + url = https://github.com/quodlibet/mutagen/commit/0ee86ef9d7e06639a388d0638732810b79998608.patch; + sha256 = "1bj3mpbv7krh5m1mvfl0z18s8wdxb1949zcnkcqxp2xl5fzsi288"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 591aa6b0477..b100f3fa350 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib -, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests, requests_oauthlib, six +, pytest, pytestpep8, pytestcache, pytestcov, responses, mock +}: buildPythonPackage rec { version = "0.9.3"; pname = "mwclient"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mwclient"; @@ -13,9 +14,9 @@ buildPythonPackage rec { sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw"; }; - buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; + checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; - propagatedBuildInputs = [ six requests requests_oauthlib ]; + propagatedBuildInputs = [ requests requests_oauthlib six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 1194280ef4b..a06a378a076 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.7"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "00b030f9558454ec237576def2de9b7e50517ae039e03d84482b6ddf1bd1d54d"; + sha256 = "be1f14b0b841b49adb2f6018eaa1ce9529c8147eb561909baaa757e8cf9e821b"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index bcb252a7b49..c028eaaaa14 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.650"; + version = "0.670"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q"; + sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mysql_python/default.nix b/pkgs/development/python-modules/mysql_python/default.nix index a38f7e02e1c..0ab11521cc8 100644 --- a/pkgs/development/python-modules/mysql_python/default.nix +++ b/pkgs/development/python-modules/mysql_python/default.nix @@ -17,8 +17,9 @@ buildPythonPackage rec { sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ pkgs.mysql.connector-c ]; + checkInputs = [ nose ]; + nativeBuildInputs = [ pkgs.mysql.connector-c ]; + buildInputs = [ pkgs.mysql.connector-c ]; # plenty of failing tests doCheck = false; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 71287189017..58d545da624 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.3.14"; + version = "1.4.2.post1"; buildInputs = [ mysql.connector-c @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0symgjmzkckzsxx3piaxywls8q19s1pdgbmpm0v1m425wnfax09r"; + sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 92f885d7bbd..da8e953826f 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "5.5.0"; + version = "6.0.0"; checkInputs = [ pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e29031f37aa264145d6ad9acdab335479ce3636806fc7aa70b7675a2b2198d09"; + sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776"; }; # testing based on project's tox.ini diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 19e8e1eede9..e8e2dde5e1e 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.4.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a8a2749f972592aa9250db975304af6b7337f32337e523a2c995cc9e12c07807"; + sha256 = "302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4"; }; checkInputs = [ nose pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix new file mode 100644 index 00000000000..2816315f105 --- /dev/null +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, jupyter_client +, ipykernel +, nbformat +, nbconvert +, pyflakes +, requests +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "nbsmoke"; + version = "0.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "40891e556dc9e252da2a649028cacb949fc8efb81062ada7d9a87a01b08bb454"; + }; + + propagatedBuildInputs = [ + pytest + jupyter_client + ipykernel + nbformat + nbconvert + pyflakes + requests + beautifulsoup4 + ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "Basic notebook checks and linting"; + homepage = https://github.com/pyviz/nbsmoke; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix new file mode 100644 index 00000000000..ad6de3d3175 --- /dev/null +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, jinja2 +, nbconvert +, nbformat +, sphinx +, traitlets +, python +}: + +buildPythonPackage rec { + pname = "nbsphinx"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "b794219e465b3aab500b800884ff40fd152bb19d8b6f87580de1f3a07170aef8"; + }; + + propagatedBuildInputs = [ + docutils + jinja2 + nbconvert + nbformat + sphinx + traitlets + ]; + + checkPhase = '' + ${python.interpreter} -m nbsphinx + ''; + + meta = with lib; { + description = "Jupyter Notebook Tools for Sphinx"; + homepage = https://nbsphinx.readthedocs.io/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix new file mode 100644 index 00000000000..2110f3628a8 --- /dev/null +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, libndtypes +, isPy27 +}: + +buildPythonPackage { + pname = "ndtypes"; + disabled = isPy27; + inherit (libndtypes) version src meta; + + propagatedBuildInputs = [ numpy ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'include_dirs = ["libndtypes"]' \ + 'include_dirs = ["${libndtypes}/include"]' \ + --replace 'library_dirs = ["libndtypes"]' \ + 'library_dirs = ["${libndtypes}/lib"]' \ + --replace 'runtime_library_dirs = ["$ORIGIN"]' \ + 'runtime_library_dirs = ["${libndtypes}/lib"]' + ''; + + postInstall = '' + mkdir $out/include + cp python/ndtypes/*.h $out/include + ''; +} diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index e8fa0e5e409..59c13bc0a63 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.9.10"; + version = "1.0.0"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "d952e21f4333166d79423db2eda6d772be7b30134381ee055d5177be0db68a57"; + sha256 = "bd1cb7df2ea979e57d8ad02493ad85f9afbf1fcea3dfe34239da8c0dda98087e"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 32ec4b74509..f697e34e999 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.4.2"; + version = "0.5.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4"; + sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca"; }; # disable some failing tests diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 1978ce81637..fe08e1f0789 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -44,15 +44,13 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.1.7"; + version = "1.1.8"; src = fetchPypi { inherit pname version; - sha256 = "0iyi5w2h42bpssqj52ixm2kxp56yxfxdacb6xv5r24yv3hmwd4yn"; + sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc"; }; - patches = [ ./move-uneeded-requires.patch ]; - postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" diff --git a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch b/pkgs/development/python-modules/nipype/move-uneeded-requires.patch deleted file mode 100644 index 89324285d18..00000000000 --- a/pkgs/development/python-modules/nipype/move-uneeded-requires.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/nipype/info.py b/nipype/info.py -index c6503ac..4379643 100644 ---- a/nipype/info.py -+++ b/nipype/info.py -@@ -147,9 +147,6 @@ REQUIRES = [ - 'neurdflib', - 'click>=%s' % CLICK_MIN_VERSION, - 'funcsigs', -- 'pytest>=%s' % PYTEST_MIN_VERSION, -- 'pytest-xdist', -- 'mock', - 'pydotplus', - 'pydot>=%s' % PYDOT_MIN_VERSION, - 'packaging', -@@ -159,7 +156,15 @@ REQUIRES = [ - if sys.version_info <= (3, 4): - REQUIRES.append('configparser') - --TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5'] -+TESTS_REQUIRES = [ -+ 'pytest>=%s' % PYTEST_MIN_VERSION, -+ 'pytest-xdist', -+ 'mock', -+ 'pytest-cov', -+ 'codecov', -+ 'pytest-env', -+ 'coverage<5' -+] - - EXTRA_REQUIRES = { - 'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'], diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 531994d9053..23315f9531b 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nose-randomly"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3"; + sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c"; }; checkInputs = [ numpy nose ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index c9cd7f91833..b74bbf581d8 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.16.0"; + version = "1.16.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb"; + sha256 = "1c4inssky16p6ab63n1gass6dik1dzxrp3y7kmxbdq6xg4w2wsbc"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 2b37bab525e..7fb1de53dbd 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index e01ef7c902d..09bde0cfa7c 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { description = "Library for OAuth version 1.0"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 61259764bec..cdf88db632c 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,31 +1,33 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , mock -, nose -, unittest2 +, pytest , cryptography , blinker , pyjwt }: buildPythonPackage rec { - version = "2.0.0"; + version = "3.0.1"; pname = "oauthlib"; - src = fetchurl { - url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz"; - sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf"; + src = fetchPypi { + inherit pname version; + sha256 = "0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298"; }; - buildInputs = [ mock nose unittest2 ]; + checkInputs = [ mock pytest ]; propagatedBuildInputs = [ cryptography blinker pyjwt ]; + checkPhase = '' + py.test tests/ + ''; + meta = with stdenv.lib; { homepage = https://github.com/idan/oauthlib; - downloadPage = https://github.com/idan/oauthlib/releases; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; + license = licenses.bsd3; }; - } diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 161272ce1a7..f4dba0858db 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -3,26 +3,30 @@ , fetchPypi , python , isPy27 +, defusedxml +, pytest }: buildPythonPackage rec { pname = "odfpy"; - version = "1.3.6"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b"; + sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b"; }; - # Python 2.7 uses a different ordering for xml namespaces. - # The testAttributeForeign test expects "ns44", but fails since it gets "ns43" - checkPhase = " " + lib.optionalString (!isPy27) '' - ${python.interpreter} -m unittest discover -s tests + propagatedBuildInputs = [ defusedxml ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest ''; meta = { description = "Python API and tools to manipulate OpenDocument files"; - homepage = "https://joinup.ec.europa.eu/software/odfpy/home"; + homepage = https://github.com/eea/odfpy; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 9b88a71c5cc..116ba717add 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { homepage = "https://github.com/Tigge/openant"; description = "ANT and ANT-FS Python Library"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index ca05cccd037..211e7a36627 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "2.5.12"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7bcf019a0be528673a8aec1e60b5c863342c3231962dbf7922fd4da42a49a91a"; + sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 474609220cf..017f75d991c 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "ovh"; - version = "0.4.8"; + version = "0.5.0"; # Needs yanc doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd"; + sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8"; }; meta = { diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index a5b7218d886..2a3302aea38 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "18.0"; + version = "19.0"; src = fetchPypi { inherit pname version; - sha256 = "0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807"; + sha256 = "0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af"; }; propagatedBuildInputs = [ pyparsing six ]; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index 05254e4fd43..9a55719d77f 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pamela"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; + sha256 = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c"; }; postUnpack = '' diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index a6ef3b22e41..844a66392c6 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "701b0c41b68eb86bad6f111658917992780d56a3f094a6cad87ef217afa8296d"; + sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index a9b84132734..1944e23f4b4 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -20,6 +20,7 @@ , openpyxl , tables , xlwt +, runtimeShell , libcxx ? null }: @@ -97,8 +98,8 @@ in buildPythonPackage rec { # Until then we disable the tests. + optionalString isDarwin '' # Fake the impure dependencies pbpaste and pbcopy - echo "#!/bin/sh" > pbcopy - echo "#!/bin/sh" > pbpaste + echo "#!${runtimeShell}" > pbcopy + echo "#!${runtimeShell}" > pbpaste chmod a+x pbcopy pbpaste export PATH=$(pwd):$PATH '' + '' diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix new file mode 100644 index 00000000000..821a543eeb1 --- /dev/null +++ b/pkgs/development/python-modules/panel/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bokeh +, param +, pyviz-comms +, markdown +, pyct +, testpath +, pytest +, scipy +, plotly +, altair +, vega_datasets +, hvplot +}: + +buildPythonPackage rec { + pname = "panel"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "21fc6729909dba4ba8c9a84b7fadd293322cc2594d15ac73b0f66a5ceffd1f98"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "testpath<0.4" "testpath" + ''; + + propagatedBuildInputs = [ + bokeh + param + pyviz-comms + markdown + pyct + testpath + ]; + + # infinite recursion in test dependencies (hvplot) + doCheck = false; + + meta = with lib; { + description = "A high level dashboarding library for python visualization libraries"; + homepage = http://pyviz.org; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 2d4f6a9e9f4..74a223d7f80 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "paperspace"; - version = "0.0.13"; + version = "0.0.15"; src = fetchPypi { inherit pname version; - sha256 = "824ec2aeccc6ddaba82a28b4ab74b1c81fb94206fd89c2b083eae3a61e63c2bf"; + sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c"; }; propagatedBuildInputs = [ boto3 requests ]; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix new file mode 100644 index 00000000000..69a2e61e269 --- /dev/null +++ b/pkgs/development/python-modules/param/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, nose +}: + +buildPythonPackage rec { + pname = "param"; + version = "1.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "49927979d4f6c994bcd8f6f7f2b34e3a0a7f0d62404dca6bcae5acde0192bb01"; + }; + + checkInputs = [ flake8 nose ]; + + # tests not included with pypi release + doCheck = false; + + meta = with lib; { + description = "Declarative Python programming using Parameters"; + homepage = https://github.com/pyviz/param; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 14b41fe950b..8d13fcfb4d5 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k }: buildPythonPackage rec { pname = "parameterized"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa"; + sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5"; }; # Tests require some python3-isms but code works without. doCheck = isPy3k; - checkInputs = [ nose glibcLocales ]; - propagatedBuildInputs = [ six ]; + checkInputs = [ nose mock glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" nosetests -v diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 8a4881b730f..004b58fec6a 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "9dd6048ea212cd032a342f9f6aa2b7bc222f7407c7e37bdc2777fecd36897437"; + sha256 = "870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 9ebd5e9b9ea..82d9107bfdd 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "9ccd82b8a122345601f6f9209e972c0e8c3518a188fcff2d37cb4d7bc570b4b8"; }; - buildInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ]; checkPhase = '' diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index c29901b2e99..f5ecb64d232 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.3.1"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2"; + sha256 = "68406ebd7eafe17f8e40e15a84b56848eccbf27d7c1feb89e93d8fca395706db"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 1db458a0d0f..ef706c65c6c 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' rm partd/tests/test_zmq.py # requires network & fails - py.test + py.test -k "not test_serialize" ''; meta = { diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 433a67da51c..3301521b085 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,19 +1,26 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytestrunner +, pytest }: buildPythonPackage rec { - version = "1.5.2"; + version = "2.0.1"; pname = "PasteDeploy"; src = fetchPypi { inherit pname version; - sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb"; + sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a"; }; - buildInputs = [ nose ]; + buildInputs = [ pytestrunner ]; + + checkInputs = [ pytest ]; + + # no tests in PyPI tarball + # should be included with versions > 2.0.1 + doCheck = false; meta = with stdenv.lib; { description = "Load, configure, and compose WSGI applications and servers"; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index ac85b4be120..fe89e6e5aea 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "PasteScript"; src = fetchPypi { inherit pname version; - sha256 = "c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0"; + sha256 = "d9d4d98df8606ad3bfa77be4722207d1a53a0fbcc714ee75d0fcd8a5c3f775c3"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 0756174fec6..814854596e9 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "69486cfe8c9fbd028395df445e4205ea3001d7ca5608d8d0b67b67ce98bb8892"; + sha256 = "954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9"; }; propagatedBuildInputs = [ dill pox ppft multiprocess ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index b3d13a0f648..6beba771701 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.1.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68"; + sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 32a4581676b..d8fa26abf74 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.3.1"; + version = "1.4.1"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky"; + sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 90f6d5a85e0..8bac0c1c537 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.5.3"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "a0244c9e25172598fca73cb61e2a2f133503565c95d99210c3d5c0e85950c4bd"; + sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415"; }; prePatch = '' diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a0e8d08a2c7..5cf8341ffa3 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.12.4"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "903a19158e9efda326908bb4b70a71d31f640b4326576774433ab11fd4e46f39"; + sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b"; }; propagatedBuildInputs = [ pytz six ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { homepage = https://github.com/mfenniak/pg8000; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index b2ce1fb8f98..8c653ce060a 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl"; }; - buildInputs = [ pytest psycopg2 ]; + checkInputs = [ pytest psycopg2 ]; propagatedBuildInputs = [ click sqlparse ]; checkPhase = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4e94c1a7140..4fcc20d2d0d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.3"; + version = "8.10.6"; src = fetchPypi { inherit pname version; - sha256 = "0d870906c6019b41bd4b3720f804aec85a21fd78a7676ac260dcbf218b4e7097"; + sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 903b2b90c30..026d466d218 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "1.13.2.107"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "72f06728c98b9a7ab3db2d6fa2ae5d029029fbcff4e8fcfbc29f1e2620a0f905"; + sha256 = "46baf7c4571fe75374071674727c2beb0388cf57073e0623d8457f04b1c54495"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index bbf2c687ce5..68009435750 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.1"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "636cb4743a6e6fb1d89efcfd772e6deb5a058590f3531703595d776507098d7b"; + sha256 = "077da788630394adce075c88f4a087bcdb27d98cab67eb9046ebcfeedfc1194d"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 5651884928c..e0791248e26 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "Pillow"; - version = "5.3.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93"; + sha256 = "5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f"; }; doCheck = !stdenv.isDarwin && !isPyPy; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index d6806308e55..8bbda8bd51f 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -1,21 +1,27 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy27 +, funcsigs }: buildPythonPackage rec { pname = "pint"; - version = "0.8.1"; + version = "0.9"; src = fetchPypi { - inherit pname version; - sha256 = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4"; + inherit version; + pname = "Pint"; + sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = lib.optional isPy27 funcsigs; + + meta = with lib; { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index de35a06d6d4..3c3183da273 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "3.1.0"; + version = "3.3.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi"; + sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 7fc5adee7fb..da5fc24fb22 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pip"; - version = "18.1"; + version = "19.0.3"; src = fetchPypi { inherit pname version; - sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1"; + sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2"; }; # pip detects that we already have bootstrapped_pip "installed", so we need diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 38098b432e4..ab8c2f638b4 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,6 +4,8 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.4.0"; + setupHook = pkgconfig.setupHook; + src = fetchPypi { inherit pname version; sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52"; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index db323e671d4..879274a16c3 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.4.2"; + version = "1.5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474"; + sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 87c594e473d..8577441cf9d 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "2.3.4"; + version = "2.4.1"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "fefa30cbd1114844a07b6a37d95fd6657774ce8a551a2ac79641887cd63c72db"; + sha256 = "2b7832f9fe0c6cd23dfdb805bcfc52e2ff06fca6604e5782b7518904c1dad6bb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index ac6cdc31f48..e794b53950e 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy , pytest, pytestcov }: @@ -12,6 +12,15 @@ buildPythonPackage rec { sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae"; }; + patches = [ + # Fix tests compatibility with PasteDeploy 2+ + # https://github.com/Pylons/plaster_pastedeploy/pull/17 + (fetchpatch { + url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch; + sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; + }) + ]; + checkPhase = '' py.test ''; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 04931b7df7f..6a2d49996b3 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "3.4.2"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "c988d923e0b0627085b9700e2757003552ae9ccd7daa3a4b067ce60a0c7e642f"; + sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index c4b884e1d3d..98d189d62b1 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchPypi, buildPythonPackage, pytest, tox }: buildPythonPackage rec { - version = "0.7"; + version = "1.0.0"; pname = "pluginbase"; buildInputs = [ pytest tox ]; src = fetchPypi { inherit pname version; - sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; + sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 6a7f09a1451..3f6f3ab13bf 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "plyfile"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "067e384e3723f28dbbd8e8f976a9712dadf6761b2d62c4c1a90821e3c5310bce"; + sha256 = "84ba5ee8c70a4924f64aa7edff5764b929f3b7842d53a3197d0b753818ad7089"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index bb0b56b1e9c..9ce01c098fd 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast and feature-rich Python interface to LevelDB"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://github.com/wbolster/plyvel; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 6f7ebc4cbc9..7fe41d8d3f1 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -60,6 +60,15 @@ in buildPythonPackage rec { ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 ] ++ lib.optionals isPy27 [ virtualenv functools32 ]; + postInstall = '' + mkdir -p "$out/share/bash-completion/completions" + "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" + mkdir -p "$out/share/zsh/vendor-completions" + "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" + mkdir -p "$out/share/fish/vendor_completions.d" + "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" + ''; + # No tests in Pypi tarball doCheck = false; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index c7c888f6a00..a8dc0e9907a 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora, pytest-flake8 }: +, pytest, setuptools_scm, tempora }: buildPythonPackage rec { pname = "portend"; @@ -10,11 +10,15 @@ buildPythonPackage rec { sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719"; }; + postPatch = '' + substituteInPlace pytest.ini --replace "--flake8" "" + ''; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index a4538b260fd..e08fe05d822 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1lm3i4yngi1qclb0hny19vwjd2si5k2qni30wcrnxqqasqak1y"; + sha256 = "19c0f950x544ndsdkfhga58x69iiin2vqiz59pqn9mymk2vrlpkg"; }; meta = { diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index ef1a18e7ab1..18aa9cb7369 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pox"; - version = "0.2.4"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "9c8955d9beed4f9fd509587d17820efe6bc9f9b4a1abe581642aeed9a41784ea"; + sha256 = "2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 69c4da786fe..0cac4cb1b1e 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.6.4.8"; + version = "1.6.4.9"; src = fetchPypi { inherit pname version; - sha256 = "7e1aa0d74f832f0528234890165f3e64d34b3103ec1db7c93c9e7f2ad8cc18d2"; + sha256 = "5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index f8f3d5458a0..ede3e07390c 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub , requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore -, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt +, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytest_3 betamax betamax-serializers betamax-matchers diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 5e169306b2f..14fa0d2f59d 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.2.0"; + version = "3.3.0"; meta = { description = "Turns CSS blocks into style attributes "; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735"; + sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1"; }; buildInputs = [ mock nose ]; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index c986cc6b990..5ab27b67da4 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "process-tests"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "f43f3540edd333bdc5d8741218e173b1dfdbce5b0a40066d75248911e5340a06"; + sha256 = "7ae24a680cc7c44e7687e3723e6e64597a28223ad664989999efe10dd38c2431"; }; # No tests diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 362e73c0d71..7a3d2264c28 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,7 +7,7 @@ , sphinx , flake8 , pytestpep8 -, pytestflakes +, pytest-flakes , pytestcov , pytestcache , pytestrunner @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-utils ]; nativeBuildInputs = [ pytestrunner ]; checkInputs = [ - pytest sphinx flake8 pytestpep8 pytestflakes pytestcov + pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov pytestcache freezegun ]; # ignore tests on the nix wrapped setup.py and don't flake .eggs directory diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index d358bbec1da..67b82838798 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "046cb4fffe75e55ff0e6dfd18e2ea16e54d86cc330f369bebcc683475c8b68a9"; + sha256 = "e8c11ff5ca53de6c3d91e1510500611cafd1d247a937ec6c588a0a7cc3bef93c"; }; doCheck = false; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index cd0df6c52be..78db87ce3cb 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "2.0.7"; + version = "2.0.9"; src = fetchPypi { inherit pname version; - sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"; + sha256 = "2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 7a67ce29240..4f00537db0c 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -13,8 +13,10 @@ buildPythonPackage rec { optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; - propagatedBuildInputs = [ protobuf google_apputils ]; - buildInputs = [ google_apputils pyext ]; + propagatedBuildInputs = [ google_apputils ]; + propagatedNativeBuildInputs = [ protobuf ]; # For protoc. + nativeBuildInputs = [ google_apputils pyext ]; + buildInputs = [ protobuf ]; patches = optional isPy37 # Python 3.7 compatibility (remove when protobuf 3.7 is released) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index eccca8ca3e6..d46f2ddc2d1 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -1,26 +1,18 @@ { stdenv , buildPythonPackage -, fetchPypi, fetchpatch +, fetchPypi , darwin }: buildPythonPackage rec { pname = "psutil"; - version = "5.4.8"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3"; + sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj"; }; - patches = [ - (fetchpatch { - name = "disk_io_counters_fails.patch"; - url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff"; - sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk"; - }) - ]; - # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 82b3edfdc0f..dae97d87ef2 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.7.6.1"; + version = "2.7.7"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82"; + sha256 = "f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e"; }; buildInputs = lib.optional stdenv.isDarwin openssl; - propagatedBuildInputs = [ postgresql ]; + nativeBuildInputs = [ postgresql ]; doCheck = false; diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix new file mode 100644 index 00000000000..51db9783555 --- /dev/null +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: +buildPythonPackage rec { + pname = "pure-python-adb-homeassistant"; + version = "0.1.6.dev0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe6d90220a6880649f6d6df4e707ce5034676710ee6146145ef995f7b769a482"; + }; + + # Disable tests as they require docker, docker-compose and a dedicated + # android emulator + doCheck = false; + + meta = with lib; { + description = "Pure python implementation of the adb client"; + homepage = https://github.com/JeffLIrion/pure-python-adb; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; +} diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 34134546f56..91af07b49be 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, pandas, pytz, six, pytest }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, pandas, pytz, six +, pytest, mock, pytest-mock }: buildPythonPackage rec { pname = "pvlib"; - version = "0.6.0"; + version = "0.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj"; + # Use GitHub because PyPI release tarball doesn't contain the tests. See: + # https://github.com/pvlib/pvlib-python/issues/473 + src = fetchFromGitHub{ + owner = "pvlib"; + repo = "pvlib-python"; + rev = "v${version}"; + sha256 = "17h7vz9s829qxnl4byr8458gzgiismrbrn5gl0klhfhwvc5kkdfh"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest mock pytest-mock ]; propagatedBuildInputs = [ numpy pandas pytz six ]; - # Currently, the PyPI tarball doesn't contain the tests. When that has been - # fixed, enable testing. See: https://github.com/pvlib/pvlib-python/issues/473 - doCheck = false; + # Skip a few tests that try to access some URLs + checkPhase = '' + runHook preCheck + pushd pvlib/test + pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata" + popd + runHook postCheck + ''; meta = with stdenv.lib; { homepage = http://pvlib-python.readthedocs.io; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 4c6ca0bad33..676f6b22990 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.4.0"; + version = "0.5.0"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "4042492db49efbdfc53e0afa89509695826b3fb74fb52444ed04f64c229a65f5"; + sha256 = "09mv7hcczayzjbd4dsrph16ab21slaiamgph9lwr1kjdw7ri5cpg"; }; buildInputs = [ exiv2 boost ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 11fe98c664e..0c2d5eb5c02 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.6"; + version = "0.8.13"; src = fetchPypi { inherit pname version; - sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d"; + sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 3931078c12e..16b98320e8e 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "py_stringmatching"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index fd1866d22f4..927963cec8d 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "17.12.1"; + version = "18.11.0"; src = fetchPypi { inherit pname version; - sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3"; + sha256 = "b96292cc409e0f222b6fecff96afd2e19cfab5d1f2606344907751d42301263a"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 96304606cdf..0bef3f9e69f 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyasn1-modules"; - version = "0.2.3"; + version = "0.2.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "d14fcb29dabecba3d7b360bf72327c26c385248a5d603cf6be5f566ce999b261"; + sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 60ab6465555..afc353d182c 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybase64"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf"; + sha256 = "b26263fb6aff11b1e62965c3bac205c4ebe147f37c213191384acafea7f8ab50"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 2ba0e653e77..629fdd0114d 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pycapnp"; - version = "0.6.3"; + version = "0.6.4"; disabled = isPyPy || isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b3c5a1fcc93fd02fdc070aeccb89654b87f20bdc740f643cc6378925ed6d4c17"; + sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf"; }; buildInputs = [ capnproto cython ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index bda05a58e15..0f42af00619 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "2.4.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2"; + sha256 = "7ce4eeb398a73c26bd65870739c94845da60f4527ebe2f104826ee32d70d035c"; }; disabled = !isPy3k; @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 43a8e6f9f45..4671a8e7846 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,22 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pycodestyle"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a"; + sha256 = "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"; }; - patches = [ - # https://github.com/PyCQA/pycodestyle/pull/801 - (fetchpatch { - url = https://github.com/PyCQA/pycodestyle/commit/397463014fda3cdefe8d6c9d117ae16d878dc494.patch; - sha256 = "01zask2y2gim5il9lcmlhr2qaadv9v7kaw1y619l8xbjhpbq2zh8"; - }) - ]; - meta = with lib; { description = "Python style guide checker (formerly called pep8)"; homepage = https://pycodestyle.readthedocs.io; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 6ae90ac5524..7594c7c1e57 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.8"; + version = "1.8.12"; src = fetchPypi { inherit pname version; - sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va"; + sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 473d81c73bd..e4b66b907ca 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.7.2"; + version = "3.7.3"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "f5fc7e3b2d29552f0383063408ce2bd295e9d3c7ef13377599aa300a3d2baef7"; + sha256 = "1a222250e43f3c659b4ebd5df3e11c2f112aab6aef58e38af55ef5678b9f0636"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 61a0df7accd..62613c74765 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.7.2"; + version = "3.7.3"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5d4e10ad9ff7940da534119ef92a500dcf7c28351d15e12d74ef0ce025e37d5b"; + sha256 = "b70fe991564e178af02ccf89435a8f9e8d052707a7c4b95bf6027cb785da3175"; }; } diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix new file mode 100644 index 00000000000..fc61d689329 --- /dev/null +++ b/pkgs/development/python-modules/pyct/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, param +, pyyaml +, requests +, pytest +}: + +buildPythonPackage rec { + pname = "pyct"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "df7b2d29f874cabdbc22e4f8cba2ceb895c48aa33da4e0fe679e89873e0a4c6e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + param + pyyaml + requests + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Cli for python common tasks for users"; + homepage = https://github.com/pyviz/pyct; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index c437df9cd99..9fb27c88c02 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { }; buildInputs = [ curl openssl.out ]; + nativeBuildInputs = [ curl ]; checkInputs = [ bottle pytest nose flaky ]; diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index dd8c987401d..4822e528dee 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyepsg"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ng0k140kzq3xcffi4vy10py4cmwzfy8anccysw3vgn1x30ghzjr"; + sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index fdc76493da8..bed1dffa5c7 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, fftw, fftwFloat, fftwLongDouble, numpy, scipy }: +, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }: buildPythonPackage rec { - version = "0.10.4"; + version = "0.11.1"; pname = "pyFFTW"; src = fetchPypi { inherit pname version; - sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a"; + sha256 = "05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926"; }; buildInputs = [ fftw fftwFloat fftwLongDouble]; - propagatedBuildInputs = [ numpy scipy ]; + propagatedBuildInputs = [ numpy scipy cython dask ]; # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 622c366cd8d..d8256e9632a 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "0.8.post0"; + version = "0.8.post1"; pname = "pyfiglet"; src = fetchPypi { inherit pname version; - sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519"; + sha256 = "c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 3f799c1962a..354535d47ac 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,17 +2,14 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49"; + sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d"; }; - buildInputs = [ unittest2 ]; - - # https://github.com/PyCQA/pyflakes/issues/386 - doCheck = false; + checkInputs = [ unittest2 ]; meta = with stdenv.lib; { homepage = https://launchpad.net/pyflakes; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 8fbd73dfc1f..199107022df 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11 +{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype }: @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "pygame"; version = "1.9.4"; - src = fetchurl { - url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6"; }; + nativeBuildInputs = [ + pkg-config SDL + ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 freetype @@ -35,7 +39,7 @@ buildPythonPackage rec { LOCALBASE=/ ${python.interpreter} config.py ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Python library for games"; homepage = http://www.pygame.org/; license = licenses.lgpl21Plus; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 1fcc0ef8ce4..835cdbaa6be 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python interface to Graphviz graph drawing package"; homepage = https://github.com/pygraphviz/pygraphviz; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index a12e5eb462c..5749724162e 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.54"; + version = "0.1.56"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3c27f303e6a424229d2d5133af593c21f7d660bdf19d3d00641fbac08a6992c5"; + sha256 = "ca9f222b99d80be4b7ef8a4427ab55368d14914a0516623e66d1da7563919169"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 4b984566e91..d0db3c6ed83 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; - platforms = platforms.linux; # Maybe other non-darwin Unix + platforms = platforms.unix; maintainers = [ maintainers.rycee ]; }; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 6eeeeb20c00..153b5701b26 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; description = "Python interface to the Input Subsystem's input_event and uinput"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index ca9492cb948..efbced9f3b3 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyjet"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg"; + sha256 = "89ce11cd4541fb573d68fd60a219e5e1bdeb94cfcfffc917b472fde2aa9a5a31"; }; # fix for python37 diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 065cae45929..c02c0361cf2 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -4,27 +4,17 @@ buildPythonPackage rec { pname = "PyJWT"; - version = "1.6.4"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; }; propagatedBuildInputs = [ cryptography ecdsa ]; checkInputs = [ pytestrunner pytestcov pytest ]; - # pytest 3.9.0 changed behavior of deprecated_call, see release notes - postPatch = '' - for x in tests/test_api_*py; do - substituteInPlace "$x" --replace AssertionError pytest.fail.Exception - done - ''; - - # https://github.com/jpadilla/pyjwt/issues/382 - doCheck = false; - meta = with lib; { description = "JSON Web Token implementation in Python"; homepage = https://github.com/jpadilla/pyjwt; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 68c35ed0df1..bb1f60025db 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,22 +1,25 @@ { lib, fetchPypi, buildPythonPackage , lxml, pycryptodome, construct -, argon2_cffi, dateutil, enum34 +, argon2_cffi, dateutil, future }: buildPythonPackage rec { pname = "pykeepass"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90"; + sha256 = "2c9e2ddb03ee696ed8aa72c2cddfb81280614864e003226141d68b975aa56f6f"; }; propagatedBuildInputs = [ lxml pycryptodome construct - argon2_cffi dateutil enum34 + argon2_cffi dateutil future ]; + # no tests in PyPI tarball + doCheck = false; + meta = { homepage = https://github.com/pschmitt/pykeepass; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 7ee73975272..994ba059f9e 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; }; - buildInputs = [ krb5 ]; + nativeBuildInputs = [ krb5 ]; # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 64479a7b5af..0510948e6ba 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pylast"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8e883f13b70c3879fc821bbee1accf27ea4e68898f4462cbbe358f615adcbbfb"; + sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56"; }; propagatedBuildInputs = [ certifi six ]; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index 8db864cc869..ce0df266332 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -1,23 +1,26 @@ -{ buildPythonPackage, python, lib, fetchPypi +{ buildPythonPackage, lib, fetchPypi , isPy3k , requests +, pytest }: buildPythonPackage rec { pname = "pylibgen"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh"; + sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; }; disabled = !isPy3k; propagatedBuildInputs = [ requests ]; - # It's not using unittest - checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'"; + checkInputs = [ pytest ]; + + # no tests in PyPI tarball + doCheck = false; meta = { description = "Python interface to Library Genesis"; diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 40b639925a0..752755700b2 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -13,7 +13,7 @@ , pytestcache , pytestcov , covCore -, pytestflakes +, pytest-flakes , pytestpep8 , sphinx , mock @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock chalice + pytest-flakes pytestpep8 sphinx mock chalice ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 8e64d5cb11d..c3f360768d0 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2018.10.18"; + version = "2019.2.4"; src = fetchPypi { inherit pname version; - sha256 = "cf9e030abafc4cd7c33847acf4bf0677bfc707f68fed48469c672d1980a8ceb9"; + sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index ebf852c09a4..a683c07d3af 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.5"; + version = "3.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee"; + sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 2169f23295a..a7908171d69 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "2.3.0"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x"; + sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 3fe1952213e..fb2e9abe065 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,21 +1,36 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, libsodium +, cffi +, six +, hypothesis +}: buildPythonPackage rec { pname = "pynacl"; version = "1.3.0"; - src = fetchFromGitHub { - owner = "pyca"; - repo = pname; - rev = version; - sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052"; + src = fetchPypi { + inherit version; + pname = "PyNaCl"; + sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"; }; checkInputs = [ pytest hypothesis ]; - propagatedBuildInputs = [ libsodium cffi six ]; + buildInputs = [ libsodium ]; + propagatedBuildInputs = [ cffi six ]; SODIUM_INSTALL = "system"; + # fixed in next release 1.3.0+ + # https://github.com/pyca/pynacl/pull/480 + postPatch = '' + substituteInPlace tests/test_bindings.py \ + --replace "average_size=128," "" + ''; + checkPhase = '' py.test ''; diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index c217e8406e1..f950c7798b8 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.12.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "185wxn8gag9whxmysspbh8s7wn3sh1glgf508w2zzwi4lklryl7i"; + sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index c0e3fb51920..428ec1d46b8 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 274c72974fe..2aaabe0760f 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2018.2.2"; + version = "2018.2.3"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "419375fb794d97f9bd46f0dc24ce83b5cc83d316771ba82fac80de8bf883dcdc"; + sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index a6e8e94e094..7bc54cb0ffb 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -48,11 +48,11 @@ in buildPythonPackage rec { pname = "pyOpenSSL"; - version = "18.0.0"; + version = "19.0.0"; src = fetchPypi { inherit pname version; - sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580"; + sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index c853965469a..1392956ef03 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyowm"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849"; + sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; }; propagatedBuildInputs = [ requests geojson ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index a747d42e418..9f7c75a02d3 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,14 +1,8 @@ -{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }: +{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }: -let +buildPythonPackage rec { pname = "PyQt-x11-gpl"; version = "4.12"; - - inherit (pythonPackages) buildPythonPackage python dbus-python sip; -in buildPythonPackage { - pname = pname; - name = pname + "-" + version; - version = version; format = "other"; src = fetchurl { @@ -16,7 +10,7 @@ in buildPythonPackage { sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"; }; - configurePhase = '' + postPatch = '' mkdir -p $out lndir ${dbus-python} $out rm -rf "$out/nix-support" @@ -32,17 +26,24 @@ in buildPythonPackage { --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \ ''} - configureFlagsArray=( \ - --confirm-license --bindir $out/bin \ - --destdir $out/${python.sitePackages} \ - --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip/PyQt4 \ - --dbus=${dbus-python}/include/dbus-1.0 --verbose) - - ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" + chmod +x configure.py + sed -i '1i#!${python.interpreter}' configure.py ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper qt4 lndir dbus ]; + configureScript = "./configure.py"; + dontAddPrefix = true; + configureFlags = [ + "--confirm-license" + "--bindir=${placeholder "out"}/bin" + "--destdir=${placeholder "out"}/${python.sitePackages}" + "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins" + "--sipdir=${placeholder "out"}/share/sip/PyQt4" + "--dbus=${stdenv.lib.getDev dbus-python}/include/dbus-1.0" + "--verbose" + ]; + + nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ]; + buildInputs = [ qt4 dbus ]; propagatedBuildInputs = [ sip ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2d2c04d5fb2..46de94cd0c6 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -23,28 +23,30 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig qmake lndir ]; + nativeBuildInputs = [ pkgconfig qmake lndir sip ]; buildInputs = [ dbus sip ]; - propagatedBuildInputs = [ qtbase qtsvg qtwebengine ] + propagatedBuildInputs = [ qtbase qtsvg qtwebengine dbus-python ] ++ lib.optional (!isPy3k) enum34 ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets; + patches = [ + # Fix some wrong assumptions by ./configure.py + # TODO: figure out how to send this upstream + ./pyqt5-fix-dbus-mainloop-support.patch + ]; + configurePhase = '' runHook preConfigure - mkdir -p $out - lndir ${dbus-python} $out - rm -rf "$out/nix-support" - export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} ${python.executable} configure.py -w \ --confirm-license \ - --dbus=${dbus.dev}/include/dbus-1.0 \ + --dbus-moduledir=$out/${python.sitePackages}/dbus/mainloop \ --no-qml-plugin \ --bindir=$out/bin \ --destdir=$out/${python.sitePackages} \ diff --git a/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch b/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch new file mode 100644 index 00000000000..faa36fa1913 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch @@ -0,0 +1,70 @@ +From 944d5467e1655aac20a14325631df6daccaf5804 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sun, 3 Mar 2019 01:13:46 +0100 +Subject: [PATCH] Fix building on Nix + +./configure.py tries to find dbus-python header in dbus-1 includedir +obtained from pkg-config or from --dbus flag. Unfortunately, when supplied, +it also uses the flag for locating dbus-1 headers. This fails on Nix, +since every package is installed into its own immutable tree so we cannot +use a single directory for both dbus-python and dbus-1. We can fix this by +using pkg-config for finding dbus-python headers too. + +Additionally, the build system also tries to install the dbus support module +to dbus-python tree. Often, it is possible to handle this in pkgconfig as well [1] +but unfortunately, dbus-python does not export the moduledir in its pc file +so I have decided to solve this with an extra configure flag. + +[1]: https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ +--- + configure.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.py b/configure.py +index a3450ca3..440d90a2 100644 +--- a/configure.py ++++ b/configure.py +@@ -905,6 +905,9 @@ class TargetConfiguration: + if opts.pydbusincdir is not None: + self.pydbus_inc_dir = opts.pydbusincdir + ++ if opts.pydbusmoduledir is not None: ++ self.pydbus_module_dir = opts.pydbusmoduledir ++ + if opts.pyuicinterpreter is not None: + self.pyuic_interpreter = opts.pyuicinterpreter + +@@ -1184,6 +1187,11 @@ def create_optparser(target_config): + metavar="DIR", + help="the directory containing the dbus/dbus-python.h header is " + "DIR [default: supplied by pkg-config]") ++ g.add_option("--dbus-moduledir", dest='pydbusmoduledir', type='string', ++ default=None, action='callback', callback=store_abspath, ++ metavar="DIR", ++ help="the directory where dbus support module will be installed to" ++ "DIR [default: obtained from dbus.mainloop python module]") + p.add_option_group(g) + + # Installation. +@@ -2149,7 +2157,7 @@ def check_dbus(target_config, verbose): + + inform("Checking to see if the dbus support module should be built...") + +- cmd = 'pkg-config --cflags-only-I --libs dbus-1' ++ cmd = 'pkg-config --cflags-only-I --libs dbus-1 dbus-python' + + if verbose: + sys.stdout.write(cmd + "\n") +@@ -2178,7 +2186,8 @@ def check_dbus(target_config, verbose): + inform("The Python dbus module doesn't seem to be installed.") + return + +- target_config.pydbus_module_dir = dbus.mainloop.__path__[0] ++ if target_config.pydbus_module_dir == '': ++ target_config.pydbus_module_dir = dbus.mainloop.__path__[0] + + # Try and find dbus-python.h. We don't use pkg-config because it is broken + # for dbus-python (at least for versions up to and including v0.81.0). +-- +2.18.0 + diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3f8af5b82eb..51c6f28564f 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "37c3e1c9eae72817e0365e2a38143543aee8b75240701fa5cb3a1be86c01a1c0"; + sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e"; }; checkInputs = [ docutils virtualenv webtest zope_component ]; diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 626142ee2f2..216fb57c221 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyramid_jinja2"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "5c21081f65a5bec0b76957990c2b89ed41f4fd11257121387110cb722fd0e5eb"; + sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502"; }; buildInputs = [ webtest ]; diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index 2ea6043c427..99c4b7116d5 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { checkPhase = '' redis-server & - nosetests . + nosetests . --exclude test_worker_pids ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index f3bc353fe0e..2ef68338687 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.3.1.post1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "0shsnc5bia9k1fzmqnwwbm1x5qvac3zrq4lvyhg27rjgpcamvb9l"; + sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index df8df2cb93c..65ff765a584 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Pyro4"; - version = "4.74"; + version = "4.75"; src = fetchPypi { inherit pname version; - sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f"; + sha256 = "1dfpp36imddx19yv0kd28gk1l71ckhpqy6jd590wpm2680jw15rq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 16805ac58c0..9f8103b0606 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = https://github.com/svinota/pyroute2; license = licenses.asl20; maintainers = [maintainers.mic92]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index ab9c93b9b01..9dd262e0035 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -2,12 +2,12 @@ , setuptools, multipledispatch, numpy }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.10.1"; pname = "pyrr"; src = fetchPypi { inherit pname version; - sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa"; + sha256 = "06305b2f555f8b8091a6c29a05d5d33f131c9dd268e22d94985e43ab5df70c1d"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index e916c907e4f..a2b614ba3b8 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,20 +9,17 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.14.9"; + version = "0.14.11"; src = fetchPypi { inherit pname version; - sha256 = "0xwaqjjn665wd1rllqzndmlc8yzfw2wxakpfwlh6ir6kgbajff2s"; + sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"; }; propagatedBuildInputs = [ six ]; checkInputs = [ pytestrunner pytest hypothesis ]; - # pytestrunner is only needed to run tests - patches = [ ./no-setup-requires-pytestrunner.patch ]; - meta = with stdenv.lib; { homepage = https://github.com/tobgu/pyrsistent/; description = "Persistent/Functional/Immutable data structures"; diff --git a/pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch b/pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch deleted file mode 100644 index 74d85dc4293..00000000000 --- a/pkgs/development/python-modules/pyrsistent/no-setup-requires-pytestrunner.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/setup.py b/setup.py -index 90a39a5..7bf444f 100644 ---- a/setup.py -+++ b/setup.py -@@ -77,9 +77,8 @@ setup( - 'Programming Language :: Python :: Implementation :: PyPy', - ], - test_suite='tests', -- tests_require=['pytest','hypothesis'], -+ tests_require=['pytest-runner', 'pytest','hypothesis'], - scripts=[], -- setup_requires=['pytest-runner'], - ext_modules=extensions, - cmdclass={'build_ext': custom_build_ext}, - install_requires=['six'], diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index a86badb3bca..0bb24031084 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; homepage = https://github.com/roger-/pyrtlsdr; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 4784e46ffb2..a15342e17fa 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; propagatedBuildInputs = [ pcsclite ]; - buildInputs = [ swig ] ++ stdenv.lib.optional stdenv.isDarwin PCSC; + buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC; + nativeBuildInputs = [ swig ]; meta = { homepage = https://pyscard.sourceforge.io/; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 62ff439afbb..d9168f291c0 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; license = stdenv.lib.licenses.gpl2; homepage = http://www.pyside.org/docs/apiextractor/; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index ab46c726f6c..1d61854cb67 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; + nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; @@ -21,7 +21,6 @@ buildPythonPackage rec { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; homepage = http://www.pyside.org; - maintainers = [ lib.maintainers.chaoflow ]; - platforms = lib.platforms.all; + broken = true; }; } diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 9ad65dc76e0..0950726172d 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; license = stdenv.lib.licenses.gpl2; homepage = http://www.pyside.org/docs/generatorrunner/; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 859e91c872e..42ad55ad0b9 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; + nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = lib.licenses.gpl2; homepage = http://www.pyside.org/docs/shiboken/; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a56899f8d0b..abb0bdebd5d 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.gpl2; homepage = http://www.pyside.org; - maintainers = [ lib.maintainers.chaoflow ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index a5a0104490a..d80cbf41629 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyspread"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83"; + sha256 = "6e5d0eb49750eed7734852e15727e190270880c75dcc5f6c8fb1bfdaa59c48fc"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index acdd0e36cdb..77ea742387e 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -8,9 +8,8 @@ }: buildPythonPackage rec { - version = "2.0.2"; pname = "pytest-ansible"; - disabled = isPy3k; + version = "2.0.2"; src = fetchPypi { inherit pname version; @@ -30,7 +29,7 @@ buildPythonPackage rec { doCheck = false; checkPhase = '' - pytest tests + pytest ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 24602c52260..346530d4a81 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.9.0"; + version = "0.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf"; + sha256 = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf"; }; buildInputs = [ pytest ] diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 1bb5d001ddb..9ddec4199d7 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytest_xdist, virtualenv, process-tests, coverage }: +, pytest, coverage }: buildPythonPackage rec { pname = "pytest-cov"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33"; }; - buildInputs = [ pytest pytest_xdist virtualenv process-tests ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ coverage ]; # xdist related tests fail with the following error diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index ed38b5b5265..ec28c8af442 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.6"; + version = "3.4.7"; src = fetchPypi { inherit pname version; - sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y"; + sha256 = "3d489db7c9bd18d7c154347b1bdfb82cc6b1ec8539543508b199c77e5eb2caec"; }; nativeBuildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 67ceebef305..e9ae311d496 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -1,18 +1,18 @@ { stdenv, buildPythonPackage, fetchPypi -, setuptools-git, pytest }: +, setuptools-git, pytest_3 }: buildPythonPackage rec { pname = "pytest-fixture-config"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08"; + sha256 = "839d70343c87d6dda5bca88e3ab06e7b2027998dc1ec452c14d50be5725180a3"; }; nativeBuildInputs = [ setuptools-git ]; - buildInputs = [ pytest ]; + buildInputs = [ pytest_3 ]; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index eb8a2e3e117..d3b2df60399 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.3"; + version = "1.0.4"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b2c71fb6d469bae076a01c43d4a83485d740db6a8a00bad77e0657ed035e98d4"; + sha256 = "4d225c13e787471502ff94409dcf6f7927049b2ec251c63b764a4b17447b60c0"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index 52cfed14150..df7981e6bfc 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143"; }; - buildInputs = [ pytestpep8 pytest ]; + checkInputs = [ pytestpep8 pytest ]; + nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ pyflakes ]; # disable one test case that looks broken diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 14eb3a74d57..b3ea60174a6 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "0.2"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805"; + sha256 = "d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index e0be487e86d..6d84ef0de7d 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -1,28 +1,23 @@ { buildPythonPackage , lib -, fetchFromGitHub +, fetchPypi , pytest -, flask -, decorator , httpbin , six -, requests }: buildPythonPackage rec { pname = "pytest-httpbin"; - version = "0.3.0"; + version = "1.0.0"; - src = fetchFromGitHub { - owner = "kevin1024"; - repo = "pytest-httpbin"; - rev = "v${version}"; - sha256 = "0p86ljx775gxxicscs1dydmmx92r1g9bs00vdvxrsl3qdll1ksfm"; + src = fetchPypi { + inherit pname version; + sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq"; }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ flask decorator httpbin six requests ]; + propagatedBuildInputs = [ httpbin six ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 7daffbfa69c..5f2516b646c 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0615b1698bdd2a1e6e396caf2f496020f4f69bccc0518df5050aeb02800f7c07"; + sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2"; }; propagatedBuildInputs = [ werkzeug ]; - buildInputs = [ pytest six requests ]; + checkInputs = [ pytest six requests ]; checkPhase = '' - py.test + pytest ''; meta = { diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 163063ae57f..6a70b6e8ce9 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,15 +2,15 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.0"; - + version = "1.10.1"; + src = fetchPypi { inherit pname version; - sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"; + sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4"; }; - propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; - nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = lib.optional (!isPy3k) mock; + nativeBuildInputs = [ setuptools_scm pytest ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-quickcheck/default.nix b/pkgs/development/python-modules/pytest-quickcheck/default.nix index 1decbeb643d..1e8a49f90be 100644 --- a/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.8.3"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ pytestflakes pytestpep8 tox ]; + propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ]; meta = with stdenv.lib; { license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index caede4c1809..df34c3361d0 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; - version = "1.3.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df"; + sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix new file mode 100644 index 00000000000..2a4c5591a5f --- /dev/null +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, requests +, psutil +, pytest +, subprocess32 +}: + +buildPythonPackage rec { + pname = "pytest-services"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c"; + }; + + propagatedBuildInputs = [ + requests + psutil + pytest + ] ++ lib.optional (!isPy3k) subprocess32; + + # no tests in PyPI tarball + doCheck = false; + + meta = with lib; { + description = "Services plugin for pytest testing framework"; + homepage = https://github.com/pytest-dev/pytest-services; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 4fa11dbd7d1..fedf5010b2b 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,18 +1,19 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { pname = "pytest-shutil"; - version = "1.3.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1"; + sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca"; }; - buildInputs = [ cmdline pytest ]; + checkInputs = [ cmdline pytest_3 ]; propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + nativeBuildInputs = [ pytest_3 ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f000a1f937a..3997e716817 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a"; }; + patches = fetchpatch { + url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw; + sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46"; + }; + checkInputs = [ pytest pexpect ]; checkPhase = ''pytest -ra''; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 413d090bbcc..ec644187056 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,19 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: +, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }: buildPythonPackage rec { pname = "pytest-virtualenv"; - version = "1.3.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f"; + sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19"; }; - buildInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest_3 pytestcov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ]; checkPhase = '' py.test tests/unit ''; + nativeBuildInputs = [ pytest_3 ]; + meta = with stdenv.lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; homepage = https://github.com/manahl/pytest-plugins; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index a8fc1c6742b..614a5348bce 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.24.1"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de"; + sha256 = "d03d1ff1b008458ed04fa73e642d840ac69b4107c168e06b71037c62d7813dd4"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/pytest/3.10.nix b/pkgs/development/python-modules/pytest/3.10.nix new file mode 100644 index 00000000000..f24cab8af1c --- /dev/null +++ b/pkgs/development/python-modules/pytest/3.10.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools +, atomicwrites, mock, writeText, pathlib2 +}: +buildPythonPackage rec { + version = "3.10.1"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"; + }; + + checkInputs = [ hypothesis mock ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable" + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + + preDistPhases+=" pytestcachePhase" + ''; + + meta = with stdenv.lib; { + homepage = https://docs.pytest.org; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 9412a750a9a..45572938496 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2 }: buildPythonPackage rec { - version = "3.9.3"; + version = "4.2.1"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db"; + sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c"; }; checkInputs = [ hypothesis mock ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 74d04cfd927..9ed165f93b1 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -3,12 +3,12 @@ , autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.7.1"; pname = "python-binance"; src = fetchPypi { inherit pname version; - sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps"; + sha256 = "9ce406da68bfbc209ae6852d1b8a2812708d04502f82a61b0c9ca41356cc6ab7"; }; doCheck = false; # Tries to test multiple interpreters with tox diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 76544adaf0b..f4704c30b5d 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "2.2.0"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "aca149ebf7e73f10cd554b2df5c95295d49add8666348eff6195053ec307728c"; + sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25"; }; # A test fail within chroot builds. diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix new file mode 100644 index 00000000000..bee0cab0a3f --- /dev/null +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -0,0 +1,59 @@ +{ lib, buildPythonPackage, fetchPypi, + nose, dbus, dbus-python, pygobject3, + which, pyflakes, pycodestyle, bluez, networkmanager +}: + +buildPythonPackage rec { + pname = "python-dbusmock"; + version = "0.18.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hj02p65cic4jdc6a5xf1hx8j5icwy7dcrm5kg91lkjks4gwpg5h"; + }; + + prePatch = '' + sed -i -e 's|pyflakes3|pyflakes|g' tests/test_code.py; + ''; + + # TODO: Get the rest of these tests running? + # This is a mocking library used as a check dependency for a single derivation. + # That derivation's tests pass. Maybe not worth the effort to fix these... + NOSE_EXCLUDE = lib.concatStringsSep "," [ + "test_bluez4" # NixOS ships BlueZ5 + # These appear to fail because they're expecting to run in an Ubuntu chroot? + "test_everything" # BlueZ5 OBEX + "test_polkitd" + "test_consolekit" + "test_api" + "test_logind" + "test_notification_daemon" + "test_ofono" + "test_gnome_screensaver" + "test_cli" + "test_timedated" + "test_upower" + # Very slow, consider disabling? + # "test_networkmanager" + ]; + + checkInputs = [ + nose dbus dbus-python which pycodestyle pyflakes + pygobject3 bluez bluez.test networkmanager + ]; + + checkPhase = '' + runHook preCheck + export PATH="$PATH:${bluez.test}/test"; + nosetests -v + runHook postCheck + ''; + + meta = with lib; { + description = "Mock D-Bus objects for tests"; + homepage = https://github.com/martinpitt/python-dbusmock; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ callahad ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 94cdd8029ba..4691785dae1 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.0.3"; + version = "1.0.4"; pname = "python-editor"; src = fetchPypi { inherit pname version; - sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565"; + sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"; }; # No proper tests diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 8e3e9d9a584..48dbc9b710a 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ python.pkgs.dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" ''; - + preBuild = "${python.interpreter} setup.py build_ext"; installPhase= "${python.interpreter} setup.py install --prefix=$out"; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index d245d472a00..2b55d975ed3 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.6.3"; + version = "0.7.0"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085"; + sha256 = "d9c1411b25600ea65bb534ad75bf4ab6efd9627abd86872f0e5453ff42220d06"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index b3e3de0285a..39950b97f6c 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "1.2.6"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245"; + sha256 = "d3e034397236020498e677a35e5c05dcc6ba1624b608b9ef7e5fe3090ccbd5a8"; }; doCheck = !isPy3k; # (only) on python3 unittest loader (loadTestsFromModule) fails diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix new file mode 100644 index 00000000000..4615bfcccce --- /dev/null +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, python +, snappy +, cffi +, nose +}: + +buildPythonPackage rec { + pname = "python-snappy"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "8a7f803f06083d4106d55387d2daa32c12b5e376c3616b0e2da8b8a87a27d74a"; + }; + + buildInputs = [ snappy ]; + + propagatedBuildInputs = lib.optional isPyPy cffi; + + checkInputs = [ nose ]; + + checkPhase = '' + rm -r snappy # prevent local snappy from being picked up + nosetests test_snappy.py + '' + lib.optionalString isPyPy '' + nosetests test_snappy_cffi.py + ''; + + meta = with lib; { + description = "Python library for the snappy compression library from Google"; + homepage = http://github.com/andrix/python-snappy; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f58b42aa04c..368b26f2fb5 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "2.1.2"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "9e9d87d5f3cd6d39c42dd665e1fe3e12361637e28f5ad9a7aa8f73358b7a3dd5"; + sha256 = "aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 7aa77654006..67fbd4e24eb 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }: buildPythonPackage rec { pname = "python-utils"; @@ -14,7 +14,7 @@ buildPythonPackage rec { rm tests/*.pyc ''; - checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ]; + checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ]; checkPhase = '' py.test tests diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index f7cecae8497..cd20bf72f5d 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -24,5 +24,6 @@ buildPythonPackage rec { ''; maintainers = [ maintainers.mic92 ]; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 41eac5d2044..37bfee1d246 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2018.5.2"; + version = "2019.1"; src = fetchPypi { inherit pname version; - sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b"; + sha256 = "f6972030e6c97089e49b832fd1f4e7959aee89bb6db929aaa3bde2553d78872b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 408c64190bb..cc30c802fd9 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2018.7"; + version = "2018.9"; src = fetchPypi { inherit pname version; - sha256 = "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca"; + sha256 = "d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index d1328fca004..9fb057800db 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytzdata"; - version = "2018.7"; + version = "2018.9"; src = fetchPypi { inherit pname version; - sha256 = "10c74b0cfc51a9269031f86ecd11096c9c6a141f5bb15a3b8a88f9979f6361e2"; + sha256 = "dddaaf4f1717820a6fdcac94057e03c1a15b3829a44d9eaf19988917977db408"; }; # No tests diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 4169c2a22f9..49b01550772 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.15"; + version = "2.16"; src = fetchPypi { inherit pname version; - sha256 = "cf2f9f538722447bded6b319a35c26ea088c51ccdbd3dec887210946c7992ebf"; + sha256 = "1d28ec8204fe3b0eb1043f5ba9b646a2c38e5fd89a0419d760cff8f0df507c83"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index 37fe5a05369..bfb0787a1bb 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyupdate"; - version = "0.2.16"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "1p4zpjvwy6h9kr0dp80z5k04s14r9f75jg9481gpx8ygxj0l29bi"; + sha256 = "1qxbakhsgmdc5aakhkadr26dlhi0lma7170b245sragn170fqjxf"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix new file mode 100644 index 00000000000..53f06cff922 --- /dev/null +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, fetchPypi +, lib +, param +}: + +buildPythonPackage rec { + pname = "pyviz_comms"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7ad4ff0c2166f0296ee070049ce21341f868f907003714eb6eaf1630ea8e241a"; + }; + + propagatedBuildInputs = [ param ]; + + # there are not tests with the package + doCheck = false; + + meta = with lib; { + description = "Launch jobs, organize the output, and dissect the results"; + homepage = http://pyviz.org/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 71243ef6f76..9de07d3ed08 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "17.1.2"; + version = "17.1.3"; src = fetchPypi { inherit pname version; - sha256 = "a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf"; + sha256 = "83722236bd6ae6a07dec0cb728906785040e91826c7575709a258b4e21d0f812"; }; checkInputs = [ pytest tornado ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1938cb37c75..bb92fc9df9a 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.6.1"; + version = "0.7.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38"; + sha256 = "63e7a7c3033fe955d715cc825b3fb61d27c25ad66e1761493ca2243b5dbfb4f9"; }; buildInputs = [ cmake ] diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index ff2d8cf0740..2fe8c0a669a 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyside }: +{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: buildPythonPackage rec { pname = "QtAwesome"; @@ -9,7 +9,16 @@ buildPythonPackage rec { sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3"; }; - propagatedBuildInputs = [ qtpy six pyside ]; + propagatedBuildInputs = [ qtpy six ]; + + checkInputs = [ pyqt5 pytest ]; + + checkPhase = '' + py.test + ''; + + # Requires https://github.com/boylea/qtbot + doCheck = false; meta = with stdenv.lib; { description = "Iconic fonts in PyQt and PySide applications"; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 07b5a316961..810cffa5cc6 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw"; }; - buildInputs = [ nose ] ++ lib.optionals isPy27 [mock]; + checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; # : cannot connect to X server diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index a2e261284d8..ecc531d82ce 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac"; + sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix new file mode 100644 index 00000000000..b39e081c471 --- /dev/null +++ b/pkgs/development/python-modules/quamash/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest, isPy3k, pyqt5, pyqt ? pyqt5 }: + +buildPythonPackage rec { + pname = "quamash"; + version = "0.6.1"; + + disabled = !isPy3k; + + # No tests in PyPi tarball + src = fetchFromGitHub { + owner = "harvimt"; + repo = "quamash"; + rev = "version-${version}"; + sha256 = "117rp9r4lz0kfz4dmmpa35hp6nhbh6b4xq0jmgvqm68g9hwdxmqa"; + }; + + propagatedBuildInputs = [ pyqt ]; + + checkInputs = [ pytest ]; + checkPhase = '' + pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio + ''; + + meta = with lib; { + description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; + homepage = https://github.com/harvimt/quamash; + license = licenses.bsd2; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index a4274317e1b..bc778984493 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0"; + sha256 = "582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix new file mode 100644 index 00000000000..6f85280979b --- /dev/null +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pytest +, mock +, sphinx +}: + +buildPythonPackage rec { + pname = "readthedocs-sphinx-ext"; + version = "0.5.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "21097cbb37c9a0590e2cb444b55bd87302fc8f69640fa2d4f2d113e98e9558ff"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest mock sphinx ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "Sphinx extension for Read the Docs overrides"; + homepage = http://github.com/rtfd/readthedocs-sphinx-ext; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 879ca3d7b4d..1851fe7a0de 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -1,11 +1,11 @@ { fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "redis"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1kw3a1618pl908abiaxd41jg5z0rwyl2w2i0d8xi9zxy5437a011"; + sha256 = "7ba8612bbfd966dea8c62322543fed0095da2834dbd5a7c124afbc617a156aa7"; }; # tests require a running redis diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index f089d1cdba2..bc16fffcef5 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2018.11.22"; + version = "2019.02.21"; src = fetchPypi { inherit pname version; - sha256 = "79a6a60ed1ee3b12eb0e828c01d75e3b743af6616d69add6c2fde1d425a4ba3f"; + sha256 = "587bd4cad11c7294f89799c45778abca271d7c6668a0e85c41a6dbfa8096f9bb"; }; postCheck = '' @@ -19,6 +19,9 @@ buildPythonPackage rec { ${python.interpreter} -c 'import test_regex; test_regex.test_main();' ''; + # No tests in archive + doCheck = false; + meta = { description = "Alternative regular expression module, to replace re"; homepage = https://bitbucket.org/mrabarnett/mrab-regex; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index d2fcef3e169..be37a48f00c 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -2,12 +2,12 @@ , oauthlib, requests }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.2.0"; pname = "requests-oauthlib"; src = fetchPypi { inherit pname version; - sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f"; + sha256 = "bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57"; }; doCheck = false; # Internet tests fail when building in chroot diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index f865f6b8aed..13e017520a7 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -9,23 +9,27 @@ buildPythonPackage rec { pname = "requests-toolbelt"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"; + sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"; }; checkInputs = [ betamax mock pytest ]; propagatedBuildInputs = [ requests ]; checkPhase = '' - py.test tests + # disabled tests access the network + py.test tests -k "not test_no_content_length_header \ + and not test_read_file \ + and not test_reads_file_from_url_wrapper" ''; meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with lib.maintainers; [ jgeerds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; }; -} +} \ No newline at end of file diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index cf9660b0906..063c6d95071 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.20.1"; + version = "2.21.0"; src = fetchPypi { inherit pname version; - sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263"; + sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"; }; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index b8626524b54..9f73ba28362 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.1.3"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037"; + sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350"; }; checkInputs = [ nose flake8 pyyaml testtools ]; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index ed0bf42ae68..1a40f61cc50 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -14,5 +14,6 @@ buildPythonPackage rec { builder = ./builder.sh; - buildInputs = [ rpmextract python wirelesstools gettext ]; + nativeBuildInputs = [ rpmextract gettext ]; + buildInputs = [ wirelesstools ]; } diff --git a/pkgs/development/python-modules/root_numpy/default.nix b/pkgs/development/python-modules/root_numpy/default.nix index 3f36eb730ce..dc2c5f790b5 100644 --- a/pkgs/development/python-modules/root_numpy/default.nix +++ b/pkgs/development/python-modules/root_numpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "root_numpy"; - version = "4.7.3"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg"; + sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878"; }; disabled = isPy3k; # blocked by #27649 diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21281d341cc..b91709446b3 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rope"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2"; + sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index dfbcdec858a..7ff5b0343ea 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { homepage = http://rpy.sourceforge.net/rpy2; description = "Python interface to R"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ joelmo ]; }; } diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 3e7cd4479eb..7b14d337f34 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.15.86"; + version = "0.15.88"; src = fetchPypi { inherit pname version; - sha256 = "d98b3d421eebf7e10311ab12f41c5b0353e7cae1cc78f51312e24f569d593de0"; + sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7"; }; # Tests cannot load the module to test diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 9b74b9c8ba3..7589d0fce73 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.1.13"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1"; + sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021"; }; foo = 1; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 9486899c606..d4eed74611e 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "salmon-mail"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc"; + sha256 = "cb2f9c3bf2b9f8509453ca8bc06f504350e19488eb9d3d6a4b9e4b8c160b527d"; }; checkInputs = [ nose jinja2 mock ]; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 18dd6e58f5c..7ca3fc0f94b 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Powerful interactive network packet manipulation program"; homepage = https://scapy.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; }; } diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index ee86d8869fe..4d4ec409e02 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh"; + sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix new file mode 100644 index 00000000000..b0300744b5c --- /dev/null +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchPypi, wheel, setuptools, packaging +, cmake, ninja, cython, codecov, coverage, six, virtualenv, pathpy +, pytest, pytestcov, pytest-virtualenv, pytest-mock, pytestrunner +, requests, flake8 }: + +buildPythonPackage rec { + pname = "scikit-build"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hh275lj98wgwi53mr9fqk8wh1dajjksch52xjax6a79gld4391a"; + }; + + # Fixes incorrect specified requirement (part of next release) + patches = [ ./fix_pytestrunner_req.patch ]; + + propagatedBuildInputs = [ wheel setuptools packaging ]; + checkInputs = [ + cmake ninja cython codecov coverage six virtualenv pathpy + pytest pytestcov pytest-mock pytest-virtualenv pytestrunner + requests flake8 + ]; + + disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ + "test_hello_develop" # tries setuptools develop install + "test_wheel" # pip has no way to install missing dependencies + "test_fortran_compiler" # passes if gfortran is available + "test_install_command" # tries to alter out path + "test_test_command" # tries to alter out path + ]); + + checkPhase = '' + py.test -k '${disabledTests}' + ''; + + meta = with lib; { + homepage = http://scikit-build.org/; + description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; + license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code + maintainers = [ maintainers.FlorianFranzen ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch b/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch new file mode 100644 index 00000000000..e8e19f84a5d --- /dev/null +++ b/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index dd348fa..4de89c6 100755 +--- a/setup.py ++++ b/setup.py +@@ -22,7 +22,7 @@ with open('requirements-dev.txt', 'r') as fp: + dev_requirements = list(filter(bool, (line.strip() for line in fp))) + + # Require pytest-runner only when running tests +-pytest_runner = (['pytest-runner>=2.0,<3dev'] ++pytest_runner = (['pytest-runner>=2.0'] + if any(arg in sys.argv for arg in ('pytest', 'test')) + else []) + diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 5d8399d6267..e2ba35e0438 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.14.1"; + version = "0.14.2"; src = fetchPypi { inherit pname version; - sha256 = "86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50"; + sha256 = "1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5fe21024e00..01c54ef5f16 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "51a2424c8ed80e60bdb9a896806e7adaf24a58253b326fbad10f80a6d06f2214"; + sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index d3c6006bc6c..158d9a054df 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 0a34c2b5429..7548f96a88e 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "40.6.3"; + version = "40.8.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8"; + sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d"; }; nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ]; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index f6e0daea5ad..4a6b5ecc0cd 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, pip }: buildPythonPackage rec { pname = "setuptools_scm"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40"; + sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358"; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 42d82566073..220726733dc 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, geos, glibcLocales, pytest, cython +{ stdenv, buildPythonPackage, fetchPypi, substituteAll +, geos, pytest, cython , numpy }: @@ -12,26 +12,31 @@ buildPythonPackage rec { sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; }; - buildInputs = [ geos glibcLocales cython ]; + nativeBuildInputs = [ + geos # for geos-config + cython + ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy ]; - preConfigure = '' - export LANG="en_US.UTF-8"; - ''; + # environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - patchPhase = let - libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6"; - in '' - sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py - sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py - ''; + patches = [ + (substituteAll { + src = ./library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}" + + stdenv.lib.optionalString (!stdenv.isDarwin) ".6"; + }) + ]; # Disable the tests that improperly try to use the built extensions checkPhase = '' - py.test -k 'not test_vectorized and not test_fallbacks' tests + rm -r shapely # prevent import of local shapely + py.test tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch new file mode 100644 index 00000000000..6137e758182 --- /dev/null +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -0,0 +1,109 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 09bf1ab..837aa98 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): + "Could not find lib {0} or load any of its variants {1}.".format( + libname, fallbacks or [])) + +-_lgeos = None +- +-if sys.platform.startswith('linux'): +- # Test to see if we have a wheel repaired by 'auditwheel' containing its +- # own libgeos_c +- geos_whl_so = glob.glob(os.path.abspath(os.path.join(os.path.dirname( +- __file__), '.libs/libgeos_c-*.so.*'))) +- if len(geos_whl_so) == 1: +- _lgeos = CDLL(geos_whl_so[0]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- else: +- alt_paths = [ +- 'libgeos_c.so.1', +- 'libgeos_c.so', +- # anaconda +- os.path.join(sys.prefix, "lib", "libgeos_c.so"), +- ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) +- free = load_dll('c').free +- free.argtypes = [c_void_p] +- free.restype = None +- +-elif sys.platform == 'darwin': +- # Test to see if we have a delocated wheel with a GEOS dylib. +- geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( +- __file__), '.dylibs/libgeos_c.1.dylib')) +- if os.path.exists(geos_whl_dylib): +- _lgeos = CDLL(geos_whl_dylib) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- +- else: +- if hasattr(sys, 'frozen'): +- try: +- # .app file from py2app +- alt_paths = [os.path.join( +- os.environ['RESOURCEPATH'], '..', 'Frameworks', +- 'libgeos_c.dylib')] +- except KeyError: +- # binary from pyinstaller +- alt_paths = [ +- os.path.join(sys.executable, 'libgeos_c.dylib')] +- if hasattr(sys, '_MEIPASS'): +- alt_paths.append( +- os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib')) +- else: +- alt_paths = [ +- # anaconda +- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), +- # The Framework build from Kyng Chaos +- "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS", +- # macports +- '/opt/local/lib/libgeos_c.dylib', +- ] +- _lgeos = load_dll('geos_c', fallbacks=alt_paths) +- +- free = load_dll('c').free +- free.argtypes = [c_void_p] +- free.restype = None +- +-elif sys.platform == 'win32': +- try: +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), 'DLLs')) +- if hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + '../../DLLS')) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ['PATH'] +- os.environ['PATH'] = "%s;%s;%s" % \ +- (egg_dlls, wininst_dlls, original_path) +- _lgeos = load_dll("geos_c.dll", fallbacks=[ +- os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"), +- ]) +- except (ImportError, WindowsError, OSError): +- raise +- +- def free(m): +- try: +- cdll.msvcrt.free(m) +- except WindowsError: +- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 +- pass +- +-elif sys.platform == 'sunos5': +- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) +- free = CDLL('libc.so.1').free +- free.argtypes = [c_void_p] +- free.restype = None +-else: # other *nix systems +- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) +- free = load_dll('c', fallbacks=['libc.so.6']).free +- free.argtypes = [c_void_p] +- free.restype = None ++_lgeos = CDLL('@libgeos_c@') ++free = CDLL('@libc@').free ++free.argtypes = [c_void_p] ++free.restype = None + + + def _geos_version(): diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 6921b3590e4..78e7a5f0538 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 5896437e61d..9d4df113599 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap"; + sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index d039756eb81..4c938490eb4 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, xmltodict, requests # Test dependencies -, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx +, pytest_3, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx , sphinx_rtd_theme }: @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xmltodict requests ]; checkInputs = [ - pytest pytestcov coveralls pylint flake8 graphviz mock sphinx + pytest_3 pytestcov coveralls pylint flake8 graphviz mock sphinx sphinx_rtd_theme ]; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 92ace6f2bb3..5b67fcb0964 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.5.3"; + version = "6.6.3"; src = fetchPypi { inherit pname version; - sha256 = "4d8c1dc7e9cad73afc40d849484bc0f626aad6557951b1a0cff437af442ccb99"; + sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 5362e0b0037..b2b7f203503 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950"; + sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a"; }; # pypi tarball does not come with tests diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix new file mode 100644 index 00000000000..9f877ffb355 --- /dev/null +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, beautifulsoup4 +, isPy3k +, backports_functools_lru_cache +}: + +buildPythonPackage rec { + pname = "soupsieve"; + version = "1.7.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest beautifulsoup4 ]; + + propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + + # Circular test dependency on beautifulsoup4 + doCheck = false; + + meta = { + description = "A CSS4 selector implementation for Beautiful Soup"; + license = lib.licenses.mit; + homepage = https://github.com/facelessuser/soupsieve; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix new file mode 100644 index 00000000000..d3d78620a3d --- /dev/null +++ b/pkgs/development/python-modules/sparse/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, numba +, pytest +}: + +buildPythonPackage rec { + pname = "sparse"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ac6fcbf68b38b999eae98467cf4880b942c13a72036868f78d65a10aeba808d"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ + numpy + scipy + numba + ]; + + checkPhase = '' + pytest sparse + ''; + + meta = with lib; { + description = "Sparse n-dimensional arrays computations"; + homepage = https://github.com/pydata/sparse/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 3f54fefadf2..661bc6363f4 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.4.3"; + version = "0.4.4"; doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs src = fetchPypi { inherit pname version; - sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b"; + sha256 = "9051ede204b1e25b6358b5e0e573b624ec0e208c24eb03a7ed4925b745c93b5e"; }; propagatedBuildInputs = [ astropy radio_beam pytest ]; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 7385387eb86..7428e6e9e91 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,20 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, python }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: buildPythonPackage rec { pname = "spglib"; - version = "1.10.4.11"; + version = "1.12.2.post0"; src = fetchPypi { inherit pname version; - sha256 = "13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e"; + sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443"; }; propagatedBuildInputs = [ numpy ]; - checkPhase = '' - cd test - ${python.interpreter} -m unittest discover -bv - ''; + checkInputs = [ nose pyyaml ]; meta = with stdenv.lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 86d440a63b1..4b110f3ec18 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx-testing"; - version = "0.8.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf"; + sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 6ce714c9a31..515f6b6156a 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -2,19 +2,27 @@ , buildPythonPackage , fetchPypi , sphinx +, readthedocs-sphinx-ext +, pytest }: buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09"; + sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"; }; propagatedBuildInputs = [ sphinx ]; + checkInputs = [ readthedocs-sphinx-ext pytest ]; + + checkPhase = '' + py.test + ''; + meta = with stdenv.lib; { description = "ReadTheDocs.org theme for Sphinx"; homepage = https://github.com/snide/sphinx_rtd_theme/; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 2c8b91edc65..2daa9766a3a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "169afb3a3485775e5473934a0fdff1780e8bdcdd44db7ed286044a074331c729"; + sha256 = "0af7651hfjh4hv97xns4vpf8n3kqy7ghyjlkfda5wxw56hxgp6hn"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 4843a5bbe9d..b8a4f25f5df 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "411da1819fda0593976a157f1a14ec1cfaef9ee1b4b708e795d0bf3953f0142b"; + sha256 = "9d64c8a119bfc592e6316af3e5475ce2d4d8ed6e013dc016a3f2e7971e50d7f3"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix index 530bc53a280..f20a3435a00 100644 --- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.12"; + version = "0.14"; src = fetchPypi { inherit pname version; - sha256 = "95a453e1d912bfdd6a950f8df02f46608154676842d66f8a0d1db0b85a5ddfe5"; + sha256 = "504229e943e8ac821cd9d708124bde30041ae9d8341f9ea953866404527f4e82"; }; # No tests included. diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index aa3bcc6ae7a..53c6ae8cdba 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.2.12"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "7a099f42358731589851c38e5a90d997490dd6275b39e09f21bdd4df91a24413"; + sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 2eccc5e013f..86fcb6eaaab 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.7.0"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c0d440b638c091027deea7330bb934188b86402cba552a0bbde0535ed8fdab93"; + sha256 = "0f0a5d9430c40b9fa5065e210a7fd3aaabb0713313e72b1b7b7dc4c7d62e43d2"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 2df3397f625..e7e9a1e5391 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "srptools"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37"; + sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix new file mode 100644 index 00000000000..b23853a9bae --- /dev/null +++ b/pkgs/development/python-modules/streamz/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tornado +, toolz +, zict +, six +, pytest +, networkx +, distributed +, confluent-kafka +, graphviz +}: + +buildPythonPackage rec { + pname = "streamz"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "cfdd42aa62df299f550768de5002ec83112136a34b44441db9d633b2df802fb4"; + }; + + checkInputs = [ pytest networkx distributed confluent-kafka graphviz ]; + propagatedBuildInputs = [ + tornado + toolz + zict + six + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pipelines to manage continuous streams of data"; + homepage = http://github.com/mrocklin/streamz/; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4652bd0cf45..978592366cb 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.10.1"; + version = "2.21.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12dslgxr06ymv1w9lzvlxp1zg0p6zg58l67pdb3v5v24c51rxrg7"; + sha256 = "170f76f2502888debf02da580138c840497b9359876ca3838f4692f2f02c9110"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index a4130502e4b..aa582aacaa9 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "18.2.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4"; + sha256 = "5feae03167620824d3ae3e8915ea8589fc28d1ad6f3edf3cc90ed7c7cb33fab5"; }; checkInputs = [ pytest pretend freezegun simplejson twisted ] diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index b238d58f68d..7321848afd0 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.2"; + version = "0.8.3"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2"; + sha256 = "8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index da2fd2cd22d..41e413948c2 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.5"; + version = "0.2.9.post1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85"; + sha256 = "bbe6a8ca32dd42aa1830b91f08f0458d728dc9eedca0ca27814a34c0b566100e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix new file mode 100644 index 00000000000..5b9e032c49a --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k +, numpy +, absl-py +, mock +}: + +buildPythonPackage rec { + pname = "tensorflow-estimator"; + version = "1.13.0"; + format = "wheel"; + + src = fetchPypi { + pname = "tensorflow_estimator"; + inherit version format; + sha256 = "068l4w0w7dj9gqkf8avjclq9zsp7ifwzw4rpf4qjylz3hczamzbw"; + }; + + propagatedBuildInputs = [ mock numpy absl-py ]; + + meta = with stdenv.lib; { + description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp ]; + }; +} + diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 7f2c2539a73..b196fc8edce 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -5,6 +5,7 @@ , grpcio , markdown , futures +, absl-py }: # tensorflow/tensorboard is built from a downloaded wheel, because @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "1.11.0"; + version = "1.13.0"; format = "wheel"; src = fetchPypi ({ @@ -22,13 +23,15 @@ buildPythonPackage rec { format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "1nkd37zq9mk0gc9x6d4x8whahbx2cn0wl94lir3g1pibdzx9hc4v"; + sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2"; } else { python = "py2"; sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5"; })); - propagatedBuildInputs = [ numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures; + propagatedBuildInputs = [ numpy werkzeug protobuf + markdown + grpcio absl-py ]; # ++ lib.optional (!isPy3k) futures; meta = with stdenv.lib; { description = "TensorFlow's Visualization Toolkit"; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 90f8c9e6e30..e1c25d9eca7 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -14,6 +14,7 @@ , mock , backports_weakref , enum34 +, tensorflow-estimator , tensorflow-tensorboard , cudaSupport ? false , cudatoolkit ? null @@ -41,7 +42,7 @@ let in buildPythonPackage rec { pname = "tensorflow"; - version = "1.11.0"; + version = "1.13.1"; format = "wheel"; src = let @@ -50,10 +51,10 @@ in buildPythonPackage rec { platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyver}_${unit}"; - dls = import ./tf1.11.0-hashes.nix; + dls = import (./. + "/tf${version}-hashes.nix"); in fetchurl dls.${key}; - propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-tensorboard keras-applications keras-preprocessing ] + propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ] ++ lib.optional (!isPy3k) mock; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow @@ -64,7 +65,6 @@ in buildPythonPackage rec { rm $out/bin/tensorboard ''; - installFlags = "--no-dependencies"; # tensorflow wants setuptools 39, can't allow that. # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then # patchelf --shrink-rpath will remove the cuda libraries. diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 0954a381005..d4ec2e757b2 100644 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,10 +1,10 @@ -version=1.11.0 +version=1.13.1 hashfile=tf${version}-hashes.nix rm -f $hashfile echo "{" >> $hashfile for sys in "linux" "mac"; do for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do - for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64"; do + for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do if [ $sys == "mac" ]; then [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] result=$? diff --git a/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix deleted file mode 100644 index 47cd25ef757..00000000000 --- a/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ -linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp27-none-linux_x86_64.whl"; - sha256 = "0s3ar2jzz2m9ilqfl4aigfi4bq8k5n04grnfqy4nyii2y98xjy14"; -}; -linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "0vfw2v033h8wdgjlbwjx2i9fdqqnxxc3r085irq9nzkdmwzw2jl8"; -}; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "0zmr5bw3ki5l6jb19h70kmq3k3xnq60jkw6wqqr6par1c7b4i9c3"; -}; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp27-none-linux_x86_64.whl"; - sha256 = "1pcacy4ky7zhq7h7d93s4xp213q1yj2zxn2khlyll389lq0bcbax"; -}; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "04ggz7jzbhl41alnj526rp0vz88h68mcv3rbs5pmrwyg0j2cqjz3"; -}; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1ywpq3n51pn7jrr231immi2s6ghdy9s0bnkk7dg4dbbxrisxg33a"; -}; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py2-none-any.whl"; - sha256 = "1rjb6gm0spj0l5zl02zsr6x3qagf2khrjw02z7znmsshb5xhsx8j"; -}; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py3-none-any.whl"; - sha256 = "16la41a2d29wa4i7h1g32d94g23ixzc3wc69kd9w82w45bwfv4xl"; -}; -} diff --git a/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix new file mode 100644 index 00000000000..bbfb0632c3c --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/tf1.13.1-hashes.nix @@ -0,0 +1,42 @@ +{ +linux_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp27-none-linux_x86_64.whl"; + sha256 = "0y1vd3y5fxcjj5d35qbk8482b0s642nyp0c2sm068vx5wd4sjpcg"; +}; +linux_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp35-cp35m-linux_x86_64.whl"; + sha256 = "0b27swk4c2vaimwzbzl4c7xnccr9cfak5a3848lfqlcavcmbp94j"; +}; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl"; + sha256 = "087jwjby3bym09z55cjhc587aasf01y6l009p1q2vcpfq7s7ljmk"; +}; +linux_py_37_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0as68dp87lh7ffcccb149km6vws15ap04604irxwz35fq9h7grxg"; +}; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp27-none-linux_x86_64.whl"; + sha256 = "0bf239f2bnsbqs3qh4xdql9pgbsm0zk7j8q1hg0wn0wrq440n0ds"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp35-cp35m-linux_x86_64.whl"; + sha256 = "1cqav22a8yz6fzk46z6kv1ha2i28h5wccbd7k66drrfxibmb93j0"; +}; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp36-cp36m-linux_x86_64.whl"; + sha256 = "1xnbiz36z7nicqrv0cmymfnwb8mdz2hifcv71gh6gnyi1962f2d7"; +}; +linux_py_37_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp37-cp37m-linux_x86_64.whl"; + sha256 = "10gcrmd9y5a89wpi4rpp9scc9l2krijv8yjp7iphlykmn54ps74k"; +}; +mac_py_2_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py2-none-any.whl"; + sha256 = "1a6y5xj2wqkd8qmabn2xjg3q7x2jfixwrz351dgcxlhy8qy5yc0g"; +}; +mac_py_3_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py3-none-any.whl"; + sha256 = "1klsv18k0isfd61z1wirfz1lnqmx8k73ga8g9s18yand65iycads"; +}; +} diff --git a/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix deleted file mode 100644 index c9ed7c18264..00000000000 --- a/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ -linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp27-none-linux_x86_64.whl"; - sha256 = "0p8n5x74qmdv9g63y176xqpfdc1gawzjysn79bvk46knrks3pa2b"; -}; -linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp35-cp35m-linux_x86_64.whl"; - sha256 = "050qv8fjpnw2y8da7s910jv4nsxg56d3xdpl09jim47kbwqabr5m"; -}; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp36-cp36m-linux_x86_64.whl"; - sha256 = "00d5cij1mh64hh0zc2qfl8z2hpr3nna6lhpsc6qh4am1g7wz4ndn"; -}; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp27-none-linux_x86_64.whl"; - sha256 = "0ami6nlp9cwg631a8f5rfpzpwb9ls9zxhsx61cimw46xljx3l2b5"; -}; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp35-cp35m-linux_x86_64.whl"; - sha256 = "1xfc8dww52fy8g4b0j8r20q7yj2bfg20hlk9p7sk3k9z8swfw0kc"; -}; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1kkqx8m7h03b8l9l6dki4g4r7sgi3wbb4dp9gvk6l08n4vnlvc50"; -}; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py2-none-any.whl"; - sha256 = "1icbsvvwkkc09s6bdd43drvnhc6v6xmnqwjzipgc8rmpj1z71yz5"; -}; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py3-none-any.whl"; - sha256 = "0s5dy956jvwazqflc90v15i912zvhwsbzlf0cl8k7isq52j6g3kp"; -}; -} diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index d2821310068..395deff2226 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.0"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2"; + sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2"; }; meta = { diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index d0d032b6217..af3d24899c7 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.5"; + version = "3.9.7"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4de3d599d898bf22a311248e749bb21920a8b0f6139f80489352bcb950835db2"; + sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577"; }; # Do not run the test suite: it takes a long time and uses diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 0e888d4ac27..9a0876548e5 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,31 +1,34 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder -, numpy, nose, enum34, futures, pathlib }: +{ lib, fetchPypi, buildPythonPackage, isPy27 +, numpy, enum34, futures, pathlib +, pytest +}: buildPythonPackage rec { pname = "tifffile"; - # 2018.10.18 and 2018.11.6 are not releases...? - # https://github.com/blink1073/tifffile/issues/54 - # anaconda uses 0.15.1 - version = "0.15.1"; + version = "2019.2.22"; src = fetchPypi { inherit pname version; - sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08"; + sha256 = "ed49d75b3eff711dbe74b35324dfd79e0db598b6e772a9096001545e81e95437"; }; - checkInputs = [ nose ]; + patches = lib.optional isPy27 ./python2-regex-compat.patch; + + # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles + # and test data missing from PyPI tarball + doCheck = false; + checkInputs = [ pytest ]; checkPhase = '' - nosetests --exe -v --exclude="test_extension" + pytest ''; propagatedBuildInputs = [ numpy ] - ++ lib.optional isPy27 [ futures pathlib ] - ++ lib.optional (pythonOlder "3.0") enum34; + ++ lib.optional isPy27 [ futures enum34 pathlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Read and write image data from and to TIFF files."; - homepage = https://github.com/blink1073/tifffile; + homepage = https://www.lfd.uci.edu/~gohlke/; maintainers = [ maintainers.lebastr ]; - license = licenses.bsd2; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch new file mode 100644 index 00000000000..7f4ec5764bb --- /dev/null +++ b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch @@ -0,0 +1,23 @@ +--- a/setup.py 2019-02-20 18:52:12.000000000 +0100 ++++ b/setup.py 2019-03-02 13:55:39.014019260 +0100 +@@ -20,12 +20,6 @@ + + description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0] + +-readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}from', code, +- re.MULTILINE | re.DOTALL).groups()[0] +- +-readme = '\n'.join([description, '=' * len(description)] +- + readme.splitlines()[1:]) +- + license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code, + re.MULTILINE | re.DOTALL).groups()[0] + +@@ -41,7 +35,6 @@ + name='tifffile', + version=version, + description=description, +- long_description=readme, + author='Christoph Gohlke', + author_email='cgohlke@uci.edu', + url='https://www.lfd.uci.edu/~gohlke/', diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 1b144b4db8d..848c114543d 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { description = "Trend Micro Locality Sensitive Hash"; homepage = https://github.com/trendmicro/tlsh; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 3fcb118ac2a..dd1156f4355 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A topological sort algorithm"; homepage = https://pypi.python.org/pypi/toposort/1.1; maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 3e67e73ac56..772128c6860 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.5.3"; + version = "3.7.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862"; + sha256 = "25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index a38dd3ed88e..f224ec21b0e 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.28.1"; + version = "4.31.1"; src = fetchPypi { inherit pname version; - sha256 = "5b4d5549984503050883bc126280b386f5f4ca87e6c023c5d015655ad75bdebb"; + sha256 = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; @@ -27,7 +27,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; - doCheck = !stdenv.isDarwin; +# doCheck = !stdenv.isDarwin; + # Test suite is too big and slow. + doCheck = false; meta = { description = "A Fast, Extensible Progress Meter"; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 380827e6488..c6f3a127ed5 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "traits"; - version = "4.6.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx"; + sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0"; }; # Use pytest because its easier to discover tests diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 7808eb35932..4a2920418f1 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.1"; + version = "0.11.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6043f321d856e1b45b9df0c37810264f08d065bb56cd999f61a05fe2906e9e18"; + sha256 = "a6f4b47b37a21247535fc43411cb70a8c61ef0a5a2dfee668bd05611e2741fb8"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp ]; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 6d0835b431c..e0c5329d23f 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec{ pname = "trezor_agent"; - version = "0.9.3"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1ef62903534d8b01260dbd6304780e278bc83e0bc21f6a83beee76e48e1580"; + sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690"; }; propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 3e6109133ba..f76939603d3 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.10.0"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk"; + sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3"; }; checkInputs = [ pytest pyopenssl trustme jedi pylint ]; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 01ad57e55d7..476a2361416 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { ./tests.patch ]; + disabled = isPy3k; + postPatch = '' # Overrides PYTHONPATH causing dependencies not to be found sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index db966ed4421..d870b622b8a 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk"; + sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564"; }; checkInputs = [ pytest pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 4c031c20aa1..a49e994019e 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "twine"; - version = "1.12.1"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c"; + sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc"; }; propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix index b2d6054aa25..ed177fc63f8 100644 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ b/pkgs/development/python-modules/twitter-common-collections/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.collections"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5"; + sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21"; }; propagatedBuildInputs = [ twitter-common-lang ]; diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix index 53605baa3d5..393bc0ac4e8 100644 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ b/pkgs/development/python-modules/twitter-common-confluence/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.confluence"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26"; + sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1"; }; propagatedBuildInputs = [ twitter-common-log ]; diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix index 0172232a750..5d8a3e76fca 100644 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ b/pkgs/development/python-modules/twitter-common-dirutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "twitter.common.dirutil"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha"; + sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf"; }; propagatedBuildInputs = [ twitter-common-lang ]; diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix index 3541dacce4e..53135a94d62 100644 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ b/pkgs/development/python-modules/twitter-common-lang/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.lang"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan"; + sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix index e3e1f2859da..0fa7b63f525 100644 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ b/pkgs/development/python-modules/twitter-common-log/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "twitter.common.log"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v"; + sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555"; }; propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ]; diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix index 36b18403fab..62705f3b6b1 100644 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ b/pkgs/development/python-modules/twitter-common-options/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "twitter.common.options"; - version = "0.3.9"; + version = "0.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd"; + sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 5536c68e2be..dd3b899efa9 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }: buildPythonPackage rec { pname = "txaio"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pytest_3 mock ]; propagatedBuildInputs = [ six twisted ]; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index a17ecc0e592..91e83250d8b 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "18.3.0"; + version = "19.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1c7qfpr1zz34whz66lk4xpwdn7d5jqk6ccgas5n54li479mra0an"; + sha256 = "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p"; }; # Skip a failing test until fixed upstream: diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index f3f260cc1e8..ea4c9a63a19 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,10 +1,10 @@ { buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.1.2"; + version = "1.3.1"; src = fetchPypi{ inherit pname version; - sha256 = "4304399ff89452871348f6fb7a7112454cd508fbe3eb49b5ed711cce9b99fe9e"; + sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 69442bafd09..96190811650 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.2.11"; + version = "0.4.3"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "289b9b4a58511f35ab4783bb37cdc922eba75d1886e0eb1be136cc861eff7b66"; + sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 097313b42f7..8718e9b3029 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.2.15"; + version = "3.4.6"; src = fetchPypi { inherit pname version; - sha256 = "a871f57529e3df170aa5556c1353a64077277644baecabb18d042954f2af9030"; + sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 09106e3a6d4..9a589ccf1f8 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = https://github.com/vega/ipyvega; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index a7b6c6865cc..af1489df035 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vega_datasets"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459"; }; propagatedBuildInputs = [ pandas ]; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 14d678be892..cb2b2af713d 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venusian"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d"; + sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index e01353b6238..7003b9e1b04 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "1.0.1"; + version = "1.5.6"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "31b45fa6c6c726ee05c4e106d95682f17258750d09e2e1c880bbccbf866f323e"; + sha256 = "6b488aed337855ac8b3730f7c6964c2ad41111a8f61ab0b457197696feefa593"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index a1b4cb82379..9e917e35ab0 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.2.6"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405"; + sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 5a39407ed2f..d26b7b4f50a 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.1.0"; + version = "16.4.1"; src = fetchPypi { inherit pname version; - sha256 = "f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208"; + sha256 = "5a3ecdfbde67a4a3b3111301c4d64a5b71cf862c8c42958d30cf3253df1f29dd"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch index 2c121c83d49..934426bf6ca 100644 --- a/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch @@ -13,17 +13,17 @@ it will only add the path to the python used when building available. -diff --git a/src/virtualenv.py b/src/virtualenv.py -index 4b57cde..afda73f 100755 ---- a/src/virtualenv.py -+++ b/src/virtualenv.py -@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False): +diff --git a/virtualenv.py b/virtualenv.py +index bcf3225..3530997 100755 +--- a/virtualenv.py ++++ b/virtualenv.py +@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False): def change_prefix(filename, dst_prefix): - prefixes = [sys.prefix] - -- if is_darwin: +- if IS_DARWIN: - prefixes.extend( - ( - os.path.join("/Library/Python", sys.version[:3], "site-packages"), @@ -39,16 +39,16 @@ index 4b57cde..afda73f 100755 if hasattr(sys, "real_prefix"): prefixes.append(sys.real_prefix) -@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix): +@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix): if src_prefix != os.sep: # sys.prefix == "/" - assert relpath[0] == os.sep - relpath = relpath[1:] + assert relative_path[0] == os.sep + relative_path = relative_path[1:] + if src_prefix == "/nix/store": -+ relpath = "/".join(relpath.split("/")[1:]) - return join(dst_prefix, relpath) ++ relative_path = "/".join(relative_path.split("/")[1:]) + return join(dst_prefix, relative_path) assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) -@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy +@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy site_filename_dst = change_prefix(site_filename, home_dir) site_dir = os.path.dirname(site_filename_dst) writefile(site_filename_dst, SITE_PY) diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 64c1912af7a..19ec56a1ece 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; - version = "4.8.2"; + version = "4.8.4"; src = fetchPypi { inherit pname version; - sha256 = "18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374"; + sha256 = "51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa"; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 05d372ec47d..29515f75c9e 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2.0.0"; + version = "2.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41"; + sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index a377abc160e..a988fa259a5 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9"; + sha256 = "c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe"; }; doCheck = false; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 6135409328b..cfe66ce63d7 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.32.3"; + version = "0.33.1"; src = fetchPypi { inherit pname version; - sha256 = "029703bf514e16c8271c3821806a1c171220cc5bdd325cbf4e7da1e056a01db6"; + sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d"; }; checkInputs = [ pytest pytestcov coverage ]; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index 41d8530293d..246b3c65fc5 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }: buildPythonPackage rec { pname = "Whoosh"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; # Wrong encoding postPatch = '' diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 7258ec30f9f..e2ad1254aa3 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -16,6 +16,10 @@ buildPythonPackage rec { sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a"; }; + postPatch = '' + substituteInPlace setup.py --replace "h2==" "h2>=" + ''; + propagatedBuildInputs = [ six h2 ]; meta = { diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index badecc776d7..9247a7c7757 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.10.11"; + version = "1.11.1"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6"; + sha256 = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533"; }; meta = { diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 8773ef30b3d..f9062c18584 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -1,14 +1,20 @@ -{ buildPythonPackage, fetchPypi, h11, enum34 }: +{ buildPythonPackage, fetchPypi, h11, enum34, pytest }: buildPythonPackage rec { pname = "wsproto"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "1fcb726d448f1b9bcbea884e26621af5ddd01d2d502941a024f4c727828b6009"; + sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705"; }; propagatedBuildInputs = [ h11 enum34 ]; + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + } diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix new file mode 100644 index 00000000000..322c85b5810 --- /dev/null +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "wurlitzer"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add"; + }; + + checkInputs = [ mock pytest ]; + + checkPhase = '' + py.test test.py + ''; + + meta = { + description = "Capture C-level output in context managers"; + homepage = https://github.com/minrk/wurlitzer; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 427b46f44ee..584200ff2b0 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -33,12 +33,14 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ ] - ++ (lib.optional openglSupport pyopengl) - ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ]) - ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]) - ; + nativeBuildInputs = [ pkgconfig ] + ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) + ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]); + + buildInputs = [ ] + ++ (lib.optionals (!stdenv.isDarwin) [ (wxGTK.gtk) ]) + ++ (lib.optional openglSupport pyopengl); + preConfigure = '' cd wxPython # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 21390d9c3f8..674a56d3cb4 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.16.5"; + version = "1.17.2"; src = fetchPypi { inherit pname version; - sha256 = "62961d24466964f4770bdbdbcca9ebdb148d0bdb48a8329c7bf41e9317dbb9d4"; + sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b"; }; # No tests included diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 6307f630fcd..e37b2694576 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,22 +1,22 @@ { stdenv , buildPythonPackage , fetchPypi -, nose +, pytest }: buildPythonPackage rec { pname = "xlrd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2"; + sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2"; }; - checkInputs = [ nose ]; + checkInputs = [ pytest ]; checkPhase = '' - nosetests -v + py.test -k "not test_tilde_path_expansion" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 91933c5f95e..e86b1b20609 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.12.3"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "64609a2194d18c03e2348f1ea2fb97208b3455dfb76a16900143813aa61b6d3c"; + sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index be1651caf8a..07250337f83 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xmltodict"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df"; + sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; checkInputs = [ coverage nose ]; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix new file mode 100644 index 00000000000..8ffb8f96936 --- /dev/null +++ b/pkgs/development/python-modules/xnd/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ndtypes +, libndtypes +, libxnd +, isPy27 +}: + +buildPythonPackage { + pname = "xnd"; + disabled = isPy27; + inherit (libxnd) version src meta; + + propagatedBuildInputs = [ ndtypes ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ + 'include_dirs = ["${libndtypes}/include", "${ndtypes}/include", "${libxnd}/include"]' \ + --replace 'library_dirs = ["libxnd", "ndtypes/libndtypes"] + LIBS' \ + 'library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \ + --replace 'runtime_library_dirs = ["$ORIGIN"]' \ + 'runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib"]' \ + ''; + + postInstall = '' + mkdir $out/include + cp python/xnd/*.h $out/include + ''; +} diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index a1e2c1a4e7b..a474bf84d0f 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "4.1.3.1"; + version = "3.3.7.1"; src = fetchPypi { inherit version pname; - sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f"; + sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131"; }; # no tests implemented diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index bfd302d27df..53ad728cc29 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "0x9ansmhqvc3rj0nbhpl0jdqr5pk6qdxf7i6r4gr0hzqr50vdaf0"; + sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 292709a455b..69ce7a360b0 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa"; + sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index cd31f7c2d55..5c02ea83ec9 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0r3pwfygvpkgc0hzxc6z8dl56g6brlh52r0x8kcjhywr1biahqb2"; + sha256 = "94210945c868f696a31812a510c01724d61c9a4d279eb4adf340c0d2a4c0bfd7"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 3b6237638dc..24cb00c2b18 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "ZConfig"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585"; + sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998"; }; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 99d05a35963..5772308f967 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { ''; homepage = https://github.com/zimmermanncode/zetup; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index d7f212f2284..72c32ef8277 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zm-py"; - version = "0.3.0"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q"; + sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 42d3842c451..28f46168997 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.configuration"; - version = "4.3.0"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3"; + sha256 = "6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1"; }; checkInputs = [ zope_testrunner manuel ]; diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index da0d442b9c6..f6c5f51b626 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.deprecation"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224"; + sha256 = "0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df"; }; buildInputs = [ zope_testing ]; diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index f9a7264f02c..aad822bca59 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.i18n"; - version = "4.6.1"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "14f7339f6d4fed5e94882a7f1b2e40fd90ad00b3c28a7f4353762101395e3304"; + sha256 = "229de41f751dae36b1ef9fa284bc548ef40169234bf0d2199e41581e16304621"; }; propagatedBuildInputs = [ pytz zope_component ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e28f5d85a6b..7b7dab1481e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -23,7 +23,7 @@ , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx -, file, libvirt, glib, vips +, file, libvirt, glib, vips, taglib , libselinux ? null, libsepol ? null }@args: @@ -423,6 +423,10 @@ in ''; }; + taglib-ruby = attrs: { + buildInputs = [ taglib ]; + }; + timfel-krb5-auth = attrs: { buildInputs = [ kerberos ]; }; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 53f46e372ef..604e44cf7b1 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.17"; + version = "8.18"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "10i285kzbma9pny0vlm8wglxsbqliqrhig6n9rj2nv13x5i53ifj"; + sha256 = "1l9dqihl73yi3k27j2a1k87gqzs64z0mpwxj6w68ipvxf4rg63x5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index e2b6d8e34fc..f228cf7774c 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.86"; + version = "1.87"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0p4zdyc6l7x5611bybv7gwjdz1dvakb60xf0ya3dhvf9272iszf3"; + sha256 = "1jl1qlr8la1rix1ffcvl6s4arv2n9fvx85sl4zgp29428xks9c73"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index defc39a9f74..7db46005f45 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -27,6 +27,6 @@ perlPackages.buildPerlPackage rec { ''; homepage = http://www.gson.org/egypt/; license = with licenses; [ artistic1 gpl1Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index d2c27b9f485..939ae10c089 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ant, jdk }: +{ stdenv, fetchFromGitHub, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "jdepend-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install dist/${name}.jar $out/share cat > "$out/bin/jdepend" <<EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${jdk.jre}/bin/java -classpath "$out/share/*" "\$@" EOF chmod a+x $out/bin/jdepend diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index e60729dc8b9..97140d10ca2 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.10.0"; + version = "6.11.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1yzgin2lbhfswb07mm14wq8rn129kpfjidd8nv9pg77ywhnbwqmb"; + sha256 = "0mg32bnl6j4p15akdhfc0wgilqvyphcgjimlaqq3jz51dmlr9scb"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a72ef7937c5..f88dc3f6d33 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -8,7 +8,10 @@ , python3 ? null , ruby ? null , lua ? null -, useX11, rubyBindings, pythonBindings, luaBindings +, useX11 ? false +, rubyBindings ? false +, pythonBindings ? false +, luaBindings ? false }: assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); @@ -26,7 +29,7 @@ let rev, version, sha256, - cs_tip, + cs_ver, cs_sha256 }: stdenv.mkDerivation rec { @@ -43,15 +46,21 @@ let owner = "aquynh"; repo = "capstone"; # version from $sourceRoot/shlr/Makefile - rev = cs_tip; + rev = cs_ver; sha256 = cs_sha256; }; in '' - if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi - # When using meson, it expects capstone source relative to build directory mkdir -p build/shlr - cp -r ${capstone} shlr/capstone - chmod -R +w shlr/capstone + cp -r ${capstone} capstone-${cs_ver} + chmod -R +w capstone-${cs_ver} + # radare 3.3 compat for radare2-cutter + (cd shlr && ln -s ../capstone-${cs_ver} capstone) + tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} + # necessary because they broke the offline-build: + # https://github.com/radare/radare2/commit/6290e4ff4cc167e1f2c28ab924e9b99783fb1b38#diff-a44d840c10f1f1feaf401917ae4ccd54R258 + # https://github.com/radare/radare2/issues/13087#issuecomment-465159716 + curl() { true; } + export -f curl ''; postInstall = '' @@ -101,23 +110,23 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20591"; - gittap = "3.2.1"; - gittip = "25913f4745cb3b635d52f1aafc4d8ff2aad3988a"; - rev = "3.2.1"; - version = "3.2.1"; - sha256 = "1c4zj96386sc9lvfcsdh9lhyh0rvv4zzfr6218gvjkg9fy6cc91y"; - cs_tip = "0ff8220adef16a942697afd245afc5ab0f70cbf8"; - cs_sha256 = "1ak8ysgivq28d23r77881p0z5v65jhpap5plm10p9j3y2x00n3zn"; + version_commit = "20942"; + gittap = "3.3.0"; + gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; + rev = "3.3.0"; + version = "3.3.0"; + sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + cs_ver = "4.0.1"; + cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "20591"; + version_commit = "20942"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; version = "2018-10-07"; sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; - cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; #</generated> diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 684d70bc0bc..794581bca7a 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -61,15 +61,15 @@ def git(dirname: str, *args: str) -> str: def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: sha256 = prefetch_github("radare", "radare2", rev) - cs_tip = None + cs_ver = None with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: for l in makefile: - match = re.match("CS_TIP=(\S+)", l) + match = re.match("CS_VER=(\S+)", l) if match: - cs_tip = match.group(1) - assert cs_tip is not None + cs_ver = match.group(1) + assert cs_ver is not None - cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip) + cs_sha256 = prefetch_github("aquynh", "capstone", cs_ver) return dict( rev=rev, @@ -77,7 +77,7 @@ def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: version_commit=git(dirname, "rev-list", "--all", "--count"), gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), gittip=git(dirname, "rev-parse", "HEAD"), - cs_tip=cs_tip, + cs_ver=cs_ver, cs_sha256=cs_sha256, ) @@ -90,7 +90,7 @@ def write_package_expr(version: str, info: Dict[str, str]) -> str: rev = "{info["rev"]}"; version = "{version}"; sha256 = "{info["sha256"]}"; - cs_tip = "{info["cs_tip"]}"; + cs_ver = "{info["cs_ver"]}"; cs_sha256 = "{info["cs_sha256"]}"; }}""" diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix deleted file mode 100644 index 12eee5f8086..00000000000 --- a/pkgs/development/tools/ansible-lint/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, pythonPackages, ansible }: - -pythonPackages.buildPythonPackage rec { - pname = "ansible-lint"; - version = "3.5.1"; - - src = fetchFromGitHub { - owner = "willthames"; - repo = "ansible-lint"; - rev = "v${version}"; - sha256 = "09qixiaqhm6dbl74s1rwxbsg31nr6jjsvr4fxfnxl9ccbxcrpzn2"; - }; - - propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; - - checkInputs = [ pythonPackages.nose ]; - - postPatch = '' - patchShebangs bin/ansible-lint - ''; - - preBuild = '' - export HOME="$TMP" - ''; - - checkPhase = '' - nosetests test - ''; - - meta = { - homepage = "https://github.com/willthames/ansible-lint"; - description = "Best practices checker for Ansible"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.sengaya ]; - }; -} diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 5bb1825d035..c75a053acb2 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -10,13 +10,13 @@ buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0yphks1qlp3xcbq5mg95lxrhl3q8pza5g3f9i2j6y7dsfz0s0l4v"; + sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p"; }; nativeBuildInputs = [ go git python ]; @@ -49,7 +49,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "14k1cpw4h78c2gk294xzq9a9nv09yabdrahbzgin8xizbgdxn1q8"; + sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 32d35f1421c..eb9f0d106d1 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,6 +6,7 @@ # Allow to independently override the jdks used to build and run respectively , buildJdk, runJdk , buildJdkName +, runtimeShell # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -281,7 +282,7 @@ stdenv.mkDerivation rec { mkdir -p tools cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exit 1 EOF chmod +x tools/bazel @@ -290,7 +291,7 @@ stdenv.mkDerivation rec { ! hello_test cat > tools/bazel <<"EOF" - #!${stdenv.shell} -e + #!${runtimeShell} -e exec "$BAZEL_REAL" "$@" EOF diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index c83f56ae572..78077f9eaa5 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,6 +1,24 @@ -diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx 2018-08-09 21:14:08.000000000 +0900 -+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx 2018-08-12 02:47:28.719691934 +0900 +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 8aff8f6..af1852d 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc" + endif() + endif() + +-# On Apple we need CoreFoundation and CoreServices +-if(APPLE) +- target_link_libraries(CMakeLib "-framework CoreFoundation") +- target_link_libraries(CMakeLib "-framework CoreServices") +-endif() +- + if(WIN32 AND NOT UNIX) + # We need the rpcrt4 library on Windows. + # We need the crypt32 library on Windows for crypto/cert APIs. +diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx +index e353a37..b06f842 100644 +--- a/Source/cmGlobalXCodeGenerator.cxx ++++ b/Source/cmGlobalXCodeGenerator.cxx @@ -35,11 +35,6 @@ struct cmLinkImplementation; @@ -13,3 +31,19 @@ diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Sou #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmXMLParser.h" +diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt +index d7af6e2..d4808fc 100644 +--- a/Utilities/cmlibarchive/CMakeLists.txt ++++ b/Utilities/cmlibarchive/CMakeLists.txt +@@ -1662,11 +1662,6 @@ IF(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) + ENDIF(MSVC) + +-# We need CoreServices on Mac OS. +-IF(APPLE) +- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") +-ENDIF(APPLE) +- + add_subdirectory(libarchive) + + install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 68d4118f049..54fe8e4af5a 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash +, buildPackages # darwin attributes -, ps +, cf-private, ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) , useNcurses ? false, ncurses @@ -16,10 +17,10 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "3.12"; - minorVersion = "1"; - # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt - sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5"; + majorVersion = "3.13"; + minorVersion = "4"; + # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz + sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b"; version = "${majorVersion}.${minorVersion}"; in @@ -33,11 +34,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - prePatch = optionalString (!useSharedLibraries) '' - substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ - --replace '"-framework CoreServices"' '""' - ''; - patches = [ # Don't search in non-Nix locations such as /usr, but do search in our libc. ./search-path.patch @@ -56,11 +52,14 @@ stdenv.mkDerivation rec { buildInputs = [ setupHook pkgconfig ] + ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] ++ optional useNcurses ncurses ++ optional useQt4 qt4 ++ optional withQt5 qtbase; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = optional stdenv.isDarwin ps; preConfigure = '' @@ -71,7 +70,8 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" + # BUILD_CC and BUILD_CXX are used to bootstrap cmake + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags" ''; configureFlags = [ @@ -95,6 +95,11 @@ stdenv.mkDerivation rec { # Avoid depending on frameworks. ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + # make install attempts to use the just-built cmake + preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) '' + sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + ''; + dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index f095103ee04..c21e10bb061 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -75,6 +75,13 @@ cmakeConfigurePhase() { # And build always Release, to ensure optimisation flags cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + # Disable user package registry to avoid potential side effects + # and unecessary attempts to access non-existent home folder + # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry + cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags" + if [ "$buildPhase" = ninjaBuildPhase ]; then cmakeFlags="-GNinja $cmakeFlags" fi diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 18c6eff76e1..024c57201e1 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,109 +1,76 @@ { stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: -let - - dubBuild = stdenv.mkDerivation rec { - name = "dubBuild-${version}"; - version = "1.13.0"; - - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "dlang"; - repo = "dub"; - rev = "v${version}"; - sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; - }; - - postUnpack = '' - patchShebangs . - ''; - - # Can be removed with https://github.com/dlang/dub/pull/1368 - dubvar = "\\$DUB"; - postPatch = '' - substituteInPlace test/fetchzip.sh \ - --replace "dub remove" "\"${dubvar}\" remove" - ''; - - nativeBuildInputs = [ dmd libevent rsync ]; - buildInputs = [ curl ]; - - buildPhase = '' - export DMD=${dmd.out}/bin/dmd - ./build.sh - ''; +stdenv.mkDerivation rec { + name = "dub-${version}"; + version = "1.13.0"; - installPhase = '' - mkdir $out - mkdir $out/bin - cp bin/dub $out/bin - ''; + enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; - license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; + src = fetchFromGitHub { + owner = "dlang"; + repo = "dub"; + rev = "v${version}"; + sha256 = "1wd5pdnbaafj33bbg188w0iz28ps4cyjangb12g2s9dyic29zjqv"; }; - # Need to test in a fixed-output derivation, otherwise the - # network tests would fail if sandbox mode is enabled. - # Disable tests on Darwin for now because they don't work - # reliably there. - dubUnittests = if !stdenv.hostPlatform.isDarwin then - stdenv.mkDerivation rec { - name = "dubUnittests-${version}"; - version = dubBuild.version; - - enableParallelBuilding = dubBuild.enableParallelBuilding; - preferLocalBuild = true; - inputString = dubBuild.outPath; - outputHashAlgo = "sha256"; - outputHash = builtins.hashString "sha256" inputString; - - src = dubBuild.src; - - postUnpack = dubBuild.postUnpack; - postPatch = dubBuild.postPatch; - - nativeBuildInputs = dubBuild.nativeBuildInputs; - buildInputs = dubBuild.buildInputs; + postUnpack = '' + patchShebangs . + ''; - buildPhase = '' - # Can't use dub from dubBuild directly because one unittest - # (issue895-local-configuration) needs to generate a config - # file under ../etc relative to the dub location. - cp ${dubBuild}/bin/dub bin/ - export DUB=$NIX_BUILD_TOP/source/bin/dub - export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ - export DC=${dmd.out}/bin/dmd - export HOME=$TMP - ./test/run-unittest.sh - ''; + # Can be removed with https://github.com/dlang/dub/pull/1368 + dubvar = "\\$DUB"; + postPatch = '' + substituteInPlace test/fetchzip.sh \ + --replace "dub remove" "\"${dubvar}\" remove" + ''; - installPhase = '' - echo -n $inputString > $out - ''; - } - else - ""; + nativeBuildInputs = [ dmd libevent rsync ]; + buildInputs = [ curl ]; -in + buildPhase = '' + export DMD=${dmd.out}/bin/dmd + ./build.sh + ''; -stdenv.mkDerivation rec { - inherit dubUnittests; - name = "dub-${dubBuild.version}"; - phases = "installPhase"; - buildInputs = dubBuild.buildInputs; + doCheck = true; + + checkPhase = '' + export DUB=$NIX_BUILD_TOP/source/bin/dub + export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ + export DC=${dmd.out}/bin/dmd + export HOME=$TMP + + rm -rf test/issue502-root-import + rm test/issue990-download-optional-selected.sh + rm test/timeout.sh + rm test/issue674-concurrent-dub.sh + rm test/issue672-upgrade-optional.sh + rm test/issue1574-addcommand.sh + rm test/issue1524-maven-upgrade-dependency-tree.sh + rm test/issue1416-maven-repo-pkg-supplier.sh + rm test/issue1037-better-dependency-messages.sh + rm test/interactive-remove.sh + rm test/fetchzip.sh + rm test/feat663-search.sh + rm test/ddox.sh + rm test/0-init-multi.sh + rm test/0-init-multi-json.sh + + ./test/run-unittest.sh + ''; installPhase = '' mkdir $out - cp -r --symbolic-link ${dubBuild}/* $out/ + mkdir $out/bin + cp bin/dub $out/bin ''; - meta = dubBuild.meta; + meta = with stdenv.lib; { + description = "Package and build manager for D applications and libraries"; + homepage = http://code.dlang.org/; + license = licenses.mit; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix index 7fd80148831..baa658b522a 100644 --- a/pkgs/development/tools/build-managers/gup/default.nix +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }: +{ stdenv, fetchFromGitHub, nix-update-source, lib, python +, which, runtimeShell, pychecker ? null }: stdenv.mkDerivation rec { version = "0.7.0"; src = fetchFromGitHub { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { cp -r python/bin $out/bin ''; passthru.updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 66e6dcbc059..5e03474bf10 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.0"; + version = "2.9.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "18wwcc956w1ii6zf8zjndgvmc614s18nxz3dary2iigbfq4y0asc"; + sha256 = "1h0gpzpr7xk6hvmrrq41bcp2k9aai348baf8ad9bxvci01n4zb12"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "07pw852w57w3lj3fddlxfzjsln90q52dwxvxpz9qbprw8p2xfrim"; + sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a"; }; JARNAME = "${name}-standalone.jar"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 96e04407325..3651884253a 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: python3Packages.buildPythonApplication rec { - version = "0.49.0"; + version = "0.49.1"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0895igla1qav8k250z2qv03a0fg491wzzkfpbk50wwq848vmbkd0"; + sha256 = "05wr4kn88aqq2cbzqx59zj56410c9d42wracb4cjs70mvq0lp50s"; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index e70291ce51a..796747bf6e9 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,18 +1,34 @@ -{ stdenv, fetchFromGitHub, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: +{ stdenv, fetchFromGitHub, fetchpatch, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: with stdenv.lib; stdenv.mkDerivation rec { name = "ninja-${version}"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f"; + sha256 = "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610"; }; + patches = [ + # Make builds reproducible by generating the same IDs from the same inputs. + (fetchpatch { + name = "consistent-doc-ids"; + url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch"; + sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; + }) + # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? + # + (fetchpatch { + name = "fix-issue-1510.patch"; + url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; + sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69"; + }) + ]; + nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; buildPhase = '' diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 02bf9c23cba..9757d8cda8d 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -3,21 +3,21 @@ with stdenv.lib; with pythonPackages; -let - version = "1.7.0"; -in buildPythonApplication rec { - inherit version; +buildPythonApplication rec { pname = "pantsbuild.pants"; - name = "${pname}-${version}"; + version = "1.7.0"; src = fetchPypi { inherit pname version; sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37"; }; + # No tests + doCheck = false; + prePatch = '' sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0" + substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0" ''; # Unnecessary, and causes some really weird behavior around .class files, which @@ -36,6 +36,6 @@ in buildPythonApplication rec { homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 1b884307273..05e11ad63a7 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = name; - sha256 = "1r4nyxpf07w98bx9zx0xii97rwsc27s6898xi9ph25p0n6hsdxxg"; + sha256 = "006a4wb9i569pahs8ji86hrv58g2hm8xikgchnll3bdqgxllhnrs"; }; buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1cd8f7757f9..0e21164482a 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { description = "Generate changelogs from local git metadata"; homepage = https://github.com/clog-tool/clog-cli; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [stdenv.lib.maintainers.nthorne]; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ae9fa6b3690..f44e76c0b8e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.7.0"; + version = "11.8.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1q8m2hi85kh01lz6agp76ppny3ik5m61v5l3ipha4jf6k90140k8"; + sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1325jh984hv7yhc977d271866i5gq78lmw4h16sj5i8zny4wzgz5"; + sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "119azvkbx6gmmh7y166jxaja0a6n8lghmslsyar95dxw8akxrfzz"; + sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 548268bb762..eab4c855e1c 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,13 +5,13 @@ , drivers ? [] }: let - version = "3.9.0"; + version = "3.9.1"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "0b16l7p7klagxnwkx2az4mbyd35kv4aj8xxbwm27pp3spz9dk8m0"; + sha256 = "1xpkh9kwdjzd0zks8c4mq3add9ivc24hb0hflp11dl32dsdmzrai"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index d667e49e7cb..e559f714bd1 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "Bulk, parallel insert of CSV records into PostgreSQL"; homepage = http://github.com/timescale/timescaledb-parallel-copy; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 91037e6dfaa..d0bb744f124 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command line utility used to interact with the Deis open source PaaS."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index 3f818ea7be6..b8f49c863e4 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { homepage = https://deis.io; description = "A command-line utility used to provision and operate a Deis cluster."; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index e70971b670c..b23745a7b49 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { }; checkInputs = with pythonPackages; [ - pytest pytestflakes webtest mock + pytest pytest-flakes webtest mock devpi-server tox sphinx wheel git mercurial detox setuptools diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index c9332163809..f50191d7dad 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dive"; - version = "0.5.0"; + version = "0.6.0"; goPackagePath = "github.com/wagoodman/dive"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "wagoodman"; repo = "dive"; rev = "v${version}"; - sha256 = "159m36p7b0ygdp42qdmmz02rhrkymh8m6yl21m1ixd4c2pjkjhns"; + sha256 = "05n19a5q1yi8r6r72z634z93lz2i347zccs9qm7gx5h86nh147zd"; }; goDeps = ./deps.nix; @@ -21,6 +21,6 @@ buildGoPackage rec { description = "A tool for exploring each layer in a docker image"; homepage = https://github.com/wagoodman/dive; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam spacekookie ]; }; } diff --git a/pkgs/development/tools/dive/deps.nix b/pkgs/development/tools/dive/deps.nix index c140b2ae774..99fe79c1814 100644 --- a/pkgs/development/tools/dive/deps.nix +++ b/pkgs/development/tools/dive/deps.nix @@ -709,4 +709,24 @@ sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; }; } + + { + goPackagePath = "github.com/logrusorgru/aurora"; + fetch = { + type = "git"; + url = "https://github.com/logrusorgru/aurora"; + rev = "a7b3b318ed4e"; + sha256 = "1dldc270z42zm2d377ks7sa5059janjcjhv3inza3rjvapknsrcb"; + }; + } + + { + goPackagePath = "github.com/wagoodman/keybinding"; + fetch = { + type = "git"; + url = "https://github.com/wagoodman/keybinding"; + rev = "6a824da6df05"; + sha256 = "0f59idv5xia7w53363ym0qywvp0aas2kmk93rnndf2s7cs2f1d3l"; + }; + } ] diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 74cde43440b..3c6e6728529 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "mdsh-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "0sggclzghm54g4wnbab00qw4ry49min4zyw3hjwi0v741aa51xb2"; + sha256 = "17pd090wpnx7i8q9pp9rhps35ahm1xn4h6pm1cfsafm072qd7rff"; }; cargoSha256 = "1hsnz4sj8kff9azcbw9pkr2ipxlymz4zcm4vhfwydfkdlvdncpxm"; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index ccfcfaace01..593287dbf21 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.084.0"; + version = "2.084.1"; srcs = [ (fetchFromGitHub { owner = "dlang"; repo = "dmd"; rev = "v${version}"; - sha256 = "1v61spdamncl8c1bzjc19b03p4jl0ih5zq9b7cqsy9ix7qaxmikf"; + sha256 = "10ll5072rkv3ln7i5l88h2f9mzda567kw2jwh6466vm6ylzl4jms"; name = "dmd"; }) (fetchFromGitHub { @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { postUnpack = '' mv dmd dtools cd dtools + + substituteInPlace posix.mak --replace "\$(DMD) \$(DFLAGS) -unittest -main -run rdmd.d" "" ''; nativeBuildInputs = [ dmd ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 1a9d83c1294..d7a33e68db5 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -37,7 +37,7 @@ }: let - version = "1.0.2"; + version = "1.0.3"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0z5aaw9zvgp26szbysa3059gqsivq5ah8b6l29mqxx6ryp1nhrc1"; + sha256 = "034slpydcn2mrmq7iy1p8n6bpklfn9abq5xpwb9cg7qbvfkdsgyp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 361fc74c729..750df126e94 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = " Go bindings for protocol buffer"; maintainers = with maintainers; [ lewo ]; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 497c765b5b1..993305bd98f 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "godef-${version}"; - version = "1.0.0"; - rev = "7b4626be9fa8081987905fd4719d2f6628f9d8b5"; + version = "1.1.1"; + rev = "v${version}"; goPackagePath = "github.com/rogpeppe/godef"; - excludedPackages = "go/printer/testdata"; + subPackages = [ "." ]; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/rogpeppe/godef"; - sha256 = "0zhw4ba19hy0kv74c58ax759h8721khmwj04fak2y5800ymsgndg"; + owner = "rogpeppe"; + repo = "godef"; + sha256 = "1bpzqnb9fsk1pjjap3gm94pqch1jz02rfah9hg8iqbfm0dzpy31b"; }; meta = { diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index a2a049615b7..3b52c262c0c 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }: +{ stdenv, fetchFromGitHub, jshon, electron +, runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); @@ -34,7 +35,7 @@ in stdenv.mkDerivation rec { # install electron wrapper script cat > $out/bin/hyper-haskell <<EOF - #!${stdenv.shell} + #!${runtimeShell} export PATH="${binPath}:\$PATH" exec ${electron}/bin/electron $out/app "\$@" EOF diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 5cec122950f..b149703241e 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2018.12.31"; + version = "2019.02.23"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "c0cbae88ab47a3879aacf80d53b6a85710682a6b"; - sha256 = "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya"; + rev = "3a2bfee5cbc0558641668114260d3f644d6b7c83"; + sha256 = "1avc9b6w3xbmpq4y4lf9b5mym6aygh5hngzyasa9jyj0cx8mxcpf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 1a421cc47ed..dbda476171a 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.6.4"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8"; + sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index afac17b5251..be964cf4d30 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index 62489800cbb..cd80a5ad9e6 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -1,17 +1,28 @@ -{ lib, python3Packages }: +{ lib, python3Packages, git, mercurial }: with python3Packages; buildPythonApplication rec { pname = "mbed-cli"; - version = "1.8.3"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "04vn2v0d7y3vmm8cswzvn2z85balgp3095n5flvgf3r60fdlhlmp"; + sha256 = "1228plh55id03qywsw0ai88ypdpbh9iz18jfcyhn21pci7mj77fv"; }; - doCheck = false; # no tests available in Pypi + checkInputs = [ + git + mercurial + pytest + ]; + + checkPhase = '' + export GIT_COMMITTER_NAME=nixbld + export EMAIL=nixbld@localhost + export GIT_COMMITTER_DATE=$SOURCE_DATE_EPOCH + pytest test + ''; meta = with lib; { homepage = https://github.com/ARMmbed/mbed-cli; diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch new file mode 100644 index 00000000000..5a047b0f070 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch @@ -0,0 +1,517 @@ +From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Fri, 20 Jul 2018 09:18:47 -0700 +Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed + +When -z separate-code, which is enabled by default for Linux/x86, is +used to create executable, ld won't place any data in the code-only +PT_LOAD segment. If there are no data sections placed before the +code-only PT_LOAD segment, the program headers won't be mapped into +any PT_LOAD segment. When the executable tries to access it (based +on the program header address passed in AT_PHDR), it will lead to +segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if +there may be no data sections before the text section so that the +first PT_LOAD segment won't be code-only and will contain the program +header. + +Testcases are adjusted to either pass "-z noseparate-code" to ld or +discard the .note.gnu.property section. A Linux/x86 run-time test is +added. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the + separate code program header is needed, make sure that the first + read-only PT_LOAD segment has no code by adding a + GNU_PROPERTY_X86_ISA_1_USED note. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/linux-x86.S: New file. + * testsuite/ld-elf/linux-x86.exp: Likewise. + * testsuite/ld-elf/pr23428.c: Likewise. + * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld + for Linux/x86 targets. + * testsuite/ld-i386/abs-iamcu.d: Likewise. + * testsuite/ld-i386/abs.d: Likewise. + * testsuite/ld-i386/pr12718.d: Likewise. + * testsuite/ld-i386/pr12921.d: Likewise. + * testsuite/ld-x86-64/abs-k1om.d: Likewise. + * testsuite/ld-x86-64/abs-l1om.d: Likewise. + * testsuite/ld-x86-64/abs.d: Likewise. + * testsuite/ld-x86-64/pr12718.d: Likewise. + * testsuite/ld-x86-64/pr12921.d: Likewise. + * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property + section. + * testsuite/ld-scripts/print-memory-usage.t: Likewise. + * testsuite/ld-scripts/size-2.t: Likewise. + * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld + to create executable if language is "asm". + +(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) +--- + bfd/elfxx-x86.c | 60 ++++++++++++++----- + ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ + ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ + ld/testsuite/ld-elf/sec64k.exp | 2 + + ld/testsuite/ld-i386/abs-iamcu.d | 2 +- + ld/testsuite/ld-i386/abs.d | 2 +- + ld/testsuite/ld-i386/pr12718.d | 2 +- + ld/testsuite/ld-i386/pr12921.d | 2 +- + ld/testsuite/ld-linkonce/zeroeh.ld | 1 + + ld/testsuite/ld-scripts/print-memory-usage.t | 2 + + ld/testsuite/ld-scripts/size-2.t | 1 + + ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- + ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- + ld/testsuite/ld-x86-64/abs.d | 2 +- + ld/testsuite/ld-x86-64/pr12718.d | 2 +- + ld/testsuite/ld-x86-64/pr12921.d | 2 +- + ld/testsuite/lib/ld-lib.exp | 5 +- + 20 files changed, 248 insertions(+), 25 deletions(-) + create mode 100644 ld/testsuite/ld-elf/linux-x86.S + create mode 100644 ld/testsuite/ld-elf/linux-x86.exp + create mode 100644 ld/testsuite/ld-elf/pr23428.c + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index a2497aab86..2e4ff88f1f 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties + const struct elf_backend_data *bed; + unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; + unsigned int got_align; ++ bfd_boolean has_text = FALSE; + + features = 0; + if (info->ibt) +@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties + if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour + && bfd_count_sections (pbfd) != 0) + { ++ if (!has_text) ++ { ++ /* Check if there is no non-empty text section. */ ++ sec = bfd_get_section_by_name (pbfd, ".text"); ++ if (sec != NULL && sec->size != 0) ++ has_text = TRUE; ++ } ++ + ebfd = pbfd; + + if (elf_properties (pbfd) != NULL) + break; + } + +- if (ebfd != NULL && features) ++ bed = get_elf_backend_data (info->output_bfd); ++ ++ htab = elf_x86_hash_table (info, bed->target_id); ++ if (htab == NULL) ++ return pbfd; ++ ++ if (ebfd != NULL) + { +- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and +- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_FEATURE_1_AND, +- 4); +- prop->u.number |= features; +- prop->pr_kind = property_number; ++ prop = NULL; ++ if (features) ++ { ++ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and ++ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_FEATURE_1_AND, ++ 4); ++ prop->u.number |= features; ++ prop->pr_kind = property_number; ++ } ++ else if (has_text ++ && elf_properties (ebfd) == NULL ++ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL ++ && !htab->elf.dynamic_sections_created ++ && !info->traditional_format ++ && (info->output_bfd->flags & D_PAGED) != 0 ++ && info->separate_code) ++ { ++ /* If the separate code program header is needed, make sure ++ that the first read-only PT_LOAD segment has no code by ++ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_USED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + + /* Create the GNU property note section if needed. */ +- if (pbfd == NULL) ++ if (prop != NULL && pbfd == NULL) + { + sec = bfd_make_section_with_flags (ebfd, + NOTE_GNU_PROPERTY_SECTION_NAME, +@@ -2581,12 +2617,6 @@ error_alignment: + + pbfd = _bfd_elf_link_setup_gnu_properties (info); + +- bed = get_elf_backend_data (info->output_bfd); +- +- htab = elf_x86_hash_table (info, bed->target_id); +- if (htab == NULL) +- return pbfd; +- + htab->r_info = init_table->r_info; + htab->r_sym = init_table->r_sym; + +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +new file mode 100644 +index 0000000000..bdf40c6e01 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -0,0 +1,63 @@ ++ .text ++ .globl _start ++ .type _start,@function ++ .p2align 4 ++_start: ++ xorl %ebp, %ebp ++#ifdef __LP64__ ++ popq %rdi ++ movq %rsp, %rsi ++ andq $~15, %rsp ++#elif defined __x86_64__ ++ mov (%rsp),%edi ++ addl $4,%esp ++ movl %esp, %esi ++ andl $~15, %esp ++#else ++ popl %esi ++ movl %esp, %ecx ++ andl $~15, %esp ++ ++ subl $8,%esp ++ pushl %ecx ++ pushl %esi ++#endif ++ ++ call main ++ ++ hlt ++ ++ .type syscall, @function ++ .globl syscall ++ .p2align 4 ++syscall: ++#ifdef __x86_64__ ++ movq %rdi, %rax /* Syscall number -> rax. */ ++ movq %rsi, %rdi /* shift arg1 - arg5. */ ++ movq %rdx, %rsi ++ movq %rcx, %rdx ++ movq %r8, %r10 ++ movq %r9, %r8 ++ movq 8(%rsp),%r9 /* arg6 is on the stack. */ ++ syscall /* Do the system call. */ ++#else ++ push %ebp ++ push %edi ++ push %esi ++ push %ebx ++ mov 0x2c(%esp),%ebp ++ mov 0x28(%esp),%edi ++ mov 0x24(%esp),%esi ++ mov 0x20(%esp),%edx ++ mov 0x1c(%esp),%ecx ++ mov 0x18(%esp),%ebx ++ mov 0x14(%esp),%eax ++ int $0x80 ++ pop %ebx ++ pop %esi ++ pop %edi ++ pop %ebp ++#endif ++ ret /* Return to caller. */ ++ .size syscall, .-syscall ++ .section .note.GNU-stack,"",@progbits +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +new file mode 100644 +index 0000000000..36217c6fb4 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -0,0 +1,46 @@ ++# Expect script for simple native Linux/x86 tests. ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# ++# This file is part of the GNU Binutils. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++# MA 02110-1301, USA. ++# ++ ++# Test very simple native Linux/x86 programs with linux-x86.S. ++if { ![isnative] || [which $CC] == 0 \ ++ || (![istarget "i?86-*-linux*"] \ ++ && ![istarget "x86_64-*-linux*"] \ ++ && ![istarget "amd64-*-linux*"]) } { ++ return ++} ++ ++# Add $PLT_CFLAGS if PLT is expected. ++global PLT_CFLAGS ++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. ++global NOPIE_CFLAGS NOPIE_LDFLAGS ++ ++run_ld_link_exec_tests [list \ ++ [list \ ++ "Run PR ld/23428 test" \ ++ "--no-dynamic-linker -z separate-code" \ ++ "" \ ++ { linux-x86.S pr23428.c } \ ++ "pr23428" \ ++ "pass.out" \ ++ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ ++ "asm" \ ++ ] \ ++] +diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c +new file mode 100644 +index 0000000000..3631ed7926 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr23428.c +@@ -0,0 +1,43 @@ ++#include <unistd.h> ++#include <link.h> ++#include <syscall.h> ++ ++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) ++ ++int ++main (int argc, char **argv) ++{ ++ char **ev = &argv[argc + 1]; ++ char **evp = ev; ++ ElfW(auxv_t) *av; ++ const ElfW(Phdr) *phdr = NULL; ++ size_t phnum = 0; ++ size_t loadnum = 0; ++ int fd = STDOUT_FILENO; ++ size_t i; ++ ++ while (*evp++ != NULL) ++ ; ++ ++ av = (ElfW(auxv_t) *) evp; ++ ++ for (; av->a_type != AT_NULL; ++av) ++ switch (av->a_type) ++ { ++ case AT_PHDR: ++ phdr = (const void *) av->a_un.a_val; ++ break; ++ case AT_PHNUM: ++ phnum = av->a_un.a_val; ++ break; ++ } ++ ++ for (i = 0; i < phnum; i++, phdr++) ++ if (phdr->p_type == PT_LOAD) ++ loadnum++; ++ ++ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); ++ ++ syscall (SYS_exit, !loadnum); ++ return 0; ++} +diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp +index b58139e9dd..3909c0eaa1 100644 +--- a/ld/testsuite/ld-elf/sec64k.exp ++++ b/ld/testsuite/ld-elf/sec64k.exp +@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] + foreach sfile $sfiles { puts $ofd "#source: $sfile" } + if { [istarget spu*-*-*] } { + puts $ofd "#ld: --local-store 0:0" ++ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { ++ puts $ofd "#ld: -z noseparate-code" + } else { + puts $ofd "#ld:" + } +diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d +index ac9beff2e5..aba7d6b03f 100644 +--- a/ld/testsuite/ld-i386/abs-iamcu.d ++++ b/ld/testsuite/ld-i386/abs-iamcu.d +@@ -2,7 +2,7 @@ + #source: abs.s + #source: zero.s + #as: --32 -march=iamcu +-#ld: -m elf_iamcu ++#ld: -m elf_iamcu -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d +index e660aca524..191ee4456a 100644 +--- a/ld/testsuite/ld-i386/abs.d ++++ b/ld/testsuite/ld-i386/abs.d +@@ -2,7 +2,7 @@ + #as: --32 + #source: abs.s + #source: zero.s +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d +index ec51540a42..7eba52d95e 100644 +--- a/ld/testsuite/ld-i386/pr12718.d ++++ b/ld/testsuite/ld-i386/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d +index e49079b3c8..ea2da3eb51 100644 +--- a/ld/testsuite/ld-i386/pr12921.d ++++ b/ld/testsuite/ld-i386/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld +index b22eaa12c9..f89855a08f 100644 +--- a/ld/testsuite/ld-linkonce/zeroeh.ld ++++ b/ld/testsuite/ld-linkonce/zeroeh.ld +@@ -2,4 +2,5 @@ SECTIONS { + .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } + .gcc_except_table 0x2000 : { *(.gcc_except_table) } + .eh_frame 0x4000 : { *(.eh_frame) } ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t +index 5ff057a5e3..6eda1d2dc4 100644 +--- a/ld/testsuite/ld-scripts/print-memory-usage.t ++++ b/ld/testsuite/ld-scripts/print-memory-usage.t +@@ -11,4 +11,6 @@ SECTIONS + *(.data) + *(.rw) + } ++ ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t +index 723863995e..c3c4eddab4 100644 +--- a/ld/testsuite/ld-scripts/size-2.t ++++ b/ld/testsuite/ld-scripts/size-2.t +@@ -18,4 +18,5 @@ SECTIONS + LONG (SIZEOF (.tdata)) + LONG (SIZEOF (.tbss)) + } :image ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d +index 2c26639fc0..6b0fde0eed 100644 +--- a/ld/testsuite/ld-x86-64/abs-k1om.d ++++ b/ld/testsuite/ld-x86-64/abs-k1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=k1om +-#ld: -m elf_k1om ++#ld: -m elf_k1om -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d +index 1fb96d44b7..f87869f9d0 100644 +--- a/ld/testsuite/ld-x86-64/abs-l1om.d ++++ b/ld/testsuite/ld-x86-64/abs-l1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=l1om +-#ld: -m elf_l1om ++#ld: -m elf_l1om -z noseparate-code + #objdump: -rs -j .text + #target: x86_64-*-linux* + +diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d +index b24b018639..d99ab4685d 100644 +--- a/ld/testsuite/ld-x86-64/abs.d ++++ b/ld/testsuite/ld-x86-64/abs.d +@@ -1,7 +1,7 @@ + #name: Absolute non-overflowing relocs + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s +-#ld: ++#ld: -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d +index 07d17325d0..2c503ffbaa 100644 +--- a/ld/testsuite/ld-x86-64/pr12718.d ++++ b/ld/testsuite/ld-x86-64/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d +index 6fe6abee09..1162d55818 100644 +--- a/ld/testsuite/ld-x86-64/pr12921.d ++++ b/ld/testsuite/ld-x86-64/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp +index cfbefe9028..1095091882 100644 +--- a/ld/testsuite/lib/ld-lib.exp ++++ b/ld/testsuite/lib/ld-lib.exp +@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { + continue + } + +- if { [ string match "c++" $lang ] } { ++ if { [ string match "asm" $lang ] } { ++ set link_proc ld_link ++ set link_cmd $ld ++ } elseif { [ string match "c++" $lang ] } { + set link_proc ld_link + set link_cmd $CXX + } else { +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch new file mode 100644 index 00000000000..ca50d9a57cd --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch @@ -0,0 +1,137 @@ +From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Sat, 11 Aug 2018 06:41:33 -0700 +Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property + +Existing properties may be removed during property merging. We avoid +adding X86_ISA_1_NEEDED property only if existing properties won't be +removed. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't + add X86_ISA_1_NEEDED property only if existing properties won't + be removed. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/dummy.s: New file. + * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. + * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. + +(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) +--- + bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ + ld/testsuite/ld-elf/dummy.s | 1 + + ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 2 +- + 6 files changed, 66 insertions(+), 7 deletions(-) + create mode 100644 ld/testsuite/ld-elf/dummy.s + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ccfd25815..2d8f7b640b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties + prop->pr_kind = property_number; + } + else if (has_text +- && elf_properties (ebfd) == NULL + && elf_tdata (info->output_bfd)->o->build_id.sec == NULL + && !htab->elf.dynamic_sections_created + && !info->traditional_format +@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by + adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_NEEDED, +- 4); +- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; +- prop->pr_kind = property_number; ++ elf_property_list *list; ++ bfd_boolean need_property = TRUE; ++ ++ for (list = elf_properties (ebfd); list; list = list->next) ++ switch (list->property.pr_type) ++ { ++ case GNU_PROPERTY_STACK_SIZE: ++ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: ++ case GNU_PROPERTY_X86_ISA_1_NEEDED: ++ /* These properties won't be removed during merging. */ ++ need_property = FALSE; ++ break; ++ } ++ ++ if (need_property) ++ { ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + } + + /* Create the GNU property note section if needed. */ +diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s +new file mode 100644 +index 0000000000..403f98000d +--- /dev/null ++++ b/ld/testsuite/ld-elf/dummy.s +@@ -0,0 +1 @@ ++# Dummy +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +index bdf40c6e01..d94abc1106 100644 +--- a/ld/testsuite/ld-elf/linux-x86.S ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -61,3 +61,31 @@ syscall: + ret /* Return to caller. */ + .size syscall, .-syscall + .section .note.GNU-stack,"",@progbits ++ ++ .section ".note.gnu.property", "a" ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++ .long 1f - 0f /* name length */ ++ .long 5f - 2f /* data length */ ++ .long 5 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++2: .long 0xc0000002 /* pr_type. */ ++ .long 4f - 3f /* pr_datasz. */ ++3: ++ .long 0x2 ++4: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++5: +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +index 36217c6fb4..f6f5a80853 100644 +--- a/ld/testsuite/ld-elf/linux-x86.exp ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ + "Run PR ld/23428 test" \ + "--no-dynamic-linker -z separate-code" \ + "" \ +- { linux-x86.S pr23428.c } \ ++ { linux-x86.S pr23428.c dummy.s } \ + "pr23428" \ + "pass.out" \ + "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch new file mode 100644 index 00000000000..866d6db8ce2 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch @@ -0,0 +1,583 @@ +From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Wed, 8 Aug 2018 06:09:15 -0700 +Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. +If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the +corresponding x86 instruction set isn’t used. When merging properties +from 2 input files and one input file doesn't have the +GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have +it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED +property if an input file doesn't have it. + +This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the +GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA +requirement. + +bfd/ + + PR ld/23486 + * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove + GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. + (_bfd_x86_elf_link_setup_gnu_properties): Adding the + GNU_PROPERTY_X86_ISA_1_NEEDED, instead of + GNU_PROPERTY_X86_ISA_1_USED, property. + +ld/ + + PR ld/23486 + * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + * testsuite/ld-i386/pr23486a.d: New file. + * testsuite/ld-i386/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486a.d: Likewise. + * testsuite/ld-x86-64/pr23486a.s: Likewise. + * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486b.s: Likewise. + * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". + * testsuite/ld-i386/property-4.r: Likewise. + * testsuite/ld-i386/property-5.r: Likewise. + * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. + * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. + * testsuite/ld-x86-64/property-3.r: Likewise. + * testsuite/ld-x86-64/property-4.r: Likewise. + * testsuite/ld-x86-64/property-5.r: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. + +(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) +--- + bfd/elfxx-x86.c | 25 ++++++++++++--- + ld/testsuite/ld-i386/i386.exp | 2 ++ + ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ + ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ + ld/testsuite/ld-i386/property-3.r | 1 - + ld/testsuite/ld-i386/property-4.r | 1 - + ld/testsuite/ld-i386/property-5.r | 1 - + ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++- + ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++- + ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++- + ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++- + ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++ + ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++ + ld/testsuite/ld-x86-64/property-3.r | 1 - + ld/testsuite/ld-x86-64/property-4.r | 1 - + ld/testsuite/ld-x86-64/property-5.r | 1 - + .../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++- + .../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++- + .../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++- + .../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++- + ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ + 31 files changed, 211 insertions(+), 47 deletions(-) + create mode 100644 ld/testsuite/ld-i386/pr23486a.d + create mode 100644 ld/testsuite/ld-i386/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s + create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s + +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + switch (pr_type) + { + case GNU_PROPERTY_X86_ISA_1_USED: ++ if (aprop == NULL || bprop == NULL) ++ { ++ /* Only one of APROP and BPROP can be NULL. */ ++ if (aprop != NULL) ++ { ++ /* Remove this property since the other input file doesn't ++ have it. */ ++ aprop->pr_kind = property_remove; ++ updated = TRUE; ++ } ++ break; ++ } ++ goto or_property; ++ + case GNU_PROPERTY_X86_ISA_1_NEEDED: + if (aprop != NULL && bprop != NULL) + { ++or_property: + number = aprop->u.number; + aprop->u.number = number | bprop->u.number; +- /* Remove the property if ISA bits are empty. */ ++ /* Remove the property if all bits are empty. */ + if (aprop->u.number == 0) + { + aprop->pr_kind = property_remove; +@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + { + if (aprop->u.number == 0) + { +- /* Remove APROP if ISA bits are empty. */ ++ /* Remove APROP if all bits are empty. */ + aprop->pr_kind = property_remove; + updated = TRUE; + } + } + else + { +- /* Return TRUE if APROP is NULL and ISA bits of BPROP ++ /* Return TRUE if APROP is NULL and all bits of BPROP + aren't empty to indicate that BPROP should be added + to ABFD. */ + updated = bprop->u.number != 0; +@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties + { + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by +- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ + prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_USED, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, + 4); + prop->u.number = GNU_PROPERTY_X86_ISA_1_486; + prop->pr_kind = property_number; +diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp +index 6d794fe653..78dad02579 100644 +--- a/ld/testsuite/ld-i386/i386.exp ++++ b/ld/testsuite/ld-i386/i386.exp +@@ -462,6 +462,8 @@ run_dump_test "pr23189" + run_dump_test "pr23194" + run_dump_test "pr23372a" + run_dump_test "pr23372b" ++run_dump_test "pr23486a" ++run_dump_test "pr23486b" + + if { !([istarget "i?86-*-linux*"] + || [istarget "i?86-*-gnu*"] +diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d +new file mode 100644 +index 0000000000..41a6dcf7d5 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486a.s ++#source: ../ld-x86-64/pr23486b.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d +new file mode 100644 +index 0000000000..08019b7274 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486b.s ++#source: ../ld-x86-64/pr23486a.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r +index 0ed91f5922..d03203c1e5 100644 +--- a/ld/testsuite/ld-i386/property-3.r ++++ b/ld/testsuite/ld-i386/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r +index cb2bc15d9a..da295eb6c7 100644 +--- a/ld/testsuite/ld-i386/property-4.r ++++ b/ld/testsuite/ld-i386/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r +index 552965058c..e4141594b3 100644 +--- a/ld/testsuite/ld-i386/property-5.r ++++ b/ld/testsuite/ld-i386/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d +index 4bb35b00fb..0aedea1614 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d +index 418d58a8f7..bd69ac6478 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d +index e261038f60..76d2a39f2c 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d +index 25f3d2361e..e770ecffa5 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d +new file mode 100644 +index 0000000000..6d9fa68cdb +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d +new file mode 100644 +index 0000000000..dc2b7bf760 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s +new file mode 100644 +index 0000000000..a07d0c7ced +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_USED */ ++ .long 0xc0000000 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0xa ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d +new file mode 100644 +index 0000000000..0445e69d82 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486b.s ++#source: pr23486a.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d +new file mode 100644 +index 0000000000..dc2b7bf760 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s +new file mode 100644 +index 0000000000..c5167eeb65 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ ++ .long 0xc0000001 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0x3 ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r +index 0ed91f5922..d03203c1e5 100644 +--- a/ld/testsuite/ld-x86-64/property-3.r ++++ b/ld/testsuite/ld-x86-64/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r +index cb2bc15d9a..da295eb6c7 100644 +--- a/ld/testsuite/ld-x86-64/property-4.r ++++ b/ld/testsuite/ld-x86-64/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r +index 552965058c..e4141594b3 100644 +--- a/ld/testsuite/ld-x86-64/property-5.r ++++ b/ld/testsuite/ld-x86-64/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +index 011426f5a4..4cec728dc7 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +index 1b4229a037..a8df49a351 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +index 290ed6abf1..c112626711 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +index 1142e03272..f10dffdc2c 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +index 819542d181..0147a3c7b6 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +index 4c5d0e0a18..1f8c2dc929 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +index ba181e0bc5..7ca2539ca5 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +index 5216f385dd..f66a40e449 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp +index 6edb9e86f4..ae21e554ad 100644 +--- a/ld/testsuite/ld-x86-64/x86-64.exp ++++ b/ld/testsuite/ld-x86-64/x86-64.exp +@@ -403,6 +403,10 @@ run_dump_test "pr23372a" + run_dump_test "pr23372a-x32" + run_dump_test "pr23372b" + run_dump_test "pr23372b-x32" ++run_dump_test "pr23486a" ++run_dump_test "pr23486a-x32" ++run_dump_test "pr23486b" ++run_dump_test "pr23486b-x32" + + if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { + return +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 787a5dbc646..4e2f26fd691 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPackages -, fetchurl, zlib, autoreconfHook264 +, fetchurl, zlib, autoreconfHook # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes , enableShared ? true @@ -12,7 +12,7 @@ let # Remove gold-symbol-visibility patch when updating, the proper fix # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.30"; + version = "2.31.1"; basename = "binutils-${version}"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; + sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; }); patches = [ @@ -55,10 +55,11 @@ stdenv.mkDerivation rec { # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - # Version 2.30 introduced strict requirements on ELF relocations which cannot - # be satisfied on aarch64 platform. Add backported fix from bugzilla. - # https://sourceware.org/bugzilla/show_bug.cgi?id=22764 - ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch + # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 + # un-break features so linking against musl doesn't produce crash-only binaries + ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch + ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch + ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; @@ -67,7 +68,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison ] ++ lib.optionals stdenv.targetPlatform.isiOS [ - autoreconfHook264 + autoreconfHook ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch deleted file mode 100644 index 6a04b3cc558..00000000000 --- a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index c310da6ed3..d31f46171f 100644 ---- a/bfd/ChangeLog -+++ b/bfd/ChangeLog -@@ -1,3 +1,10 @@ -+2018-02-05 Renlin Li <renlin.li@arm.com> -+ -+ PR ld/22764 -+ * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the -+ R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the -+ check for writeable section as well. -+ - 2018-01-27 Nick Clifton <nickc@redhat.com> - - This is the 2.30 release: -diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c -index d5711e0eb1..973188220b 100644 ---- a/bfd/elfnn-aarch64.c -+++ b/bfd/elfnn-aarch64.c -@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, - #if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: - #endif -- if (bfd_link_pic (info) -- && (sec->flags & SEC_ALLOC) != 0 -- && (sec->flags & SEC_READONLY) != 0) -+ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) - { -+ if (h != NULL -+ /* This is an absolute symbol. It represents a value instead -+ of an address. */ -+ && ((h->root.type == bfd_link_hash_defined -+ && bfd_is_abs_section (h->root.u.def.section)) -+ /* This is an undefined symbol. */ -+ || h->root.type == bfd_link_hash_undefined)) -+ break; -+ -+ /* For local symbols, defined global symbols in a non-ABS section, -+ it is assumed that the value is an address. */ - int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; - _bfd_error_handler - /* xgettext:c-format */ -diff --git a/ld/ChangeLog b/ld/ChangeLog -index 6337cd0cb6..1aaa6da3b5 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,11 @@ -+2018-02-05 Renlin Li <renlin.li@arm.com> -+ -+ PR ld/22764 -+ * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address. -+ * testsuite/ld-aarch64/emit-relocs-259.s: Likewise. -+ * testsuite/ld-aarch64/pr22764.s: New. -+ * testsuite/ld-aarch64/pr22764.d: New. -+ - 2018-01-27 Nick Clifton <nickc@redhat.com> - - This is the 2.30 release: -diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp -index f31089361b..d766f3736b 100644 ---- a/ld/testsuite/ld-aarch64/aarch64-elf.exp -+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp -@@ -275,6 +275,7 @@ run_dump_test "pr17415" - run_dump_test_lp64 "tprel_g2_overflow" - run_dump_test "tprel_add_lo12_overflow" - run_dump_test "protected-data" -+run_dump_test_lp64 "pr22764" - - # ifunc tests - run_dump_test "ifunc-1" -diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s -index f724776243..87bb657c5d 100644 ---- a/ld/testsuite/ld-aarch64/emit-relocs-258.s -+++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s -@@ -1,5 +1,6 @@ -+.global dummy - .text -- -+dummy: - ldr x0, .L1 - - .L1: -diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s -index 7e1ba3ceb4..0977c9d869 100644 ---- a/ld/testsuite/ld-aarch64/emit-relocs-259.s -+++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s -@@ -1,5 +1,6 @@ -+.global dummy - .text -- -+dummy: - ldr x0, .L1 - - .L1: -diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d -new file mode 100644 -index 0000000000..997519f469 ---- /dev/null -+++ b/ld/testsuite/ld-aarch64/pr22764.d -@@ -0,0 +1,18 @@ -+#source: pr22764.s -+#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs -+#notarget: aarch64_be-*-* -+#objdump: -dr -+#... -+ -+Disassembly of section \.text: -+ -+0000000000010000 \<\.text\>: -+ 10000: d503201f nop -+ ... -+ 10004: R_AARCH64_ABS64 sym_abs1 -+ 1000c: 00000002 \.word 0x00000002 -+ 1000c: R_AARCH64_ABS32 sym_abs2 -+ 10010: 0003 \.short 0x0003 -+ 10010: R_AARCH64_ABS16 sym_abs3 -+ 10012: 0000 \.short 0x0000 -+ 10014: d503201f nop -diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s -new file mode 100644 -index 0000000000..25e36b4a12 ---- /dev/null -+++ b/ld/testsuite/ld-aarch64/pr22764.s -@@ -0,0 +1,6 @@ -+ .text -+ nop -+ .xword sym_abs1 -+ .word sym_abs2 -+ .short sym_abs3 -+ nop diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 11e02eba566..c8ab6b0fd96 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper -, cmake, llvmPackages, rapidjson }: +, cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { name = "ccls-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEM_CLANG=ON" ]; - shell = stdenv.shell; + shell = runtimeShell; postFixup = '' # We need to tell ccls where to find the standard library headers. diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 97cf820f9a9..daf39318432 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; homepage = https://circleci.com/; }; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index f032a85173a..54ad7ca7071 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, makeWrapper -, cmake, llvmPackages, ncurses }: +, cmake, llvmPackages, ncurses +, runtimeShell }: let src = fetchFromGitHub { @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" ]; - shell = stdenv.shell; + shell = runtimeShell; postFixup = '' # We need to tell cquery where to find the standard library headers. diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 75ae9f1ba8b..869e7a61121 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -14,7 +14,7 @@ with pkgs.stdenv.lib; # the derivation. use language extensions specified by args ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name '' - #!/bin/sh + #!${pkgs.runtimeShell} exec ${pkgs.ctags}/bin/ctags ${concatStringsSep " " (map escapeShellArg args)} "$@" '') { args = let x = pkgs.ctagsWrapped; in concatLists [ diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index ae27ff72c84..b96f65c2ecc 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ]; + buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 9d6c19516f2..f25ea78ecd8 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -9,14 +9,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { name = "dialog-${version}"; - version = "1.3-20181107"; + version = "1.3-20190211"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/dialog/${name}.tgz" "https://invisible-mirror.net/archives/dialog/${name}.tgz" ]; - sha256 = "0mv4a31sz5kc1hyc51cvg9dq54vhlz0vbizn7jgkm9fx4y0cmspg"; + sha256 = "1lx0bvradzx1zl7znlrsnyljcs596r7wamkhyq37ikbxsy4y5h29"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index cef399eb5c1..9891726c663 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static +, runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false }: @@ -53,7 +54,7 @@ let mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF - #!/bin/sh + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc gcc "\$@" EOF @@ -61,7 +62,7 @@ let fi if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF - #!/bin/sh + #!${runtimeShell} ${extraConfig} exec ${distcc}/bin/distcc g++ "\$@" EOF diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 017c6ad8049..240d52ca7d0 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { downloadPage="https://gitlab.com/esr/loccount/tree/master"; license = licenses.bsd2; maintainers = with maintainers; [ calvertvl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index c8fdf246bcf..874aa04157d 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git }: +{ stdenv, fetchurl, jre, ctags, makeWrapper, coreutils, git, runtimeShell }: stdenv.mkDerivation rec { name = "opengrok-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" - substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!/bin/sh" + substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${runtimeShell}" wrapProgram $out/bin/OpenGrok \ --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index c89492287db..18ffc238f0d 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -9,7 +9,7 @@ { stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils -, makeDesktopItem, xkeyboardconfig +, makeDesktopItem, xkeyboardconfig, runtimeShell }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # Make wrapper script that uses the LD_PRELOAD library mkdir -p "$out/bin" cat > "$out/bin/saleae-logic" << EOF - #!${stdenv.shell} + #!${runtimeShell} export LD_PRELOAD="$out/lib/preload.so" export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb" export PATH="${pciutils}/bin:\$PATH" diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index be6bb73aab8..d9e563952ea 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,7 +2,7 @@ , lambdaTerm, cppo, makeWrapper }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 3d5f09b7bc3..57fed5c9e8d 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.2.4"; + pname = "bison"; + version = "3.3.2"; src = fetchurl { - url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "16n7xs3sa1rlhs8y8zg4gi2s2kbkz8d69w3xp935wjykk0i3wryb"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg"; }; - patches = []; # remove on another rebuild - nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; propagatedBuildInputs = [ m4 ]; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 254b3d2283e..296d45723b2 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { pkgconfig shared-mime-info wrapGAppsHook - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme ]; buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 3bba4237cf8..9416b9e4f3e 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -38,11 +38,11 @@ let ]; in stdenv.mkDerivation rec { name = "react-native-debugger-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "180rvcnr3xxg7nb5g4b45l9a67h2dx8ps0l05r6ph3f71kzh4dd9"; + sha256 = "0ljhpqanl9rjk9n69if1vrfvac0s73f8by0k6sa4ngvgqzgvq3kb"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 5a1c2364a77..a1f5e5769ae 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }: +{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin, + runtimeShell }: rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; @@ -32,7 +33,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; checkInputs = let fakeRustup = writeScriptBin "rustup" '' - #!${stdenv.shell} + #!${runtimeShell} shift shift exec "$@" diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 4684841cf47..dac00aa4c96 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rustfmt-${version}"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustfmt"; rev = "${version}"; - sha256 = "17ady2zq4jcbgawgpfszrkp6kxabb2f261g82y2az7nfax1h1pwy"; + sha256 = "1l18ycbq3125sq8v3wgma630wd6kclarlf8f51cmi9blk322jg9p"; }; - cargoSha256 = "0v8iq50h9368kai3m710br5cxc3p6mpbwz1v6gaf5802n48liqs8"; + cargoSha256 = "1557783icdzlwn02c5zl4362yl85r5zj4nkjv80p6896yli9hk9h"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 11de0bec425..2e9093bfae6 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.19.0"; - # rev is the 0.19.0 commit, mainly for skaffold version command output - rev = "9eb0dfc1bf634b97462c66b4dfb80e4cea378ade"; + version = "0.21.1"; + # rev is the 0.21.1 commit, mainly for skaffold version command output + rev = "a73671cb547a80d3437f78d046bc500269673ea3"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s7dyfdmgslwnmbkzyqvf2622gj5d7vx9igwz3bf6dpaz382mk6h"; + sha256 = "0n4gqri4rmah1brckj9d4vidm6faabvwfy5smhpl3f6flyv3slsy"; }; meta = { diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 966c50404d4..eeef99991db 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,21 +8,21 @@ let in stdenv.mkDerivation rec { name = "trellis-${version}"; - version = "2018.12.20"; + version = "2019.02.21"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "b947028a6ac6494b6000c6e1ab5aa0db813e8544"; - sha256 = "14dcsl2drx3xaqvpawp0j7088cijxcr5018yji48rmbl85763aw9"; + rev = "90910577671cdd950e56df6cb29d848dadea9467"; + sha256 = "0j5gnkqfkp8k01wmzsplg713dmw1zvg04hsy33bzbyxaqviybdip"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "670d04f0b8412193d5e974eea67f2bb7355aa1ec"; - sha256 = "1hm385rg1jq9qbq63g5134gq9xpfadvpahxvzwpv0q543brkg730"; + rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; + sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; name = "database"; }) ]; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index b8ba30361aa..8f68471f1e3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,11 +1,12 @@ -{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, libguestfs, qemu, writeText, withLibvirt ? true}: +{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.0"; + version = "2.2.3"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1wa8l3j6hpy0m0snz7wvfcf0wsjikp22c2z29crpk10f7xl7c56b"; + sha256 = "1j00glqn8b1zsgqg2nyk5as405a6s6vclswg2ri0a229hnsiabvs"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -36,7 +37,6 @@ in buildRubyGem rec { src = fetchurl { inherit url sha256; }; patches = [ - ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch ./0004-Support-system-installed-plugins.patch ]; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 39eeb02ce55..9d98b3a48bd 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -3,10 +3,18 @@ dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; + }; + bcrypt_pbkdf = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv"; + type = "gem"; + }; + version = "1.0.0"; }; builder = { source = { @@ -25,6 +33,14 @@ }; version = "0.6.3"; }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + type = "gem"; + }; + version = "1.1.4"; + }; crack = { dependencies = ["safe_yaml"]; source = { @@ -51,6 +67,14 @@ }; version = "0.5.20180417"; }; + ed25519 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; erubis = { source = { remotes = ["https://rubygems.org"]; @@ -70,10 +94,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; gssapi = { dependencies = ["ffi"]; @@ -96,10 +120,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; hashicorp-checkpoint = { source = { @@ -127,12 +151,13 @@ version = "2.8.3"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00nsll7q89ab6k43dl3apxjhy4zidlgjmgb9mpk42bj3wk5zdyzf"; + sha256 = "1gcp1m1p6dpasycfz2sj82ci9ggz7lsskz9c9q6gvfwxrl8y9dx7"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -214,10 +239,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qfanf71yv8w7yl9l9wqcy68i2x1ghvnf8m581yy4pl0anfdhqw8"; + sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; type = "gem"; }; - version = "5.0.2"; + version = "5.1.0"; }; netrc = { source = { @@ -263,10 +288,10 @@ dependencies = ["ffi"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rb-kqueue = { dependencies = ["ffi"]; @@ -397,7 +422,7 @@ version = "0.0.7.5"; }; vagrant = { - dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; + dependencies = ["bcrypt_pbkdf" "childprocess" "ed25519" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"]; }; vagrant-spec = { dependencies = ["childprocess" "log4r" "rspec" "thor"]; @@ -414,10 +439,10 @@ dependencies = ["rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k325a1cblj3jd2av8a6j3xsjjm36g578gpbmxw7h5dbffp49il1"; + sha256 = "0451x3ab869hbycffcq656dm7mmjwmnxcyhv6g7dpdv3acg64783"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; wdm = { source = { @@ -440,27 +465,27 @@ dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05c1xji4afwxx4vgim5n4nj62zbyppmm67ci3kwi0jjrqaj9y11q"; + sha256 = "0l299w172hl023b3v2vnbx4cqfjq9k2pp8blc1dz8n6g9dc6pk9f"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; winrm-elevated = { dependencies = ["winrm" "winrm-fs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr"; + sha256 = "1saqc3ffh075y6fdkc7iqmn0v3pnidvfw0sh09w9cn6jvpsdxizk"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; winrm-fs = { dependencies = ["erubis" "logging" "rubyzip" "winrm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g9grzp03knh1nxcicnm93pmlf4r264lhvl5yviyri8swmqlbz5"; + sha256 = "0fy4yj52kssrm5hchq7l2mbry6w6yvi736p1wjpyv8m19rx7k0c3"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch index 88595942895..7b4ce471c94 100644 --- a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch +++ b/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch @@ -1,8 +1,8 @@ -diff --git i/bin/vagrant w/bin/vagrant -index 19df75033..682fae226 100755 ---- i/bin/vagrant -+++ w/bin/vagrant -@@ -128,11 +128,6 @@ begin +diff --git a/bin/vagrant b/bin/vagrant +index 0e6abdc..cb36e9c 100755 +--- a/bin/vagrant ++++ b/bin/vagrant +@@ -155,11 +155,6 @@ begin end end @@ -11,6 +11,6 @@ index 19df75033..682fae226 100755 - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) - end - - begin - # Execute the CLI interface, and exit with the proper error code - exit_status = env.cli(argv) + # Acceptable experimental flag values include: + # + # Unset - Disables experimental features diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index e2250297c8e..211f7169397 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeScript, writeText, php }: +{ stdenv, lib, fetchurl, writeScript, writeText, php, runtimeShell }: let version = "2.0.1"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $dir cat <<_EOF > $out/bin/wp -#!${stdenv.shell} +#!${runtimeShell} set -euo pipefail diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index b2455095a01..959c79405e8 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages, makeWrapper, writeText, runCommand , CoreServices, ImageIO, CoreGraphics +, runtimeShell , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" , sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }: @@ -35,7 +36,7 @@ let ''; xcode-select = writeText "xcode-select" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in -h | --help) ;; # noop @@ -50,7 +51,7 @@ done ''; xcrun = writeText "xcrun" '' -#!${stdenv.shell} +#!${runtimeShell} while [ $# -gt 0 ]; do case "$1" in --sdk | -sdk) shift ;; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8ff02dfe718..0cd80b6cae3 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser , pkgconfig, which # Updater dependencies -, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix +, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg , darwin, xcbuild , procps @@ -104,7 +104,7 @@ in ''; passthru.updateScript = import ./update.nix { - inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix; + inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; inherit (stdenv) lib; inherit majorVersion; }; diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index bf6951dc688..7b5a4710aa0 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -9,10 +9,11 @@ , common-updater-scripts , majorVersion , nix +, runtimeShell }: writeScript "update-nodejs" '' - #!${stdenv.shell} + #!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} HOME=`mktemp -d` diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 97cbe616c57..d4ff86c424b 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }: +{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, runtimeShell, requireFile, commercialVersion ? false }: let plainName = "andyetitmoves"; version = "1.2.2"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF - #!/bin/sh + #!${runtimeShell} cd $out/opt/andyetitmoves exec ./lib/$binName EOF diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 0f9b4efd61d..c9a227b98db 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -33,10 +33,10 @@ let # when updating, also update rev-manual to a recent version of # https://github.com/dae/ankidocs # The manual is distributed independently of the software. - version = "2.1.8"; - sha256-pkg = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p"; - rev-manual = "3a3d32dd9bfee6f5a7f5bdad2d70938874c881fa"; - sha256-manual = "1kz9ywbb6f42krxg8c5cwpjsnzm863vnkkn07szb3m1j85c10gjy"; + version = "2.1.9"; + sha256-pkg = "0p4admjxs0gwc54hby9kc1isg99ghxd5kpy08w9hrk3mcyq74z3i"; + rev-manual = "c2c443bf991089534b0193029f6ee34908124e80"; + sha256-manual = "1jwm5zrydc6qis7zslfqj56d083kpbzbl51n0x4czhskm9pjh7qd"; manual = stdenv.mkDerivation { name = "anki-manual-${version}"; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 91959a1c942..b2c86222f2b 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp AstroMenace $out cp gamedata.vfs $out cat > $out/bin/AstroMenace << EOF - #!${stdenv.shell} + #!${runtimeShell} $out/AstroMenace --dir=$out EOF chmod 755 $out/bin/AstroMenace diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 2c55911defc..b39eb987e00 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa -, debug +, debug, runtimeShell }: let @@ -86,7 +86,7 @@ let mkdir $app/Contents/MacOS launcher=$app/Contents/MacOS/Cataclysm.sh cat << EOF > $launcher - #!${stdenv.shell} + #!${runtimeShell} $out/bin/cataclysm-tiles EOF chmod 555 $launcher diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 502a554bae2..c51f014b179 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm -, pkgconfig, SDL2, SDL2_mixer }: +, pkgconfig, SDL2, SDL2_mixer, runtimeShell }: let year = "2015"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Make wrapper script cat > eduke32-wrapper <<EOF - #!/bin/sh + #!${runtimeShell} if [ "$EDUKE32_DATA_DIR" = "" ]; then EDUKE32_DATA_DIR=/var/lib/games/eduke32 diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index bd05c372810..0cafddefa99 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; - experimental = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; + experimental = bdist { sha256 = "0s8fhf790wwmckhi8wdbc036gg5vs1mrj3gd38ln4ynx9s3jb1z8"; version = "0.17.2"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; - experimental = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; + experimental = bdist { sha256 = "0gp3csf2dckvv0nf5k3cwylda4zpijlz3g18s10jgfxj03a6aly6"; version = "0.17.2"; }; }; demo = { stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index a9ebd994bb8..5895e87e731 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { --subst-var-by out "$out/" substitute ${./fix-paths.sh} $out/fixpaths/fix-paths \ --subst-var-by libxsltBin ${libxslt.bin} \ + --subst-var-by shell ${stdenv.shell} \ --subst-var out chmod +x $out/fixpaths/fix-paths diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/games/freeorion/fix-paths.sh index 73a3bd6feda..3f82533dd60 100644 --- a/pkgs/games/freeorion/fix-paths.sh +++ b/pkgs/games/freeorion/fix-paths.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ if [ -e ~/.config/freeorion/config.xml ]; then @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 5c8d2541a01..d334439cafb 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xorgproto +, runtimeShell }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -24,7 +25,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin $out/libexec cp sand $out/libexec - echo -e '#!${stdenv.shell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg + echo -e '#!${runtimeShell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg ''; diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/games/gargoyle/darwin.sh index 9bd45d0b1d5..ed0daec4ef1 100644 --- a/pkgs/games/gargoyle/darwin.sh +++ b/pkgs/games/gargoyle/darwin.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ set -e diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 5bf0ae1c814..c908a9b75a9 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jam, cctools, pkgconfig +{ stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig , SDL, SDL_mixer, SDL_sound, cf-private, gtk2, libvorbis, smpeg }: let @@ -29,16 +29,19 @@ stdenv.mkDerivation { sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9"; }; - nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools; buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] - ++ lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ]; patches = [ ./darwin.patch ]; buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; - installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' + installPhase = + if stdenv.isDarwin then + (substituteAll { inherit (stdenv) shell; src = ./darwin.sh; }) + else jamenv + '' jam -j$NIX_BUILD_CORES install mkdir -p "$out/bin" ln -s ../libexec/gargoyle/gargoyle "$out/bin" @@ -52,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with lib; { + meta = with stdenv.lib; { homepage = http://ccxvii.net/gargoyle/; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index ad3baa9d22a..f84b83a3010 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "055"; + version = "056"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p"; + sha256 = "07mj3b2p3n3bq7rwi31y0vywnr4namqbcnz4c53kl38ajw9viyf0"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 2d2a31dd812..668605a9ae1 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -rv data resources credits.txt license.txt "$out/share/mars/" cp -v mars "$out/bin/mars.bin" cat << EOF > "$out/bin/mars" - #! /bin/sh + #! ${stdenv.shell} cd "$out/share/mars/" exec "$out/bin/mars.bin" "\$@" EOF diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 6be5c9ee247..7e6e034a2b5 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,14 +4,12 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; - # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see - # https://github.com/NixOS/nixpkgs/issues/42387 - version = "unstable-2018-06-04"; + version = "0.6.4"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; - sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; + rev = "0.6.4"; + sha256 = "0z9mhvfsq9m2cmi0dbrjjc51642r6ppdbb8932236gar5j7w3bc2"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 319cdb610ca..1d56d86f530 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,11 +1,11 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr -, libXrender, fontconfig, freetype, openal }: +, libXrender, fontconfig, freetype, openal, runtimeShell }: let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; - src = + src = let url = config.oilrush.url or null; sha256 = config.oilrush.sha256 or null; @@ -54,7 +54,7 @@ stdenv.mkDerivation { cp -r * "$out/opt/oilrush" mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" - #! /bin/sh + #!${runtimeShell} LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" @@ -66,7 +66,7 @@ stdenv.mkDerivation { longDescription = '' Oil Rush is a real-time naval strategy game based on group control. It combines the strategic challenge of a classical RTS with the sheer fun - of Tower Defense. + of Tower Defense. ''; homepage = http://oilrush-game.com/; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 78fdb32b436..237021e9801 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig , withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true , withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps -, writeScriptBin, makeWrapper +, writeScriptBin, makeWrapper, runtimeShell }: let @@ -21,7 +21,7 @@ let }; playmidi = writeScriptBin "playmidi" '' - #!/bin/sh + #!${runtimeShell} trap "${procps}/bin/pkill fluidsynth" EXIT ${fluidsynth}/bin/fluidsynth -a ${audioDriver} -i ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $* ''; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 301249789da..d4945d43c7d 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; # and a special license for art data # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; broken = true; # it won't build diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index f48736a56d6..3a9635f6712 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer -, libpng, zlib, libjpeg, imagemagick, libX11 +, libpng, zlib, libjpeg, imagemagick, libX11, runtimeShell }: stdenv.mkDerivation rec { @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { cp -rv packages $out/share/sauerbraten/ cp -rv data $out/share/sauerbraten/ cat > $out/bin/sauerbraten_server <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/sauerbraten ./sauer_server "\$@" EOF cat > $out/bin/sauerbraten_client <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/sauerbraten ./sauer_client "\$@" EOF diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index 1ccb351af4a..a96250e7acb 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, writeText -, scummvm }: +, scummvm, runtimeShell }: let desktopItem = name: short: long: description: makeDesktopItem { @@ -13,7 +13,7 @@ let }; run = name: short: code: writeText "${short}.sh" '' - #!${stdenv.shell} -eu + #!${runtimeShell} -eu exec ${scummvm}/bin/scummvm \ --path=@out@/share/${name} \ diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index ccece066cdc..a97338f6f20 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, unzip, zlib, libpng, bzip2, SDL, SDL_mixer -, buildEnv, config +, buildEnv, config, runtimeShell }: let @@ -95,7 +95,7 @@ let postBuild = '' rm "$out/bin" && mkdir "$out/bin" cat > "$out/bin/simutrans" <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd "$out"/share/simutrans exec "${binaries}/bin/simutrans" -use_workdir "\''${extraFlagsArray[@]}" "\$@" EOF @@ -167,4 +167,3 @@ let }; in result - diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index ad0c7441d7f..2556aa49b4c 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, -libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}: +libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis, runtimeShell }: stdenv.mkDerivation rec { version = "2.2.1-r6404"; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir "$out/bin" for i in "$out"/games/*; do - echo '#!${stdenv.shell}' >> "$out/bin/$(basename "$i")" + echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")" echo "$i"' "$@"' >> "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" done diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index c31b8b22216..4661cf7d803 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,11 +1,14 @@ -{ stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 +{ config, stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null -, withJava ? false -, withPrimus ? false , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false +, runtimeShell + +# DEPRECATED +, withJava ? config.steam.java or false +, withPrimus ? config.steam.primus or false }: let @@ -33,7 +36,7 @@ let ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); runSh = writeScript "run.sh" '' - #!${stdenv.shell} + #!${runtimeShell} runtime_paths="${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then echo "$runtime_paths" @@ -193,7 +196,7 @@ in buildFHSUserEnv rec { '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' - #!${stdenv.shell} + #!${runtimeShell} if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -202,7 +205,7 @@ in buildFHSUserEnv rec { ** WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix and then run \`sudo nixos-rebuild switch\`: - { + { hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; } @@ -224,7 +227,7 @@ in buildFHSUserEnv rec { inherit multiPkgs extraBuildCommands; runScript = writeScript "steam-run" '' - #!${stdenv.shell} + #!${runtimeShell} run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index dd6e9a070b1..95493498f5e 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, traceDeps ? false}: +{stdenv, fetchurl, runtimeShell, traceDeps ? false}: let traceLog = "/tmp/steam-trace-dependencies.log"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <<EOF - #!${stdenv.shell} + #!${runtimeShell} echo \$1 >> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 48fa0a3b518..57e7217fcdb 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, tcllib }: +{ stdenv, fetchurl, tcl, tcllib, runtimeShell }: stdenv.mkDerivation { name = "tcl2048-0.4.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin cp $src $out/2048.tcl cat > $out/bin/2048 << EOF - #!${stdenv.shell} + #!${runtimeShell} # wrapper for tcl2048 export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index cfef1ed0db2..02c55d7d06c 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, libX11, libGLU_combined }: +{ stdenv, fetchurl, glibc, libX11, runtimeShell, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -38,7 +38,7 @@ stdenv.mkDerivation { # The wrapper script itself. We use $LD_LIBRARY_PATH for libGL. cat << EOF > "$out/bin/Tibia" - #!${stdenv.shell} + #!${runtimeShell} cd $out/res ${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@" EOF diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index ce30be7be0b..470856af90e 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal }: +{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal, runtimeShell }: stdenv.mkDerivation rec { name = "tremulous-${version}"; version = "1.1.0"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { for b in tremulous tremded do cat << EOF > $out/bin/$b - #!/bin/sh + #!${runtimeShell} cd $out/opt/tremulous exec ./$b.$arch "\$@" EOF diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index fc6a45ace57..ae16510fdc5 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: +{ fetchurl, stdenv, runtimeShell +, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: stdenv.mkDerivation rec { name = "trigger-rally-0.6.5"; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin cat <<EOF > $out/bin/trigger-rally - #!/bin/sh + #!${runtimeShell} exec $out/games/trigger-rally "$@" EOF chmod +x $out/bin/trigger-rally diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index ab6f1ca765c..483912bab45 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,14 +1,14 @@ -{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }: +{ stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/${name}-bin" in the directory where you saved it. - ''; + ''; src = if (stdenv.isi686) then requireFile { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; installPhase = '' @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { # allow scripting of the mojoinstaller gcc -fPIC -shared -o isatty.so $ld_preload - echo @@@ + echo @@@ echo @@@ this next step appears to hang for a while - echo @@@ + echo @@@ - # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. + # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rm $out/libexec/strangeloop/vessel/x86/libstdc++* # props to Ethan Lee (the Vessel porter) for understanding - # how $ORIGIN works in rpath. There is hope for humanity. + # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done cat > $out/bin/Vessel << EOW - #!/bin/sh + #!${runtimeShell} cd $out/libexec/strangeloop/vessel/ exec ./x86/vessel.x86 EOW diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index ad86072dd1c..7d8380e9f7c 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,25 +1,26 @@ { stdenv, requireFile , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined +, runtimeShell , demo ? false }: # TODO: add i686 support stdenv.mkDerivation rec { - name = if demo + name = if demo then "WorldOfGooDemo-1.41" else "WorldofGoo-1.41"; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "supported" else throw "Sorry. World of Goo only is only supported on x86_64 now."; - goBuyItNow = '' + goBuyItNow = '' We cannot download the full version automatically, as you require a license. Once you bought a license, you need to add your downloaded version to the nix store. You can do this by using "nix-prefetch-url file://\$PWD/WorldOfGooSetup.1.41.tar.gz" in the directory where you saved it. - Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. - ''; + Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. + ''; getTheDemo = '' We cannot download the demo version automatically. Please go to @@ -28,8 +29,8 @@ stdenv.mkDerivation rec { directory where you saved it. ''; - src = if demo - then + src = if demo + then requireFile { message = getTheDemo; name = "WorldOfGooDemo.1.41.tar.gz"; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { #makeWrapper doesn't do cd. :( cat > $out/bin/WorldofGoo << EOF - #!/bin/sh + #!${runtimeShell} cd $out/libexec/2dboy/WorldOfGoo exec ./WorldOfGoo.bin64 EOF diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index 6fab4982534..3d5da239115 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/zangband $out/bin/.zangband.real - echo '#! /bin/sh + echo '#! ${stdenv.shell} PATH="$PATH:${coreutils}/bin" ZANGBAND_PATH="$HOME/.zangband" diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix new file mode 100644 index 00000000000..20efe634285 --- /dev/null +++ b/pkgs/misc/acpilight/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, python36, udev, coreutils }: + +stdenv.mkDerivation rec { + pname = "acpilight"; + version = "1.1"; + + src = fetchgit { + url = "https://gitlab.com/wavexx/acpilight.git"; + rev = "v${version}"; + sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd"; + }; + + pyenv = python36.withPackages (pythonPackages: with pythonPackages; [ + ConfigArgParse + ]); + + postConfigure = '' + substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin + ''; + + buildInputs = [ pyenv udev ]; + + makeFlags = [ "DESTDIR=$(out) prefix=" ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.com/wavexx/acpilight"; + description = "ACPI backlight control"; + license = licenses.gpl3; + maintainers = with maintainers; [ "smakarov" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 51ef47fe469..2df3cfe6733 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "Brother BrGenML1 LPR driver"; homepage = http://www.brother.com; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix new file mode 100644 index 00000000000..001a3c1eac0 --- /dev/null +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -0,0 +1,78 @@ +{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}: + +let + version = "1.1.4-0"; + cupsdeb = fetchurl { + url = "https://download.brother.com/welcome/dlf007070/hl3140cwcupswrapper-${version}.i386.deb"; + sha256 = "a76281828ca6ee86c63034673577fadcf5f24e8ed003213bdbb6bf47a7aced6f"; + }; + srcdir = "hl3140cw_cupswrapper_GPL_source_${version}"; + cupssrc = fetchurl { + url = "https://download.brother.com/welcome/dlf006740/${srcdir}.tar.gz"; + sha256 = "1wp85rbvbar6rqqkaffymxjpls6jx9m9230dlrpqwy5akiaxf0rl"; + }; + lprdeb = fetchurl { + url = "https://support.brother.com/g/b/files/dlf/dlf007068/hl3140cwlpr-1.1.2-1.i386.deb"; + sha256 = "601f392b52ed7080f71b780181823bb8f6abfd0591146b452ba1f23e21f9f865"; + }; +in +stdenv.mkDerivation { + name = "cups-brother-hl3140cw"; + nativeBuildInputs = [ makeWrapper dpkg ]; + buildInputs = [ cups ghostscript a2ps ]; + + unpackPhase = '' + tar -xvf ${cupssrc} + ''; + + buildPhase = '' + gcc -Wall ${srcdir}/brcupsconfig/brcupsconfig.c -o brcupsconfpt1 + ''; + + installPhase = '' + # install lpr + dpkg-deb -x ${lprdeb} $out + + substituteInPlace $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ + --replace /opt "$out/opt" + substituteInPlace $out/opt/brother/Printers/hl3140cw/inf/setupPrintcapij \ + --replace /opt "$out/opt" + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw + + wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + + + dpkg-deb -x ${cupsdeb} $out + + substituteInPlace $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ + --replace /opt "$out/opt" + + mkdir -p $out/lib/cups/filter + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw $out/lib/cups/filter/cupswrapperhl3140cw + + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/brother_hl3140cw_printer_en.ppd $out/lib/cups/filter/brother_hl3140cw_printer_en.ppd + + cp brcupsconfpt1 $out/opt/brother/Printers/hl3140cw/cupswrapper/ + ln -s $out/opt/brother/Printers/hl3140cw/cupswrapper/brcupsconfpt1 $out/lib/cups/filter/brcupsconfpt1 + ln -s $out/opt/brother/Printers/hl3140cw/lpd/filterhl3140cw $out/lib/cups/filter/brother_lpdwrapper_hl3140cw + + wrapProgram $out/opt/brother/Printers/hl3140cw/cupswrapper/cupswrapperhl3140cw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother hl3140cw printer driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128"; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index ff71df5dc1b..e22a159c428 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd, runtimeShell , ghostscript, a2ps }: # Why: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; brprintconf_mfcj6510dw_script = '' - #!/bin/sh + #!${runtimeShell} cd $(mktemp -d) ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 348b7c6550e..34761df5ea1 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.21.6"; + version = "1.22.1"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "0k0x9p40bahq44189vy9zai2ia9i91h26chrddr0m9agzsy5s3k3"; + sha256 = "08szgpmac7xlf6vqkvg3pbphnrk2mal3gy382q2y3cm7k4plys3y"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 3892c37a1d5..6bb021c4958 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -25,6 +25,39 @@ in # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... let plugins = { + v330 = stdenv.mkDerivation rec { + name = "iscan-v330-bundle"; + version = "1.0.1"; + pluginVersion = "0.2.0"; + + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9"; + }; + + buildInputs = [ patchelf rpm ]; + + installPhase = '' + ${rpm}/bin/rpm2cpio "plugins/esci-interpreter-perfection-v330-${pluginVersion}-1.x86_64.rpm" | ${cpio}/bin/cpio -idmv + mkdir $out{,/share,/lib} + cp -r ./usr/share/{iscan-data,esci}/ $out/share/ + cp -r ./usr/lib64/esci $out/lib + ''; + + preFixup = '' + lib=$out/lib/esci/libesci-interpreter-perfection-v330.so + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $lib + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" + ''; + hw = "Perfection V330 Photo"; + }; + meta = common_meta // { description = "Plugin to support "+passthru.hw+" scanner in sane."; }; + }; x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "1.0.1"; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 99286d5f204..580b473b0cd 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' - substituteInPlace foomaticrip.c --replace /bin/bash /bin/sh + substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} ''; installTargets = "install-cups"; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index f03d75dfa02..10dd0401cf0 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -12,16 +12,16 @@ let name = "hplip-${version}"; - version = "3.18.5"; + version = "3.19.1"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; + sha256 = "1kl1q4753xx1w76dhp92wgrhn5k1yx1ib35pyi0vi3mw0njbhrzm"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; + sha256 = "1fwjypy1ycyi7rr1vk1yxhbdhx51n7fxhvjb36mzw8qz71dif2i3"; }; hplipState = substituteAll { diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 64b485bea31..87893a93136 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -6,7 +6,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ]; drvParams = { postFixup = '' wrapProgram $out/bin/image-analyzer \ diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 9403a969e8f..14560919b71 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -8,7 +8,7 @@ let inherit (pythonPackages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.defaultIconTheme gdk_pixbuf librsvg ]; + gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { postFixup = '' wrapProgram $out/bin/gcdemu \ diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index b720bf142d4..e57c3854926 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "2018-12-25"; + version = "2019-02-16"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "ca2a2c98f252d21dc609d26f4264a43ed091b8fe"; - sha256 = "0903hp7fkh08ggjx8zrsvwhh1x8bprv3lh2d8yci09al1cqqj5cb"; + rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07"; + sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 45b2f79146c..1349fa0f0b6 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,8 @@ , udev , libGLU_combined, SDL , libao, openal, libpulseaudio -, gtk2, gtksourceview }: +, gtk2, gtksourceview +, runtimeShell }: with stdenv.lib; stdenv.mkDerivation rec { @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { # stuff needed by higan at runtime cat <<EOF > $out/bin/higan-init.sh - #!${stdenv.shell} + #!${runtimeShell} cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ @@ -69,8 +70,8 @@ stdenv.mkDerivation rec { longDescription = '' higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - - Nintendo's Famicom, Super Famicom (with subsystems: - Super Game Boy, BS-X Satellaview, Sufami Turbo); + - Nintendo's Famicom, Super Famicom (with subsystems: + Super Game Boy, BS-X Satellaview, Sufami Turbo); Game Boy, Game Boy Color, Game Boy Advance; - Sega's Master System, Game Gear, Mega Drive; - NEC's PC Engine, SuperGrafx; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index bdc372c7ca2..4f40c10b037 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123 }: +{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123, runtimeShell }: let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ]; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; runner = writeText "kega-fusion" '' - #!${stdenv.shell} -ex + #!${runtimeShell} -ex kega_libdir="@out@/lib/kega-fusion" kega_localdir="$HOME/.Kega Fusion" diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 7fb804d31e4..09c3d8e762d 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper, pkgconfig +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, pkgconfig , cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit , qttools, minizip }: @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0m1pkxa6i94gq95cankv390wsbp88b3x41c7hf415rp9rkfq25vk"; + sha256 = "0s4dl4pi8rxqahvzxnh37xdgsfax36cn5wlh1srdcmabwsrfpb3w"; }; enableParallelBuilding = true; @@ -32,11 +32,6 @@ in stdenv.mkDerivation rec { qttools ]; - patches = [(fetchpatch { - url = "https://github.com/mgba-emu/mgba/commit/7f41dd354176b720c8e3310553c6b772278b9dca.patch"; - sha256 = "0j334v8wf594kg8s1hngmh58wv1pi003z8avy6fjhj5qpjmbbavh"; - })]; - postInstall = '' cp -r ${desktopItem}/share/applications $out/share wrapProgram $out/bin/mgba-qt --suffix QT_PLUGIN_PATH : \ diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 6b708cccc8f..1072a66e0ea 100644 --- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, cores }: +{ stdenv, pkgs, cores, runtimeShell }: assert cores != []; @@ -7,7 +7,7 @@ with pkgs.lib; let script = exec: '' - #!${stdenv.shell} + #!${runtimeShell} nohup sh -c "pkill -SIGTSTP kodi" & # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750 nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi" diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 40c1fcc6fde..2537669bbc4 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig -, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib +, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mv $out/share/retrofe/example/retrofe $out/bin/ cat > $out/bin/retrofe-init << EOF - #!/bin/sh + #!${runtimeShell} echo "This will install retrofe's example files into this directory" echo "Example files location: $out/share/retrofe/example/" diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index 1aad9fe20c7..c006db3116b 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -1,5 +1,3 @@ -#!/bin/sh - ## build described at http://wiki.winehq.org/Wine64 source $stdenv/setup diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index db2afa5ba63..991be274ecc 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -14,10 +14,10 @@ , enableQt ? false, qt4 ? null # media -, enableFFmpeg ? true, ffmpeg_2 ? null +, enableFFmpeg ? true, ffmpeg_2 ? null # misc -, enableJemalloc ? true, jemalloc ? null +, enableJemalloc ? true, jemalloc ? null , enableHwAccel ? true , enablePlugins ? false, xulrunner ? null, npapi_sdk ? null }: @@ -66,12 +66,12 @@ assert length renderers == 0 -> throw "at least one renderer must be enabled"; stdenv.mkDerivation rec { name = "gnash-${version}"; - version = "0.8.11-2017-03-08"; + version = "0.8.11-2019-30-01"; src = fetchgit { url = "git://git.sv.gnu.org/gnash.git"; - rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9"; - sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02"; + rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4"; + sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry"; }; postPatch = '' diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 6e4ae16e9c8..8539db5e002 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; }; } diff --git a/pkgs/misc/themes/elementary/default.nix b/pkgs/misc/themes/elementary/default.nix deleted file mode 100644 index 0d02b32c8ff..00000000000 --- a/pkgs/misc/themes/elementary/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "elementary-gtk-theme-${version}"; - version = "5.1.1"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = "stylesheet"; - rev = version; - sha256 = "1749byc2lbxmprladn9n7k6jh79r8ffgayjn689gmqsrm6czsmh2"; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/themes/elementary - cp -r gtk-* plank $out/share/themes/elementary - ''; - - meta = with stdenv.lib; { - description = "GTK theme designed to be smooth, attractive, fast, and usable"; - homepage = https://github.com/elementary/stylesheet; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ davidak ]; - }; -} diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e356e83436d..e10fa1b06b7 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.6.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; - rev = "urbit-${version}"; - sha256 = "158mz6c6y5z1b6piid8hvrl5mcqh8q1ny185gz51jayia51azmgs"; + rev = "v${version}"; + sha256 = "192843pjzh8z55fd0x70m3l1vncmixljia3nphgn7j7x4976xkp2"; fetchSubmodules = true; }; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 2a758aa9843..14332c70078 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,6 +1,6 @@ { stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git -, fetchFromGitHub +, fetchFromGitHub, runtimeShell }: /* @@ -359,19 +359,57 @@ rec { inherit vimrcFile; # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: - let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; - in writeScriptBin (if name == null then "vim" else name) '' - #!/bin/sh - exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + vimWithRC = { + vimExecutable, + gvimExecutable, + vimManPages, + wrapManual, + wrapGui, + name ? "vim", + vimrcFile ? null, + gvimrcFile ? null, + vimExecutableName, + gvimExecutableName, + }: + let + rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + vimWrapperScript = writeScriptBin vimExecutableName '' + #!${runtimeShell} + exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" ''; + gvimWrapperScript = writeScriptBin gvimExecutableName '' + #!${stdenv.shell} + exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + ''; + in + buildEnv { + inherit name; + paths = [ + vimWrapperScript + ] ++ lib.optional wrapGui gvimWrapperScript + ++ lib.optional wrapManual vimManPages + ; + }; # add a customize option to a vim derivation makeCustomizable = vim: vim // { - customize = { name, vimrcConfig }: vimWithRC { + customize = { + name, + vimrcConfig, + wrapManual ? true, + wrapGui ? false, + vimExecutableName ? name, + gvimExecutableName ? (lib.concatStrings [ "g" name ]), + }: vimWithRC { vimExecutable = "${vim}/bin/vim"; - inherit name; + gvimExecutable = "${vim}/bin/gvim"; + inherit name wrapManual wrapGui vimExecutableName gvimExecutableName; vimrcFile = vimrcFile vimrcConfig; + vimManPages = buildEnv { + name = "vim-doc"; + paths = [ vim ]; + pathsToLink = [ "/share/man" ]; + }; }; override = f: makeCustomizable (vim.override f); diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e5b83511e72..2a9eeae3d57 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript, runtimeShell , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -53,7 +53,7 @@ let }; openDebugAD7Script = writeScript "OpenDebugAD7" '' - #!${stdenv.shell} + #!${runtimeShell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" ${if gdbUseFixed then '' diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 084a1e01375..77284e4dfa8 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -7,8 +7,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.5"; - sha256 = "011yx3pwqbcz5fmzani57k0axgh458r4ipqwbjlklnrwbrkjhzra"; + version = "1.2.7"; + sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn"; }; postPatch = '' diff --git a/pkgs/os-specific/bsd/netbsd/builder.sh b/pkgs/os-specific/bsd/netbsd/builder.sh new file mode 100644 index 00000000000..925001567f7 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/builder.sh @@ -0,0 +1,122 @@ +source $stdenv/setup + +# NetBSD makefiles should be able to detect this +# but without they end up using gcc on Darwin stdenv +addMakeFlags() { + export setOutputFlags= + + export LIBCRT0= + export LIBCRTI= + export LIBCRTEND= + export LIBCRTBEGIN= + export LIBC= + export LIBUTIL= + export LIBSSL= + export LIBCRYPTO= + export LIBCRYPT= + export LIBCURSES= + export LIBTERMINFO= + export LIBM= + export LIBL= + + export _GCC_CRTBEGIN= + export _GCC_CRTBEGINS= + export _GCC_CRTEND= + export _GCC_CRTENDS= + export _GCC_LIBGCCDIR= + export _GCC_CRTI= + export _GCC_CRTN= + export _GCC_CRTDIR= + + # Definitions passed to share/mk/*.mk. Should be pretty simple - + # eventually maybe move it to a configure script. + export DESTDIR= + export USETOOLS=never + export NOCLANGERROR=yes + export NOGCCERROR=yes + export LEX=flex + export MKUNPRIVED=yes + export EXTERNAL_TOOLCHAIN=yes + + export INSTALL_FILE="install -U -c" + export INSTALL_DIR="xinstall -U -d" + export INSTALL_LINK="install -U -l h" + export INSTALL_SYMLINK="install -U -l s" + + makeFlags="MACHINE=$MACHINE $makeFlags" + makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" + makeFlags="AR=$AR $makeFlags" + makeFlags="CC=$CC $makeFlags" + makeFlags="CPP=$CPP $makeFlags" + makeFlags="CXX=$CXX $makeFlags" + makeFlags="LD=$LD $makeFlags" + makeFlags="STRIP=$STRIP $makeFlags" + + makeFlags="BINDIR=${!outputBin}/bin $makeFlags" + makeFlags="LIBDIR=${!outputLib}/lib $makeFlags" + makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags" + makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" + makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags" + makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags" + makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags" + + # Parallel building. Needs the space. + makeFlags="-j $NIX_BUILD_CORES $makeFlags" +} + +setNetBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this + sourceRoot=$PWD/$sourceRoot + export NETBSDSRCDIR=$sourceRoot + export BSDSRCDIR=$NETBSDSRCDIR + export _SRC_TOP_=$NETBSDSRCDIR + chmod -R u+w $sourceRoot + for path in $extraPaths; do + cd $path + find . -type d -exec mkdir -p $sourceRoot/\{} \; + find . -type f -exec cp -pr \{} $sourceRoot/\{} \; + chmod -R u+w $sourceRoot + done + + cd $sourceRoot + if [ -d "$NETBSD_PATH" ] + then sourceRoot=$sourceRoot/$NETBSD_PATH + fi +} + +includesPhase() { + if [ -z "${skipIncludesPhase:-}" ]; then + + local flagsArray=( + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + DESTDIR=${!outputInclude} includes + ) + + echoCmd 'includes flags' "${flagsArray[@]}" + make ${makefile:+-f $makefile} "${flagsArray[@]}" + + moveUsrDir + + fi +} + +moveUsrDir() { + if [ -d $prefix ]; then + # Remove lingering /usr references + if [ -d $prefix/usr ]; then + cd $prefix/usr + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec mv \{} $out/\{} \; + fi + + find $prefix -type d -empty -delete + fi +} + +postUnpackHooks+=(setNetBSDSourceDir) +preConfigureHooks+=(addMakeFlags) +preInstallHooks+=(includesPhase) +fixupOutputHooks+=(moveUsrDir) + +genericBuild diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index d7f7c64fc2d..46bac37f4e8 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,272 +1,83 @@ -{ stdenv, fetchcvs, lib, groff, mandoc, zlib, buildPackages -, yacc, flex, libressl, bash, less, writeText }: +{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex, bash +, writeText, buildPackages, splicePackages, symlinkJoin }: let - inherit (lib) optionalString replaceStrings; - inherit (stdenv) hostPlatform; - fetchNetBSD = path: version: sha256: fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src/${path}"; inherit sha256; - tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE"; + tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; - # Needed to support cross correctly. Splicing only happens when we - # do callPackage, but sense everything is here, it needs to be done - # by hand. All native build inputs should come from here. - nbBuildPackages = buildPackages.netbsd; - - MACHINE_ARCH = { - "i686" = "i386"; - }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + # Splice packages so we get the correct package when using + # nativeBuildInputs... + nbSplicedPackages = splicePackages { + pkgsBuildBuild = buildPackages.buildPackages.netbsd; + pkgsBuildHost = buildPackages.netbsd; + pkgsBuildTarget = {}; + pkgsHostHost = {}; + pkgsHostTarget = netbsd; + pkgsTargetTarget = {}; + }; - MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; - }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + netbsd = with nbSplicedPackages; { - netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "netbsd-${attrs.pname or (baseNameOf attrs.path)}-${attrs.version}"; + mkDerivation = lib.makeOverridable (attrs: let + stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + in stdenv'.mkDerivation ({ + name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; - setOutputFlags = false; - - nativeBuildInputs = [ yacc flex mandoc groff - nbBuildPackages.makeMinimal - nbBuildPackages.stat - nbBuildPackages.install - nbBuildPackages.tsort - nbBuildPackages.lorder ]; - buildInputs = [ nbPackages.compat ]; - installFlags = [ "includes" ]; - # TODO: eventually move this to a make.conf - makeFlags = [ - "MACHINE=${MACHINE}" - "MACHINE_ARCH=${MACHINE_ARCH}" - - "AR=${stdenv.cc.targetPrefix}ar" - "CC=${stdenv.cc.targetPrefix}cc" - "CPP=${stdenv.cc.targetPrefix}cpp" - "CXX=${stdenv.cc.targetPrefix}c++" - "LD=${stdenv.cc.targetPrefix}ld" - "STRIP=${stdenv.cc.targetPrefix}strip" - ] ++ (attrs.makeFlags or []); - - # Definitions passed to share/mk/*.mk. Should be pretty simple - - # eventually maybe move it to a configure script. - # TODO: don’t rely on DESTDIR, instead use prefix - DESTDIR = "$(out)"; - TOOLDIR = "$(out)"; - USETOOLS = "never"; - NOCLANGERROR = "yes"; - NOGCCERROR = "yes"; - LEX = "flex"; - MKUNPRIVED = "yes"; - HOST_SH = "${buildPackages.bash}/bin/sh"; + + nativeBuildInputs = [ makeMinimal install tsort lorder mandoc groff stat ]; + buildInputs = [ compat ]; + # depsBuildBuild = [ buildPackages.stdenv.cc ]; + OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp"; - - MKPIC = if stdenv.isDarwin then "no" else "yes"; - MKRELRO = if stdenv.isDarwin then "no" else "yes"; - - INSTALL_FILE = "install -U -c"; - INSTALL_DIR = "xinstall -U -d"; - INSTALL_LINK = "install -U -l h"; - INSTALL_SYMLINK = "install -U -l s"; - - HOST_CC = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; - HOST_CXX = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; - - # libs will be provided by cc-wrapper - LIBCRT0 = ""; - LIBCRTI = ""; - LIBCRTEND = ""; - LIBCRTBEGIN = ""; - LIBC = ""; - LIBUTIL = ""; - LIBSSL = ""; - LIBCRYPTO = ""; - LIBCRYPT = ""; - LIBCURSES = ""; - LIBTERMINFO = ""; - LIBM = ""; - LIBL = ""; - _GCC_CRTBEGIN = ""; - _GCC_CRTBEGINS = ""; - _GCC_CRTEND = ""; - _GCC_CRTENDS = ""; - _GCC_LIBGCCDIR = ""; - _GCC_CRTI = ""; - _GCC_CRTDIR = ""; - _GCC_CRTN = ""; - - "LIBDO.terminfo" = "_external"; - "LIBDO.curses" = "_external"; - - # all dirs will be prefixed with DESTDIR - BINDIR = "/bin"; - LIBDIR = "/lib"; - SHLIBDIR = "/lib"; - INCSDIR = "/include"; - MANDIR = "/share/man"; - INFODIR = "/share/info"; - DOCDIR = "/share/doc"; - LOCALEDIR = "/share/locale"; - X11BINDIR = "/bin"; - X11USRLIBDIR = "/lib"; - X11MANDIR = "/share/man"; - - # NetBSD makefiles should be able to detect this - # but without they end up using gcc on Darwin stdenv - preConfigure = '' - export HAVE_${if stdenv.cc.isClang then "LLVM" else "GCC"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} - - # Parallel building. Needs the space. - export makeFlags+=" -j $NIX_BUILD_CORES" - ''; + HOST_SH = "${buildPackages.bash}/bin/sh"; - postUnpack = '' - # merge together all extra paths - # there should be a better way to do this - sourceRoot=$PWD/$sourceRoot - export NETBSDSRCDIR=$sourceRoot - export BSDSRCDIR=$NETBSDSRCDIR - export _SRC_TOP_=$NETBSDSRCDIR - chmod -R u+w $sourceRoot - for path in $extraPaths; do - cd $path - find . -type d -exec mkdir -p $sourceRoot/\{} \; - find . -type f -exec cp -pr \{} $sourceRoot/\{} \; - chmod -R u+w $sourceRoot - done - - cd $sourceRoot - if [ -d ${attrs.path} ] - then sourceRoot=$sourceRoot/${attrs.path} - fi - ''; + MACHINE_ARCH = { + "i686" = "i386"; + }.${stdenv'.hostPlatform.parsed.cpu.name} + or stdenv'.hostPlatform.parsed.cpu.name; - preFixup = '' - # Remove lingering /usr references - if [ -d $out/usr ]; then - cd $out/usr - find . -type d -exec mkdir -p $out/\{} \; - find . -type f -exec mv \{} $out/\{} \; - fi + MACHINE = { + "x86_64" = "amd64"; + "aarch64" = "evbarm64"; + "i686" = "i386"; + }.${stdenv'.hostPlatform.parsed.cpu.name} + or stdenv'.hostPlatform.parsed.cpu.name; - find $out -type d -empty -delete - ''; + AR = "${stdenv'.cc.targetPrefix or ""}ar"; + CC = "${stdenv'.cc.targetPrefix or ""}cc"; + CPP = if (stdenv'.cc.isClang or false) then "clang-cpp" else "cpp"; + CXX = "${stdenv'.cc.targetPrefix or ""}c++"; + LD = "${stdenv'.cc.targetPrefix or ""}ld"; + STRIP = "${stdenv'.cc.targetPrefix or ""}strip"; + + NETBSD_PATH = attrs.path; + + builder = ./builder.sh; meta = with lib; { maintainers = with maintainers; [matthewbauer]; platforms = platforms.unix; license = licenses.bsd2; }; - }) // (removeAttrs attrs ["makeFlags"])); - - libutil = netBSDDerivation { - path = "lib/libutil"; - version = "8.0"; - sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; - extraPaths = [ - (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") - ]; - }; - - libc = netBSDDerivation { - path = "lib/libc"; - version = "8.0"; - sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; - extraPaths = [ - (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") - ]; - }; - - make = netBSDDerivation { - path = "usr.bin/make"; - sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; - version = "8.0"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ - --replace /bin/rm rm - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ - --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" \ - --replace '-Wl,--warn-shared-textrel' "" \ - --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/mk FILESDIR=/share/mk install - ''; - extraPaths = [ - (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") - ]; - }; - - libcurses = netBSDDerivation { - path = "lib/libcurses"; - version = "8.0"; - sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; - buildInputs = [ nbPackages.libterminfo ]; - makeFlags = [ "INCSDIR=/include" ]; - NIX_CFLAGS_COMPILE = [ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; - propagatedBuildInputs = [ nbPackages.compat ]; - MKDOC = "no"; # missing vfontedpr - postPatch = '' - substituteInPlace printw.c \ - --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ - --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' - substituteInPlace scanw.c \ - --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' - ''; - }; - - libedit = netBSDDerivation { - path = "lib/libedit"; - buildInputs = [ nbPackages.libterminfo libcurses ]; - propagatedBuildInputs = [ nbPackages.compat ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - sed -i '1i #undef bool_t' el.h - substituteInPlace config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - ''; - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - version = "8.0"; - sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; - }; - - nbPackages = rec { + } // lib.optionalAttrs (stdenv'.cc.isClang or false) { + HAVE_LLVM = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); + } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { + HAVE_GCC = lib.head (lib.splitString "." (lib.getVersion stdenv'.cc.cc)); + } // lib.optionalAttrs (attrs.headersOnly or false) { + installPhase = "includesPhase"; + dontBuild = true; + } // attrs)); ## - ## BOOTSTRAPPING + ## START BOOTSTRAPPING ## - makeMinimal = netBSDDerivation rec { + makeMinimal = mkDerivation rec { path = "tools/make"; sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; @@ -274,6 +85,8 @@ let buildInputs = []; nativeBuildInputs = []; + skipIncludesPhase = true; + postPatch = '' patchShebangs configure ${make.postPatch} @@ -298,7 +111,7 @@ let extraPaths = [ make.src ] ++ make.extraPaths; }; - compat = if hostPlatform.isNetBSD then null else netBSDDerivation rec { + compat = if stdenv.hostPlatform.isNetBSD then stdenv else mkDerivation rec { path = "tools/compat"; sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; version = "8.0"; @@ -309,13 +122,15 @@ let ]; # override defaults to prevent infinite recursion - nativeBuildInputs = [ nbBuildPackages.makeMinimal ]; + nativeBuildInputs = [ makeMinimal ]; buildInputs = [ zlib ]; # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = [ "INSTALL=${buildPackages.coreutils}/bin/install" ]; - installFlags = []; + makeFlags = [ + "INSTALL=${buildPackages.coreutils}/bin/install" + "TOOLDIR=$(out)" + ]; RENAME = "-D"; patches = [ ./compat.patch ]; @@ -352,15 +167,6 @@ let substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ --subst-var-by out $out \ --subst-var-by version ${version} - - # Remove lingering /usr references - if [ -d $out/usr ]; then - cd $out/usr - find . -type d -exec mkdir -p $out/\{} \; - find . -type f -exec mv \{} $out/\{} \; - fi - - find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq") @@ -369,19 +175,20 @@ let ] ++ libutil.extraPaths ++ libc.extraPaths; }; - # HACK to ensure parent directories exist. This emulates GNU + # HACK: to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. install = let binstall = writeText "binstall" '' #!${stdenv.shell} for last in $@; do true; done mkdir -p $(dirname $last) xinstall "$@" - ''; in netBSDDerivation { + ''; in mkDerivation { path = "usr.bin/xinstall"; version = "8.0"; sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ nbBuildPackages.makeMinimal mandoc groff ]; + nativeBuildInputs = [ makeMinimal mandoc groff ]; + skipIncludesPhase = true; buildInputs = [ compat fts ]; installPhase = '' runHook preInstall @@ -395,7 +202,7 @@ let ''; }; - fts = netBSDDerivation { + fts = mkDerivation { pname = "fts"; path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; @@ -407,6 +214,7 @@ let (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7") (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; + skipIncludesPhase = true; buildPhase = '' cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ -o lib/libc/gen/fts.o @@ -428,132 +236,434 @@ let ]; }; - stat = netBSDDerivation { + stat = mkDerivation { path = "usr.bin/stat"; version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; - tsort = netBSDDerivation { + tsort = mkDerivation { path = "usr.bin/tsort"; version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; - lorder = netBSDDerivation { + lorder = mkDerivation { path = "usr.bin/lorder"; version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install - mandoc groff ]; + nativeBuildInputs = [ makeMinimal install mandoc groff ]; }; ## ## END BOOTSTRAPPING ## - mtree = netBSDDerivation { + ## + ## START COMMAND LINE TOOLS + ## + make = mkDerivation { + path = "usr.bin/make"; + sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; + version = "8.0"; + postPatch = '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/mk FILESDIR=$out/share/mk install + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") + ]; + }; + + mtree = mkDerivation { path = "usr.sbin/mtree"; version = "8.0"; sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; extraPaths = [ mknod.src ]; }; - mknod = netBSDDerivation { + mknod = mkDerivation { path = "sbin/mknod"; version = "8.0"; sha256 = "0vq66v0hj0r4z2r2z2d3l3c5vh48pvcdmddc8bhm8hzq2civ5df2"; }; - getent = netBSDDerivation { + getent = mkDerivation { path = "usr.bin/getent"; sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; version = "8.0"; patches = [ ./getent.patch ]; }; - getconf = netBSDDerivation { + getconf = mkDerivation { path = "usr.bin/getconf"; sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; version = "8.0"; }; - dict = netBSDDerivation { - path = "share/dict"; + locale = mkDerivation { + path = "usr.bin/locale"; version = "8.0"; - sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; - makeFlags = [ "BINDIR=/share" ]; + sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; + patches = [ ./locale.patch ]; + NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; - fingerd = netBSDDerivation { - path = "libexec/fingerd"; - sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190"; + rpcgen = mkDerivation { + path = "usr.bin/rpcgen"; version = "8.0"; + sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; }; - libterminfo = netBSDDerivation { - path = "lib/libterminfo"; + genassym = mkDerivation { + path = "usr.bin/genassym"; version = "8.0"; - sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; - buildInputs = [ compat tic nbperf ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - substituteInPlace term.c --replace /usr/share $out/share - substituteInPlace setupterm.c --replace '#include <curses.h>' 'void use_env(bool);' + sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; + }; - ''; - postInstall = '' - make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share - make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share install - ''; - extraPaths = [ - (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") - ]; + gencat = mkDerivation { + path = "usr.bin/gencat"; + version = "8.0"; + sha256 = "1696lgh2lhz93247lklvpvkd0f5asg6z27w2g4bmpfijlgw2h698"; }; - nbperf = netBSDDerivation { + nbperf = mkDerivation { path = "usr.bin/nbperf"; version = "8.0"; sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; }; - tic = netBSDDerivation { + tic = mkDerivation { path = "tools/tic"; version = "8.0"; sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; - buildInputs = [ compat nbperf ]; + buildInputs = [ compat ]; + nativeBuildInputs = [ makeMinimal install mandoc groff nbperf ]; + makeFlags = [ "TOOLDIR=$(out)" ]; extraPaths = [ libterminfo.src (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") ]; }; + ## + ## END COMMAND LINE TOOLS + ## + + ## + ## START HEADERS + ## + include = mkDerivation { + path = "include"; + version = "8.0"; + sha256 = "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq"; + nativeBuildInputs = [ makeMinimal install mandoc groff nbperf rpcgen ]; + extraPaths = [ common.src ]; + headersOnly = true; + noCC = true; + # meta.platforms = lib.platforms.netbsd; + makeFlags = [ "RPCGEN_CPP=${buildPackages.gcc-unwrapped}/bin/cpp" ]; + }; + + common = mkDerivation { + path = "common"; + version = "8.0"; + sha256 = "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; + }; + + # The full kernel + sys = mkDerivation { + path = "sys"; + version = "8.0"; + sha256 = "123ilg8fqmp69bw6bs6nh98fpi1v2n9lamrzar61p27ji6sj7g0w"; + propagatedBuildInputs = [ include ]; + #meta.platforms = lib.platforms.netbsd; + extraPaths = [ common.src ]; + MKKMOD = "no"; + }; + + headers = symlinkJoin { + name = "netbsd-headers-8.0"; + paths = [ include ] ++ map (pkg: pkg.override (_: { + installPhase = "includesPhase"; + dontBuild = true; + noCC = true; + meta.platforms = lib.platforms.all; + })) [ sys libpthread ]; + }; + ## + ## END HEADERS + ## + + ## + ## START LIBRARIES + ## + libutil = mkDerivation { + path = "lib/libutil"; + version = "8.0"; + sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; + extraPaths = [ common.src ]; + }; + + libedit = mkDerivation { + path = "lib/libedit"; + version = "8.0"; + sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; + buildInputs = [ libterminfo libcurses ]; + propagatedBuildInputs = [ compat ]; + postPatch = '' + sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + substituteInPlace readline/Makefile --replace /usr/include "$out/include" + ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; + }; - misc = netBSDDerivation { - path = "share/misc"; + libterminfo = mkDerivation { + path = "lib/libterminfo"; version = "8.0"; - sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; - makeFlags = [ "BINDIR=/share" ]; + sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; + buildInputs = [ compat ]; + postPatch = '' + substituteInPlace term.c --replace /usr/share $out/share + substituteInPlace setupterm.c \ + --replace '#include <curses.h>' 'void use_env(bool);' + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/terminfo BINDIR=$out/share install + ''; + extraPaths = [ + (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") + ]; }; - locale = netBSDDerivation { - path = "usr.bin/locale"; + libcurses = mkDerivation { + path = "lib/libcurses"; version = "8.0"; - sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; - patches = [ ./locale.patch ]; - NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; + sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; + buildInputs = [ libterminfo ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; + propagatedBuildInputs = [ compat ]; + MKDOC = "no"; # missing vfontedpr + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace printw.c \ + --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; }; - column = netBSDDerivation { + libkern = mkDerivation { + path = "lib/libkern"; + version = "8.0"; + sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4"; + meta.platforms = lib.platforms.netbsd; + }; + + column = mkDerivation { path = "usr.bin/column"; version = "8.0"; sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; }; + libossaudio = mkDerivation { + path = "lib/libossaudio"; + version = "8.0"; + sha256 = "03azp5anavhjr15sinjlik9792lyf7w4zmkcihlkksrywhs05axh"; + meta.platforms = lib.platforms.netbsd; + postPatch = '' + substituteInPlace rpc/Makefile --replace /usr $out + ''; + }; + + librpcsvc = mkDerivation { + path = "lib/librpcsvc"; + version = "8.0"; + sha256 = "14ri9w6gdhsm4id5ck133syyvbmkbknfa8w0xkklm726nskhfkj7"; + makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; + meta.platforms = lib.platforms.netbsd; + }; + + librt = mkDerivation { + path = "lib/librt"; + version = "8.0"; + sha256 = "078qsi4mg1hyyxr1awvjs9b0c2gicg3zw4vl603g1m9vm8gfxw9l"; + meta.platforms = lib.platforms.netbsd; + }; + + libcrypt = mkDerivation { + path = "lib/libcrypt"; + version = "8.0"; + sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; + meta.platforms = lib.platforms.netbsd; + }; + + libpthread = mkDerivation { + path = "lib/libpthread"; + version = "8.0"; + sha256 = "0pcz61klc3ijf5z2zf8s78nj7bwjfblzjllx7vr4z5qv3m0sdb3j"; + meta.platforms = lib.platforms.netbsd; + }; + + libresolv = mkDerivation { + path = "lib/libresolv"; + version = "8.0"; + sha256 = "11vpb3p2343wyrhw4v9gwz7i0lcpb9ysmfs9gsx56b5gkgipdy4v"; + meta.platforms = lib.platforms.netbsd; + }; + + libm = mkDerivation { + path = "lib/libm"; + version = "8.0"; + sha256 = "0i22603cgj6n00gn2m446v4kn1pk109qs1g6ylrslmihfmiy2h1d"; + meta.platforms = lib.platforms.netbsd; + }; + + i18n_module = mkDerivation { + path = "lib/i18n_module"; + version = "8.0"; + sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; + meta.platforms = lib.platforms.netbsd; + }; + + csu = mkDerivation { + path = "lib/csu"; + version = "8.0"; + sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq"; + meta.platforms = lib.platforms.netbsd; + nativeBuildInputs = [ makeMinimal install mandoc groff flex + yacc genassym gencat lorder tsort stat ]; + extraPaths = [ sys.src ld_elf_so.src ]; + }; + + ld_elf_so = mkDerivation { + path = "libexec/ld.elf_so"; + version = "8.0"; + sha256 = "1jmqpi0kg2daiqnvpwdyfy8rpnszxsm70sxizz0r7wn53xjr5hva"; + meta.platforms = lib.platforms.netbsd; + USE_FORT = "yes"; + extraPaths = [ libc.src ] ++ libc.extraPaths; + }; + + libc = mkDerivation { + path = "lib/libc"; + version = "8.0"; + sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; + USE_FORT = "yes"; + MKPROFILE = "no"; + extraPaths = [ common.src i18n_module.src sys.src + ld_elf_so.src libpthread.src libm.src libresolv.src + librpcsvc.src libutil.src librt.src libcrypt.src ]; + buildInputs = [ buildPackages.netbsd.headers csu ]; + nativeBuildInputs = [ makeMinimal install mandoc groff flex + yacc genassym gencat lorder tsort stat ]; + NIX_CFLAGS_COMPILE = "-B${csu}/lib"; + meta.platforms = lib.platforms.netbsd; + SHLIBINSTALLDIR = "$(out)/lib"; + NLSDIR = "$(out)/share/nls"; + makeFlags = [ "FILESDIR=$(out)/var/db"]; + postInstall = '' + pushd ${buildPackages.netbsd.headers} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + pushd ${csu} + find . -type d -exec mkdir -p $out/\{} \; + find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \; + popd + + NIX_CFLAGS_COMPILE+=" -B$out/lib" + NIX_CFLAGS_COMPILE+=" -I$out/include" + NIX_LDFLAGS+=" -L$out/lib" + + make -C $NETBSDSRCDIR/lib/libpthread $makeFlags + make -C $NETBSDSRCDIR/lib/libpthread $makeFlags install + + make -C $NETBSDSRCDIR/lib/libm $makeFlags + make -C $NETBSDSRCDIR/lib/libm $makeFlags install + + make -C $NETBSDSRCDIR/lib/libresolv $makeFlags + make -C $NETBSDSRCDIR/lib/libresolv $makeFlags install + + make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags + make -C $NETBSDSRCDIR/lib/librpcsv $makeFlags install + + make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags + make -C $NETBSDSRCDIR/lib/i18n_module $makeFlags install + + make -C $NETBSDSRCDIR/lib/libutil $makeFlags + make -C $NETBSDSRCDIR/lib/libutil $makeFlags install + + make -C $NETBSDSRCDIR/lib/librt $makeFlags + make -C $NETBSDSRCDIR/lib/librt $makeFlags install + + make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags + make -C $NETBSDSRCDIR/lib/libcrypt $makeFlags install + ''; + postPatch = '' + substituteInPlace sys/Makefile.inc \ + --replace /usr/include/sys/syscall.h ${buildPackages.netbsd.headers}/include/sys/syscall.h + ''; + }; + # + # END LIBRARIES + # + + # + # START MISCELLANEOUS + # + dict = mkDerivation { + path = "share/dict"; + noCC = true; + version = "8.0"; + sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; + makeFlags = [ "BINDIR=$(out)/share" ]; + }; + + misc = mkDerivation { + path = "share/misc"; + noCC = true; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; + makeFlags = [ "BINDIR=$(out)/share" ]; + }; + + man = mkDerivation { + path = "share/man"; + noCC = true; + version = "8.0"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch0"; + makeFlags = [ "FILESDIR=$(out)/share" ]; + }; + # + # END MISCELLANEOUS + # + }; -in nbPackages +in netbsd diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index 94152d1628d..c111492f2b3 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -155,7 +155,6 @@ rec { "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" - "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport" "/usr/lib/libCRFSuite.dylib" "/usr/lib/libOpenScriptingUtil.dylib" @@ -203,7 +202,6 @@ rec { "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv" "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices" "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary" - "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing" "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211" "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage" diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 4a155a4c403..ebeb3ef0884 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -3,6 +3,12 @@ appleDerivation { dontBuild = true; + postPatch = '' + substituteInPlace Makefile \ + --replace '/bin/mkdir' 'mkdir' \ + --replace '/usr/bin/install' 'install' + ''; + installFlags = [ "EXPORT_DSTDIR=/include/architecture" ]; DSTROOT = "$(out)"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 4fa0c0e3e47..c9473bca06d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }: +{ stdenv, buildPackages, fetchurl, fetchzip, pkgs }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -141,7 +141,7 @@ let # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling fetch = if name == "libiconv" - then fetchurlBoot + then stdenv.fetchurlBoot else fetchurl; in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix index 7725b9f3d1a..f54d667d6ae 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix @@ -101,7 +101,6 @@ "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" - "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport" "/usr/lib/libCRFSuite.dylib" "/usr/lib/libOpenScriptingUtil.dylib" diff --git a/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch new file mode 100644 index 00000000000..9aae2be1d03 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch @@ -0,0 +1,98 @@ +diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +index 09c0e12..ac6b085 100644 +--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp ++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp +@@ -187,6 +187,7 @@ struct DynamicLibrary { + ld::File::ObjcConstraint _objcConstraint; + Options::Platform _platform; + std::vector<Token> _allowedClients; ++ std::vector<Token> _allowableClients; + std::vector<Token> _reexportedLibraries; + std::vector<Token> _symbols; + std::vector<Token> _classes; +@@ -246,6 +247,14 @@ class TBDFile { + }); + } + ++ void parseAllowableClients(DynamicLibrary& lib) { ++ if ( !hasOptionalToken("allowable-clients") ) ++ return; ++ parseFlowSequence([&](Token name) { ++ lib._allowableClients.emplace_back(name); ++ }); ++ } ++ + void parseReexportedDylibs(DynamicLibrary& lib) { + if ( !hasOptionalToken("re-exports") ) + return; +@@ -306,6 +315,21 @@ class TBDFile { + return false; + } + ++ void skipUUIDs(DynamicLibrary& lib) { ++ expectToken("uuids"); ++ while ( true ) { ++ auto token = next(); ++ if ( token == "]" ) ++ break; ++ } ++ } ++ ++ void skipParentUmbrella(DynamicLibrary& lib) { ++ if (!hasOptionalToken("parent-umbrella")) ++ return; ++ next(); ++ } ++ + void parsePlatform(DynamicLibrary& lib) { + expectToken("platform"); + +@@ -410,6 +434,7 @@ class TBDFile { + } + + parseAllowedClients(lib); ++ parseAllowableClients(lib); + parseReexportedDylibs(lib); + parseSymbols(lib); + if ( !hasOptionalToken("-") ) +@@ -455,17 +480,21 @@ class TBDFile { + return result.front(); + } + +- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) { ++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) { + auto selectedArchName = parseAndSelectArchitecture(requestedArchName); + if (selectedArchName.empty()) + throwf("invalid arch"); + ++ if(isTbdV2) ++ skipUUIDs(lib); + parsePlatform(lib); + parseInstallName(lib); + parseCurrentVersion(lib); + parseCompatibilityVersion(lib); + parseSwiftVersion(lib); + parseObjCConstraint(lib); ++ if(isTbdV2) ++ skipParentUmbrella(lib); + parseExportsBlock(lib, selectedArchName); + } + +@@ -476,7 +505,8 @@ public: + _tokenizer.reset(); + DynamicLibrary lib; + expectToken("---"); +- parseDocument(lib, requestedArchName); ++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2"); ++ parseDocument(lib, requestedArchName, isTbdV2); + expectToken("..."); + return lib; + } +@@ -486,6 +516,7 @@ public: + auto token = next(); + if ( token != "---" ) + return false; ++ hasOptionalToken("!tapi-tbd-v2"); + return !parseAndSelectArchitecture(requestedArchName).empty(); + } + diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d41f571cf97..caf85b227be 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,10 +1,18 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook , libcxxabi, libuuid, llvm , libobjc ? null, maloader ? null +, enableDumpNormalizedLibArgs ? false }: let + # We need to use an old version of cctools-port to support linking TBD files + # in the iOS SDK. Note that this only provides support for SDK versions up to + # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the + # default version here, which can support the new TBD format via Apple's + # libtapi. + useOld = stdenv.targetPlatform.isiOS; + # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = stdenv.lib.optionalString @@ -15,27 +23,47 @@ in # Non-Darwin alternatives assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; +assert enableDumpNormalizedLibArgs -> (!useOld); + let baseParams = rec { name = "${targetPrefix}cctools-port-${version}"; - version = "895"; + version = if useOld then "886" else "895"; - src = fetchFromGitHub { + src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "07619027f8311fa61b4a549c75994b88739a82d8"; - sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi"; - }; + # master with https://github.com/tpoechtrager/cctools-port/pull/34 + rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; + sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else if useOld then { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; + } else { + owner = "tpoechtrager"; + repo = "cctools-port"; + rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 + sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; + }); outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool_2 autoreconfHook ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; - patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ]; + patches = [ + ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch + ] ++ stdenv.lib.optionals useOld [ + # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed. + ./undo-unknown-triple.patch + ./ld-tbd-v2.patch + ./support-ios.patch + ]; - __propagatedImpureHostDeps = [ + __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [ # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them "/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.dylib" @@ -48,9 +76,7 @@ let ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; configureFlags = [ "--disable-clang-as" ]; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cctools/Makefile.am --replace libobjc2 "" - '' + '' + postPatch = '' sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp # FIXME: there are far more absolute path references that I don't want to fix right now @@ -99,6 +125,7 @@ let homepage = http://www.opensource.apple.com/source/cctools/; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; }; }; in stdenv.mkDerivation baseParams diff --git a/pkgs/os-specific/darwin/cctools/support-ios.patch b/pkgs/os-specific/darwin/cctools/support-ios.patch new file mode 100644 index 00000000000..f78c6b63ac8 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/support-ios.patch @@ -0,0 +1,13 @@ +diff --git a/cctools/configure.ac b/cctools/configure.ac +index 56e8f24..0b4b3ff 100644 +--- a/cctools/configure.ac ++++ b/cctools/configure.ac +@@ -39,7 +39,7 @@ EXTRACXXFLAGS="" + WARNINGS="" + + case $host_os in +- darwin* ) ++ darwin* | ios*) + isdarwin=yes + AM_CONDITIONAL([ISDARWIN], [true]) + ;; diff --git a/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch new file mode 100644 index 00000000000..7df9bdd16da --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch @@ -0,0 +1,17 @@ +diff --git a/cctools/as/driver.c b/cctools/as/driver.c +index b06d085..c03397a 100644 +--- a/cctools/as/driver.c ++++ b/cctools/as/driver.c +@@ -363,12 +363,6 @@ char **envp) + /* Add -c or clang will run ld(1). */ + new_argv[j] = "-c"; + j++; +- /* cctools-port start */ +- new_argv[j] = "-target"; +- j++; +- new_argv[j] = "unknown-apple-darwin"; +- j++; +- /* cctools-port end */ + new_argv[j] = NULL; + if(execute(new_argv, verbose)) + exit(0); diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix index ec8f948a00b..6fedf0a451e 100644 --- a/pkgs/os-specific/darwin/stubs/default.nix +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScriptBin }: +{ stdenv, writeScriptBin, runtimeShell }: let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' - #!${stdenv.shell} + #!${runtimeShell} echo >&2 "Faking call to ${name} with arguments:" echo >&2 "$@" '') (drv: { diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index f819429f4de..6f7caa8ec02 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -8,7 +8,9 @@ let url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c"; sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc"; }; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { name = "swift-corefoundation"; src = fetchFromGitHub { @@ -34,6 +36,10 @@ in stdenv.mkDerivation { --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \ --replace "cf.LDFLAGS += '-ldispatch" '#' + # Fix sandbox impurities. + substituteInPlace ../lib/script.py \ + --replace '/bin/cp' cp + # Includes xpc for some initialization routine that they don't define anyway, so no harm here substituteInPlace PlugIn.subproj/CFBundlePriv.h \ --replace '#if (TARGET_OS_MAC' '#if (0' @@ -53,7 +59,7 @@ in stdenv.mkDerivation { BUILD_DIR = "./Build"; CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs - + # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra" # and this version is a version from there. No idea how accurate it is. LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize"; diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 8e730058020..3c3fbc6e797 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,20 +1,15 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.7"; + name = "alsa-lib-1.1.8"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "02fw7dw202mjid49w9ki3dsfcyvid5fj488561bdzcm3haw00q4x"; + sha256 = "1pxf0zkmps03l3zzd0fr828xhkg6a8hxljmbxzc2cyj2ls9kmp1w"; }; patches = [ ./alsa-plugin-conf-multilib.patch - (fetchpatch { # pcm interval fix needed for some programs with broken audio, remove when bumping version - name = "pcm-interval-fix.patch"; - url = "http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=b420056604f06117c967b65d43d01536c5ffcbc9"; - sha256 = "1vjfslzsypd6w15zvvrpdk825hm5j0gz16gw7kj290pkbsdgd435"; - }) ]; # Fix pcm.h file in order to prevent some compilation bugs diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix index 60262a14c9b..769b6ecd9bf 100644 --- a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix +++ b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix @@ -1,5 +1,5 @@ { writeScriptBin, stdenv, alsaPlugins }: writeScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" '' - #/bin/sh + #${stdenv.shell} ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@" '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 6cb0c123406..ccad9795301 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -82,8 +82,8 @@ let prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.cc.libc.dev}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${stdenv.lib.getDev stdenv.cc.libc}/include/netinet/in.h" ''; inherit patches; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index f5d3b4f5c4e..4b914860068 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, kernel }: +{ stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -36,12 +36,12 @@ stdenv.mkDerivation { mkdir -p $out/bin tee $out/bin/discrete_vga_poweroff << EOF - #!/bin/sh + #!${runtimeShell} echo -n OFF > /proc/acpi/bbswitch EOF tee $out/bin/discrete_vga_poweron << EOF - #!/bin/sh + #!${runtimeShell} echo -n ON > /proc/acpi/bbswitch EOF diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch new file mode 100644 index 00000000000..0853bcea916 --- /dev/null +++ b/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch @@ -0,0 +1,12 @@ +diff --git a/scripts/meson-install.sh b/scripts/meson-install.sh +index 859ae81..05a1c58 100644 +--- a/scripts/meson-install.sh ++++ b/scripts/meson-install.sh +@@ -7,5 +7,5 @@ fi + + BOLT_DBDIR=$1 + +-echo "Creating database dir: ${BOLT_DBDIR}" +-mkdir -p "${DESTDIR}/${BOLT_DBDIR}" ++# echo "Creating database dir: ${BOLT_DBDIR}" ++# mkdir -p "${DESTDIR}/${BOLT_DBDIR}" diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix new file mode 100644 index 00000000000..f57fb1310c6 --- /dev/null +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -0,0 +1,61 @@ +{ stdenv, meson, ninja, pkgconfig, fetchFromGitLab, + python3, umockdev, gobject-introspection, dbus, + asciidoc, libxml2, libxslt, docbook_xml_dtd_45, docbook_xsl, + glib, systemd, polkit +}: + +stdenv.mkDerivation rec { + pname = "bolt"; + version = "0.7"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "bolt"; + repo = "bolt"; + rev = "${version}"; + sha256 = "0xn2c31kcjh1j76gq1qrcxwjyjyqnsxygkfrvh3xk07qc92f99xd"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + asciidoc libxml2 libxslt docbook_xml_dtd_45 docbook_xsl + ] ++ stdenv.lib.optional (!doCheck) python3; + + buildInputs = [ + glib systemd polkit + ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH=${umockdev.out}/lib/ + ''; + + checkInputs = [ + dbus umockdev gobject-introspection + (python3.withPackages + (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) + ]; + + # meson install tries to create /var/lib/boltd + patches = [ ./0001-skip-mkdir.patch ]; + + postPatch = '' + patchShebangs tests/test-integration + ''; + + mesonFlags = [ + "-Dlocalstatedir=/var" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + meta = with stdenv.lib; { + description = "Thunderbolt 3 device management daemon"; + homepage = https://gitlab.freedesktop.org/bolt/bolt; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.callahad ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 73bea1c7da6..4b287725082 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.3"; + name = "busybox-1.30.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; + sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x"; }; hardeningDisable = [ "format" "pie" ] diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 3d7fb43bbd1..1af37c2168d 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ config, stdenv, fetchFromGitHub, pkgconfig, cmake # dependencies , glib, libXinerama @@ -27,7 +27,7 @@ , wirelessSupport ? true , wirelesstools ? null , nvidiaSupport ? false , libXNVCtrl ? null -, pulseSupport ? false , libpulseaudio ? null +, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null , curlSupport ? true , curl ? null , rssSupport ? curlSupport @@ -68,13 +68,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0yalcpwx85smh6nnvxxsgqi344nk7jzlkkam7yjghm87df4v7xmx"; + sha256 = "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index c6920eab855..f4c83a58823 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 027706c25b7..3b3d5605248 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,61 +1,57 @@ -{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python -, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx +{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3 +, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3 , glibmm , alsaLib, dbus, dbus_cplusplus -, pyqt4, dbus-python }: -stdenv.mkDerivation rec { - name = "ffado-${version}"; - version = "2.4.0"; +let + inherit (python3.pkgs) pyqt5 dbus-python; + python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]); +in stdenv.mkDerivation rec { + pname = "ffado"; + version = "2.4.1"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f"; + sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y"; }; + patches = [ + # fix installing metainfo file + ./fix-build.patch + ]; + outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; + nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ]; prefixKey = "PREFIX="; sconsFlags = [ "DEBUG=False" "ENABLE_ALL=True" - "SERIALIZE_USE_EXPAT=True" "BUILD_TESTS=False" "WILL_DEAL_WITH_XDG_MYSELF=True" "BUILD_MIXER=True" + "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" + "PYPKGDIR=${placeholder "out"}/${python3.sitePackages}" + "BINDIR=${placeholder "bin"}/bin" + "INCLUDEDIR=${placeholder "dev"}/include" + "PYTHON_INTERPRETER=${python.interpreter}" ]; - configurePhase = '' - mkdir -p $out/lib/udev/rules.d $bin/bin $dev/include \ - $out/lib/${python.libPrefix}/site-packages - sconsFlagsArray+=(UDEVDIR=$out/lib/udev/rules.d) - sconsFlagsArray+=(PYPKGDIR=$out/lib/${python.libPrefix}/site-packages) - sconsFlagsArray+=(BINDIR=$bin/bin) - sconsFlagsArray+=(INCLUDEDIR=$dev/include) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)" - ''; - buildInputs = [ - expat libraw1394 libconfig libavc1394 libiec61883 dbus dbus_cplusplus - libxmlxx pyqt4 dbus-python glibmm + libraw1394 + libconfig + libavc1394 + libiec61883 + dbus + dbus_cplusplus + libxmlxx3 + python + glibmm ]; - postPatch = '' - sed '1iimport sys' -i SConstruct - ''; - - postInstall = '' - for exe in $bin/bin/ffado-mixer $bin/bin/ffado-diag; do - wrapProgram $exe \ - --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages \ - --prefix PYTHONPATH : $out/share/libffado/python \ - --prefix PYTHONPATH : ${pyqt4}/lib/${python.libPrefix}/site-packages \ - --prefix PYTHONPATH : ${dbus-python}/lib/${python.libPrefix}/site-packages - done - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.ffado.org; diff --git a/pkgs/os-specific/linux/ffado/fix-build.patch b/pkgs/os-specific/linux/ffado/fix-build.patch new file mode 100644 index 00000000000..7e360932613 --- /dev/null +++ b/pkgs/os-specific/linux/ffado/fix-build.patch @@ -0,0 +1,26 @@ +From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Sun, 3 Mar 2019 11:50:27 +0100 +Subject: [PATCH] Fix build on Nix + +We do not have global /usr. +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 05755e4b..3fbdc1d8 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -537,7 +537,7 @@ env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env ) + env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env ) + env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env ) + env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env ) +-env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env ) ++env['metainfodir'] = Template( env.destdir + env['SHAREDIR'] + "/metainfo" ).safe_substitute( env ) + + env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) ) + +-- +2.19.2 + diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 19c4841cf27..96cc8769a06 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.58"; + version="0.9.58.2"; name="${baseName}-${version}"; - hash="0yxzcy2nxzkyl759mb9fzmynfkz9spzpb0n29rxn8kalw9ccnvrg"; - url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.58.tar.xz"; - sha256="0yxzcy2nxzkyl759mb9fzmynfkz9spzpb0n29rxn8kalw9ccnvrg"; + hash="0ck40b5g1gr5w25qa1lnamwkqnnnbyl14na5c8bq0za0qpf2f8jx"; + url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.58.2.tar.xz"; + sha256="0ck40b5g1gr5w25qa1lnamwkqnnnbyl14na5c8bq0za0qpf2f8jx"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 57135bf515b..df917888dc7 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2018-12-13"; + version = "2019-02-13"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "813fa1fc6fba6638decd974c4a6a2e485069ea15"; - sha256 = "0zspisbrvplgz1plk4ya22h7ilnsk60srk4q38h6n5d18fpn7rdw"; + rev = "710963fe53ee3f227556d36839df3858daf6e232"; + sha256 = "1q3jvlqqxba08s2mrh9hwl0d5w6nhkwj63j0m6amxqpf10k49jxp"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1yr6wcvc3s97h4w0qapma4l17dqsj175an6kmn5w6dppz19g0r5b"; + outputHash = "13gqnr6gm7336pm48v5p37clphwwdmgbrcipsg3w44wdwgc7fa2f"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 1afd1078c03..acafa0376f5 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, intltool, pkgconfig +{ config, stdenv, fetchurl, intltool, pkgconfig , gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl -, pulseaudioSupport ? true, libpulseaudio ? null }: +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }: assert pulseaudioSupport -> libpulseaudio != null; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 3a6e0a08103..b1b5401b88d 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -3,62 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1"; + sha256 = "0hd181sghdk944hxd7d41s7zhqd4dmsbkxipjj27bgisrjixvc11"; }; - patches = [ - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=0d42179e1246f996d334c8bd18deca469fdb1add"; - sha256 = "0w5n3ypwavq5zlyfxpcyvbaf96g59xkwbw9xwpjyzb7h5j264615"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=df426738fb212d62b132d9bb447f0128194e00ab"; - sha256 = "0ps2prjijlcgv1i97xb5ypw840dhkc7ja1aw8zhlbrap7pbgi1mm"; - }) - (fetchurl { - url = "https://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae"; - sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1"; - }) - - #KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - #(fetchurl { # wpa-supplicant only - # url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - # sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - #}) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 7e50babc80a..387792b8631 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-4.14"; + pname = "iw"; + version = "5.0.1"; src = fetchurl { - url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph"; + url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; + sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl ]; - makeFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { description = "Tool to use nl80211"; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index eb0059f55c3..c00fc1761d5 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -75,8 +75,8 @@ let in { linuxHeaders = common { - version = "4.18.3"; - sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1"; + version = "4.19.16"; + sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q"; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1a56e68fa4b..18911044579 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -203,6 +203,7 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; + SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) PSS_MIXER = whenOlder "4.12" yes; @@ -591,6 +592,8 @@ let BLK_DEV_INTEGRITY = yes; + BLK_SED_OPAL = whenAtLeast "4.14" yes; + BSD_PROCESS_ACCT_V3 = yes; BT_HCIUART_BCSP = option yes; @@ -633,6 +636,8 @@ let MLX4_EN_VXLAN = whenOlder "4.8" yes; MLX5_CORE_EN = option yes; + PSI = whenAtLeast "4.20" yes; + MODVERSIONS = whenOlder "4.9" yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MTRR_SANITIZER = yes; diff --git a/pkgs/os-specific/linux/kernel/interpreter-trunc.patch b/pkgs/os-specific/linux/kernel/interpreter-trunc.patch deleted file mode 100644 index a0eceec2258..00000000000 --- a/pkgs/os-specific/linux/kernel/interpreter-trunc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From cb5b020a8d38f77209d0472a0fea755299a8ec78 Mon Sep 17 00:00:00 2001 -From: Linus Torvalds <torvalds@linux-foundation.org> -Date: Thu, 14 Feb 2019 15:02:18 -0800 -Subject: Revert "exec: load_script: don't blindly truncate shebang string" - -This reverts commit 8099b047ecc431518b9bb6bdbba3549bbecdc343. - -It turns out that people do actually depend on the shebang string being -truncated, and on the fact that an interpreter (like perl) will often -just re-interpret it entirely to get the full argument list. - -Reported-by: Samuel Dionne-Riel <samuel@dionne-riel.com> -Acked-by: Kees Cook <keescook@chromium.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - fs/binfmt_script.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c -index d0078cbb718b..7cde3f46ad26 100644 ---- a/fs/binfmt_script.c -+++ b/fs/binfmt_script.c -@@ -42,14 +42,10 @@ static int load_script(struct linux_binprm *bprm) - fput(bprm->file); - bprm->file = NULL; - -- for (cp = bprm->buf+2;; cp++) { -- if (cp >= bprm->buf + BINPRM_BUF_SIZE) -- return -ENOEXEC; -- if (!*cp || (*cp == '\n')) -- break; -- } -+ bprm->buf[BINPRM_BUF_SIZE - 1] = '\0'; -+ if ((cp = strchr(bprm->buf, '\n')) == NULL) -+ cp = bprm->buf+BINPRM_BUF_SIZE-1; - *cp = '\0'; -- - while (cp > bprm->buf) { - cp--; - if ((*cp == ' ') || (*cp == '\t')) --- -cgit 1.2-0.3.lf.el7 - diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 95050a37d28..df5f34ed7db 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.101"; + version = "4.14.104"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16mnrn2lb6xhcmpqx8brk2w4g6igfb1cwkqkpvlnc7003g2zfbql"; + sha256 = "0rz0gg5dhgga58ywaylmvkwz4wlw38z3bxszkdwsb38kclz0whyx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ac6b3dad86b..60890ce6ed7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.23"; + version = "4.19.26"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02hkiz5vlx2qhyi1hxar9d1cr2gfnrpjdrjjkh83yzxci9kjb6rd"; + sha256 = "1z27nxyi3asj1fbkgdb3rw3x9jx2wyfyhddw5dpmjfa7r5k5zi5y"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.20.nix b/pkgs/os-specific/linux/kernel/linux-4.20.nix index 382747b69d9..0ccffd91832 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.20.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.20.10"; + version = "4.20.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1y1w3j65n2k4ibn9clapbhy5m2rbyspg2maql7q9k27vmplnppjk"; + sha256 = "1h8axf8wg3g87kjaan2241zq83n5p5769anmc3i8mrm4y2saswqf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 8edd744ba66..0b5c5f3e095 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.174"; + version = "4.4.176"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fdsxfwhn1xqic56c4aafxw1rdqy7s4w0inmkhcnh98lj3fi2lmy"; + sha256 = "0pf7y4dcnf4mn11wgjd65v09kx3p712ky50w6vrn45v9m80m9ni7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cdebebc7482..5e7aaa4cbc0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.158"; + version = "4.9.161"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vvm2gw5cddy40amxxr1hcw0bis2zldzyicvjhy11wg6j3snk2lc"; + sha256 = "19i8igx0pchzd9wgx595alcji8jxl4bpcg5zd33ymyamgq5q67p1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 6655845efe5..6bc69238591 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.87-153"; + version = "4.14.94-155"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.87"; + modDirVersion = "4.14.94"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1aj3l8pf3nl0mm4m5z4z4iqd72b0nqip4cajmhpfjmq8vkygcw5c"; + sha256 = "1jg4m17y5wkmfmw8y9y9nh14xzw6011gbzlckqabmbazcdpbmf9d"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 82326a2ee73..53478d92dcc 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.20.2019.02.09"; + version = "4.20.2019.02.20"; modDirVersion = "4.20.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "09a546543006b60d44c4c51e7b40cd3ec7837a5e"; - sha256 = "0p187vp9df0nnhawql0f2bj2sdim0f2b424106d41yxc8ayhz0d9"; + rev = "2d1aed5672ad55f86544cb5352560d5395012136"; + sha256 = "0b4swx0z36y4gglkjwxn3x1q0wknv4k2lbprhbing3ms0d45z9f2"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 0cd793db339..375a71789be 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.0-rc6"; - modDirVersion = "5.0.0-rc6"; + version = "5.0-rc8"; + modDirVersion = "5.0.0-rc8"; extraMeta.branch = "5.0"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1315hkjwgm97kh98y8ynsf6fy1b6yf4b74ws6d4s7dls70qzl3yw"; + sha256 = "1i58jljwc2y58ggahmh5643h3nckf3k00d0qnni4s9z1xw3w143p"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 18fd311ca06..4c338b37dec 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,11 +57,4 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; - - # https://github.com/NixOS/nixpkgs/issues/53672 - # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78 - interpreter-trunc = { - name = "interpreter-trunc"; - patch = ./interpreter-trunc.patch; - }; } diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 8b8f5a05f94..1d9497a7edd 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "05bi5ja6f3h3kdi7p9dihlqlfrsmi1wh1r2bdgxc0180xh6g5bnk"; }; + patches = [ + (fetchurl { + # improve reproducibility + url = "https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch"; + sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm"; + }) + ]; + + BUILDDATE = "1970-01-01"; outputs = [ "out" "lib" "dev" ]; installFlags = [ diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix new file mode 100644 index 00000000000..28027fd4510 --- /dev/null +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ledger-udev-rules"; + version = "unstable-2019-02-13"; + + src = fetchFromGitHub { + owner = "LedgerHQ"; + repo = "udev-rules"; + rev = "20cc1651eb551c4855aaa56628c77eaeb3031c22"; + sha256 = "0riydkc4in10pv4qlrvbg3w78qsvxly5caa3zwyqcmsm5fmprqky"; + }; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + mkdir -p $out/lib/udev/rules.d + cp 20-hw1.rules $out/lib/udev/rules.d/20-ledger.rules + ''; + + meta = with stdenv.lib; { + description = "udev rules for Ledger devices"; + license = licenses.asl20; + maintainers = with maintainers; [ asymmetric ]; + platforms = platforms.linux; + homepage = https://github.com/LedgerHQ/udev-rules; + }; +} diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index a32f99600cd..3953ff1915a 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse -, enableDebugBuild ? false }: +{ config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch b/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch deleted file mode 100644 index 5e691ae99e6..00000000000 --- a/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4e4a162d9af283cf71f7310c497672e0c2b8ca3b Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 4 Sep 2018 21:28:38 -0400 -Subject: [PATCH 1/3] in pthread_mutex_trylock, EBUSY out more directly when - possible - -avoid gratuitously setting up and tearing down the robust list pending -slot. ---- - src/thread/pthread_mutex_trylock.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c -index 54876a61..783ca0c4 100644 ---- a/src/thread/pthread_mutex_trylock.c -+++ b/src/thread/pthread_mutex_trylock.c -@@ -15,6 +15,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) - return 0; - } - if (own == 0x7fffffff) return ENOTRECOVERABLE; -+ if (own && (!(own & 0x40000000) || !(type & 4))) return EBUSY; - - if (m->_m_type & 128) { - if (!self->robust_list.off) { -@@ -25,8 +26,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) - self->robust_list.pending = &m->_m_next; - } - -- if ((own && (!(own & 0x40000000) || !(type & 4))) -- || a_cas(&m->_m_lock, old, tid) != old) { -+ if (a_cas(&m->_m_lock, old, tid) != old) { - self->robust_list.pending = 0; - return EBUSY; - } --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch b/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch deleted file mode 100644 index 2f611fc467e..00000000000 --- a/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d1fa28860634af4f0efd70d533a756b51a45f83e Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 4 Sep 2018 21:31:47 -0400 -Subject: [PATCH 2/3] in pthread_mutex_timedlock, avoid repeatedly reading - mutex type field - -compiler cannot cache immutable fields of the mutex object across -external calls it can't see, much less across atomics. ---- - src/thread/pthread_mutex_timedlock.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c -index 0a240e79..f91f4a61 100644 ---- a/src/thread/pthread_mutex_timedlock.c -+++ b/src/thread/pthread_mutex_timedlock.c -@@ -6,7 +6,8 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec - && !a_cas(&m->_m_lock, 0, EBUSY)) - return 0; - -- int r, t, priv = (m->_m_type & 128) ^ 128; -+ int type = m->_m_type; -+ int r, t, priv = (type & 128) ^ 128; - - r = pthread_mutex_trylock(m); - if (r != EBUSY) return r; -@@ -15,9 +16,9 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec - while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); - - while ((r=pthread_mutex_trylock(m)) == EBUSY) { -- if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4))) -+ if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4))) - continue; -- if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK -+ if ((type&3) == PTHREAD_MUTEX_ERRORCHECK - && (r&0x7fffffff) == __pthread_self()->tid) - return EDEADLK; - --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch b/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch deleted file mode 100644 index 783873732af..00000000000 --- a/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2de29bc994029b903a366b8a4a9f8c3c3ee2be90 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 4 Sep 2018 22:56:57 -0400 -Subject: [PATCH 3/3] fix namespace violation for c11 mutex functions - -__pthread_mutex_timedlock is used to implement c11 mutex functions, -and therefore cannot call pthread_mutex_trylock by name. ---- - src/thread/pthread_mutex_timedlock.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c -index f91f4a61..d2bd1960 100644 ---- a/src/thread/pthread_mutex_timedlock.c -+++ b/src/thread/pthread_mutex_timedlock.c -@@ -1,5 +1,7 @@ - #include "pthread_impl.h" - -+int __pthread_mutex_trylock(pthread_mutex_t *); -+ - int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at) - { - if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL -@@ -15,7 +17,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec - int spins = 100; - while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); - -- while ((r=pthread_mutex_trylock(m)) == EBUSY) { -+ while ((r=__pthread_mutex_trylock(m)) == EBUSY) { - if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4))) - continue; - if ((type&3) == PTHREAD_MUTEX_ERRORCHECK --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 6137a5942c2..9835a0c96db 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -28,12 +28,12 @@ let in stdenv.mkDerivation rec { - name = "musl-${version}"; - version = "1.1.20"; + pname = "musl"; + version = "1.1.21"; src = fetchurl { - url = "https://www.musl-libc.org/releases/musl-${version}.tar.gz"; - sha256 = "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4"; + url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; + sha256 = "0i2z52zgc86af1n1gjiz43hgd85mxjgvgn345zsybja9dxpvchn7"; }; enableParallelBuilding = true; @@ -56,29 +56,7 @@ stdenv.mkDerivation rec { url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) - # Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d - # Explicitly flagged for inclusion by distributions using musl - ./fix-file-locking-race.patch - # More specific error reporting - ./tty-more-precise-errors.patch - # Use execveat to impl fexecve when avail (useful for containers) - ./fexecve-execveat.patch - # improve behavior in few cases - ./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch - ./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch - ./0003-fix-namespace-violation-for-c11-mutex-functions.patch - # Fix getaddrinfo usage encountered sometimes in containers - ./fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch - # name_to_handle_at - ./name-to-handle-at.patch - ./max-handle-sz-for-name-to-handle-at.patch - # stacksize bump (upstream) - ./stacksize-bump.patch ]; - preConfigure = '' - configureFlagsArray+=("--syslibdir=$out/lib") - ''; - CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; @@ -87,6 +65,7 @@ stdenv.mkDerivation rec { "--enable-static" "--enable-debug" "--enable-wrapper=all" + "--syslibdir=${placeholder "out"}/lib" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/musl/fexecve-execveat.patch b/pkgs/os-specific/linux/musl/fexecve-execveat.patch deleted file mode 100644 index 6b3894a916c..00000000000 --- a/pkgs/os-specific/linux/musl/fexecve-execveat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e36f80cba6d5eefcc1ee664f16c2c72054b83134 Mon Sep 17 00:00:00 2001 -From: "Joseph C. Sible" <josephcsible@gmail.com> -Date: Sun, 2 Sep 2018 13:42:26 -0400 -Subject: implement fexecve in terms of execveat when it exists - -This lets fexecve work even when /proc isn't mounted. ---- - src/process/fexecve.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/process/fexecve.c b/src/process/fexecve.c -index 6507b429..8be3f760 100644 ---- a/src/process/fexecve.c -+++ b/src/process/fexecve.c -@@ -1,10 +1,15 @@ -+#define _GNU_SOURCE - #include <unistd.h> - #include <errno.h> -+#include <fcntl.h> -+#include "syscall.h" - - void __procfdname(char *, unsigned); - - int fexecve(int fd, char *const argv[], char *const envp[]) - { -+ int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH); -+ if (r != -ENOSYS) return __syscall_ret(r); - char buf[15 + 3*sizeof(int)]; - __procfdname(buf, fd); - execve(buf, argv, envp); --- -cgit v1.2.1 - diff --git a/pkgs/os-specific/linux/musl/fix-file-locking-race.patch b/pkgs/os-specific/linux/musl/fix-file-locking-race.patch deleted file mode 100644 index 2ef91390a69..00000000000 --- a/pkgs/os-specific/linux/musl/fix-file-locking-race.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Tue, 18 Sep 2018 10:03:27 +0300 -Subject: fix race condition in file locking - -The condition occurs when -- thread #1 is holding the lock -- thread #2 is waiting for it on __futexwait -- thread #1 is about to release the lock and performs a_swap -- thread #3 enters the __lockfile function and manages to grab the lock - before thread #1 calls __wake, resetting the MAYBE_WAITERS flag -- thread #1 calls __wake -- thread #2 wakes up but goes again to __futexwait as the lock is - held by thread #3 -- thread #3 releases the lock but does not call __wake as the - MAYBE_WAITERS flag is not set - -This condition results in thread #2 not being woken up. This patch fixes -the problem by making the woken up thread ensure that the flag is -properly set before going to sleep again. - -Mainainer's note: This fixes a regression introduced in commit -c21f750727515602a9e84f2a190ee8a0a2aeb2a1. ---- - src/stdio/__lockfile.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c -index 2ff75d8a..0dcb2a42 100644 ---- a/src/stdio/__lockfile.c -+++ b/src/stdio/__lockfile.c -@@ -8,13 +8,13 @@ int __lockfile(FILE *f) - int owner = f->lock, tid = __pthread_self()->tid; - if ((owner & ~MAYBE_WAITERS) == tid) - return 0; -- for (;;) { -- owner = a_cas(&f->lock, 0, tid); -- if (!owner) return 1; -- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break; -+ owner = a_cas(&f->lock, 0, tid); -+ if (!owner) return 1; -+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) { -+ if ((owner & MAYBE_WAITERS) || -+ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) -+ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1); - } -- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) -- __futexwait(&f->lock, owner, 1); - return 1; - } - --- -cgit v1.2.1 - diff --git a/pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch b/pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch deleted file mode 100644 index d603c16f806..00000000000 --- a/pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Wed, 19 Sep 2018 18:03:22 -0400 -Subject: [PATCH] fix getaddrinfo regression with AI_ADDRCONFIG on some - configurations - -despite not being documented to do so in the standard or Linux -documentation, attempts to udp connect to 127.0.0.1 or ::1 generate -EADDRNOTAVAIL when the loopback device is not configured and there is -no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG -to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6 -configurations, rather than the intended behavior of detecting IPv6 as -unsuppported and producing IPv4-only results. - -previously, only EAFNOSUPPORT was treated as unavailability of the -address family being probed. instead, treat all errors related to -inability to get an address or route as conclusive that the family -being probed is unsupported, and only fail with EAI_SYSTEM on other -errors. - -further improvements may be desirable, such as reporting EAI_AGAIN -instead of EAI_SYSTEM for errors which are expected to be transient, -but this patch should suffice to fix the serious regression. ---- - src/network/getaddrinfo.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c -index ba26847a..e33bfa28 100644 ---- a/src/network/getaddrinfo.c -+++ b/src/network/getaddrinfo.c -@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru - close(s); - if (!r) continue; - } -- if (errno != EAFNOSUPPORT) return EAI_SYSTEM; -+ switch (errno) { -+ case EADDRNOTAVAIL: -+ case EAFNOSUPPORT: -+ case EHOSTUNREACH: -+ case ENETDOWN: -+ case ENETUNREACH: -+ break; -+ default: -+ return EAI_SYSTEM; -+ } - if (family == tf[i]) return EAI_NONAME; - family = tf[1-i]; - } --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch b/pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch deleted file mode 100644 index aa00b4619f8..00000000000 --- a/pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7d7f44253f2d8cfd0a7adf9f918d88aa24d4e012 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Sep 2018 07:00:05 -0700 -Subject: [PATCH] define MAX_HANDLE_SZ for use with name_to_handle_at - -MAX_HANDLE_SZ is described in name_to_handle_at() to contain maximum -expected size for a file handle ---- - include/fcntl.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/fcntl.h b/include/fcntl.h -index 99b21759..4d91338b 100644 ---- a/include/fcntl.h -+++ b/include/fcntl.h -@@ -166,6 +166,7 @@ struct f_owner_ex { - }; - #define FALLOC_FL_KEEP_SIZE 1 - #define FALLOC_FL_PUNCH_HOLE 2 -+#define MAX_HANDLE_SZ 128 - #define SYNC_FILE_RANGE_WAIT_BEFORE 1 - #define SYNC_FILE_RANGE_WRITE 2 - #define SYNC_FILE_RANGE_WAIT_AFTER 4 --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/name-to-handle-at.patch b/pkgs/os-specific/linux/musl/name-to-handle-at.patch deleted file mode 100644 index 10cd8a9947c..00000000000 --- a/pkgs/os-specific/linux/musl/name-to-handle-at.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3e14bbcd1979376b188bfabb816ff828608fb5d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Sep 2018 18:02:11 -0700 -Subject: [PATCH] wireup linux/name_to_handle_at and name_to_handle_at syscalls - ---- - include/fcntl.h | 7 +++++++ - src/linux/name_to_handle_at.c | 10 ++++++++++ - src/linux/open_by_handle_at.c | 8 ++++++++ - 3 files changed, 25 insertions(+) - create mode 100644 src/linux/name_to_handle_at.c - create mode 100644 src/linux/open_by_handle_at.c - -diff --git a/include/fcntl.h b/include/fcntl.h -index 6d8edcd1..99b21759 100644 ---- a/include/fcntl.h -+++ b/include/fcntl.h -@@ -155,6 +155,11 @@ int lockf(int, int, off_t); - #define F_OWNER_PID 1 - #define F_OWNER_PGRP 2 - #define F_OWNER_GID 2 -+struct file_handle { -+ unsigned handle_bytes; -+ int handle_type; -+ unsigned char f_handle[]; -+}; - struct f_owner_ex { - int type; - pid_t pid; -@@ -170,6 +175,8 @@ struct f_owner_ex { - #define SPLICE_F_GIFT 8 - int fallocate(int, int, off_t, off_t); - #define fallocate64 fallocate -+int name_to_handle_at(int, const char *, struct file_handle *, int *, int); -+int open_by_handle_at(int, struct file_handle *, int); - ssize_t readahead(int, off_t, size_t); - int sync_file_range(int, off_t, off_t, unsigned); - ssize_t vmsplice(int, const struct iovec *, size_t, unsigned); -diff --git a/src/linux/name_to_handle_at.c b/src/linux/name_to_handle_at.c -new file mode 100644 -index 00000000..cd4075bd ---- /dev/null -+++ b/src/linux/name_to_handle_at.c -@@ -0,0 +1,10 @@ -+#define _GNU_SOURCE -+#include <fcntl.h> -+#include "syscall.h" -+ -+int name_to_handle_at(int dirfd, const char *pathname, -+ struct file_handle *handle, int *mount_id, int flags) -+{ -+ return syscall(SYS_name_to_handle_at, dirfd, -+ pathname, handle, mount_id, flags); -+} -diff --git a/src/linux/open_by_handle_at.c b/src/linux/open_by_handle_at.c -new file mode 100644 -index 00000000..1c9b6a2b ---- /dev/null -+++ b/src/linux/open_by_handle_at.c -@@ -0,0 +1,8 @@ -+#define _GNU_SOURCE -+#include <fcntl.h> -+#include "syscall.h" -+ -+int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags) -+{ -+ return syscall(SYS_open_by_handle_at, mount_fd, handle, flags); -+} --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/stacksize-bump.patch b/pkgs/os-specific/linux/musl/stacksize-bump.patch deleted file mode 100644 index fb5373005cb..00000000000 --- a/pkgs/os-specific/linux/musl/stacksize-bump.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c0058ab465e950c2c3302d2b62e21cc0b494224b Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 18 Sep 2018 23:11:49 -0400 -Subject: [PATCH 3/4] increase default thread stack/guard size - -stack size default is increased from 80k to 128k. this coincides with -Linux's hard-coded default stack for the main thread (128k is -initially committed; growth beyond that up to ulimit is contingent on -additional allocation succeeding) and GNU ld's default PT_GNU_STACK -size for FDPIC, at least on sh. - -guard size default is increased from 4k to 8k to reduce the risk of -guard page jumping on overflow, since use of just over 4k of stack is -common (PATH_MAX buffers, etc.). ---- - src/internal/pthread_impl.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h -index e73a251f..d491f975 100644 ---- a/src/internal/pthread_impl.h -+++ b/src/internal/pthread_impl.h -@@ -185,8 +185,8 @@ hidden void __inhibit_ptc(void); - extern hidden unsigned __default_stacksize; - extern hidden unsigned __default_guardsize; - --#define DEFAULT_STACK_SIZE 81920 --#define DEFAULT_GUARD_SIZE 4096 -+#define DEFAULT_STACK_SIZE 131072 -+#define DEFAULT_GUARD_SIZE 8192 - - #define DEFAULT_STACK_MAX (8<<20) - #define DEFAULT_GUARD_MAX (1<<20) --- -2.19.0 - diff --git a/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch b/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch deleted file mode 100644 index 06b108559e4..00000000000 --- a/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c84971995b3a6d5118f9357c040572f4c78bcd55 Mon Sep 17 00:00:00 2001 -From: Benjamin Peterson <benjamin@python.org> -Date: Thu, 13 Sep 2018 14:23:42 -0700 -Subject: improve error handling of ttyname_r and isatty - -POSIX allows ttyname(_r) and isatty to return EBADF if passed file -descriptor is invalid. - -maintainer's note: these are optional ("may fail") errors, but it's -non-conforming for ttyname_r to return ENOTTY when it failed for a -different reason. ---- - src/unistd/isatty.c | 6 +++++- - src/unistd/ttyname_r.c | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c -index c8badaf5..75a9c186 100644 ---- a/src/unistd/isatty.c -+++ b/src/unistd/isatty.c -@@ -1,9 +1,13 @@ - #include <unistd.h> -+#include <errno.h> - #include <sys/ioctl.h> - #include "syscall.h" - - int isatty(int fd) - { - struct winsize wsz; -- return !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); -+ unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); -+ if (r == 0) return 1; -+ if (errno != EBADF) errno = ENOTTY; -+ return 0; - } -diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c -index cb364c29..82acb75e 100644 ---- a/src/unistd/ttyname_r.c -+++ b/src/unistd/ttyname_r.c -@@ -9,7 +9,7 @@ int ttyname_r(int fd, char *name, size_t size) - char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2]; - ssize_t l; - -- if (!isatty(fd)) return ENOTTY; -+ if (!isatty(fd)) return errno; - - __procfdname(procname, fd); - l = readlink(procname, name, size); --- -cgit v1.2.1 - diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index f6f6c10112a..9490bc91181 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3950"; + version = "4054"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; + sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 46ea5a55aa5..c0ebb768eea 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -129,6 +129,8 @@ installPhase() { for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do if [ -e "$i" ]; then install -Dm755 $i $bin/bin/$i + # unmodified binary backup for mounting in containers + install -Dm755 $i $bin/origBin/$i patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$libPath $bin/bin/$i fi diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 474d3a69119..c6993d146f1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; postFixup = '' + # Save a copy of persistenced for mounting in containers + mkdir $out/origBin + cp $out/{bin,origBin}/nvidia-persistenced + patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $out/origBin/nvidia-persistenced + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \ $out/bin/nvidia-persistenced ''; diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 3b2a22e452d..93cf33979f4 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure.ac --replace m4_esyscmd m4_esyscmd_s - substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh + substituteInPlace scripts/git_hash.sh --replace /bin/bash ${stdenv.shell} echo ${version} > .scmversion ''; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index baf24b27562..9b915725514 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: +{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }: let @@ -11,7 +11,7 @@ let bin = "${drv}${path}"; in assert name != ""; writeScript "setUID-${name}" '' - #!${stdenv.shell} + #!${runtimeShell} inode=$(stat -Lc %i ${bin}) for file in $(type -ap ${name}); do case $(stat -Lc %a $file) in diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 93e2c097ff7..aeb4d78d0ec 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl +{ config, lib, stdenv, fetchurl , yacc, flex , sysfsutils, kmod, udev -, firmware # Special pcmcia cards. -, config # Special hardware (map memory & port & irq) -, lib # used to generate postInstall script. -}: +, firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards. +, configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq) +}: # used to generate postInstall script. # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { @@ -28,8 +27,8 @@ stdenv.mkDerivation rec { " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if config == null then "" else '' - ln -sf ${config} ./config/config.opts'') + + (if configOpts == null then "" else '' + ln -sf ${configOpts} ./config/config.opts'') ; makeFlags = "LEX=flex"; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 9be17ade149..e177b284bbd 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -3,8 +3,8 @@ , gobject-introspection }: python3.pkgs.buildPythonApplication rec { - pname = "piper-${version}"; - version = "0.2.902"; + pname = "piper"; + version = "0.2.903"; format = "other"; @@ -12,11 +12,11 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb"; + sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; - buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; + buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; postPatch = '' diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index f24f5a5d06f..54fdfb354d1 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Analyze power consumption on Intel-based laptops"; homepage = https://01.org/powertop; license = licenses.gpl2; - maintainers = with maintainers; [ chaoflow fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index 1efbd7bc2c9..b6c16948339 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pscircle-${version}"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "mildlyparallel"; repo = "pscircle"; rev = "v${version}"; - sha256 = "1sxdnhkcr26l29nk0zi1zkvkd7128xglfql47rdb1bx940vflgb6"; + sha256 = "0qsif00dkqa8ky3vl2ycx5anx2yk62nrv47f5lrlqzclz91f00fx"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh index bf6e679660c..75716e40dae 100755 --- a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh +++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ # Executes a hook in case of a change to the # rfkill state. The hook can be passed as diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 054ed471eaa..6ba4f8d4b06 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -1,4 +1,4 @@ -{ stdenv }: +{ stdenv, substituteAll }: # Provides a facility to hook into rfkill changes. # @@ -10,7 +10,7 @@ # Add a hook script in the managed etc directory, e.g.: # etc = [ # { source = pkgs.writeScript "rtfkill.hook" '' -# #!/bin/sh +# #!${pkgs.runtimeShell} # # if [ "$RFKILL_STATE" -eq "1" ]; then # exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on @@ -24,7 +24,13 @@ # Note: this package does not need the binaries # in the rfkill package. -stdenv.mkDerivation { +let + rfkillHook = + substituteAll { + inherit (stdenv) shell; + src = ./rfkill-hook.sh; + }; +in stdenv.mkDerivation { name = "rfkill-udev"; unpackPhase = "true"; @@ -33,11 +39,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out/etc/udev/rules.d/"; cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF - SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" + SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" EOF mkdir -p "$out/bin/"; - cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh" + cp ${rfkillHook} "$out/bin/rfkill-hook.sh" chmod +x "$out/bin/rfkill-hook.sh"; ''; @@ -46,4 +52,4 @@ stdenv.mkDerivation { description = "Rules+hook for udev to catch rfkill state changes"; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index 64e38b41a5f..6c9635b3aee 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, substituteAll, coreutils }: +{ stdenv, runCommand, substituteAll, coreutils }: let name = "service-wrapper-${version}"; @@ -7,10 +7,11 @@ in runCommand "${name}" { script = substituteAll { src = ./service-wrapper.sh; + inherit (stdenv) shell; inherit coreutils; }; - meta = with lib; { + meta = with stdenv.lib; { description = "A convenient wrapper for the systemctl commands, borrow from Ubuntu"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh index 373d86443f0..460bf678e6a 100755 --- a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh +++ b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ ########################################################################### # /usr/bin/service diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 2562bb7e260..8965b5da4f4 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,19 +1,45 @@ -{ stdenv, fetchFromRepoOrCz, fetchpatch, nasm, perl, python, libuuid, mtools, makeWrapper }: +{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }: stdenv.mkDerivation rec { - # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. - # Same issue here https://www.syslinux.org/archives/2019-February/026330.html - name = "syslinux-2019-02-07"; + name = "syslinux-2015-11-09"; - src = fetchFromRepoOrCz { + src = fetchFromGitHub { + owner = "geneC"; repo = "syslinux"; - rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; - sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; + rev = "0cc9a99e560a2f52bcf052fd85b1efae35ee812f"; + sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw"; }; + patches = let + mkURL = commit: patchName: + "https://salsa.debian.org/images-team/syslinux/raw/${commit}/debian/patches/" + + patchName; + in [ + ./perl-deps.patch + (fetchurl { + # ldlinux.elf: Not enough room for program headers, try linking with -N + name = "not-enough-room.patch"; + url = mkURL "a556ad7" "0014_fix_ftbfs_no_dynamic_linker.patch"; + sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw"; + }) + (fetchurl { + # mbr.bin: too big (452 > 440) + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414 + url = mkURL "7468ef0e38c43" "0016-strip-gnu-property.patch"; + sha256 = "17n63b8wz6szv8npla1234g1ip7lqgzx2whrpv358ppf67lq8vwm"; + }) + (fetchurl { + # mbr.bin: too big (452 > 440) + url = mkURL "012e1dd312eb" "0017-single-load-segment.patch"; + sha256 = "0azqzicsjw47b9ppyikhzaqmjl4lrvkxris1356bkmgcaiv6d98b"; + }) + ]; + postPatch = '' substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) + substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) + substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ diff --git a/pkgs/os-specific/linux/syslinux/perl-deps.patch b/pkgs/os-specific/linux/syslinux/perl-deps.patch new file mode 100644 index 00000000000..82c9820809e --- /dev/null +++ b/pkgs/os-specific/linux/syslinux/perl-deps.patch @@ -0,0 +1,81 @@ +http://git.ipxe.org/ipxe.git/commitdiff/719b498 + +diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios +--- syslinux-4.02-orig/gpxe/src/arch/i386/Makefile.pcbios 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02/gpxe/src/arch/i386/Makefile.pcbios 2010-08-06 23:32:57.000000000 +0200 +@@ -24,11 +24,11 @@ + + # Padding rules + # +-PAD_rom = $(PADIMG) --blksize=512 --byte=0xff $@ ++PAD_rom = $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@ + PAD_hrom = $(PAD_rom) + PAD_xrom = $(PAD_rom) +-PAD_dsk = $(PADIMG) --blksize=512 $@ +-PAD_hd = $(PADIMG) --blksize=32768 $@ ++PAD_dsk = $(PERL) $(PADIMG) --blksize=512 $@ ++PAD_hd = $(PERL) $(PADIMG) --blksize=32768 $@ + + # rule to make a non-emulation ISO boot image + NON_AUTO_MEDIA += iso +diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile syslinux-4.02/gpxe/src/Makefile +--- syslinux-4.02-orig/gpxe/src/Makefile 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02/gpxe/src/Makefile 2010-08-06 23:31:15.000000000 +0200 +@@ -31,12 +31,12 @@ + OBJCOPY := $(CROSS_COMPILE)objcopy + NM := $(CROSS_COMPILE)nm + OBJDUMP := $(CROSS_COMPILE)objdump +-PARSEROM := $(PERL) ./util/parserom.pl +-MAKEROM := $(PERL) ./util/makerom.pl +-SYMCHECK := $(PERL) ./util/symcheck.pl +-SORTOBJDUMP := $(PERL) ./util/sortobjdump.pl +-PADIMG := $(PERL) ./util/padimg.pl +-LICENCE := $(PERL) ./util/licence.pl ++PARSEROM := ./util/parserom.pl ++MAKEROM := ./util/makerom.pl ++SYMCHECK := ./util/symcheck.pl ++SORTOBJDUMP := ./util/sortobjdump.pl ++PADIMG := ./util/padimg.pl ++LICENCE := ./util/licence.pl + NRV2B := ./util/nrv2b + ZBIN := ./util/zbin + ELF2EFI32 := ./util/elf2efi32 +diff -ru -x '*~' -x '*.orig' -x '*.rej' syslinux-4.02-orig/gpxe/src/Makefile.housekeeping syslinux-4.02/gpxe/src/Makefile.housekeeping +--- syslinux-4.02-orig/gpxe/src/Makefile.housekeeping 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02/gpxe/src/Makefile.housekeeping 2010-08-06 23:31:49.000000000 +0200 +@@ -456,7 +456,7 @@ + '\n$(2) : $$($(4)_DEPS)\n' \ + '\nTAGS : $$($(4)_DEPS)\n' \ + >> $(2) +- @$(PARSEROM) $(1) >> $(2) ++ @$(PERL) $(PARSEROM) $(1) >> $(2) + + endef + +@@ -657,7 +657,7 @@ + $(QM)$(ECHO) " [LD] $@" + $(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \ + -Map $(BIN)/$*.tmp.map +- $(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map ++ $(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map + + # Keep intermediate object file (useful for debugging) + .PRECIOUS : $(BIN)/%.tmp +@@ -714,7 +714,7 @@ + echo "files are missing a licence declaration:" ;\ + echo $(call unlicensed_deps_list,$<);\ + exit 1,\ +- $(LICENCE) $(call licence_list,$<)) ++ $(PERL) $(LICENCE) $(call licence_list,$<)) + + # Extract compression information from intermediate object file + # +@@ -941,7 +941,7 @@ + CLEANUP += $(BIN)/symtab + + symcheck : $(SYMTAB) +- $(SYMCHECK) $< ++ $(PERL) $(SYMCHECK) $< + + endif # defined(BIN) + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d4623ccd633..2f873f34b88 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,7 +18,7 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); in stdenv.mkDerivation rec { - version = "239.20190110"; + version = "239.20190219"; name = "systemd-${version}"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { owner = "NixOS"; repo = "systemd"; rev = "nixos-v${version}"; - sha256 = "1m9mhv7b4kfa43z79106gpgxx51zlhvvfjrlmimdsvsiw72nzldj"; + sha256 = "0aczg25ih2gfjq810x8rw6rnpr6sw1lz6z0lvlyw2qphyih68b4x"; }; prePatch = let diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 89c6639748d..13a5f2a2bff 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts +{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, runtimeShell }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" - "SHELL=/bin/sh" + "SHELL=${stdenv.shell}" "HDAPS=1" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = import ./update.nix { - inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts; + inherit stdenv lib writeScript coreutils gnugrep jq curl common-updater-scripts runtimeShell; }; meta = { diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 1b6dfd90b1e..b89912434ec 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: +{ stdenv, lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts, runtimeShell }: writeScript "update-tp_smapi" '' -#!${stdenv.shell} +#!${runtimeShell} PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` diff --git a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch b/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch deleted file mode 100644 index a186cdad969..00000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index 0f82af9..70564ff 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1558,6 +1558,7 @@ OBJS += $(CONFIG_MAIN).o - ifdef CONFIG_PRIVSEP - OBJS_priv += $(OBJS_d) ../src/drivers/drivers.o - OBJS_priv += $(OBJS_l2) -+OBJS_priv += ../src/crypto/crypto_openssl.o - OBJS_priv += ../src/utils/os_$(CONFIG_OS).o - OBJS_priv += ../src/utils/$(CONFIG_ELOOP).o - OBJS_priv += ../src/utils/common.o diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 176eef3b861..8b8c23739c2 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libnl +{ stdenv, fetchpatch, fetchurl, openssl, pkgconfig, libnl , dbus, readline ? null, pcsclite ? null }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6"; + version = "2.7"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "https://w1.fi/releases/${name}.tar.gz"; - sha256 = "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl"; + sha256 = "0x1hqyahq44jyla8jl6791nnwrgicrhidadikrnqxsm2nw36pskn"; }; # TODO: Patch epoll so that the dbus actually responds @@ -82,46 +82,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; patches = [ - ./build-fix.patch - - # KRACKAttack.com - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; - sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; - sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; - sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; - sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; - sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; - sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; - }) - (fetchurl { # wpa-supplicant only - url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; - sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; - }) - (fetchurl { - url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; - sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; - }) - - # Unauthenticated EAPOL-Key decryption (CVE-2018-14526) - (fetchurl { - url = "https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"; - sha256 = "0z0zxc9wrikmvciyqpdhx0l5v7qsd8c6b5ph9h5rniqllpr3q34n"; + (fetchpatch { + name = "build-fix.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch?id=e0288112138a70a8acc3ae0196772fd7ccb677ce"; + sha256 = "0ysazfcyn195mvkb1v10mgzzmpmqgv5kwqxwzfbsfhzq5bbaihld"; }) ]; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index db80682d899..586b51ee346 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.13.0"; + version = "6.14.1"; src = fetchurl { - url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1ckpcb0dq964gwdls5q71260r0i8zxgx8nzv8y4sizr37jvpi8mw"; + url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; + sha256 = "1pmxfikkydfi2m0bx1rgaj1ijhwh84zwwxkpw1f0vryvkl7av2gz"; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 6bde7e187d7..2b32357089e 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1mdjxr4p56rlsgnv78bfnlwmniv8hv3hdxnfvqzsmvv88s3z7c66"; + sha256 = "007jyizrkmn97kfkczpsk8128qsd5lj2343vfhd70w82p01qjy21"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 8e11ef6163c..3c7c0dc6156 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.13.0"; + version = "8.0.1"; src = fetchurl { - url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "1dra5h8lgqwzhs95br8x34c5pcrkgrkmpyhiq9vbayf1aarjxfnq"; + url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; + sha256 = "0cf0j781k23fs3jzrd4ranzvqnhdnza8dbaqxx31dk3p7c7168bw"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index a8db20cede7..a6f1629a4b2 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.11.1"; + version = "0.11.4"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l"; + sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a"; }; buildFlagsArray = '' diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 76d92541855..21a5bad72fc 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -51,6 +51,6 @@ buildGoPackage rec { maintainers = with maintainers; [ hodapp ]; # TODO: Fix broken build on macOS. The GitHub presently lists the # FreeBSD build as broken too, but this may change in the future. - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 74e1fda2d42..550a8fa13cc 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl +{ config, stdenv, lib, fetchurl , perl , libcap, libtool, libxml2, openssl -, enablePython ? false, python3 ? null +, enablePython ? config.bind.enablePython or false, python3 ? null , enableSeccomp ? false, libseccomp ? null, buildPackages }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool libxml2 openssl ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp - ++ lib.optional enablePython python3; + ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 2affc8ceff2..04d0a0cf8d0 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -19,6 +19,11 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b"; }; + # Short-lived cross fix, as upstream is migrating to meson anyway. + postPatch = '' + substituteInPlace platform.mk --replace "objdump" "$OBJDUMP" + ''; + outputs = [ "out" "dev" ]; configurePhase = "patchShebangs scripts/"; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index baed66bb4bd..92ec5d97dcd 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.5.0"; + version = "0.6.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "4ad137d336508ab74840a34b3cc488ad884cc75285f5d7842544df1c3adacf8d"; + sha256 = "0yjqjfqr1gc4c9k5z5i7ngcpcwmyp3lzs4xv7allgqvglmw26ji4"; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3b3d997e6aa..082f7ed4e69 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,12 +2,13 @@ # Do not edit! { - version = "0.86.4"; + version = "0.87.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "air_quality" = ps: with ps; [ ]; "air_quality.demo" = ps: with ps; [ ]; + "air_quality.nilu" = ps: with ps; [ ]; "air_quality.opensensemap" = ps: with ps; [ ]; "alarm_control_panel" = ps: with ps; [ ]; "alarm_control_panel.abode" = ps: with ps; [ ]; @@ -21,7 +22,6 @@ "alarm_control_panel.egardia" = ps: with ps; [ ]; "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; - "alarm_control_panel.homekit_controller" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -44,6 +44,10 @@ "alexa.flash_briefings" = ps: with ps; [ ]; "alexa.intent" = ps: with ps; [ ]; "alexa.smart_home" = ps: with ps; [ ]; + "ambient_station" = ps: with ps; [ ]; + "ambient_station.config_flow" = ps: with ps; [ ]; + "ambient_station.const" = ps: with ps; [ ]; + "ambient_station.sensor" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ha-ffmpeg ]; "android_ip_webcam" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; @@ -214,7 +218,6 @@ "camera.xeoma" = ps: with ps; [ ]; "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; "camera.yi" = ps: with ps; [ ha-ffmpeg ]; - "camera.zoneminder" = ps: with ps; [ zm-py ]; "canary" = ps: with ps; [ ]; "cast" = ps: with ps; [ PyChromecast ]; "climate" = ps: with ps; [ ]; @@ -231,7 +234,6 @@ "climate.generic_thermostat" = ps: with ps; [ ]; "climate.heatmiser" = ps: with ps; [ ]; "climate.hive" = ps: with ps; [ ]; - "climate.homekit_controller" = ps: with ps; [ ]; "climate.homematic" = ps: with ps; [ pyhomematic ]; "climate.homematicip_cloud" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; @@ -269,10 +271,12 @@ "cloud.http_api" = ps: with ps; [ ]; "cloud.iot" = ps: with ps; [ ]; "cloud.prefs" = ps: with ps; [ ]; + "cloud.utils" = ps: with ps; [ ]; "cloudflare" = ps: with ps; [ ]; "coinbase" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; "config" = ps: with ps; [ aiohttp-cors ]; + "config.area_registry" = ps: with ps; [ aiohttp-cors ]; "config.auth" = ps: with ps; [ ]; "config.automation" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; @@ -298,8 +302,8 @@ "cover.garadget" = ps: with ps; [ ]; "cover.gogogate2" = ps: with ps; [ ]; "cover.group" = ps: with ps; [ ]; - "cover.homekit_controller" = ps: with ps; [ ]; "cover.homematic" = ps: with ps; [ pyhomematic ]; + "cover.homematicip_cloud" = ps: with ps; [ ]; "cover.insteon" = ps: with ps; [ ]; "cover.isy994" = ps: with ps; [ ]; "cover.knx" = ps: with ps; [ ]; @@ -325,6 +329,9 @@ "daikin" = ps: with ps; [ ]; "daikin.config_flow" = ps: with ps; [ ]; "daikin.const" = ps: with ps; [ ]; + "danfoss_air" = ps: with ps; [ ]; + "danfoss_air.binary_sensor" = ps: with ps; [ ]; + "danfoss_air.sensor" = ps: with ps; [ ]; "datadog" = ps: with ps; [ datadog ]; "deconz" = ps: with ps; [ ]; "deconz.binary_sensor" = ps: with ps; [ ]; @@ -353,11 +360,11 @@ "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; "device_tracker.ddwrt" = ps: with ps; [ ]; "device_tracker.demo" = ps: with ps; [ ]; + "device_tracker.ee_brightbox" = ps: with ps; [ ]; "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.googlehome" = ps: with ps; [ ]; - "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ]; "device_tracker.hitron_coda" = ps: with ps; [ ]; "device_tracker.huawei_lte" = ps: with ps; [ ]; "device_tracker.huawei_router" = ps: with ps; [ ]; @@ -365,7 +372,6 @@ "device_tracker.keenetic_ndms2" = ps: with ps; [ ]; "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; "device_tracker.linksys_smart" = ps: with ps; [ ]; - "device_tracker.locative" = ps: with ps; [ aiohttp-cors ]; "device_tracker.luci" = ps: with ps; [ ]; "device_tracker.meraki" = ps: with ps; [ aiohttp-cors ]; "device_tracker.mikrotik" = ps: with ps; [ ]; @@ -381,6 +387,7 @@ "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; "device_tracker.swisscom" = ps: with ps; [ ]; + "device_tracker.synology_srm" = ps: with ps; [ ]; "device_tracker.tado" = ps: with ps; [ ]; "device_tracker.tesla" = ps: with ps; [ ]; "device_tracker.thomson" = ps: with ps; [ ]; @@ -401,10 +408,14 @@ "discovery" = ps: with ps; [ netdisco ]; "dominos" = ps: with ps; [ aiohttp-cors ]; "doorbird" = ps: with ps; [ ]; + "dovado" = ps: with ps; [ ]; + "dovado.notify" = ps: with ps; [ ]; + "dovado.sensor" = ps: with ps; [ ]; "downloader" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dweet" = ps: with ps; [ ]; "dyson" = ps: with ps; [ ]; + "ecoal_boiler" = ps: with ps; [ ]; "ecobee" = ps: with ps; [ ]; "ecovacs" = ps: with ps; [ ]; "edp_redy" = ps: with ps; [ ]; @@ -470,6 +481,7 @@ "google_assistant.trait" = ps: with ps; [ ]; "google_domains" = ps: with ps; [ ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; + "gpslogger.device_tracker" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; @@ -494,6 +506,13 @@ "homekit.const" = ps: with ps; [ ]; "homekit.util" = ps: with ps; [ ]; "homekit_controller" = ps: with ps; [ ]; + "homekit_controller.alarm_control_panel" = ps: with ps; [ ]; + "homekit_controller.binary_sensor" = ps: with ps; [ ]; + "homekit_controller.climate" = ps: with ps; [ ]; + "homekit_controller.cover" = ps: with ps; [ ]; + "homekit_controller.light" = ps: with ps; [ ]; + "homekit_controller.lock" = ps: with ps; [ ]; + "homekit_controller.switch" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; "homematicip_cloud.config_flow" = ps: with ps; [ ]; @@ -534,6 +553,7 @@ "image_processing.openalpr_cloud" = ps: with ps; [ ]; "image_processing.openalpr_local" = ps: with ps; [ ]; "image_processing.opencv" = ps: with ps; [ numpy ]; + "image_processing.qrcode" = ps: with ps; [ pillow ]; "image_processing.seven_segments" = ps: with ps; [ ]; "image_processing.tensorflow" = ps: with ps; [ numpy pillow protobuf ]; "influxdb" = ps: with ps; [ influxdb ]; @@ -572,13 +592,13 @@ "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; + "light.everlights" = ps: with ps; [ ]; "light.fibaro" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; "light.futurenow" = ps: with ps; [ ]; "light.greenwave" = ps: with ps; [ ]; "light.group" = ps: with ps; [ ]; "light.hive" = ps: with ps; [ ]; - "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; "light.homematicip_cloud" = ps: with ps; [ ]; "light.homeworks" = ps: with ps; [ ]; @@ -638,12 +658,12 @@ "lirc" = ps: with ps; [ ]; "litejet" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; + "locative.device_tracker" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "lock.abode" = ps: with ps; [ ]; "lock.august" = ps: with ps; [ ]; "lock.bmw_connected_drive" = ps: with ps; [ ]; "lock.demo" = ps: with ps; [ ]; - "lock.homekit_controller" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; "lock.kiwi" = ps: with ps; [ ]; @@ -699,7 +719,7 @@ "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.epson" = ps: with ps; [ ]; - "media_player.firetv" = ps: with ps; [ ]; + "media_player.firetv" = ps: with ps; [ firetv ]; "media_player.frontier_silicon" = ps: with ps; [ ]; "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; @@ -935,7 +955,6 @@ "sensor.airvisual" = ps: with ps; [ pyairvisual ]; "sensor.alarmdecoder" = ps: with ps; [ ]; "sensor.alpha_vantage" = ps: with ps; [ ]; - "sensor.ambient_station" = ps: with ps; [ ]; "sensor.amcrest" = ps: with ps; [ ha-ffmpeg ]; "sensor.android_ip_webcam" = ps: with ps; [ ]; "sensor.apcupsd" = ps: with ps; [ ]; @@ -963,6 +982,7 @@ "sensor.canary" = ps: with ps; [ ]; "sensor.cert_expiry" = ps: with ps; [ ]; "sensor.citybikes" = ps: with ps; [ ]; + "sensor.co2signal" = ps: with ps; [ ]; "sensor.coinbase" = ps: with ps; [ ]; "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ]; "sensor.comed_hourly_pricing" = ps: with ps; [ ]; @@ -980,7 +1000,6 @@ "sensor.dht" = ps: with ps; [ ]; "sensor.discogs" = ps: with ps; [ discogs_client ]; "sensor.dnsip" = ps: with ps; [ aiodns ]; - "sensor.dovado" = ps: with ps; [ ]; "sensor.dsmr" = ps: with ps; [ ]; "sensor.dte_energy_bridge" = ps: with ps; [ ]; "sensor.dublin_bus_transport" = ps: with ps; [ ]; @@ -989,6 +1008,7 @@ "sensor.dweet" = ps: with ps; [ ]; "sensor.dyson" = ps: with ps; [ ]; "sensor.ebox" = ps: with ps; [ ]; + "sensor.ecoal_boiler" = ps: with ps; [ ]; "sensor.ecobee" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; "sensor.edp_redy" = ps: with ps; [ ]; @@ -1018,6 +1038,7 @@ "sensor.folder" = ps: with ps; [ ]; "sensor.foobot" = ps: with ps; [ ]; "sensor.freebox" = ps: with ps; [ ]; + "sensor.fritzbox" = ps: with ps; [ ]; "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "sensor.gearbest" = ps: with ps; [ ]; @@ -1045,10 +1066,12 @@ "sensor.hydrawise" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; "sensor.ihc" = ps: with ps; [ defusedxml ]; - "sensor.imap" = ps: with ps; [ aioimaplib ]; + "sensor.iliad_italy" = ps: with ps; [ ]; + "sensor.imap" = ps: with ps; [ ]; "sensor.imap_email_content" = ps: with ps; [ ]; "sensor.influxdb" = ps: with ps; [ influxdb ]; "sensor.insteon" = ps: with ps; [ ]; + "sensor.integration" = ps: with ps; [ ]; "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "sensor.iota" = ps: with ps; [ ]; "sensor.iperf3" = ps: with ps; [ ]; @@ -1128,12 +1151,14 @@ "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; + "sensor.recollect_waste" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; "sensor.rfxtrx" = ps: with ps; [ ]; "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ]; + "sensor.rova" = ps: with ps; [ ]; "sensor.rtorrent" = ps: with ps; [ ]; "sensor.ruter" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; @@ -1234,7 +1259,6 @@ "sensor.zamg" = ps: with ps; [ ]; "sensor.zestimate" = ps: with ps; [ xmltodict ]; "sensor.zigbee" = ps: with ps; [ ]; - "sensor.zoneminder" = ps: with ps; [ zm-py ]; "sensor.zwave" = ps: with ps; [ ]; "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; @@ -1247,6 +1271,14 @@ "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smartthings" = ps: with ps; [ aiohttp-cors ]; + "smartthings.binary_sensor" = ps: with ps; [ aiohttp-cors ]; + "smartthings.config_flow" = ps: with ps; [ ]; + "smartthings.const" = ps: with ps; [ ]; + "smartthings.fan" = ps: with ps; [ aiohttp-cors ]; + "smartthings.light" = ps: with ps; [ aiohttp-cors ]; + "smartthings.smartapp" = ps: with ps; [ ]; + "smartthings.switch" = ps: with ps; [ aiohttp-cors ]; "smhi" = ps: with ps; [ ]; "smhi.config_flow" = ps: with ps; [ ]; "smhi.const" = ps: with ps; [ ]; @@ -1277,6 +1309,7 @@ "switch.digitalloggers" = ps: with ps; [ ]; "switch.dlink" = ps: with ps; [ ]; "switch.doorbird" = ps: with ps; [ ]; + "switch.ecoal_boiler" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ]; "switch.edp_redy" = ps: with ps; [ ]; "switch.elkm1" = ps: with ps; [ ]; @@ -1291,7 +1324,6 @@ "switch.hikvisioncam" = ps: with ps; [ ]; "switch.hive" = ps: with ps; [ ]; "switch.hlk_sw16" = ps: with ps; [ ]; - "switch.homekit_controller" = ps: with ps; [ ]; "switch.homematic" = ps: with ps; [ pyhomematic ]; "switch.homematicip_cloud" = ps: with ps; [ ]; "switch.hook" = ps: with ps; [ ]; @@ -1302,6 +1334,7 @@ "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; "switch.konnected" = ps: with ps; [ aiohttp-cors ]; + "switch.lcn" = ps: with ps; [ ]; "switch.lightwave" = ps: with ps; [ ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; @@ -1351,7 +1384,7 @@ "switch.tradfri" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.tuya" = ps: with ps; [ ]; - "switch.unifi" = ps: with ps; [ ]; + "switch.unifi" = ps: with ps; [ aiounifi ]; "switch.upcloud" = ps: with ps; [ ]; "switch.velbus" = ps: with ps; [ ]; "switch.vera" = ps: with ps; [ ]; @@ -1366,8 +1399,8 @@ "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; "switch.zigbee" = ps: with ps; [ ]; - "switch.zoneminder" = ps: with ps; [ zm-py ]; "switch.zwave" = ps: with ps; [ ]; + "system_health" = ps: with ps; [ aiohttp-cors ]; "system_log" = ps: with ps; [ aiohttp-cors ]; "tado" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ ]; @@ -1390,6 +1423,7 @@ "tradfri" = ps: with ps; [ ]; "tradfri.config_flow" = ps: with ps; [ ]; "tradfri.const" = ps: with ps; [ ]; + "transmission" = ps: with ps; [ transmissionrpc ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tts.amazon_polly" = ps: with ps; [ boto3 ]; "tts.baidu" = ps: with ps; [ ]; @@ -1402,7 +1436,7 @@ "tts.yandextts" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; - "unifi" = ps: with ps; [ ]; + "unifi" = ps: with ps; [ aiounifi ]; "unifi.const" = ps: with ps; [ ]; "unifi.controller" = ps: with ps; [ ]; "unifi.errors" = ps: with ps; [ ]; @@ -1412,6 +1446,9 @@ "upnp.const" = ps: with ps; [ ]; "upnp.device" = ps: with ps; [ ]; "usps" = ps: with ps; [ ]; + "utility_meter" = ps: with ps; [ ]; + "utility_meter.const" = ps: with ps; [ ]; + "utility_meter.sensor" = ps: with ps; [ ]; "vacuum" = ps: with ps; [ ]; "vacuum.demo" = ps: with ps; [ ]; "vacuum.dyson" = ps: with ps; [ ]; @@ -1469,10 +1506,11 @@ "zha.binary_sensor" = ps: with ps; [ ]; "zha.config_flow" = ps: with ps; [ ]; "zha.const" = ps: with ps; [ ]; - "zha.entities" = ps: with ps; [ ]; + "zha.core" = ps: with ps; [ ]; + "zha.device_entity" = ps: with ps; [ ]; + "zha.entity" = ps: with ps; [ ]; "zha.event" = ps: with ps; [ ]; "zha.fan" = ps: with ps; [ ]; - "zha.helpers" = ps: with ps; [ ]; "zha.light" = ps: with ps; [ ]; "zha.sensor" = ps: with ps; [ ]; "zha.switch" = ps: with ps; [ ]; @@ -1482,6 +1520,10 @@ "zone.const" = ps: with ps; [ ]; "zone.zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; + "zoneminder.binary_sensor" = ps: with ps; [ zm-py ]; + "zoneminder.camera" = ps: with ps; [ zm-py ]; + "zoneminder.sensor" = ps: with ps; [ zm-py ]; + "zoneminder.switch" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave.config_flow" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 27eff24d704..519ae013f1c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -20,18 +20,35 @@ let # Override the version of some packages pinned in Home Assistant's setup.py (mkOverride "aiohttp" "3.5.4" "9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf") - (mkOverride "astral" "1.7.1" - "88086fd2006c946567285286464b2da3294a3b0cbba4410b7008ec2458f82a07") + (mkOverride "astral" "1.8" + "7d624ccd09c591e56103f077733bc36194940076939875d84909d5086afd99c8") (mkOverride "async-timeout" "3.0.1" "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.5" "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f") - (mkOverride "pyjwt" "1.6.4" - "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176") - (mkOverride "cryptography" "2.3.1" - "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.6.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176"; + }; + doCheck = false; # https://github.com/jpadilla/pyjwt/issues/382 + }); + }) + (self: super: { + cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec { + version = "2.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6"; + }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.idna ]; + checkInputs = with self; [ pytest_3 pretend iso8601 pytz hypothesis ]; + }); + }) (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") (mkOverride "python-slugify" "1.2.6" @@ -87,7 +104,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.86.4"; + hassVersion = "0.87.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -102,7 +119,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "13yyzcwz44gz6j0fh1awws83p6fmpib9ribm1453qr172knanhjy"; + sha256 = "1f1l4a78dix1mwkpg84b3iw69nxx1dqbl3c698qg857kwac6w9d5"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch b/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch deleted file mode 100644 index 21918764436..00000000000 --- a/pkgs/servers/home-assistant/dont-import-platformio-esptool.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py -index 26f42c1..529d2e0 100644 ---- a/esphomeyaml/__main__.py -+++ b/esphomeyaml/__main__.py -@@ -167,13 +167,10 @@ def compile_program(args, config): - - - def upload_using_esptool(config, port): -- import esptool -- - path = os.path.join(CORE.build_path, '.pioenvs', CORE.name, 'firmware.bin') -- cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset', -+ cmd = ['@esptool@/bin/esptool.py', '--before', 'default_reset', '--after', 'hard_reset', - '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path] -- # pylint: disable=protected-access -- return run_external_command(esptool._main, *cmd) -+ return run_external_command(*cmd) - - - def upload_program(config, args, host): -diff --git a/esphomeyaml/platformio_api.py b/esphomeyaml/platformio_api.py -index df29491..f991701 100644 ---- a/esphomeyaml/platformio_api.py -+++ b/esphomeyaml/platformio_api.py -@@ -13,12 +13,9 @@ _LOGGER = logging.getLogger(__name__) - - - def run_platformio_cli(*args, **kwargs): -- import platformio.__main__ -- - os.environ["PLATFORMIO_FORCE_COLOR"] = "true" -- cmd = ['platformio'] + list(args) -- return run_external_command(platformio.__main__.main, -- *cmd, **kwargs) -+ cmd = ['@platformio@/bin/platformio'] + list(args) -+ return run_external_command(*cmd, **kwargs) - - - def run_platformio_cli_run(config, verbose, *args, **kwargs): -diff --git a/esphomeyaml/util.py b/esphomeyaml/util.py -index eebb4b7..9e9e58f 100644 ---- a/esphomeyaml/util.py -+++ b/esphomeyaml/util.py -@@ -4,6 +4,7 @@ import io - import logging - import re - import sys -+import subprocess - - _LOGGER = logging.getLogger(__name__) - -@@ -79,42 +80,25 @@ class RedirectText(object): - return True - - --def run_external_command(func, *cmd, **kwargs): -- def mock_exit(return_code): -- raise SystemExit(return_code) -- -- orig_argv = sys.argv -- orig_exit = sys.exit # mock sys.exit -+def run_external_command(*cmd, **kwargs): - full_cmd = u' '.join(shlex_quote(x) for x in cmd) - _LOGGER.info(u"Running: %s", full_cmd) - -- orig_stdout = sys.stdout -- sys.stdout = RedirectText(sys.stdout) -- orig_stderr = sys.stderr -- sys.stderr = RedirectText(sys.stderr) -- - capture_stdout = kwargs.get('capture_stdout', False) - if capture_stdout: -- cap_stdout = sys.stdout = io.BytesIO() -+ cap_stdout = io.BytesIO() -+ else: -+ cap_stdout = sys.stdout - - try: -- sys.argv = list(cmd) -- sys.exit = mock_exit -- return func() or 0 -- except KeyboardInterrupt: -- return 1 -- except SystemExit as err: -- return err.args[0] -+ completed_process = subprocess.run(cmd, -+ stdout=RedirectText(cap_stdout), -+ stderr=RedirectText(sys.stderr)) -+ return completed_process.returncode - except Exception as err: # pylint: disable=broad-except - _LOGGER.error(u"Running command failed: %s", err) - _LOGGER.error(u"Please try running %s locally.", full_cmd) - finally: -- sys.argv = orig_argv -- sys.exit = orig_exit -- -- sys.stdout = orig_stdout -- sys.stderr = orig_stderr -- - if capture_stdout: - # pylint: disable=lost-exception - return cap_stdout.getvalue() -diff --git a/setup.py b/setup.py -index 78a5378..8ce80de 100755 ---- a/setup.py -+++ b/setup.py -@@ -23,12 +23,10 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__) - - REQUIRES = [ - 'voluptuous>=0.11.1', -- 'platformio>=3.5.3', - 'pyyaml>=3.12', - 'paho-mqtt>=1.3.1', - 'colorlog>=3.1.2', - 'tornado>=5.0.0', -- 'esptool>=2.3.1', - 'typing>=3.0.0', - 'protobuf>=3.4', - 'tzlocal>=1.4', diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index e089c83239b..d4420be94b5 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -1,29 +1,27 @@ -{ lib, python3, fetchpatch, substituteAll, platformio, esptool }: +{ lib, python3, fetchpatch, platformio, esptool, git }: python3.pkgs.buildPythonApplication rec { - pname = "esphomeyaml"; - version = "1.10.1"; + pname = "esphome"; + version = "1.11.2"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "426cd545b4e9505ce5b4f5c63d2d54cb038f93fe3ba9d4d56b6b6431b222485d"; + sha256 = "0kg8fqv3mv8i852jr42p4mipa9wjlzjwj60j1r2zpgzgr8p8wfs8"; }; - patches = [ - (substituteAll { - src = ./dont-import-platformio-esptool.patch; - inherit platformio esptool; - }) - ]; - - postPatch = '' - # typing is part of the standard library since Python 3.5 - substituteInPlace setup.py --replace "'typing>=3.0.0'," "" - ''; + ESPHOME_USE_SUBPROCESS = ""; propagatedBuildInputs = with python3.pkgs; [ voluptuous pyyaml paho-mqtt colorlog - tornado protobuf tzlocal pyserial + tornado protobuf tzlocal pyserial ifaddr + ]; + + makeWrapperArgs = [ + # platformio is used in esphomeyaml/platformio_api.py + # esptool is used in esphomeyaml/__main__.py + # git is used in esphomeyaml/writer.py + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--set ESPHOME_USE_SUBPROCESS ''" ]; checkPhase = '' @@ -36,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; - homepage = https://esphomelib.com/esphomeyaml; + homepage = https://esphome.io/; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1ea9e96d8f9..35fafa3e100 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190121.1"; + version = "20190203.0"; src = fetchPypi { inherit pname version; - sha256 = "7d1e127249dbefd0c8e101d8b178eeae6bf76a0296d8b22ed33759e23ef07856"; + sha256 = "8f71a63e1c35ec088ed46e4529b30df7dd44f4968d84068306718c912d3a1410"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bf82e916590..64e57f64236 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.37"; + version = "2.4.38"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "09npb7vlz5sizgj0nvl0bqxj9zig29ipkp07fgmw5ykjcxfdr61l"; + sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 3f4f99acbc6..d86a78187e5 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.8"; - sha256 = "11q7njr0khv8hb96bclyw5f75gvm12nw3jjgmq9rifbym2yazgd8"; + version = "1.15.9"; + sha256 = "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4"; }) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index a418e2af468..33443552f60 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0nxkszdgs6fs86j6w1lf3vhxvjh1hw2jmrii5icqx9a9xqgg74rw"; + sha256 = "1sgy9apffi6daf3zsmkg8b3wzbhz8x9j7pr45mvqsf2hwm1ds6sr"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c3fcd13a41f..431e66e38fb 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec { homepage = http://spamassassin.apache.org/; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ peti qknight ]; }; } diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix index 0e290f13518..7bd7df84924 100644 --- a/pkgs/servers/mail/system-sendmail/default.nix +++ b/pkgs/servers/mail/system-sendmail/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeText }: +{ stdenv, writeText, runtimeShell }: let script = writeText "script" '' - #!/bin/sh + #!${runtimeShell} if command -v sendmail > /dev/null 2>&1 && [ "$(command -v sendmail)" != "{{MYPATH}}" ]; then exec sendmail "$@" diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 46d74c06013..783c0b5bde8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,13 +23,18 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.1.1"; + version = "0.99.2"; src = fetchPypi { inherit pname version; - sha256 = "1ych13x3c2cam7af4q2ariwvzwvr65g3j2x8ajjn33ydwxxbqbg6"; + sha256 = "0y6vic0fjx9k8178vsns0ab4ngqx8qhiyampqnil0b1biqcd68bw"; }; + patches = [ + # adds an entry point for the service + ./homeserver-script.patch + ]; + propagatedBuildInputs = [ bcrypt bleach @@ -70,13 +75,13 @@ in buildPythonApplication rec { checkInputs = [ mock parameterized ]; checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" trial tests + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; meta = with stdenv.lib; { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = with maintainers; [ ralith roblabla ekleog ]; + maintainers = with maintainers; [ ralith roblabla ekleog pacien ]; }; } diff --git a/pkgs/servers/matrix-synapse/homeserver-script.patch b/pkgs/servers/matrix-synapse/homeserver-script.patch new file mode 100644 index 00000000000..95e28196a22 --- /dev/null +++ b/pkgs/servers/matrix-synapse/homeserver-script.patch @@ -0,0 +1,21 @@ +diff --git a/homeserver b/homeserver +new file mode 120000 +index 0000000..2f1d413 +--- /dev/null ++++ b/homeserver +@@ -0,0 +1,1 @@ ++synapse/app/homeserver.py +\ No newline at end of file +diff --git a/setup.py b/setup.py +index b00c2af..c7f6e0a 100755 +--- a/setup.py ++++ b/setup.py +@@ -92,6 +92,6 @@ setup( + include_package_data=True, + zip_safe=False, + long_description=long_description, +- scripts=["synctl"] + glob.glob("scripts/*"), ++ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), + cmdclass={'test': TestCommand}, + ) + diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix new file mode 100644 index 00000000000..ea3fbd58e2e --- /dev/null +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "mautrix-unstable-${version}"; + version = "2019-02-11"; + + goPackagePath = "maunium.net/go/mautrix-whatsapp"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "mautrix-whatsapp"; + rev = "f689297ba6704265a938951f307b365e829fcfa1"; + sha256 = "1658bika9ylhm64k9lxavp43dxilygn6vx7yn6y1l10j8by2akxk"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/tulir/mautrix-whatsapp; + description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; + license = licenses.agpl3; + maintainers = with maintainers; [ vskilet ]; + }; +} diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/pkgs/servers/mautrix-whatsapp/deps.nix new file mode 100644 index 00000000000..8a1543ac012 --- /dev/null +++ b/pkgs/servers/mautrix-whatsapp/deps.nix @@ -0,0 +1,201 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go"; + fetch = { + type = "git"; + url = "https://github.com/Baozisoftware/qrcode-terminal-go"; + rev = "c0650d8dff0f"; + sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"; + }; + } + { + goPackagePath = "github.com/Rhymen/go-whatsapp"; + fetch = { + type = "git"; + url = "https://github.com/Rhymen/go-whatsapp"; + rev = "2ca6af00572c"; + sha256 = "0lrscj59n9nmd5z0h9r2c952m0da672r3aj33bi443ap0h97w19i"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.10.0"; + sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/skip2/go-qrcode"; + fetch = { + type = "git"; + url = "https://github.com/skip2/go-qrcode"; + rev = "dc11ecdae0a9"; + sha256 = "0mc70hsn5x2a66a9sbwlq51cng2s1aq7rw4pr9pif4xdzflkl057"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "ff983b9c42bc"; + sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "915654e7eabc"; + sha256 = "0fzd7n2yc4qnnf2wk21zxy6gb01xviq2z1dzrbqcn8p1s4fjsqw5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "48ac38b7c8cb"; + sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "maunium.net/go/mauflag"; + fetch = { + type = "git"; + url = "https://github.com/tulir/mauflag.git"; + rev = "v1.0.0"; + sha256 = "09jv1819jwq5i29y6ngf4j4ii6qwlshydvprfvsfplc419dkz1vx"; + }; + } + { + goPackagePath = "maunium.net/go/maulogger"; + fetch = { + type = "git"; + url = "https://github.com/tulir/maulogger.git"; + rev = "v2.0.0"; + sha256 = "0qz4cpaqvcmrj3fb2bb6yrhw3k5h51crskricyqgg1b7aklphan5"; + }; + } + { + goPackagePath = "maunium.net/go/mautrix"; + fetch = { + type = "git"; + url = "https://github.com/tulir/mautrix-go.git"; + rev = "v0.1.0-alpha.3"; + sha256 = "12nlyij57ss2a5d1f1k1vsmjjvxp1fannlrbnp2jsj6rrsq0d2wr"; + }; + } + { + goPackagePath = "maunium.net/go/mautrix-appservice"; + fetch = { + type = "git"; + url = "https://github.com/tulir/mautrix-appservice-go.git"; + rev = "v0.1.0-alpha.3"; + sha256 = "17y11wgqbrafbq6bnn4rp2lzd50fjz9d6f8j3382jsara7ps95vr"; + }; + } +] diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 132f812bf46..b677b6080d1 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, patchelf }: +{ stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let bootstrap = fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # otherwise it fails spectacularly. mkdir -p $out/bin cat << EOF > $out/bin/meteor - #!${stdenv.shell} + #!${runtimeShell} if [[ ! -f \$HOME/.meteor/package-metadata/v2.0.1/packages.data.db ]]; then mkdir -p \$HOME/.meteor/package-metadata/v2.0.1 diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1dcac1f9a82..faec807c4b8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2019-01-31T00-31-19Z"; + version = "2019-02-26T19-51-46Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0rvvjgnbk9khi443bahrg6iqa5lhmv8gydg96vgkrby13r1yy84k"; + sha256 = "1f2c7wzcb47msb0iqrcc0idz39wdm9fz61q835ks1nx4qs6hi2db"; }; goPackagePath = "github.com/minio/minio"; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 63925d30c64..f15b7ca2e82 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = https://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; }; } diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 90524483360..c8eb0731924 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://bosun.org; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1d8f9ca3c79..721f4a04302 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,20 +1,22 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.4.3"; + version = "6.0.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; + excludedPackages = [ "release_publisher" ]; + src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "11fwb80a9qqlzmg11vw4llfa0mz80jkljg0gmp0sbv6c9jspqncv"; + sha256 = "1dacji3b8iqfx92cb6psrhvg2hym8xl1lzfn7yvyss4vjj7pmbbc"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "141msgrxdn4nmwp6jhh3zg5zcbj82pxdr7ysc5v28rh9paj79yyd"; + sha256 = "02c7klma5zl1mcis7gnbfi56i59ps7i757yyy8v9gnp5ynnb55v4"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index a0f7341571c..3e6eaa4766e 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl }: +, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, runtimeShell }: with stdenv.lib; @@ -50,7 +51,7 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p $out cat <<_EOF > $out/share -#!${stdenv.shell} +#!${runtimeShell} exit 0 _EOF chmod 755 $out/share diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index c6c52bcbda5..d3ddfe26d4a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -28,6 +28,6 @@ buildGoPackage rec { license = licenses.mit; homepage = https://www.influxdata.com/time-series-platform/telegraf/; maintainers = with maintainers; [ mic92 roblabla ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e26a97dc6f3..d0d0480e5ea 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "15.0.4"; + version = "15.0.5"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0xwg7p31y1pkjk1pzygh9shpqxnfkafrab52j7in7xblq53v0zgq"; + sha256 = "125ra0rdgk17d8s80i54w0s58dqvjgkdpcxbczchqd3sg6dqcqa6"; }; installPhase = '' diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index a25eff5b05c..c4dbbbddffb 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx-sso-${version}"; - version = "0.15.1"; + version = "0.16.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "0mm6yhm22wf32yl9wvl8fy9m5jjd491khyy4cl73fn381h3n5qi2"; + sha256 = "062ni683x22ss6kj7jmdx0nrhrcgmzsfw24z5l0jj7b4wvpcn02b"; }; postInstall = '' diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 63b222529a8..d165a34d5f6 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.9.0"; + version = "3.10.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "1kf524j7wmvbjrr3grrhfddv3c3niddhj2f6m7hz9pqvf7nykvi4"; + sha256 = "0v7srssivhx0bswvbr8ifaahcknlajwqqhr449v5zzi6nbyc613a"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 1d3240fae71..7880c6db7fd 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, mono, v8 }: +{ stdenv, fetchFromGitHub, git, mono, v8, runtimeShell }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!${stdenv.shell} + #!${runtimeShell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index cf807e70596..36b29b57bf9 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; maintainers = with maintainers; [ mdaiter ]; + knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; } diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index a09b4543cbb..170b0d5f22f 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; license = licenses.asl20; + knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; }; } diff --git a/pkgs/servers/openafs/1.8/linux-4.20.patch b/pkgs/servers/openafs/1.8/linux-4.20.patch new file mode 100644 index 00000000000..bb896d82b69 --- /dev/null +++ b/pkgs/servers/openafs/1.8/linux-4.20.patch @@ -0,0 +1,62 @@ +--- a/src/afs/LINUX/osi_machdep.h ++++ b/src/afs/LINUX/osi_machdep.h +@@ -75,7 +75,14 @@ + #if defined(HAVE_LINUX_CRED_H) + #include "h/cred.h" + #endif +-#if defined(HAVE_LINUX_CURRENT_KERNEL_TIME) ++ ++#if defined(HAVE_LINUX_KTIME_GET_COARSE_REAL_TS64) ++static inline time_t osi_Time(void) { ++ struct timespec64 xtime; ++ ktime_get_coarse_real_ts64(&xtime); ++ return xtime.tv_sec; ++} ++#elif defined(HAVE_LINUX_CURRENT_KERNEL_TIME) + static inline time_t osi_Time(void) { + struct timespec xtime; + xtime = current_kernel_time(); +--- a/src/cf/linux-kernel-func.m4 ++++ b/src/cf/linux-kernel-func.m4 +@@ -72,6 +72,10 @@ AC_CHECK_LINUX_FUNC([iter_file_splice_write], + AC_CHECK_LINUX_FUNC([kernel_setsockopt], + [#include <linux/net.h>], + [kernel_setsockopt(NULL, 0, 0, NULL, 0);]) ++AC_CHECK_LINUX_FUNC([ktime_get_coarse_real_ts64], ++ [#include <linux/time.h>], ++ [struct timespec64 *s; ++ ktime_get_coarse_real_ts64(s);]) + AC_CHECK_LINUX_FUNC([locks_lock_file_wait], + [#include <linux/fs.h>], + [locks_lock_file_wait(NULL, NULL);]) +--- a/src/afs/LINUX/osi_misc.c ++++ b/src/afs/LINUX/osi_misc.c +@@ -28,18 +28,6 @@ + int afs_osicred_initialized = 0; + afs_ucred_t afs_osi_cred; + +-void +-afs_osi_SetTime(osi_timeval_t * tvp) +-{ +- struct timespec tv; +- tv.tv_sec = tvp->tv_sec; +- tv.tv_nsec = tvp->tv_usec * NSEC_PER_USEC; +- +- AFS_STATCNT(osi_SetTime); +- +- do_settimeofday(&tv); +-} +- + void + osi_linux_mask(void) + { +--- a/src/afs/LINUX/osi_prototypes.h ++++ b/src/afs/LINUX/osi_prototypes.h +@@ -45,7 +45,6 @@ extern void osi_ioctl_init(void); + extern void osi_ioctl_clean(void); + + /* osi_misc.c */ +-extern void afs_osi_SetTime(osi_timeval_t * tvp); + extern int osi_lookupname_internal(char *aname, int followlink, + struct vfsmount **mnt, struct dentry **dpp); + extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink, diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 958fcd578c2..36a73bf5878 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -11,6 +11,8 @@ in stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; + patches = [ ./linux-4.20.patch ]; + nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index cce1f5c6ab0..f94d185910f 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, rpmextract, glibc +{ config, stdenv, fetchurl, rpmextract, glibc , dataDir ? "/var/lib/plex" # Plex's data directory must be baked into the package due to symlinks. -, enablePlexPass ? false +, enablePlexPass ? config.plex.enablePlexPass or false }: let diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 3d421e7a6ec..4da3ae362c4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.7.10"; + version = "4.7.12"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0w5y6a7kiw5ap7hd84yglzk7cjax6lxlszd0wz1sxnmqx4a6hn9l"; + sha256 = "0jmg39xigrh48j39r4f1390kmr1p3xbfxzfabln4b0r9qdmki70f"; }; outputs = [ "out" "dev" "man" ]; @@ -72,7 +72,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" ] - ++ optional (!enableDomainController) "--without-ad-dc" + ++ [(if enableDomainController + then "--with-experimental-mit-ad-dc" + else "--without-ad-dc")] ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 8e72605b834..6a32ce39d5c 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "solr-${version}"; - version = "7.6.0"; + pname = "solr"; + version = "7.7.1"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1marwyn7r85k5j28vwkl9n942gp52kjh6s1hbm357w8gnfh2bd1c"; + sha256 = "1i189xhlxrpdqx2gx3r8s4dcd7nm74vjynwkrgv2hnq4mw95zf2g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index ffbeb2fca34..90768e8f66e 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -99,6 +99,6 @@ perlPackages.buildPerlPackage rec { # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt license = licenses.unfree; maintainers = [ maintainers.phile314 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 8111991cd38..3409fc00066 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "1bdz3dic12lwl3rfczd9bxpgjbpw2g7yap2zddz6dvgkqvyjjf1h"; + sha256 = "0mjq9cx093b0825rqbcq3z0lzy81pd8h0fz6rda6npg3604rxj81"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index c1c70955d1f..1f5ba6150ed 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "2.1.3"; + version = "2.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0glk2qg4dq7gzkr6wjamxksjn668zsny8mmd0jph4w7166hm3n0n"; + sha256 = "0bdbkz917175vp28kc513996ik0m61hfbvnqnv0alxv0mfx8djzn"; }; inherit nativeBuildInputs buildInputs; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index c23bdcd2476..249a5af5d48 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -57,7 +57,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = "-fpermissive -std=c++11"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index e440f11b2e4..c77330bd2ac 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "percona-server-${version}"; - version = "5.6.35-80.0"; + version = "5.6.43-84.3"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "0szjywx902da09pg8yqj8l2acplmh69hn5smrk45i291qsi5m6r5"; + sha256 = "1cc0lfmpq4pw90bcsszsygw06vd4j4bh3ph5x0yn3z7wddvmjlpw"; }; buildInputs = [ cmake bison ncurses openssl zlib libaio perl ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 ''; passthru.mysqlVersion = "5.6"; @@ -57,6 +56,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ grahamc ]; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 7b92d756da5..955b6067884 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -76,7 +76,8 @@ let postInstall = '' moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it - moveToOutput "lib/*.a" "$out" + moveToOutput "lib/libpgcommon.a" "$out" + moveToOutput "lib/libpgport.a" "$out" moveToOutput "lib/libecpg*" "$out" # Prevent a retained dependency on gcc-wrapper. @@ -84,7 +85,7 @@ let if [ -z "''${dontDisableStatic:-}" ]; then # Remove static libraries in case dynamic are available. - for i in $out/lib/*.a; do + for i in $out/lib/*.a $lib/lib/*.a; do name="$(basename "$i")" ext="${stdenv.hostPlatform.extensions.sharedLibrary}" if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then @@ -156,40 +157,40 @@ let in self: { postgresql_9_4 = self.callPackage generic { - version = "9.4.20"; + version = "9.4.21"; psqlSchema = "9.4"; - sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf"; + sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80"; this = self.postgresql_9_4; inherit self; }; postgresql_9_5 = self.callPackage generic { - version = "9.5.15"; + version = "9.5.16"; psqlSchema = "9.5"; - sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv"; + sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.11"; + version = "9.6.12"; psqlSchema = "9.6"; - sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q"; + sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.6"; - psqlSchema = "10.0"; - sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38"; + version = "10.7"; + psqlSchema = "10.0"; # should be 10, but changing it is invasive + sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { version = "11.2"; - psqlSchema = "11.2"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6"; this = self.postgresql_11; inherit self; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 0f08d94a052..9ba60416119 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -36,6 +36,6 @@ buildGoPackage rec { homepage = "https://gravitational.com/teleport/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.tomberek ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 98079c37f1f..696baff0ca3 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { homepage = https://trezor.io; license = licenses.lgpl3; maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 674d96e5462..e05d9e919d1 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.7"; + version = "4.2.8"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g"; + sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m"; }; buildInputs = [ diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 768fdf0b46f..297a0215aac 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "uftp-${version}"; - version = "4.9.8"; + version = "4.9.9"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379"; + sha256 = "0j5af6vicv6zhyjmqnlba10c86qb9nz61wk98985fggwi1dcfjy0"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index e9f5e089872..d5e84cce984 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper -, fetchpatch, nodejs-6_x, phantomjs2 }: +, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }: let nodePackages = import ./node.nix { inherit pkgs; @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/codimd <<EOF - #!${stdenv.shell}/bin/sh + #!${runtimeShell} ${nodejs-6_x}/bin/node $out/app.js EOF cp -R {app.js,bin,lib,locales,package.json,public} $out/ diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index bfb98add943..3083512e1b4 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78"; + sha256 = "1jcjkyhqwh1pv0a98bidf8az6mc34l4snnsl6lc7m2gxr55099j8"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 90ebe4fad44..64aa3ae1ada 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -32,11 +32,11 @@ lib.makeScope newScope (self: with self; { }) {}; bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation { - name = "bitmap-1.0.8"; + name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz; - sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs"; + url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz; + sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -729,11 +729,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { - name = "libXau-1.0.8"; + name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; - sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; + url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2; + sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1106,11 +1106,11 @@ lib.makeScope newScope (self: with self; { }) {}; libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, zlib }: stdenv.mkDerivation { - name = "libfontenc-1.1.3"; + name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; - sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; + url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2; + sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1417,6 +1417,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation { + name = "xcalc-1.0.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2; + sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXaw xorgproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { name = "xcb-proto-1.13"; builder = ./builder.sh; @@ -1522,11 +1535,11 @@ lib.makeScope newScope (self: with self; { }) {}; xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xorgproto, libXrender, libXt }: stdenv.mkDerivation { - name = "xclock-1.0.7"; + name = "xclock-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; - sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; + url = mirror://xorg/individual/app/xclock-1.0.8.tar.bz2; + sha256 = "0m92zhamh15my9f2rqa14q41d6k2cn468azm3g7g3w9n7942024k"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1574,11 +1587,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { - name = "xcursorgen-1.0.6"; + name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; - sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; + url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2; + sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1587,11 +1600,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { - name = "xcursor-themes-1.0.5"; + name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2; - sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf"; + url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2; + sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1639,11 +1652,11 @@ lib.makeScope newScope (self: with self; { }) {}; xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXrandr }: stdenv.mkDerivation { - name = "xev-1.2.2"; + name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; - sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; + url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2; + sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1781,6 +1794,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { + name = "xf86-video-apm-1.3.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2; + sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libpciaccess xorgserver ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; @@ -1821,11 +1847,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-chips-1.3.0"; + name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2; - sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2; + sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2094,11 +2120,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-s3virge-1.10.7"; + name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; - sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; + url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2; + sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2198,11 +2224,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation { - name = "xf86-video-tdfx-1.4.7"; + name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; - sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2; + sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2353,6 +2379,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xfsinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libFS, xorgproto }: stdenv.mkDerivation { + name = "xfsinfo-1.0.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2; + sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libFS xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; @@ -2380,11 +2419,11 @@ lib.makeScope newScope (self: with self; { }) {}; xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xhost-1.0.7"; + name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; - sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; + url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2; + sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2510,11 +2549,11 @@ lib.makeScope newScope (self: with self; { }) {}; xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { - name = "xlsatoms-1.1.2"; + name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; - sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; + url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2; + sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2575,11 +2614,11 @@ lib.makeScope newScope (self: with self; { }) {}; xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation { - name = "xmodmap-1.0.9"; + name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; - sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; + url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2; + sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2627,11 +2666,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.3"; + name = "xorg-server-1.20.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2; - sha256 = "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2; + sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2692,11 +2731,11 @@ lib.makeScope newScope (self: with self; { }) {}; xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { - name = "xrdb-1.1.1"; + name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2; - sha256 = "1dqp486nd5sagbg572kl0k839nwvpqnb7jvppyb7jj5vrpkss8rd"; + url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2; + sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -2756,6 +2795,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + xstdcmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xorgproto }: stdenv.mkDerivation { + name = "xstdcmap-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2; + sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXmu xorgproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.3.5"; builder = ./builder.sh; @@ -2783,11 +2835,11 @@ lib.makeScope newScope (self: with self; { }) {}; xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto, libXv }: stdenv.mkDerivation { - name = "xvinfo-1.1.3"; + name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; - sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; + url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2; + sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bd529c178f4..d62d61b429e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -342,11 +342,6 @@ self: super: }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec { - name = "xf86-input-libinput-0.28.0"; - src = fetchurl { - url = "mirror://xorg/individual/driver/${name}.tar.bz2"; - sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691"; - }; outputs = [ "out" "dev" ]; buildInputs = attrs.buildInputs ++ [ libinput ]; installFlags = "sdkdir=\${dev}/include/xorg"; @@ -603,8 +598,16 @@ self: super: })); lndir = super.lndir.overrideAttrs (attrs: { + buildInputs = []; preConfigure = '' + export XPROTO_CFLAGS=" " + export XPROTO_LIBS=" " substituteInPlace lndir.c \ + --replace '<X11/Xos.h>' '<string.h>' \ + --replace '<X11/Xfuncproto.h>' '<unistd.h>' \ + --replace '_X_ATTRIBUTE_PRINTF(1,2)' '__attribute__((__format__(__printf__,1,2)))' \ + --replace '_X_ATTRIBUTE_PRINTF(2,3)' '__attribute__((__format__(__printf__,2,3)))' \ + --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index ec1e6a413b4..57c85e0bc2f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 mirror://xorg/individual/app/appres-1.0.5.tar.bz2 mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2 -mirror://xorg/individual/app/bitmap-1.0.8.tar.gz +mirror://xorg/individual/app/bitmap-1.0.9.tar.gz mirror://xorg/individual/app/editres-1.0.7.tar.bz2 mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2 @@ -29,21 +29,23 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 +mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.8.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2 mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2 -mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 +mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2 mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2 -mirror://xorg/individual/app/xev-1.2.2.tar.bz2 +mirror://xorg/individual/app/xev-1.2.3.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2 mirror://xorg/individual/app/xfs-1.2.0.tar.bz2 +mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 -mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 +mirror://xorg/individual/app/xhost-1.0.8.tar.bz2 mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 @@ -52,27 +54,28 @@ mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.5.tar.bz2 mirror://xorg/individual/app/xload-1.1.3.tar.bz2 -mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 +mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2 mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2 -mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 +mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2 mirror://xorg/individual/app/xpr-1.0.5.tar.bz2 mirror://xorg/individual/app/xprop-1.2.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 -mirror://xorg/individual/app/xrdb-1.1.1.tar.bz2 +mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2 mirror://xorg/individual/app/xset-1.2.4.tar.bz2 mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2 mirror://xorg/individual/app/xsm-1.0.4.tar.bz2 +mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 -mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwd-1.0.7.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2 -mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 @@ -85,10 +88,11 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2 @@ -109,7 +113,7 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 @@ -117,7 +121,7 @@ mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2 @@ -166,14 +170,14 @@ mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2 -mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2 -mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 @@ -212,4 +216,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2 diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 8cb96d0ae39..22f6ce45673 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -123,6 +123,7 @@ in stdenv.mkDerivation { cp ${./startx} $out/bin/startx substituteInPlace $out/bin/startx \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@XAUTH@" "${xorg.xauth}/bin/xauth" \ --replace "@FONT_CACHE@" "$out/bin/font_cache" \ @@ -153,12 +154,14 @@ in stdenv.mkDerivation { mkdir -p $out/lib/X11/xinit/privileged_startx.d cp ${./privileged} $out/lib/X11/xinit/privileged_startx.d/privileged substituteInPlace $out/lib/X11/xinit/privileged_startx.d/privileged \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" \ --replace "@FONT_CACHE@" "$out/bin/font_cache" cp ${./font_cache} $out/bin/font_cache substituteInPlace $out/bin/font_cache \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@ENCODINGSDIR@" "${xorg.encodings}/share/fonts/X11/encodings" \ --replace "@MKFONTDIR@" "${xorg.mkfontdir}/bin/mkfontdir" \ @@ -168,6 +171,7 @@ in stdenv.mkDerivation { cp ${./xinitrc} $out/etc/X11/xinit/xinitrc substituteInPlace $out/etc/X11/xinit/xinitrc \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@PATH@" "$out/bin:${env}" \ --replace "@XSET@" "${xorg.xset}/bin/xset" \ --replace "@XMODMAP@" "${xorg.xmodmap}/bin/xmodmap" \ @@ -178,6 +182,7 @@ in stdenv.mkDerivation { cp ${./X11} $out/Applications/XQuartz.app/Contents/MacOS/X11 substituteInPlace $out/Applications/XQuartz.app/Contents/MacOS/X11 \ + --replace "@shell@" "${stdenv.shell}" \ --replace "@DEFAULT_SHELL@" "${shell}" \ --replace "@DEFAULT_STARTX@" "$defaultStartX" \ --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ diff --git a/pkgs/servers/x11/xquartz/privileged b/pkgs/servers/x11/xquartz/privileged index 3eee9479411..9d9c802002b 100755 --- a/pkgs/servers/x11/xquartz/privileged +++ b/pkgs/servers/x11/xquartz/privileged @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ export PATH=@PATH@:$PATH export FONTCONFIG_FILE="@FONTCONFIG_FILE@" diff --git a/pkgs/servers/x11/xquartz/startx b/pkgs/servers/x11/xquartz/startx index e908e1042d7..b4afebce57c 100755 --- a/pkgs/servers/x11/xquartz/startx +++ b/pkgs/servers/x11/xquartz/startx @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ # vim :set ts=4 sw=4 sts=4 et : diff --git a/pkgs/servers/x11/xquartz/xinitrc b/pkgs/servers/x11/xquartz/xinitrc index 1a0c2ccf1c0..276aeca7c84 100755 --- a/pkgs/servers/x11/xquartz/xinitrc +++ b/pkgs/servers/x11/xquartz/xinitrc @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ export PATH=@PATH@:$PATH diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 535fb061de9..8df8499d11e 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } : +{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : stdenv.mkDerivation rec { name = "pyIRCt-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/${name} ./irc.py \"$@\" EOF diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index b1c4d93f687..76861ab842b 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, xmpppy, pythonPackages, fetchcvs } : +{ stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } : stdenv.mkDerivation rec { name = "pyMAILt-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/$name cat > $out/bin/pyMAILt <<EOF - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/${name} ./mail.py \"$@\" EOF diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 780a77c5caa..5bacaf2982e 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: +{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, runtimeShell }: stdenv.mkDerivation rec { name = "zookeeper-${version}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { done cat << EOF > $out/bin/zooInspector.sh - #!${stdenv.shell} + #!${runtimeShell} cd $out/share/zooinspector exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector EOF diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 8e63eeeba15..32d87d7cc1b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -89,7 +89,7 @@ let fish = stdenv.mkDerivation rec { name = "fish-${version}"; - version = "3.0.1"; + version = "3.0.2"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; @@ -97,7 +97,7 @@ let # There are differences between the release tarball and the tarball github packages from the tag # Hence we cannot use fetchFromGithub url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz"; - sha256 = "1r55xgnacjxglban15ln3fw8p3q60k0pk0fgsax3h5zfambplrr1"; + sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 8d3452b912b..d019457ab8a 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl }: let - version = "0.3.0"; + version = "0.6.pre15"; in stdenv.mkDerivation { name = "oil-${version}"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "0j4fyn6xjaf29xqyzm09ahazmq9v1hkxv4kps7n3lzdfr32a4kk9"; + sha256 = "1azdmicv39rp30msl6fpw6921gi6ib8lxiyc8kanljqk5d7zg4p6"; }; postPatch = '' diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 29e79c0e503..b68a25630a1 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "antibody-${version}"; - version = "4.0.2"; + pname = "antibody"; + version = "4.1.0"; goPackagePath = "github.com/getantibody/antibody"; src = fetchFromGitHub { - owner = "getantibody"; - repo = "antibody"; + owner = "getantibody"; + repo = "antibody"; rev = "v${version}"; - sha256 = "1lq0bd2l928bgwqiq3fa5ippjhnsfgwdqn6nd3hfis8bijrwc5jv"; + sha256 = "027qh535cpk5mbxav199vvzhwfkcs0lm7skgfhshpzps1yw4w4mb"; }; goDeps = ./deps.nix; diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix index bdd53a9d142..86263b43944 100644 --- a/pkgs/shells/zsh/antibody/deps.nix +++ b/pkgs/shells/zsh/antibody/deps.nix @@ -1,73 +1,110 @@ -[{ - goPackagePath = "github.com/getantibody/folder"; - fetch = { - type = "git"; - url = "https://github.com/getantibody/folder"; - rev = "479aa91767d47bc27599e6ebc7fd07945dd38132"; - sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; - }; -}{ - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; -}{ - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; -}{ - goPackagePath = "github.com/caarlos0/gohome"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/gohome"; - rev = "75f08ebc60b144c5c3178115baedce176fdcfe99"; - sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; - }; -}{ - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "a39589180ebd6bbf43076e514b55f20a95d43086"; - sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; - }; -}{ - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; -}{ - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1a580b3eff7814fc9b40602fd35256c63b50f491"; - sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; - }; -}{ - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"; - sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; - }; -}{ - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "2491c5de3490fced2f6cff376127c667efeed857"; - sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; - }; -}] +[ + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "a39589180ebd"; + sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/caarlos0/gohome"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/gohome"; + rev = "75f08ebc60b1"; + sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/getantibody/folder"; + fetch = { + type = "git"; + url = "https://github.com/getantibody/folder"; + rev = "v1.0.0"; + sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1a580b3eff78"; + sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2491c5de3490"; + sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "7c87d13f8e83"; + sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; + }; + } +] diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 3e4b756044b..c9a93db2d98 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -78,7 +78,7 @@ EOF ''; license = "MIT-like"; homepage = http://www.zsh.org/; - maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; + maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index 9a3f5ec3cc4..b9047a93a41 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gradle-completion-${version}"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "gradle"; repo = "gradle-completion"; rev = "v${version}"; - sha256 = "02vv360r78ckwc6r4xbhmy5dxz6l9ya4lq9c62zh12ciq94y9kgx"; + sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2"; }; # we just move two files into $out, diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index aafc0855dbe..7b4f8adc82f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -54,6 +54,8 @@ in lib.init bootStages ++ [ then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".gcc + else if crossSystem.useLLVM or false + then buildPackages.llvmPackages_7.lldClang else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index c0bbe24e521..4313a617f78 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -43,6 +43,7 @@ in "x86_64-linux" = stagesLinux; "armv5tel-linux" = stagesLinux; "armv6l-linux" = stagesLinux; + "armv7a-linux" = stagesLinux; "armv7l-linux" = stagesLinux; "aarch64-linux" = stagesLinux; "mipsel-linux" = stagesLinux; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cafd1031ab8..dfb7e95113b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -70,6 +70,7 @@ rec { else builtins.unsafeGetAttrPos "name" attrs) , separateDebugInfo ? false , outputs ? [ "out" ] + , __darwinAllowLocalNetworking ? false , __impureHostDeps ? [] , __propagatedImpureHostDeps ? [] , sandboxProfile ? "" @@ -86,7 +87,7 @@ rec { doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform; doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform; - separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux; + separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux && !(stdenv.hostPlatform.useLLVM or false); outputs' = outputs ++ lib.optional separateDebugInfo' "debug"; fixedOutputDrv = attrs ? outputHash; @@ -175,6 +176,7 @@ rec { (removeAttrs attrs ["meta" "passthru" "pos" "checkInputs" "installCheckInputs" + "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { @@ -245,6 +247,7 @@ rec { } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 03fa589138d..8dff3557807 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -558,6 +558,10 @@ _addToEnv() { (( "$depHostOffset" <= "$depTargetOffset" )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" if [[ -z "${strictDeps-}" ]]; then + + # Keep track of which packages we have visited before. + local visitedPkgs="" + # Apply environment hooks to all packages during native # compilation to ease the transition. # @@ -570,7 +574,11 @@ _addToEnv() { ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} do + if [[ "$visitedPkgs" = *"$pkg"* ]]; then + continue + fi runHook "${!hookRef}" "$pkg" + visitedPkgs+=" $pkg" done else local pkgsRef="${pkgsVar}[$depTargetOffset - $depHostOffset]" @@ -1012,13 +1020,11 @@ buildPhase() { else foundMakefile=1 - # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 - makeFlags="SHELL=$SHELL $makeFlags" - # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) @@ -1057,6 +1063,7 @@ checkPhase() { # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} ${checkTarget} @@ -1082,6 +1089,7 @@ installPhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} ${installTargets:-install} @@ -1189,6 +1197,7 @@ installCheckPhase() { # shellcheck disable=SC2086 local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} + SHELL=$SHELL $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} ${installCheckTarget:-installcheck} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 12bf781de70..457e1671e26 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -13,6 +13,7 @@ "x86_64-linux" = import ./bootstrap-files/x86_64.nix; "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; "armv6l-linux" = import ./bootstrap-files/armv6l.nix; + "armv7a-linux" = import ./bootstrap-files/armv7l.nix; "armv7l-linux" = import ./bootstrap-files/armv7l.nix; "aarch64-linux" = import ./bootstrap-files/aarch64.nix; "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 622799106cd..5d9c120c501 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -26,14 +26,20 @@ let # We need to remove whitespace, unfortunately # Windows programs use \r but Unix programs use \n + echo Running native-built program natively + # find expected value natively ${getExecutable hostPkgs pkgFun exec} ${args'} \ | dos2unix > $out/expected + echo Running cross-built program in emulator + # run emulator to get actual value ${emulator} ${getExecutable crossPkgs pkgFun exec} ${args'} \ | dos2unix > $out/actual + echo Comparing results... + if [ "$(cat $out/actual)" != "$(cat $out/expected)" ]; then echo "${pkgName} did not output expected value:" cat $out/expected @@ -47,10 +53,10 @@ let fi ''; - mapMultiPlatformTest = test: lib.mapAttrs (name: system: test rec { + mapMultiPlatformTest = crossSystemFun: test: lib.mapAttrs (name: system: test rec { crossPkgs = import pkgs.path { localSystem = { inherit (pkgs.hostPlatform) config; }; - crossSystem = system; + crossSystem = crossSystemFun system; }; emulator = crossPkgs.hostPlatform.emulator pkgs; @@ -65,26 +71,30 @@ let } else pkg; }) testedSystems; -in - -lib.mapAttrs (_: mapMultiPlatformTest) { + tests = { + + file = {platformFun, crossPkgs, emulator}: compareTest { + inherit emulator crossPkgs; + hostPkgs = pkgs; + exec = "/bin/file"; + args = [ + "${pkgs.file}/share/man/man1/file.1.gz" + "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf" + ]; + pkgFun = pkgs: platformFun pkgs.file; + }; - file = {platformFun, crossPkgs, emulator}: compareTest { - inherit emulator crossPkgs; - hostPkgs = pkgs; - exec = "/bin/file"; - args = [ - "${pkgs.file}/share/man/man1/file.1.gz" - "${pkgs.dejavu_fonts}/share/fonts/truetype/DejaVuMathTeXGyre.ttf" - ]; - pkgFun = pkgs: platformFun pkgs.file; - }; + hello = {platformFun, crossPkgs, emulator}: compareTest { + inherit emulator crossPkgs; + hostPkgs = pkgs; + exec = "/bin/hello"; + pkgFun = pkgs: pkgs.hello; + }; - hello = {platformFun, crossPkgs, emulator}: compareTest { - inherit emulator crossPkgs; - hostPkgs = pkgs; - exec = "/bin/hello"; - pkgFun = pkgs: pkgs.hello; }; -} +in (lib.mapAttrs (_: mapMultiPlatformTest builtins.id) tests) +// (lib.mapAttrs' (name: test: { + name = "${name}-llvm"; + value = mapMultiPlatformTest (system: system // {useLLVM = true;}) test; + }) tests) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 73ec20a57a3..be4bf70e2ac 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.188"; + version = "1.189"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "1741mg2wc5wa63clkijmv04zd6jxhc7c6aq7mkhqw1r4dhfhih19"; + sha256 = "09rfnnhwjm98im711v6jrgl49iy5n1b26x12zzk5rw6g1667mz86"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 669cb4b4844..bf3ff7c6528 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -8,6 +8,7 @@ , lib , primusLib , writeScriptBin +, runtimeShell , primusLib_i686 ? null , useNvidia ? true }: @@ -25,7 +26,7 @@ let )); in writeScriptBin "primusrun" '' - #!${stdenv.shell} + #!${runtimeShell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" '' diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 7b7d5d1aeed..a84f101cdf7 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchPhase = '' for i in `find cnee/test -name \*.sh` do - sed -i "$i" -e's|/bin/bash|/bin/sh|g ; s|/usr/bin/env bash|/bin/sh|g' + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' done ''; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 738b9d3dcea..5cbf3cf3a8f 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick -, pamtester, xscreensaver, xset }: +, libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver +, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: stdenv.mkDerivation rec { name = "xsecurelock-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { autoreconfHook pkgconfig ]; buildInputs = [ - libX11 libXcomposite libXft libXmu pam - apacheHttpd imagemagick pamtester + libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver + pam apacheHttpd imagemagick pamtester ]; configureFlags = [ diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index e3916b0f8a9..f9cc3fb4ebc 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,72 +1,27 @@ -{ stdenv, fetchurl, python2 -, windowsSupport ? false -}: +{ python3Packages, fetchurl }: -let - generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec { - pname = "ansible"; - inherit version; +{ + ansible = with python3Packages; toPythonApplication ansible; + + ansible_2_7 = with python3Packages; toPythonApplication ansible; - outputs = [ "out" "man" ]; + ansible_2_6 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + pname = "ansible"; + version = "2.6.9"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - inherit sha256; + sha256 = "12mysvdavkypgmyms1wjq2974lk97w893k23i6khigxrjj6r85z1"; }; + })); - prePatch = '' - sed -i "s,/usr/,$out," lib/ansible/constants.py - ''; - - postInstall = '' - wrapPythonProgramsIn "$out/bin" "$out $PYTHONPATH" - - for m in docs/man/man1/*; do - install -vD $m -t $man/share/man/man1 - done - ''; - - doCheck = false; - dontStrip = true; - dontPatchELF = true; - dontPatchShebangs = false; - - propagatedBuildInputs = with py.pkgs; [ - pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath dopy - ] ++ stdenv.lib.optional windowsSupport pywinrm; + ansible_2_5 = with python3Packages; toPythonApplication (ansible.overridePythonAttrs(old: rec { + pname = "ansible"; + version = "2.5.14"; - meta = with stdenv.lib; { - homepage = http://www.ansible.com; - description = "A simple automation tool"; - license = with licenses; [ gpl3 ] ; - maintainers = with maintainers; [ jgeerds joamaki ]; - platforms = with platforms; linux ++ darwin; + src = fetchurl { + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + sha256 = "0sd04h2k5qv4m48dn76jkjlwlqfdk15hzyagj9i71r8brvmwhnk9"; }; - }; - -in rec { - # We will carry all the supported versions - - ansible_2_4 = generic { - version = "2.4.4.0"; - sha256 = "0n1k6h0h6av74nw8vq98fmh6q4pq6brpwmx45282vh3bkdmpa0ib"; - }; - - ansible_2_5 = generic { - version = "2.5.11"; - sha256 = "07rhgkl3a2ba59rqh9pyz1p661gc389shlwa2sw1m6wwifg4lm24"; - }; - - ansible_2_6 = generic { - version = "2.6.7"; - sha256 = "10pakw9k9wd3cy1qk3ah2253ph7c7h3qzpal4k0s5lschzgy2fh0"; - }; - - ansible_2_7 = generic { - version = "2.7.5"; - sha256 = "1fsif2jmkrrgiawsd8r6sxrqvh01fvrmdhas0p540a6i9fby3yda"; - }; - - ansible2 = ansible_2_7; - ansible = ansible2; + })); } diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 663dfa40e23..c36b6d2fbd6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -14,16 +14,23 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.3.9"; + src = oldAttrs.src.override { + inherit version; + sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; + }; + }); }; }; in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d"; + sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d"; }; # No tests included diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 32d0e584f31..62fa8219f5a 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,23 +1,25 @@ { stdenv, lib, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.4"; - versionMinor = "6_1"; + versionMajor = "6.5"; + versionMinor = "6"; + versionBuild_x86_64 = "9"; + versionBuild_i686 = "8"; in stdenv.mkDerivation rec { - name = "nomachine-client-${version}"; + pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_x86_64.tar.gz"; - sha256 = "141pv277kl5ij1pmc0iadc0hnslxri2qaqvsjkmmvls4432jh0yi"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz"; + sha256 = "07lg5yadxpl5qfvvh067b3kxd8hm3xv95ralm2pyjl4lw6aql46p"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_i686.tar.gz"; - sha256 = "0a2vi4ygw34yw8rcjhw17mqx5qbjnym4jkap8paik8lisb5mhnyj"; + url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + sha256 = "1a23isw09vicazkrypq0kxbb8qy2i4vxiarrgz5xmasjhiy5999a"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix new file mode 100644 index 00000000000..73a81fcff87 --- /dev/null +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: + +python3Packages.buildPythonApplication rec { + pname = "virtscreen"; + version = "0.3.1"; + + disabled = python3Packages.pythonOlder "3.6"; + + # No tests + doCheck = false; + + src = fetchFromGitHub { + owner = "kbumsik"; + repo = pname; + rev = version; + sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; + }; + + propagatedBuildInputs = with python3Packages; [ + netifaces + pyqt5 + quamash + x11vnc + xrandr + ]; + + postPatch = let + ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + substituteInPlace virtscreen/__main__.py \ + --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + ''; + + meta = with stdenv.lib; { + description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; + homepage = https://github.com/kbumsik/VirtScreen; + license = licenses.gpl3; + maintainers = with maintainers; [ borisbabic ]; + }; +} diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch new file mode 100644 index 00000000000..d5299528134 --- /dev/null +++ b/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch @@ -0,0 +1,45 @@ +From 428c6e0eb604b63a67fda6af445c10c8ae3c1826 Mon Sep 17 00:00:00 2001 +From: Philipp Gesang <phg@phi-gamma.net> +Date: Sun, 27 Jan 2019 21:37:13 +0100 +Subject: [PATCH] makefile: fix installation + +- comment hard-coded $(CC) +- avoid full paths during install +- set proper permissions +--- + Makefile | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 9268c6f..0797579 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ MW=-Wformat -Werror=format-security -Wall + + CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) + +-CC=gcc ++#CC=gcc + + # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment + # variables, if they exist +@@ -94,9 +94,14 @@ clean: + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + ++ifndef DESTDIR ++install: ++ $(error Please specify install prefix as $$DESTDIR) ++else + install: afio +- cp afio /usr/local/bin +- cp afio.1 /usr/share/man/man1 ++ install -Dm755 afio $(DESTDIR)/bin/afio ++ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 ++endif + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk +-- +2.18.1 + diff --git a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch deleted file mode 100644 index 9fa7aacfa88..00000000000 --- a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- p1/Makefile.orig 2017-02-14 21:40:20.404249126 +0100 -+++ p1/Makefile 2017-02-19 23:38:43.880414077 +0100 -@@ -66,37 +66,42 @@ - # systems the large file compile environment itself might be buggy or beta. - #LARGEFILEFLAGS= - LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - # even more warnings flags.. - MW= - #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations - - CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} - --CC=gcc -+#CC=gcc - - CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I - LDFLAGS = - - afio : afio.o compfile.o exten.o match.o $M - ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio - - clean: - rm -f *.o afio - rm -f regtest/cmpstat regtest/makesparse - rm -f regtest/statsize regtest/statsize64 - cd regtest; /bin/sh regtest.clean - -+ifndef DESTDIR -+install: -+ $(error Please specify install prefix as $$DESTDIR) -+else - install: afio -- cp afio /usr/local/bin -- cp afio.1 /usr/share/man/man1 -+ install -Dm755 afio $(DESTDIR)/bin/afio -+ install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1 -+endif - - # generate default list of -E extensions from manpage - # note: on sun, I had to change awk command below to nawk or gawk - # to get it to work. - exten_default.h : afio.1 - awk -f exten_make.awk afio.1 >exten_default.h - - - afio.o : afio.h patchlevel.h - compfile.o : afio.h diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 551e38a7869..0014febf40e 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "2.5.1"; + version = "2.5.2"; name = "afio-${version}"; src = fetchurl { url = "http://members.chello.nl/~k.holtman/${name}.tgz"; - sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a"; + sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; }; /* * A patch to simplify the installation and for removing the * hard coded dependency on GCC. */ - patches = [ ./afio-2.5.1-install.patch ]; + patches = [ ./0001-makefile-fix-installation.patch ]; installFlags = "DESTDIR=$(out)"; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index 8d4d5fd8ddd..6d5041c52d0 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { script = substituteAll { src = ./rpmextract.sh; inherit rpm cpio; + inherit (stdenv) shell; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/tools/archivers/rpmextract/rpmextract.sh index 04f57f6e604..6ebfa251955 100644 --- a/pkgs/tools/archivers/rpmextract/rpmextract.sh +++ b/pkgs/tools/archivers/rpmextract/rpmextract.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!@shell@ -e if [ "$1" = "" ]; then echo "usage: rpmextract package_name..." 1>&2 diff --git a/pkgs/tools/archivers/unzip/CVE-2018-18384.patch b/pkgs/tools/archivers/unzip/CVE-2018-18384.patch new file mode 100644 index 00000000000..e9320e125cf --- /dev/null +++ b/pkgs/tools/archivers/unzip/CVE-2018-18384.patch @@ -0,0 +1,35 @@ +--- unzip60/list.c ++++ unzip60/list.c +@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type + { + int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL; + #ifndef WINDLL +- char sgn, cfactorstr[10]; ++ char sgn, cfactorstr[1+10+1+1]; /* <sgn><int>%NUL */ + int longhdr=(uO.vflag>1); + #endif + int date_format; +@@ -389,9 +389,9 @@ int list_files(__G) /* return PK-type + } + #else /* !WINDLL */ + if (cfactor == 100) +- sprintf(cfactorstr, LoadFarString(CompFactor100)); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100)); + else +- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor); + if (longhdr) + Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats), + FmZofft(G.crec.ucsize, "8", "u"), methbuf, +@@ -471,9 +471,9 @@ int list_files(__G) /* return PK-type + + #else /* !WINDLL */ + if (cfactor == 100) +- sprintf(cfactorstr, LoadFarString(CompFactor100)); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100)); + else +- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor); + if (longhdr) { + Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer), + FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"), diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 7c4bb988b62..cdf189e82df 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { ./CVE-2015-7697.diff ./CVE-2014-9913.patch ./CVE-2016-9844.patch + ./CVE-2018-18384.patch ./dont-hardcode-cc.patch ] ++ stdenv.lib.optional enableNLS (fetchurl { diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ffea29691d6..7a6d4e6d3ab 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.01.01"; + version = "2019.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "10kqxw4vrz7xa8fc9z5cdyrvks8fsr2s9nai9yg1z9p5w7xhagrg"; + sha256 = "14j2vgcck7c6x8bplhfng7mmqcmh7h98jggi30d5xa0anx1271sb"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8d2bf5e634c..21e748cc79d 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins , pythonPackages, imagemagick, gobject-introspection, gst_all_1 +, runtimeShell , fetchpatch # Attributes needed for tests of the external plugins @@ -140,19 +141,22 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableAlternatives plugins.alternatives ++ optional enableCopyArtifacts plugins.copyartifacts; - buildInputs = with pythonPackages; [ - beautifulsoup4 + buildInputs = [ imagemagick - mock - nose - rarfile - responses ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly ]); + checkInputs = with pythonPackages; [ + beautifulsoup4 + mock + nose + rarfile + responses + ]; + patches = [ ./replaygain-default-bs1770gain.patch ./keyfinder-default-bin.patch @@ -212,9 +216,7 @@ in pythonPackages.buildPythonApplication rec { LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \ BEETS_TEST_SHELL="${testShell}" \ BASH_COMPLETION_SCRIPT="${completion}" \ - HOME="$(mktemp -d)" \ - # Exclude failing test https://github.com/beetbox/beets/issues/2652 - nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash + HOME="$(mktemp -d)" nosetests -v runHook postCheck ''; @@ -227,7 +229,7 @@ in pythonPackages.buildPythonApplication rec { tmphome="$(mktemp -d)" EDITOR="${writeScript "beetconfig.sh" '' - #!${stdenv.shell} + #!${runtimeShell} cat > "$1" <<CFG plugins: ${concatStringsSep " " allEnabledPlugins} CFG diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 8fed569f140..f611055a434 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme + makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 93e7afdce41..4b72ed3bfd3 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mpDris2"; name = "${pname}-${version}"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz"; - sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21"; + sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn"; }; preConfigure = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 41b3b15738d..cb6853c9a44 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper gnome3.gsettings-desktop-schemas ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index d30eaf12f91..42e88f8d07a 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,22 +1,36 @@ -{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: +{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810 + msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec { + version = "0.5.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3"; + }; + }); + }; + }; + +in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; version = "1.1.9"; - src = python3Packages.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575"; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python.pkgs; [ # For building documentation: sphinx guzzle_sphinx_theme ]; buildInputs = [ - libb2 lz4 zstd openssl python3Packages.setuptools_scm + libb2 lz4 zstd openssl python.pkgs.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ cython msgpack-python ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; @@ -50,7 +64,7 @@ python3Packages.buildPythonApplication rec { cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/ ''; - checkInputs = with python3Packages; [ + checkInputs = with python.pkgs; [ pytest ]; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 4133478dbf9..8aa2d015205 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.32"; + version = "2.2.18"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; + sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 80d5937973f..6bdcad9a21a 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.1"; + version = "2.6.2"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "107l9nirlqp7vx542ybza5vdsyykam4bjziq47xyb9hr7js86020"; + sha256 = "0bjrv6pxrzmb4d09yikl5wg6hz3llc30xl0ldzik4jzjrr8bcfpn"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix index 3855152880e..de501659b08 100644 --- a/pkgs/tools/backup/ddar/default.nix +++ b/pkgs/tools/backup/ddar/default.nix @@ -23,6 +23,7 @@ python2.pkgs.buildPythonApplication rec { make -f Makefile.prep synctus/ddar_pb2.py ''; + nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ]; propagatedBuildInputs = with python2.pkgs; [ protobuf ]; checkInputs = [ roundup ]; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix new file mode 100644 index 00000000000..829dca52dfe --- /dev/null +++ b/pkgs/tools/backup/dirvish/default.nix @@ -0,0 +1,62 @@ +{ fetchurl, stdenv, makeWrapper, perl, rsync, perlPackages }: + +stdenv.mkDerivation rec { + name = "dirvish-1.2.1"; + src = fetchurl { + url = "http://dirvish.org/${name}.tgz"; + sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ] ++ (with perlPackages; [ GetoptLong TimeParseDate TimePeriod ]); + + executables = [ "dirvish" "dirvish-runall" "dirvish-expire" "dirvish-locate" ]; + manpages = [ "dirvish.8" "dirvish-runall.8" "dirvish-expire.8" "dirvish-locate.8" "dirvish.conf.5" ]; + + buildPhase = '' + HEADER="#!${perl}/bin/perl + + \$CONFDIR = \"/etc/dirvish\"; + + " + + for executable in $executables; do + ( + echo "$HEADER" + cat $executable.pl loadconfig.pl + ) > $executable + chmod +x $executable + done + ''; + + installPhase = '' + mkdir -p $out/bin + cp --target-directory=$out/bin $executables + + for manpage in $manpages; do + if [[ $manpage =~ \.([[:digit:]]+)$ ]]; then + section=''${BASH_REMATCH[1]} + mkdir -p $out/man/man$section + cp --target-directory=$out/man/man$section $manpage + else + echo "Couldn't determine man page section by filename" + exit 1 + fi + done + ''; + + postFixup = '' + for executable in $executables; do + wrapProgram $out/bin/$executable \ + --set PERL5LIB "$PERL5LIB" + done + ''; + + meta = with stdenv.lib; { + description = "Dirvish is a fast, disk based, rotating network backup system"; + homepage = http://dirvish.org/; + license = stdenv.lib.licenses.osl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index e569d9b6d59..224b8b12906 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { name = "flockit-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp ./libflockit.so $out/lib (cat <<EOI - #!/bin/sh + #!${runtimeShell} env LD_PRELOAD="$out/lib/libflockit.so" FLOCKIT_FILE_PREFIX=\$1 \''${@:2} EOI ) > $out/bin/flockit diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 5f44e19fdf2..7324f75d95f 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -9,7 +9,7 @@ # known impurity: test cases seem to bu using /tmp/storeBackup.lock .. -let dummyMount = writeScriptBin "mount" "#!/bin/sh"; +let dummyMount = writeScriptBin "mount" "#!${stdenv.shell}"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 63affdde718..84a2375302f 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 +{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection -, withPulseAudio ? true, libpulseaudio }: +, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let pythonPackages = python3Packages; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix new file mode 100644 index 00000000000..888711a8501 --- /dev/null +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromRepoOrCz, autoreconfHook, makeWrapper, libdvdcss, libdvdread, perl, perlPackages, asciidoc, xmlto, sourceHighlight, docbook_xsl, docbook_xml_dtd_45 }: + +stdenv.mkDerivation rec { + name = "cdimgtools-${version}"; + version = "0.3"; + + src = fetchFromRepoOrCz { + repo = "cdimgtools"; + rev = "version/0.3"; + sha256 = "1hxg3glxj26fh9xnv184sfdc2wi4cnzvn7chz47wcqdsd0d5fn8w"; + }; + + nativeBuildInputs = [ autoreconfHook makeWrapper asciidoc perlPackages.PodPerldoc xmlto sourceHighlight docbook_xsl docbook_xml_dtd_45 ]; + + buildInputs = [ perl perlPackages.StringEscape perlPackages.DataHexdumper libdvdcss libdvdread ]; + + patches = [ ./nrgtool_fix_my.patch ./removed_dvdcss_interface_2.patch]; + + postFixup = '' + for cmd in raw96cdconv nrgtool; do + wrapProgram "$out/bin/$cmd" --prefix PERL5LIB : "$PERL5LIB" + done + ''; + + outputs = [ "out" "doc" ]; + + installTargets = [ "install" "install-doc" ]; + + meta = with stdenv.lib; { + homepage = https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html; + description = "Tools to inspect and manipulate CD/DVD optical disc images"; + license = licenses.gpl2; + maintainers = with maintainers; [ hhm ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch new file mode 100644 index 00000000000..5ed389c46ca --- /dev/null +++ b/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch @@ -0,0 +1,12 @@ +Fixes an error in nrgtool. +--- a/nrgtool ++++ b/nrgtool +@@ -162,7 +162,7 @@ sub process_file { + } + seek $nrg, 0, SEEK_SET if ($iff_only); + seek $nrg, $offset, SEEK_SET unless ($iff_only); +- while (my $_ = read_chunk($nrg, $iff)) { ++ while ($_ = read_chunk($nrg, $iff)) { + if ($_ < -1) { + warn "ERROR while reading an IFF chunk; aborting\n"; + return; diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch new file mode 100644 index 00000000000..cb265eae05b --- /dev/null +++ b/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch @@ -0,0 +1,53 @@ +Removes the deprecated and removed `dvdcss_interface_2` libdvdcss function. + +This does not change any functionality; it only modifies the printing of software version information. +--- a/cssdec.c ++++ b/cssdec.c +@@ -102,8 +102,8 @@ int main( int argc, char *argv[] ) + b_keyonly = 1; + break; + case 'V': +- printf( "%s version %s (libdvdcss version %s)\n", +- progname, progversion, dvdcss_interface_2 ); ++ printf( "%s version %s\n", ++ progname, progversion ); + exit( EX_SUCCESS ); + break; + case '?': +@@ -126,8 +126,8 @@ int main( int argc, char *argv[] ) + if( argc >= 3 ) end = (int)strtol( argv[2], (char **)NULL, 0 ); + + /* Initialize libdvdcss */ +- printe( 2, "%s version %s (libdvdcss version %s)", +- progname, progversion, dvdcss_interface_2 ); ++ printe( 2, "%s version %s", ++ progname, progversion ); + dvdcss = dvdcss_open( (char *)dvdfile ); + if( dvdcss == NULL ) + { +diff --git a/dvdimgdecss.c b/dvdimgdecss.c +index 0b7006d..b7d251a 100644 +--- a/dvdimgdecss.c ++++ b/dvdimgdecss.c +@@ -157,8 +157,8 @@ int main( int argc, char *argv[] ) + dvdread_decrypt = 1; + break; + case 'V': +- printf( "%s version %s (libdvdcss version %s)\n", +- progname, progversion, dvdcss_interface_2 ); ++ printf( "%s version %s\n", ++ progname, progversion ); + exit( EX_SUCCESS ); + break; + case '?': +@@ -180,8 +180,8 @@ int main( int argc, char *argv[] ) + if( !imgfile ) verbosity++; + + /* Open the DVD */ +- printe( 2, "%s: version %s (libdvdcss version %s)\n", +- progname, progversion, dvdcss_interface_2 ); ++ printe( 2, "%s: version %s\n", ++ progname, progversion ); + dvdcss = dvdcss_open( dvdfile ); + if( dvdcss == NULL ) { + printe( 1, "opening of the DVD (%s) with libdvdcss failed\n", dvdfile ); diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index d600f280400..e4e34aa919b 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, autoreconfHook +{ stdenv, fetchFromGitHub, autoreconfHook , bison, flac, flex, id3v2, vorbis-tools }: stdenv.mkDerivation rec { - name = "cuetools-${version}"; + pname = "cuetools"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/svend/cuetools/archive/${version}.tar.gz"; - sha256 = "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4"; + src = fetchFromGitHub { + owner = "svend"; + repo = pname; + rev = version; + sha256 = "02ksv1ahf1v4cr2xbclsfv5x17m9ivzbssb5r8xjm97yh8a7spa3"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bison flac flex id3v2 vorbis-tools ]; + postInstall = '' + # add link for compatibility with Debian-based distros, which package `cuetag.sh` as `cuetag` + ln -s $out/bin/cuetag.sh $out/bin/cuetag + ''; + meta = with stdenv.lib; { description = "A set of utilities for working with cue files and toc files"; homepage = https://github.com/svend/cuetools; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index ce2aa9520d6..19c160c62f5 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, fetchurl, python3, runtimeShell }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/${python3.sitePackages}/" cp "${src}" "$out/${python3.sitePackages}/mozlz4a.py" - echo "#!${stdenv.shell}" >> "$out/bin/mozlz4a" + echo "#!${runtimeShell}" >> "$out/bin/mozlz4a" echo "export PYTHONPATH='$PYTHONPATH'" >> "$out/bin/mozlz4a" echo "'${python3}/bin/python' '$out/${python3.sitePackages}/mozlz4a.py' \"\$@\"" >> "$out/bin/mozlz4a" chmod a+x "$out/bin/mozlz4a" diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 69d4284b795..3421045fe4c 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }: +{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 fts ]; + buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ]; meta = { homepage = https://mackyle.github.io/xar/; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 27447fb2b8a..ebb9db8670e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.20.1"; + version = "4.20.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1kagxh10qf1n38zbpya2ghjiybxnag36h9xyqb26fy6iy4gmsbsn"; + sha256 = "0z0fm3j4ajzsf445381ra8r3zzciyyvfh8vvbjmbyarg2rz8n3w9"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index dfd522f5a09..4e2f8eaf5c9 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cryfs-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "07f2k2b595m3vkwwlmlc0m7px0nwrrzrph3z6sss9354m0b0lcri"; + sha256 = "04yqpad8x0hiiwpykcn3swi0py6sg9xid6g15ny2qs4j3llin5ry"; }; prePatch = '' diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 2c597ccef35..80646949390 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 215f02ccdd4..ccc5f1f2d4a 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = []; homepage = https://cloud.google.com/storage/docs/gcs-fuse; description = diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 797ce40a561..42889714e92 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec{ - name = "netatalk-3.1.11"; + name = "netatalk-3.1.12"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; - sha256 = "3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6"; + sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; }; patches = [ diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 9fe4f90f258..b5f3a2f3e1f 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 37eb8b9aa72..a21aacb7e6b 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "securefs-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { - sha256 = "0m3nv748g31b5nzxbwqqqjvygmz41x9vmhrjh655086g26gzrfib"; + sha256 = "0nf0bd163gz844mikqab2mh7xjlj31ixa6hi85qxdifyjpfjv7y4"; rev = version; repo = "securefs"; owner = "netheril96"; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index a5045f97b45..a6b3ba01bfa 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -1,6 +1,6 @@ # The releases of this project are apparently precompiled to .jar files. -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin"; mkdir -p "$out/share"; install -D -m444 -t "$out/share" *.jar - echo "#!/bin/sh" > "$out/bin/briss" + echo "#!${runtimeShell}" > "$out/bin/briss" echo "${jre}/bin/java -Xms128m -Xmx1024m -cp \"$out/share/\" -jar \"$out/share/briss-${version}.jar\"" >> "$out/bin/briss" chmod +x "$out/bin/briss" ''; diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index c21fc02753e..63d3e60e206 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -11,7 +11,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Render/convert graphs in/from various formats"; license = licenses.gpl1; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; }; } diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 68ff84c7495..db21df9b5d0 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -2,12 +2,26 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango -, yacc, xorg ? null, ApplicationServices ? null }: +, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }: assert stdenv.isDarwin -> ApplicationServices != null; let inherit (stdenv.lib) optionals optionalString; + raw_patch = + # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 + fetchpatch { + name = "CVE-2018-10196.patch"; + url = https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff; + sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7"; + excludes = ["tests/*"]; # we don't run them and they don't apply + }; + # the patch needs a small adaption for older versions + patch = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else + stdenv.mkDerivation { + inherit (raw_patch) name; + buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out"; + }; in stdenv.mkDerivation rec { @@ -37,6 +51,10 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; + patches = [ + patch + ]; + postPatch = '' for f in $(find . -name Makefile.in); do substituteInPlace $f --replace "-lstdc++" "-lc++" diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index fcb2b4ba327..813c1c98780 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "grim-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "emersion"; repo = "grim"; rev = "v${version}"; - sha256 = "1mpmxkzssgzqh9z263y8vk40dayw32kah66sb8ja7yw22rm7f4zf"; + sha256 = "1bcvkggqszcwy6hg8g4mch3yr25ic0baafbd90af5s5mrhrjxxxz"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 48d40ac4965..1d3a8b26aae 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu }: stdenv.mkDerivation rec { name = "gromit-mpx-${version}"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "bk138"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake autoreconfHook + cmake gtk glib pcre libappindicator libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix new file mode 100644 index 00000000000..fec092db0c5 --- /dev/null +++ b/pkgs/tools/graphics/lepton/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, git, glibc }: + +stdenv.mkDerivation rec { + version = "1.2.1"; + name = "lepton-${version}"; + + src = fetchFromGitHub { + repo = "lepton"; + owner = "dropbox"; + rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc"; + sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; + }; + + nativeBuildInputs = [ cmake git ]; + buildInputs = [ glibc.static ]; + + meta = with stdenv.lib; { + homepage = https://github.com/dropbox/lepton; + description = "A tool to losslessly compress JPEGs"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ artemist ]; + }; +} diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 85713a300ec..3115b1b7243 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gnome3.gtk # needed for XDG_ICON_DIRS - gnome3.defaultIconTheme + gnome3.adwaita-icon-theme makeWrapper (stdenv.lib.getLib gnome3.dconf) ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/luxcoreui" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" ''; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index e9301731e85..666cdae131e 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp }: +{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: let version = "0.20"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = true; preCheck = '' - sed -i -e "s|#!/bin/bash|#!${stdenv.shell}|" test/renderercheck.sh + sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; meta = { diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 76829b6b727..dc9d9630ae5 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir "$TMP/bin" for i in chown chgrp; do - echo '#!/bin/sh' >> "$TMP/bin/$i" + echo '#!${stdenv.shell}' >> "$TMP/bin/$i" chmod +x "$TMP/bin/$i" PATH="$TMP/bin:$PATH" done diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 098721d6b93..182ab5806d7 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://sng.sourceforge.net/; license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 7943903d6f7..e10ffae4a51 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 - gnome3.defaultIconTheme ]; + gnome3.adwaita-icon-theme ]; preFixup = '' wrapProgram $out/bin/fcitx-config-gtk3 \ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index e1b01de11b2..aab7563cb02 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { name = "ibus-typing-booster-${version}"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "1ghd9rqgs3xcv6crvc8x1nhrnr84rbp3b970mfg8f1yz6rsx9107"; + sha256 = "124a6yd7g6ws8s6p5146rhvyjswk001fqncc32jsfmjjgmgisqn2"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 16580aac955..b561fb626e0 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -2,7 +2,7 @@ , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null -, buildPackages }: +, buildPackages, runtimeShell }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { substituteInPlace setup/ibus-setup.in --subst-var-by PYTHON ${python3Runtime.interpreter} substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus - echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh + echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index fea924d0fb0..3c529f31f66 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - version = "3.13"; + version = "3.14"; name = "aescrypt-${version}"; src = fetchurl { url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; - sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7"; + sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 168a3f88772..4571ee24fba 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.2.0"; + version = "1.3.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; - owner = "smira"; + owner = "aptly-dev"; repo = "aptly"; - sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; + sha256 = "032gw8qkxcgc0jyrvzqh7jkbmk4k0gf7j74hyhclfnjmd9548f5l"; }; aptlyCompletionSrc = fetchFromGitHub { @@ -26,7 +26,7 @@ buildGoPackage { src = aptlySrc; - goPackagePath = "github.com/smira/aptly"; + goPackagePath = "github.com/aptly-dev/aptly"; nativeBuildInputs = [ makeWrapper ]; @@ -41,7 +41,7 @@ buildGoPackage { homepage = https://www.aptly.info; description = "Debian repository management tool"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.montag451 ]; }; } diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix new file mode 100644 index 00000000000..3fd52051357 --- /dev/null +++ b/pkgs/tools/misc/automirror/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, git, ronn}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "automirror"; + version = "49"; + + src = fetchFromGitHub { + owner = "schlomo"; + repo = "automirror"; + rev = "v${version}"; + sha256 = "1syyf7dcm8fbyw31cpgmacg80h7pg036dayaaf0svvdsk0hqlsch"; + }; + + patchPhase = "sed -i s#/usr##g Makefile"; + + buildInputs = [ git ronn ]; + + installFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/schlomo/automirror; + description = "Automatic Display Mirror"; + license = licenses.gpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 1b179d32870..cc872ff5339 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.188"; + version = "1.189"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1g9i50a3x9p7kbyjg7z8xgxcknqxkxvzb0gg2jl2zgwjsyvjy5wn"; + sha256 = "0i4q4qdf5w96wkhc5lb2h7mdj0wfzqr3a265jp4wzyzgybayfz33"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d09f313e147..0460accf937 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "broot-${version}"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; rev = "v${version}"; - sha256 = "192qqlqym8lpskh6f7sf5fanybjwhdqs1cgl6mqm35763fa5jrdj"; + sha256 = "1080rhmm3q5h00q6xk2xzbjlvr5n7gq5fscvgkyk1vwbbyh9vc79"; }; - cargoSha256 = "059iylnkjb7lxxs9v2b6h05nidwgcj6kqyhcq58lalkhb63srb1q"; + cargoSha256 = "0722nzip3rl47rjrzyb2y3xbsy9ww1ldjv84qbzyy3flcyh2adjm"; meta = with stdenv.lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index fabb58a33d6..ce1d4dc0ba8 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; postPatch = '' - # The test tends to fail on btrfs and maybe other unusual filesystems. + # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh + sed '2i echo Skipping du threshold test && exit 0' -i ./tests/du/threshold.sh sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/tools/misc/dasht/default.nix new file mode 100644 index 00000000000..e1286820797 --- /dev/null +++ b/pkgs/tools/misc/dasht/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, coreutils +, gnused +, gnugrep +, sqlite +, wget +, w3m +, socat +, gawk +}: + +stdenv.mkDerivation rec { + pname = "dasht"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "sunaku"; + repo = pname; + rev = "v${version}"; + sha256 = "0d0pcjalba58nvxdgn39m4b6n9ifajf3ygyjaqgvzwxzgpzw0a60"; + }; + + deps = lib.makeBinPath [ + coreutils + gnused + gnugrep + sqlite + wget + w3m + socat + gawk + (placeholder "out") + ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bin/* $out/bin/ + + mkdir -p $out/share/man/man1 + cp man/man1/* $out/share/man/man1/ + + for i in $out/bin/*; do + echo "Wrapping $i" + wrapProgram $i --prefix PATH : ${deps}; + done; + + runHook postInstall + ''; + + meta = { + description = "Search API docs offline, in terminal or browser"; + homepage = "https://sunaku.github.io/dasht/man"; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.unix; #cannot test other + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 0367ab53835..c50e3adb6ab 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index f0dc3ab6460..770f4ae67f4 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,4 +1,4 @@ -{ stdenv, skawarePackages }: +{ stdenv, skawarePackages, makeWrapper }: with skawarePackages; @@ -11,6 +11,8 @@ buildPackage { outputs = [ "bin" "lib" "dev" "doc" "out" ]; + setupHooks = [ makeWrapper ]; + # TODO: nsss support configureFlags = [ "--libdir=\${lib}/lib" @@ -30,6 +32,11 @@ buildPackage { mv doc $doc/share/doc/execline/html mv examples $doc/share/doc/execline/examples + + # finally, add all tools to PATH so they are available + # from within execlineb scripts by default + wrapProgram $bin/bin/execlineb \ + --suffix PATH : $bin/bin ''; } diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index cefddbd65ef..ed31d01f09d 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "file-${version}"; - version = "5.35"; + version = "5.36"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "0ijm1fabm68ykr1zbx0bxnka5jr3n42sj8y5mbkrnxs0fj0mxi1h"; + sha256 = "0ya330cdkvfi2d28h8gvhghj4gnhysmifmryysl0a97xq2884q7v"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix new file mode 100644 index 00000000000..3d99a0e27e3 --- /dev/null +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + name = "fltrdr-${version}"; + version = "0.1.1"; + + src = fetchFromGitHub { + repo = "fltrdr"; + owner = "octobanana"; + rev = "${version}"; + sha256 = "1gglv7hwszk09ywjq6s169cdzr77sjklj89k5p24if24v93yffpf"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://octobanana.com/software/fltrdr; + description = "A TUI text reader for the terminal"; + + longDescription = '' + Fltrdr, or flat-reader, is an interactive text reader for the terminal. It + is flat in the sense that the reader is word-based. It creates a + horizontal stream of words, ignoring all newline characters and reducing + extra whitespace. Its purpose is to facilitate reading, scanning, and + searching text. The program has a play mode that moves the reader forward + one word at a time, along with a configurable words per minute (WPM), + setting. + ''; + + platforms = platforms.linux; # can only test linux + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} + diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile index 2c4fbc84963..3933eb13180 100644 --- a/pkgs/tools/misc/fluentd/Gemfile +++ b/pkgs/tools/misc/fluentd/Gemfile @@ -11,4 +11,3 @@ gem 'fluent-plugin-scribe' gem 'fluent-plugin-mongo' gem 'fluent-plugin-webhdfs' gem 'fluent-plugin-rewrite-tag-filter' - diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index 2f9485d9577..d5f78e807ff 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,121 +1,678 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - aws-sdk (2.7.0) - aws-sdk-resources (= 2.7.0) - aws-sdk-core (2.7.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + aws-eventstream (1.0.1) + aws-partitions (1.96.0) + aws-sdk (3.0.1) + aws-sdk-resources (~> 3) + aws-sdk-acm (1.9.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-acmpca (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-alexaforbusiness (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-apigateway (1.13.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-applicationautoscaling (1.11.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-applicationdiscoveryservice (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-appstream (1.13.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-appsync (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-athena (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-autoscaling (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-autoscalingplans (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-batch (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-budgets (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloud9 (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-clouddirectory (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudformation (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudfront (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudhsm (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudhsmv2 (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudsearch (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudsearchdomain (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudtrail (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudwatch (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudwatchevents (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cloudwatchlogs (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codebuild (1.12.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codecommit (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codedeploy (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codepipeline (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-codestar (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cognitoidentity (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cognitoidentityprovider (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-cognitosync (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-comprehend (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-configservice (1.12.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-connect (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-core (3.22.1) + aws-eventstream (~> 1.0) + aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.0) - aws-sdk-core (= 2.7.0) - aws-sigv4 (1.0.0) - bson (1.12.5) - bzip2-ffi (1.0.0) - ffi (~> 1.0) - concurrent-ruby (1.0.4) - cool.io (1.4.5) - elasticsearch (1.0.18) - elasticsearch-api (= 1.0.18) - elasticsearch-transport (= 1.0.18) - elasticsearch-api (1.0.18) + aws-sdk-costandusagereportservice (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-costexplorer (1.7.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-databasemigrationservice (1.7.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-datapipeline (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dax (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-devicefarm (1.7.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-directconnect (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-directoryservice (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dlm (1.0.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dynamodb (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-dynamodbstreams (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ec2 (1.38.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ecr (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ecs (1.15.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-efs (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-eks (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticache (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticbeanstalk (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticloadbalancing (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticloadbalancingv2 (1.11.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elasticsearchservice (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-elastictranscoder (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-emr (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-firehose (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-fms (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-gamelift (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-glacier (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-glue (1.10.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-greengrass (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-guardduty (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-health (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iam (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-importexport (1.1.0) + aws-sdk-core (~> 3) + aws-sigv2 (~> 1.0) + aws-sdk-inspector (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iot (1.9.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iot1clickdevicesservice (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iot1clickprojects (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iotanalytics (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iotdataplane (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-iotjobsdataplane (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesis (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisanalytics (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisvideo (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisvideoarchivedmedia (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kinesisvideomedia (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-kms (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lambda (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lambdapreview (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lex (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lexmodelbuildingservice (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-lightsail (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-machinelearning (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-macie (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-marketplacecommerceanalytics (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-marketplaceentitlementservice (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-marketplacemetering (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediaconvert (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-medialive (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediapackage (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediastore (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediastoredata (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mediatailor (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-migrationhub (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mobile (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mq (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-mturk (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-neptune (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-opsworks (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-opsworkscm (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-organizations (1.10.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-pi (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-pinpoint (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-polly (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-pricing (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-rds (1.23.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-redshift (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-rekognition (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-resourcegroups (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-resourcegroupstaggingapi (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-resources (3.22.0) + aws-sdk-acm (~> 1) + aws-sdk-acmpca (~> 1) + aws-sdk-alexaforbusiness (~> 1) + aws-sdk-apigateway (~> 1) + aws-sdk-applicationautoscaling (~> 1) + aws-sdk-applicationdiscoveryservice (~> 1) + aws-sdk-appstream (~> 1) + aws-sdk-appsync (~> 1) + aws-sdk-athena (~> 1) + aws-sdk-autoscaling (~> 1) + aws-sdk-autoscalingplans (~> 1) + aws-sdk-batch (~> 1) + aws-sdk-budgets (~> 1) + aws-sdk-cloud9 (~> 1) + aws-sdk-clouddirectory (~> 1) + aws-sdk-cloudformation (~> 1) + aws-sdk-cloudfront (~> 1) + aws-sdk-cloudhsm (~> 1) + aws-sdk-cloudhsmv2 (~> 1) + aws-sdk-cloudsearch (~> 1) + aws-sdk-cloudsearchdomain (~> 1) + aws-sdk-cloudtrail (~> 1) + aws-sdk-cloudwatch (~> 1) + aws-sdk-cloudwatchevents (~> 1) + aws-sdk-cloudwatchlogs (~> 1) + aws-sdk-codebuild (~> 1) + aws-sdk-codecommit (~> 1) + aws-sdk-codedeploy (~> 1) + aws-sdk-codepipeline (~> 1) + aws-sdk-codestar (~> 1) + aws-sdk-cognitoidentity (~> 1) + aws-sdk-cognitoidentityprovider (~> 1) + aws-sdk-cognitosync (~> 1) + aws-sdk-comprehend (~> 1) + aws-sdk-configservice (~> 1) + aws-sdk-connect (~> 1) + aws-sdk-costandusagereportservice (~> 1) + aws-sdk-costexplorer (~> 1) + aws-sdk-databasemigrationservice (~> 1) + aws-sdk-datapipeline (~> 1) + aws-sdk-dax (~> 1) + aws-sdk-devicefarm (~> 1) + aws-sdk-directconnect (~> 1) + aws-sdk-directoryservice (~> 1) + aws-sdk-dlm (~> 1) + aws-sdk-dynamodb (~> 1) + aws-sdk-dynamodbstreams (~> 1) + aws-sdk-ec2 (~> 1) + aws-sdk-ecr (~> 1) + aws-sdk-ecs (~> 1) + aws-sdk-efs (~> 1) + aws-sdk-eks (~> 1) + aws-sdk-elasticache (~> 1) + aws-sdk-elasticbeanstalk (~> 1) + aws-sdk-elasticloadbalancing (~> 1) + aws-sdk-elasticloadbalancingv2 (~> 1) + aws-sdk-elasticsearchservice (~> 1) + aws-sdk-elastictranscoder (~> 1) + aws-sdk-emr (~> 1) + aws-sdk-firehose (~> 1) + aws-sdk-fms (~> 1) + aws-sdk-gamelift (~> 1) + aws-sdk-glacier (~> 1) + aws-sdk-glue (~> 1) + aws-sdk-greengrass (~> 1) + aws-sdk-guardduty (~> 1) + aws-sdk-health (~> 1) + aws-sdk-iam (~> 1) + aws-sdk-importexport (~> 1) + aws-sdk-inspector (~> 1) + aws-sdk-iot (~> 1) + aws-sdk-iot1clickdevicesservice (~> 1) + aws-sdk-iot1clickprojects (~> 1) + aws-sdk-iotanalytics (~> 1) + aws-sdk-iotdataplane (~> 1) + aws-sdk-iotjobsdataplane (~> 1) + aws-sdk-kinesis (~> 1) + aws-sdk-kinesisanalytics (~> 1) + aws-sdk-kinesisvideo (~> 1) + aws-sdk-kinesisvideoarchivedmedia (~> 1) + aws-sdk-kinesisvideomedia (~> 1) + aws-sdk-kms (~> 1) + aws-sdk-lambda (~> 1) + aws-sdk-lambdapreview (~> 1) + aws-sdk-lex (~> 1) + aws-sdk-lexmodelbuildingservice (~> 1) + aws-sdk-lightsail (~> 1) + aws-sdk-machinelearning (~> 1) + aws-sdk-macie (~> 1) + aws-sdk-marketplacecommerceanalytics (~> 1) + aws-sdk-marketplaceentitlementservice (~> 1) + aws-sdk-marketplacemetering (~> 1) + aws-sdk-mediaconvert (~> 1) + aws-sdk-medialive (~> 1) + aws-sdk-mediapackage (~> 1) + aws-sdk-mediastore (~> 1) + aws-sdk-mediastoredata (~> 1) + aws-sdk-mediatailor (~> 1) + aws-sdk-migrationhub (~> 1) + aws-sdk-mobile (~> 1) + aws-sdk-mq (~> 1) + aws-sdk-mturk (~> 1) + aws-sdk-neptune (~> 1) + aws-sdk-opsworks (~> 1) + aws-sdk-opsworkscm (~> 1) + aws-sdk-organizations (~> 1) + aws-sdk-pi (~> 1) + aws-sdk-pinpoint (~> 1) + aws-sdk-polly (~> 1) + aws-sdk-pricing (~> 1) + aws-sdk-rds (~> 1) + aws-sdk-redshift (~> 1) + aws-sdk-rekognition (~> 1) + aws-sdk-resourcegroups (~> 1) + aws-sdk-resourcegroupstaggingapi (~> 1) + aws-sdk-route53 (~> 1) + aws-sdk-route53domains (~> 1) + aws-sdk-s3 (~> 1) + aws-sdk-sagemaker (~> 1) + aws-sdk-sagemakerruntime (~> 1) + aws-sdk-secretsmanager (~> 1) + aws-sdk-serverlessapplicationrepository (~> 1) + aws-sdk-servicecatalog (~> 1) + aws-sdk-servicediscovery (~> 1) + aws-sdk-ses (~> 1) + aws-sdk-shield (~> 1) + aws-sdk-simpledb (~> 1) + aws-sdk-sms (~> 1) + aws-sdk-snowball (~> 1) + aws-sdk-sns (~> 1) + aws-sdk-sqs (~> 1) + aws-sdk-ssm (~> 1) + aws-sdk-states (~> 1) + aws-sdk-storagegateway (~> 1) + aws-sdk-support (~> 1) + aws-sdk-swf (~> 1) + aws-sdk-transcribeservice (~> 1) + aws-sdk-translate (~> 1) + aws-sdk-waf (~> 1) + aws-sdk-wafregional (~> 1) + aws-sdk-workdocs (~> 1) + aws-sdk-workmail (~> 1) + aws-sdk-workspaces (~> 1) + aws-sdk-xray (~> 1) + aws-sdk-route53 (1.10.1) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-route53domains (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-s3 (1.17.0) + aws-sdk-core (~> 3, >= 3.21.2) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.0) + aws-sdk-sagemaker (1.11.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-sagemakerruntime (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-secretsmanager (1.10.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-serverlessapplicationrepository (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-servicecatalog (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-servicediscovery (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ses (1.8.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-shield (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-simpledb (1.1.0) + aws-sdk-core (~> 3) + aws-sigv2 (~> 1.0) + aws-sdk-sms (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-snowball (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-sns (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-sqs (1.4.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-ssm (1.18.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-states (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-storagegateway (1.6.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-support (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-swf (1.1.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-transcribeservice (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-translate (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-waf (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-wafregional (1.5.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-workdocs (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-workmail (1.2.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-workspaces (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sdk-xray (1.3.0) + aws-sdk-core (~> 3) + aws-sigv4 (~> 1.0) + aws-sigv2 (1.0.1) + aws-sigv4 (1.0.3) + bson (4.3.0) + cool.io (1.5.3) + dig_rb (1.0.1) + elasticsearch (6.1.0) + elasticsearch-api (= 6.1.0) + elasticsearch-transport (= 6.1.0) + elasticsearch-api (6.1.0) multi_json - elasticsearch-transport (1.0.18) + elasticsearch-transport (6.1.0) faraday multi_json - excon (0.54.0) - faraday (0.11.0) + excon (0.62.0) + faraday (0.15.2) multipart-post (>= 1.2, < 3) - ffi (1.9.17) - fluent-mixin-config-placeholders (0.4.0) - fluentd - uuidtools (>= 2.1.5) - fluent-mixin-plaintextformatter (0.2.6) - fluentd - ltsv - fluent-plugin-elasticsearch (1.9.2) - elasticsearch (< 1.1) + fluent-config-regexp-type (1.0.0) + fluentd (> 1.0.0, < 2) + fluent-plugin-elasticsearch (2.11.1) + elasticsearch excon - fluentd (>= 0.10.43) - fluent-plugin-kafka (0.5.0) + fluentd (>= 0.14.20) + fluent-plugin-kafka (0.7.4) fluentd (>= 0.10.58, < 2) ltsv - ruby-kafka (= 0.3.16.beta2) - fluent-plugin-kinesis (1.1.2) - aws-sdk (~> 2) - concurrent-ruby (~> 1) - fluentd (>= 0.10.58, < 2) - os (>= 0.9.6) - protobuf (>= 3.5.5) - fluent-plugin-mongo (0.7.16) - fluentd (>= 0.10.58, < 2) - mongo (~> 1.9) - fluent-plugin-record-reformer (0.8.2) + ruby-kafka (>= 0.4.1, < 1.0.0) + fluent-plugin-kinesis (2.1.1) + aws-sdk (>= 2.9.9, < 4) + fluentd (>= 0.12.35, < 2) + google-protobuf (~> 3) + fluent-plugin-mongo (1.1.1) + fluentd (>= 0.14.12, < 2) + mongo (~> 2.2.0) + fluent-plugin-record-reformer (0.9.1) fluentd - fluent-plugin-rewrite-tag-filter (1.5.5) - fluentd - fluent-plugin-s3 (0.8.0) - aws-sdk (>= 2.3.22, < 3) - fluentd (>= 0.10.58, < 2) + fluent-plugin-rewrite-tag-filter (2.1.0) + fluent-config-regexp-type + fluentd (>= 0.14.2, < 2) + fluent-plugin-s3 (1.1.3) + aws-sdk-s3 (~> 1.0) + aws-sdk-sqs (~> 1.0) + fluentd (>= 0.14.2, < 2) fluent-plugin-scribe (0.10.14) fluentd thrift (~> 0.8.0) - fluent-plugin-webhdfs (0.5.2) - bzip2-ffi - fluent-mixin-config-placeholders (>= 0.3.0) - fluent-mixin-plaintextformatter (>= 0.2.1) - fluentd (>= 0.10.59) + fluent-plugin-webhdfs (1.2.3) + fluentd (>= 0.14.4) webhdfs (>= 0.6.0) - fluentd (0.14.11) - cool.io (~> 1.4.5) + fluentd (1.2.3) + cool.io (>= 1.4.5, < 2.0.0) + dig_rb (~> 1.0.0) http_parser.rb (>= 0.5.1, < 0.7.0) msgpack (>= 0.7.0, < 2.0.0) serverengine (>= 2.0.4, < 3.0.0) sigdump (~> 0.2.2) - strptime (~> 0.1.7) + strptime (>= 0.2.2, < 1.0.0) tzinfo (~> 1.0) tzinfo-data (~> 1.0) yajl-ruby (~> 1.0) + google-protobuf (3.6.0) http_parser.rb (0.6.0) - i18n (0.7.0) - jmespath (1.3.1) + jmespath (1.4.0) ltsv (0.1.0) - middleware (0.1.0) - minitest (5.10.1) - mongo (1.12.5) - bson (= 1.12.5) - msgpack (1.0.2) - multi_json (1.12.1) + mongo (2.2.7) + bson (~> 4.0) + msgpack (1.2.4) + multi_json (1.13.1) multipart-post (2.0.0) - os (0.9.6) - protobuf (3.6.12) - activesupport (>= 3.2) - middleware - thor - thread_safe - public_suffix (2.0.5) - ruby-kafka (0.3.16.beta2) - serverengine (2.0.4) + public_suffix (3.0.2) + ruby-kafka (0.6.7) + serverengine (2.0.7) sigdump (~> 0.2.2) sigdump (0.2.4) - strptime (0.1.9) - thor (0.19.4) - thread_safe (0.3.5) + strptime (0.2.3) + thread_safe (0.3.6) thrift (0.8.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2016.10) + tzinfo-data (1.2018.5) tzinfo (>= 1.0.0) - uuidtools (2.1.5) webhdfs (0.8.0) addressable - yajl-ruby (1.3.0) + yajl-ruby (1.4.0) PLATFORMS ruby @@ -133,4 +690,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.12.5 + 1.16.2 diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index 1c508e7b58e..8a3c212d055 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -1,205 +1,1510 @@ { - activesupport = { + addressable = { + dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08bnl0nr9csjgkgz6xf8dyg7rccinmfrmn235z3bfaz8ihz15d1d"; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; }; - version = "5.0.1"; + version = "2.5.2"; }; - addressable = { + aws-eventstream = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gdiwkg24jpx5f3bkw6vchgliicn6v9bpm09j0dldaxsca66q0wy"; + type = "gem"; + }; + version = "1.0.1"; + }; + aws-partitions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; + sha256 = "1gqkj0fq1rlrsfr1s3dgrhz4dikxlkrbrkp0i2013aa3lcsm8hqm"; type = "gem"; }; - version = "2.5.0"; + version = "1.96.0"; }; aws-sdk = { + dependencies = ["aws-sdk-resources"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z01jdka7akshp524xprqaakpavzjadh0kmwmz8mwk5i1yiakba3"; + type = "gem"; + }; + version = "3.0.1"; + }; + aws-sdk-acm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r6m6l8jbnhcvs6xighgcpc8li8pnjr33l34fqgnbxbbkybwnhl0"; + type = "gem"; + }; + version = "1.9.0"; + }; + aws-sdk-acmpca = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ggvcyijmhdwiw1ym21pxac4hf7wmndy5l5g1mmd2r6mlz08n6b"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-alexaforbusiness = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bn1460ga5b1nair735nf8cg4hrgh499kdwn9r75d5mjfd4yxg1s"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-apigateway = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v1p15lx6k9iyx226h6w9pp16frhnpl1xxwm1c0q39a5f9k7vyl7"; + type = "gem"; + }; + version = "1.13.0"; + }; + aws-sdk-applicationautoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sf117qwmw3qdvydr6sn70vm9ygpnr1mgqic2vc1y6s85rzfh4z2"; + type = "gem"; + }; + version = "1.11.0"; + }; + aws-sdk-applicationdiscoveryservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n770ra6d2bc23rq66x5rd2ck0c0h0ivgxcdgi7kmvkjrh09fslj"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-appstream = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04y4s4pkwvl72a2jzrscki68p6klh9g6vxi86whi4hsg05imj909"; + type = "gem"; + }; + version = "1.13.0"; + }; + aws-sdk-appsync = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kk4r6272fniq5dx50f3k0wz8pjysbvxs26jyvr5af97ayndks1n"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-athena = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q9igjjw0jc860dns4mh8l1bm0s1q4bpfrzkgczij5vx3rp3jpqv"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-autoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15hvj08avacvkkrm60rdv39k58zxaqsigrlfjgfiki7vcrrqm19j"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-autoscalingplans = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0djk1z0q92cclr0757qvphj63x20a1ygzp3c9w1ycc6b3n7j5a0r"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-batch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18yr41pgl11x1vfc7w4f7n5v8vbhz4vb05q1fckqcwmwrwcqwycn"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-budgets = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xdwr9c0wcys9gljl2q0bvrjvlk6q676gsr2159qdh0px1s9f8cd"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-cloud9 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vs7jgg1fjz0kn1772mbk55q5ia8k8045bl38wsh23yz9naf7wrb"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-clouddirectory = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zkbqj3nf9pdyzyk9z1xm9qkslghljhwzma10mrpg2wkic8in2zg"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-cloudformation = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q75h9nbhkrs3rblc5bdf2v1yamskgjkz5rlzlikpp1x08alll2x"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-cloudfront = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wzhhv2hnxy0h3zcbppdzym1zmsgmv6fqkdcdghh5ys9mj4wnq86"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-cloudhsm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zjdql9x8cpjikjc6q4g8vmdi1xq27q7vwns8flib9cklbkb615k"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-cloudhsmv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09pw8dgay7vrmwfjz5dzjrci1q6iqazna36d5vhp3raw4drb5q0c"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-cloudsearch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k702nm5aqxhgyc2gvjx8c5abg2b004apsgwfv6pi4szcbd3c4bq"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cloudsearchdomain = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kc6d3dy7vdydwnhzddnfkrrdspsxzc1h91yml6jskr5p6ccc6mb"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cloudtrail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11lj0qw9w7cmxwgfdwvhfx6pfx5dx3b2mcsg0fmy0k8pl18zp4rr"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cloudwatch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmpmwzra3b5gracca050zs0lrsq28sc34x7qx8c0cr05jlkjjig"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-cloudwatchevents = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qr2mlx7w2wb168vldm0ci7z7jf8mjmp73i50048pa6yqsn5jg42"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-cloudwatchlogs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16fwk4hxycqq8kkv1asiimr5h5dcrnh22ix9z7vzg6gd3w4cx8yl"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-codebuild = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x88dg1ygffxlvw9hl9xj7nfvd311vic49sjwrq171ily9drd8dp"; + type = "gem"; + }; + version = "1.12.0"; + }; + aws-sdk-codecommit = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17xch4hwf5i7vvpq3mi6hg120jdjxw9qplhi7d48ch20w5w2nn3k"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-codedeploy = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18qpmbaqwnbw91hbm64fixn4dba35fhr7x770lvly885i8srbv44"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-codepipeline = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n0v9ml7bfdr30py24ab7jhh35ni17m2c7rr16d55sp14j6583ax"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-codestar = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd3l6igidddxy4flw3wry0mv2lr559vvfafjwna7ilj3v311dz2"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-cognitoidentity = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "014b9d7iai5sinjfs2qar3wwnhhb3cd35867jiwkqwhyga30r70p"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-cognitoidentityprovider = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlk4ysr1lbn94p16p7z0hr0m7pr47447g632fd0ss1hw7ap4csw"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-cognitosync = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d5fxq99sfwv4c7jgx65yrhxp9qg524bd8bsfamhakn0rlwi4iny"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-comprehend = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l50mvlrarqhb7d469czi3p7rimjwzcwp52bhklxbx6lmv3il23p"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-configservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11lzxili2c17m6h8y6ngl7z7h0rf7jwwaim4dq2pdf2qi2k5mh70"; + type = "gem"; + }; + version = "1.12.0"; + }; + aws-sdk-connect = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19s7ialas1yrc54g50yfa37z7m8dq4gqbf8dvlfg8qmpdijjxy3l"; + sha256 = "15xz6v48y4nn1yrr2n8d2w0z7g52cqyjrkjxyhgdv6967yby4qw2"; type = "gem"; }; - version = "2.7.0"; + version = "1.1.0"; }; aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a9sgff43s3zhpcmisk1bp6vvlpawa617svfhz84xwa6lmik9sp4"; + sha256 = "1dhii8d1ra9rbh3n0v5s2p4dg5mrwj44sl0mfcan40s1crcrm3m8"; type = "gem"; }; - version = "2.7.0"; + version = "3.22.1"; }; - aws-sdk-resources = { + aws-sdk-costandusagereportservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b5z25n4bgzwkzmzx2q6ik2y74jinyphmrh38lnrn9im6pmmvy3w"; + sha256 = "04sady26xlvkrmym4bmdbkc1d472kjlxsgr9awa205ih0bxsaffn"; type = "gem"; }; - version = "2.7.0"; + version = "1.1.0"; }; - aws-sigv4 = { + aws-sdk-costexplorer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + sha256 = "1ddd92nny926ipzgmr2gg9qh64iv96cd35zwsbwn7ns8mnndxa4q"; type = "gem"; }; - version = "1.0.0"; + version = "1.7.0"; }; - bson = { + aws-sdk-databasemigrationservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0slj051gw3mr155cwmj67d95wywq4v14ri6xhnkfx07sqp4i8z9a"; + type = "gem"; + }; + version = "1.7.0"; + }; + aws-sdk-datapipeline = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12zcsfr72hr0w1qyxv1iz587nzganpclvimyx5y02gg1hij8hz6b"; + sha256 = "0r2jnvbcbqkg5k42ly1x2w4g97rl4km1m3bwjvwl7q8c9fbrzpby"; type = "gem"; }; - version = "1.12.5"; + version = "1.1.0"; }; - bzip2-ffi = { + aws-sdk-dax = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5jlcz1vb0v3rbmsbbrarfglcmzdhr5jhlfc5wjnhz2zpybsz3y"; + sha256 = "0m6l7p2g667c54jxbdpb1zkin5damiq3x34aw5b3b88wk9nm8pfy"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-devicefarm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bzffmwrbw5irg94iki16ybg0wb926vsfvd4ziv890fc8n239ya"; + type = "gem"; + }; + version = "1.7.0"; + }; + aws-sdk-directconnect = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03jshg8ax2cww8zvf2lvf542xllgpv38i2iqnv79y62s9a26g4l5"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-directoryservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mmjxk34gids533s2x1ay4s9zzrvad16djf1m6xib6ys9bja1x27"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-dlm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j6r629wqg08zr9ndisy3d27hqj32kimlrfkigw276mnx2v507cn"; type = "gem"; }; version = "1.0.0"; }; - concurrent-ruby = { + aws-sdk-dynamodb = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; + sha256 = "0id29l91wpd9az9axsfmiqdwlh0qx4m1ci7fwzxm7ac6yjq4p7gr"; type = "gem"; }; - version = "1.0.4"; + version = "1.8.0"; }; - "cool.io" = { + aws-sdk-dynamodbstreams = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5fkyjdjwk68sg7fwxhx2k3hzxkkm6frnd2yix7brxdh06fp0k1"; + sha256 = "03b2wrkxp9cpr0akxqgn5hss9l2yzqa7kl9j0isyh968rbdzaxla"; type = "gem"; }; - version = "1.4.5"; + version = "1.1.0"; }; - elasticsearch = { + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdy17i56b4m7akp7yavnr8vhfhyz720waphmixq05dj21b11hl0"; + sha256 = "17144h9892pf8hn5c5lnid47q2dilyb5hxzf8pj7z3pkra5yn5aw"; type = "gem"; }; - version = "1.0.18"; + version = "1.38.0"; }; - elasticsearch-api = { + aws-sdk-ecr = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v6nb3ajz5rack3p4b4nz37hs0zb9x738h2ms8cc4plp6wqh1w5s"; + sha256 = "01x7m60sqfdkfiif1fxknl9p97076ndwr71s5aixq688plf7zybf"; type = "gem"; }; - version = "1.0.18"; + version = "1.4.0"; }; - elasticsearch-transport = { + aws-sdk-ecs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smfrz8nq49hgf67y5ayxa9i4rmmi0q4m51l0h499ykq4cvcwv6i"; + sha256 = "16czi8zgy8s1p0skcxwr4lcbfwp0g9c8ppbd3ymjchm75rdrg47g"; type = "gem"; }; - version = "1.0.18"; + version = "1.15.0"; }; - excon = { + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j4b6s90v84r4wrhbg4rzjfjg9sfisq50fjd3hh9p6yrkm86wbd3"; + sha256 = "0fi1a99fh62ma1xy4axh5cpach3fclajd30jp8kig9bxyaspsf2c"; type = "gem"; }; - version = "0.54.0"; + version = "1.2.0"; }; - faraday = { + aws-sdk-eks = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sgyja0kdj68vcqzmckxmik7ibp4rmyiw8vl6zyp3ihkqpvwf5ns"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-elasticache = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wy4w8gcdnn4ckyc0aa9p293fnwlv8ihyvmxflzjkigallxa23vc"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-elasticbeanstalk = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10f9lg288m74ssm24m7mhphi4h6km84pak0bpg7gd4rnrw4fdw1f"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-elasticloadbalancing = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dz9gx4c83s1qb03kqng5vh9kjihi0jv02j3ndp2z5z10cpncf3p"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-elasticloadbalancingv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qs1gjjnvhx1ijm7mr5aa0cv7sanvm81l8kpx1y57zrpa5ikp3r7"; + type = "gem"; + }; + version = "1.11.0"; + }; + aws-sdk-elasticsearchservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; + sha256 = "0zhylvqwln0vz5qhd1vj89s7fwdk330wksp206dphscmqjra0ggz"; type = "gem"; }; - version = "0.11.0"; + version = "1.6.0"; }; - ffi = { + aws-sdk-elastictranscoder = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7"; + sha256 = "1r9waa8jksznqwvlrapf71j8ga6cjm9j6qjrssqps083kxg0sad1"; type = "gem"; }; - version = "1.9.17"; + version = "1.1.0"; }; - fluent-mixin-config-placeholders = { + aws-sdk-emr = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14b4lqy91jgpky6g7h0vyfy2rr1qavmjzzgnmhwajfzxgw9y2jvi"; + sha256 = "0mkb4302iczxmn7al36f151xvjnf8v0r559p4wn6jginvgwxk48n"; type = "gem"; }; - version = "0.4.0"; + version = "1.3.0"; + }; + aws-sdk-firehose = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yc2kvnf0hdlpfh3i51m44775vws3k84wvlhnvj68nm5jszhhx7b"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-fms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lqh6pxg3ki2k539xm99p63fai8grswpkyd5nj8dl4pwsqn4xx57"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-gamelift = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wfyq9m0dv9isdriin285daj5b90bbkrk5b0ss0awhcqwarlj29i"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-glacier = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vlg62v7zraz5f7h13wws9cga4sdv62v6lsfkqn2ai6n1ks80c02"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-glue = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rlq8hchn6dkccwdrd27lizfghmgf4lcrdcblhs14sxmwk0jzl25"; + type = "gem"; + }; + version = "1.10.0"; }; - fluent-mixin-plaintextformatter = { + aws-sdk-greengrass = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gliangfr07060ya9sawkyfx2vz7vdygys65f83czawhckvvm75n"; + sha256 = "05cjp6jvcnzg3jxwcggg31l0sqb743b6x66230nb5ahf7l8sq4fx"; type = "gem"; }; - version = "0.2.6"; + version = "1.4.0"; + }; + aws-sdk-guardduty = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l2fbhm1d5mgkvrz8jgny2zcd4zzijwy8s4f4p91kn22m1s74cg4"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-health = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b3zgjwh2drkxcbmglw9vz9b8wir0qwxihf2yrra33qhcxvlf29q"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iam = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wch93pvh5y16ldn1b42igrj0q76j7mfwvkwqnlk8197wpmyzl8z"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-importexport = { + dependencies = ["aws-sdk-core" "aws-sigv2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clry5ch04npyrgz61xrwwj6kwqai5d9c933rd17jx0r7dm2x5zb"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-inspector = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0blgc82naibxdv5zv7brc8kdp4mnqimxc3lsb2fahn9av4bdh4zf"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-iot = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00paa2lhahcfk1kk8zka7zb3hnia1qj6i8rv5ybapgdq9rj4936q"; + type = "gem"; + }; + version = "1.9.0"; + }; + aws-sdk-iot1clickdevicesservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k1if31wsy3dpk4mhwc6s86432g8jbbb1w4gpj85qlydrk2c7y96"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iot1clickprojects = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12r1pkzixj2g0i9mz7ywsr5qlz19868d8qb4www4s45h6qjwxwnz"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iotanalytics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a69cv9nypykg6il99znymfm09da4hlh3d6i13kj8gma5q7prnq6"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-iotdataplane = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0777k6l8phrby6ar5zpbhsp4i77d8bfs5z57axn6ir1q4dalgza5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-iotjobsdataplane = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05awqr95nlral8f8il5n27swri3vq9y60mhqz9qmhld8w3cwwspj"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-kinesis = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kw8ksdy6mylrzdswvxxdjb8wim9agdgxpjp3a1aqa72nlswq3nx"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-kinesisanalytics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1krdg2qvm2if5npbpw4bk2i1kz51bknfy1j5gaiiym1mmrz7lrap"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-kinesisvideo = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1299hi3296i3wjmy8cjzpy10bzpljb638yrbyash39y3znaxk2i8"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-kinesisvideoarchivedmedia = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17sap4wdpi6l6h8yfm9yzjniv4cps5q3wrhdjp6slwrmhrmq2gpx"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-kinesisvideomedia = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rzwpjnym78i5g6427w7war436qnl77qjaiwwh5avrvy12lfjyrb"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y41nf5p94r2mrmpxx2icylz7g1jm72d1awwpjfrw5zlxbzi8jgj"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-lambda = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ng2k320s81d5v1g2ihjvkmspnyfkcb9v2fc25mszwg9gwq4mhz1"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-lambdapreview = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ys1zpc7jmzn4vs01z5qw7rkg4732fbzpiwj5p0gpgy151hip110"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-lex = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g67akcqmv1i1k4a370vwnb1qkmfl7smfllbw84kd062h8m1h2vl"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-lexmodelbuildingservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0awdfirdc2wn4xaqxkizlxy604gwna55mn261fjwj6a3jp83pb1z"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-lightsail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gxs8b3grk4dwsldszvkz31w3lypdnyqhqs1c3w7f18b66p5l714"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-machinelearning = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rf84hxrqgzpmr08h14p1070x8cs3x5gxn48l1ia1bdlfjvllv2f"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-macie = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l20rk8r0k6n81vfy132l5xbaxr4h58ykvyhka0xrb2fys5kr704"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-marketplacecommerceanalytics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mcbk1gwqpfxg9wrf1vd9c4s97d46p425yx4m7fx6z73fb26ckp3"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-marketplaceentitlementservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17r2c9ir63wbhpl4kz3pwkavjqvi73jpx3vpbm8172zqai72m2qw"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-marketplacemetering = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05snignv3fjdfpjw771daxkkm7hlc7wbsi43ajjwvrxzl8apgkl1"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-mediaconvert = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hdliqi7rxhp02rnnnvrkg1pn5rbss577f5di4h1pbcmw29zqa2p"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-medialive = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03pr959i5lnsdw4vagdhfcjfrm01h055j83abs9w2gs4asmknyi9"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-mediapackage = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190ca52xzdgnfn73qwv4kc2jix2a3s7gxx6a2nij47ak5bs8qhhn"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-mediastore = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m7xjz0xpnwvsm35m2wnp9ja8sqhk5w09jf92frim482vyddk46n"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-mediastoredata = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1da6wd4nrf99mxyv9fay4bbk3n64swzr8989dfjipqa8rpnry9dq"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-mediatailor = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rm8f2ln263mabj5ia880h8464pxqg7cp1b1dy6mggbj77v4qyw7"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-migrationhub = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vaswa6f4hd7gf5y2rn6jn4rxx4i3dhyngb6446llwc218qqcp5x"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-mobile = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvx23q0dcf4kznf72fq6vrz2wzprim1n87a7jwwvqp1cm8dkh9s"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-mq = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h258myrx75zvicpdb06bbls4d0fnpfqfp16yc0j5lmqdr6p74qn"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-mturk = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kb5ii2lqiq8va1plyrna0zczgc9p2dgv0a17xx9pzfg2djvc7vz"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-neptune = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rddn8y1cwnj5zahvln643sfb4ayddqmydrxibf5j1nqsvv46lg7"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-opsworks = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkjf0694daikkqsqygq1f34zw4wiwg57p8vxlwx5fxjbgwfi01a"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-opsworkscm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06067wx6ihk9kj11789dlzag3j2b7zxk9yil4zxy0gv95w37ypzg"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-organizations = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jhll8rgp78pwsd5wgfg4nwxkyzahlh0xrnddw3cx9qhzcb001xn"; + type = "gem"; + }; + version = "1.10.0"; + }; + aws-sdk-pi = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm7d9ssn4q2107gp90qsi8vjg87wdl5py55qq76m79xmp2i08wi"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-pinpoint = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "023yvhr6xdisyyx9p104hyaq2vy9rs0n43h2dc5nbm58a1bm2zsn"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-polly = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g98zchw6ycnz3anvpc6glxj9kal71mn78gr2i37awb6z0j3mk1g"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-pricing = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hm8m1jhf6qfpy1866ykvvnc51mfbp89mfby6z6yxy00fz6mvax5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-rds = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "009ns5wfcrxan5hhzsj7gpcwnni2ydq79mk2i3lj4gw87k9kr9zx"; + type = "gem"; + }; + version = "1.23.0"; + }; + aws-sdk-redshift = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rp9zm846rx9vm2qvh238gzixbb7r58xbrrfk0ipsrw6v19b4my4"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-rekognition = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j399i23anlj252rwnj3dcm66787nspfj8hyazfsgb5ww7b2day3"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-resourcegroups = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f878grncnyxlkml525apx3l28mmq96gfi5vpcjhcw9apz58qclf"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-resourcegroupstaggingapi = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wr75f1gi449x12hai1yjzrlw6cql3z4jyc1hd68wppyf6f1s8kw"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-resources = { + dependencies = ["aws-sdk-acm" "aws-sdk-acmpca" "aws-sdk-alexaforbusiness" "aws-sdk-apigateway" "aws-sdk-applicationautoscaling" "aws-sdk-applicationdiscoveryservice" "aws-sdk-appstream" "aws-sdk-appsync" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-autoscalingplans" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloud9" "aws-sdk-clouddirectory" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudsearch" "aws-sdk-cloudsearchdomain" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codebuild" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-codestar" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-cognitosync" "aws-sdk-comprehend" "aws-sdk-configservice" "aws-sdk-connect" "aws-sdk-costandusagereportservice" "aws-sdk-costexplorer" "aws-sdk-databasemigrationservice" "aws-sdk-datapipeline" "aws-sdk-dax" "aws-sdk-devicefarm" "aws-sdk-directconnect" "aws-sdk-directoryservice" "aws-sdk-dlm" "aws-sdk-dynamodb" "aws-sdk-dynamodbstreams" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-elastictranscoder" "aws-sdk-emr" "aws-sdk-firehose" "aws-sdk-fms" "aws-sdk-gamelift" "aws-sdk-glacier" "aws-sdk-glue" "aws-sdk-greengrass" "aws-sdk-guardduty" "aws-sdk-health" "aws-sdk-iam" "aws-sdk-importexport" "aws-sdk-inspector" "aws-sdk-iot" "aws-sdk-iot1clickdevicesservice" "aws-sdk-iot1clickprojects" "aws-sdk-iotanalytics" "aws-sdk-iotdataplane" "aws-sdk-iotjobsdataplane" "aws-sdk-kinesis" "aws-sdk-kinesisanalytics" "aws-sdk-kinesisvideo" "aws-sdk-kinesisvideoarchivedmedia" "aws-sdk-kinesisvideomedia" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-lambdapreview" "aws-sdk-lex" "aws-sdk-lexmodelbuildingservice" "aws-sdk-lightsail" "aws-sdk-machinelearning" "aws-sdk-macie" "aws-sdk-marketplacecommerceanalytics" "aws-sdk-marketplaceentitlementservice" "aws-sdk-marketplacemetering" "aws-sdk-mediaconvert" "aws-sdk-medialive" "aws-sdk-mediapackage" "aws-sdk-mediastore" "aws-sdk-mediastoredata" "aws-sdk-mediatailor" "aws-sdk-migrationhub" "aws-sdk-mobile" "aws-sdk-mq" "aws-sdk-mturk" "aws-sdk-neptune" "aws-sdk-opsworks" "aws-sdk-opsworkscm" "aws-sdk-organizations" "aws-sdk-pi" "aws-sdk-pinpoint" "aws-sdk-polly" "aws-sdk-pricing" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-rekognition" "aws-sdk-resourcegroups" "aws-sdk-resourcegroupstaggingapi" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-s3" "aws-sdk-sagemaker" "aws-sdk-sagemakerruntime" "aws-sdk-secretsmanager" "aws-sdk-serverlessapplicationrepository" "aws-sdk-servicecatalog" "aws-sdk-servicediscovery" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-snowball" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-storagegateway" "aws-sdk-support" "aws-sdk-swf" "aws-sdk-transcribeservice" "aws-sdk-translate" "aws-sdk-waf" "aws-sdk-wafregional" "aws-sdk-workdocs" "aws-sdk-workmail" "aws-sdk-workspaces" "aws-sdk-xray"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15z91flcf5daz7v5sfrib5sxm4gk6w66jlh93is0ixr6hwanqb2h"; + type = "gem"; + }; + version = "3.22.0"; + }; + aws-sdk-route53 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ga3rd1b3fgg8z46490gjkf2a7j1vys7mf3wi4qmwg8ijs8gva4c"; + type = "gem"; + }; + version = "1.10.1"; + }; + aws-sdk-route53domains = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02nzhks6kjpdakm3xcc5373g3dnn45a9gr70vc8jhdjyarhcasbk"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sxd6iwyg54qdzqxqhww1qnhg4z1il1impkg2g8ksgr9q2ykf4jd"; + type = "gem"; + }; + version = "1.17.0"; + }; + aws-sdk-sagemaker = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11arjp9mcgy3b8rp6dpdla0zcsrv40sw7cc0azplayk5n6cislx1"; + type = "gem"; + }; + version = "1.11.0"; + }; + aws-sdk-sagemakerruntime = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zyinypfjsf7kp6dh7wbk3f5x3qhj8p76pv332pknrgk94v6rn3i"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b5xk5icz664rjjcy9ijwfg4nr1chg0pbxyrmzy0agh88vxgp71z"; + type = "gem"; + }; + version = "1.10.0"; + }; + aws-sdk-serverlessapplicationrepository = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n7lzzvpyryv1v3pai3yxk2w95zk2yglmdh0k3h84n6z3w6jlgr3"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-servicecatalog = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13dhxxp1nmzs71ripdi4yas1wm17w3ks22by6qlbnqy9zwb0r6jg"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-servicediscovery = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "033fynzwr4j6idlk3p5rqk94n0ayxrwjcziky5hnfj2aic2yj3lf"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-ses = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aa3vq1lscb5cmcc10s38pdw2crdsfjd4gpb6d9j5d5z8wbpqjhz"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk-shield = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12imklik3j9l4fchyj4q6wpiw27kkm4m29accjwkxxikh70w9q0l"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-simpledb = { + dependencies = ["aws-sdk-core" "aws-sigv2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16qrczxn096aanan2qrvbbk398sqlfiawviz72z9y31pxds7699d"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-sms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d16b5s6x894fagk6mzvli4n9rpsv4gx1xw445nl49jc8z3b941l"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-snowball = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17kk7n83zbhms7bvavlasw13ydsiqzm8l2p6dpsa3cjqvs7bn9bw"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-sns = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkv99yqilpklrhwhxr5lv0xma1irk0j7q5myw220yl84d7c6m04"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-sqs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m4lk45bfanxyq3rz428az2bbz2g3xbzq40754d81m0b17kyz6nc"; + type = "gem"; + }; + version = "1.4.0"; + }; + aws-sdk-ssm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w5idgdqp3z9s0cf84r66ha1npjhszp0zd3w43rlp96m1z9m8pk8"; + type = "gem"; + }; + version = "1.18.0"; + }; + aws-sdk-states = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sg5z9mgn76l81zgigxrxwnn710gigp6iragc3gvz0cdfwwzd33f"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-storagegateway = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "078j56x8jllk5dsb8crk33336kmcgs83p2achlw5j10mlfzlra6z"; + type = "gem"; + }; + version = "1.6.0"; + }; + aws-sdk-support = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bg642zz7nn3dfr039pgry44js9jlr31yq47rsqzhl6p3qh9yisi"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-swf = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "108gzaw0y83vncbv6rzaww4950cycwh8crcw3vf2av6w0mbqi61f"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sdk-transcribeservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z66aqfh1s561wa9dqasvbb4shxb2chp12i8h6hs6lxsrpihxbi0"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-translate = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17wprz7c8h8bfi1pv8pw2jll4iaixs9v2zd6iyy33zy0ssyzp9jc"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-waf = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kxaspfpgsrwm1vdyqhbjw1l40z5ygkx9if5lfqh80906rns9gwz"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-wafregional = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryrx7zh7dmxzrvky3kx6dvz22v0s919jkdhqh8rx65p97ikml2c"; + type = "gem"; + }; + version = "1.5.0"; + }; + aws-sdk-workdocs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07grgjkzg31n3k0ig70gj6pjix44jwnl54lw4pn4yqld3472r296"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-workmail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04yak9s80kcx0vnz9ghbis5qj274rpkwga2391kky8r2gf40lpn2"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-sdk-workspaces = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vq0bayq1ryzd9z4y70w39h1ag2jj6k59bv72agdafrszv13fggf"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sdk-xray = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00n7nrx5qfbcv94hdlh623nhv269z9abfkb6mj5dmjw4hzpm8d31"; + type = "gem"; + }; + version = "1.3.0"; + }; + aws-sigv2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1191i9c0kkiyfs3vfwgfxc8kq19rg1q4lkackz56yffv05yp5ng3"; + type = "gem"; + }; + version = "1.0.1"; + }; + aws-sigv4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzndv113i6bgy2n72i5l3mwn8vjnb6hhjxfkpn9mm2p5ra77yk7"; + type = "gem"; + }; + version = "1.0.3"; + }; + bson = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07baxjrd8rb5gfsv7hh1akjqcpwih76f1711bwjzp228c79ny2na"; + type = "gem"; + }; + version = "4.3.0"; + }; + "cool.io" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03wwgs427nmic6aa365d7kyfbljpb1ra6syywffxfmz9382xswcp"; + type = "gem"; + }; + version = "1.5.3"; + }; + dig_rb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; + type = "gem"; + }; + version = "1.0.1"; + }; + elasticsearch = { + dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "162a7aiajs7w3rak21y6jidik7zhkm104wcx25190llyqbqkvlp9"; + type = "gem"; + }; + version = "6.1.0"; + }; + elasticsearch-api = { + dependencies = ["multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9shhpifl6cir68zxv30mjjybxsx39asqnircrgs4lqsb20j1n7"; + type = "gem"; + }; + version = "6.1.0"; + }; + elasticsearch-transport = { + dependencies = ["faraday" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dmb587mp526q1wvb1j13rjj13vxl4fcpmm899ipyr88spld5vc7"; + type = "gem"; + }; + version = "6.1.0"; + }; + excon = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + type = "gem"; + }; + version = "0.62.0"; + }; + faraday = { + dependencies = ["multipart-post"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; + type = "gem"; + }; + version = "0.15.2"; + }; + fluent-config-regexp-type = { + dependencies = ["fluentd"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hk0vxcmlbid7n6piyv3x83j5gyiz7in397l9x3c6nh69wicy7gm"; + type = "gem"; + }; + version = "1.0.0"; }; fluent-plugin-elasticsearch = { + dependencies = ["elasticsearch" "excon" "fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q0v8jxpwrkh1z5qh0chwrssz93nldka4jwfn32hlqhnmb99q8i1"; + sha256 = "1jh7wpj46753mii98ddafl5yas0iw8dc1b87lzgdyfri9z8cbfv1"; type = "gem"; }; - version = "1.9.2"; + version = "2.11.1"; }; fluent-plugin-kafka = { + dependencies = ["fluentd" "ltsv" "ruby-kafka"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sd025xsl1cnjs11wasg0di2k02rx9ifaj49n28ak363df6vsqgf"; + sha256 = "16r7ydlnb1ba7adk3f95v3x1qjk22cifd9bvz71099m17njw56g1"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.4"; }; fluent-plugin-kinesis = { + dependencies = ["aws-sdk" "fluentd" "google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "119ngswi9q0p5hh5ldan9pzrgd1lfsbkr5f56hy1k4gfss4kmq27"; + sha256 = "14hsvbskfviq11408qglqx1434hv6i7qbgqy8nnii8a657fccvxy"; type = "gem"; }; - version = "1.1.2"; + version = "2.1.1"; }; fluent-plugin-mongo = { + dependencies = ["fluentd" "mongo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7n8cknqh956yx3c9hv2g535x4kcixmnxw3fvcspjbqprrd1s91"; + sha256 = "1w7fla5172x7bll10zja0sg4n0gzkqa191jf6zradhb6416qd355"; type = "gem"; }; - version = "0.7.16"; + version = "1.1.1"; }; fluent-plugin-record-reformer = { + dependencies = ["fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2pws1mqp6pkb00ix6wjkxklckqb4wcbp79lpyk0b644bk9hqzb"; + sha256 = "1gwfrfyi9is4l9q4ih3c4l3c9qvyh00jnd2qajdpdh5xjj2m7akn"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.1"; }; fluent-plugin-rewrite-tag-filter = { + dependencies = ["fluent-config-regexp-type" "fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1avxvvmfm7bl7fpa2p73295kydh1nbsgdvsr7bsyrb77z1s1m86z"; + sha256 = "1xra33l2pid84qmgr0ni9dmd114l035z9j4g66wdfyihncnaaamp"; type = "gem"; }; - version = "1.5.5"; + version = "2.1.0"; }; fluent-plugin-s3 = { + dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxvk5n76pw4r37lv8vfl1cd0yjxnlj5wlwyk8f1lvp9ma5zlzmg"; + sha256 = "102d85igcnnlha8j0vw3pvc0425d38c9r0pryqhz7v1j4p2igi27"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.3"; }; fluent-plugin-scribe = { + dependencies = ["fluentd" "thrift"]; source = { remotes = ["https://rubygems.org"]; sha256 = "00m19w7p22adq0yx1h7h2h4ckw9kh5j458a8lawgmbazw2dz0zxi"; @@ -208,43 +1513,45 @@ version = "0.10.14"; }; fluent-plugin-webhdfs = { + dependencies = ["fluentd" "webhdfs"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kb9cgrgvh61pqqzv2csnibmp2jwh4hyjyvrh2npkk59k3jp54ad"; + sha256 = "1yyv3f0g30x9dzhq74b5cq8z0wbyppw9bb6152v6yrwz25b16231"; type = "gem"; }; - version = "0.5.2"; + version = "1.2.3"; }; fluentd = { + dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w1bg3nrn6gwhyp8xlpbs9rcajkddnvw6jhn7kvzydp70g2aydhz"; + sha256 = "02a7xzpq3vs3lgwawygbkzbsjr2p46945l6wc3bkvws47v33yr4d"; type = "gem"; }; - version = "0.14.11"; + version = "1.2.3"; }; - "http_parser.rb" = { + google-protobuf = { source = { - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + remotes = ["https://rubygems.org"]; + sha256 = "10r48i7g0387sd8a1cl8n2da54ar9nw29jshmydwmdrb8y5v5nic"; type = "gem"; }; - version = "0.6.0"; + version = "3.6.0"; }; - i18n = { + "http_parser.rb" = { source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; type = "gem"; }; - version = "0.7.0"; + version = "0.6.0"; }; jmespath = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; ltsv = { source = { @@ -254,45 +1561,30 @@ }; version = "0.1.0"; }; - middleware = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0703nkf2v371wqr41c04x5qid7ww45cxqv3hnlg07if3b3xrm9xl"; - type = "gem"; - }; - version = "0.1.0"; - }; - minitest = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab"; - type = "gem"; - }; - version = "5.10.1"; - }; mongo = { + dependencies = ["bson"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0658pn2hbyfvbnpp3wdh3irin0wpikm6y2qbhnx07w54jbkmgh5p"; + sha256 = "0qdy2prwr9hv9691xxl0zqgp1s24jm6pknd2vq829yy6a1fv8f87"; type = "gem"; }; - version = "1.12.5"; + version = "2.2.7"; }; msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.4"; }; multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.1"; + version = "1.13.1"; }; multipart-post = { source = { @@ -301,45 +1593,30 @@ }; version = "2.0.0"; }; - os = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; - type = "gem"; - }; - version = "0.9.6"; - }; - protobuf = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cvkfp7574dr6wqpgafl3pg9niqfri3dh2fxb2f8qaapcgfgcaq6"; - type = "gem"; - }; - version = "3.6.12"; - }; public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.2"; }; ruby-kafka = { source = { remotes = ["https://rubygems.org"]; - sha256 = "112avql9nf0hq07zvh47fyx7na721bj4zfpf43ip471l6k2ksrf5"; + sha256 = "1k9p93zgyify9barnzc4di09pm8bdaywqx68149bmw0zzhghqdqa"; type = "gem"; }; - version = "0.3.16.beta2"; + version = "0.6.7"; }; serverengine = { + dependencies = ["sigdump"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f08kbiqg9yp5fxdw5blsrnq383a9g4n830g1ypppb7ddv61sbmi"; + sha256 = "1gkm880njsi9x6vpb5grsspxb097hi8898drlbbkj1wl9qf2xv8l"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.7"; }; sigdump = { source = { @@ -352,25 +1629,18 @@ strptime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1avbl1fj4y5qx9ywkxpcjjxxpjj6h7r1dqlnddhk5wqg6ypq8lsb"; - type = "gem"; - }; - version = "0.1.9"; - }; - thor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; + sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8"; type = "gem"; }; - version = "0.19.4"; + version = "0.2.3"; }; thread_safe = { source = { - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "0.3.5"; + version = "0.3.6"; }; thrift = { source = { @@ -383,28 +1653,23 @@ tzinfo = { dependencies = ["thread_safe"]; source = { - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - type = "gem"; - }; - version = "1.2.2"; - }; - tzinfo-data = { - source = { remotes = ["https://rubygems.org"]; - sha256 = "01nr50alfm1fyzlcbzvfbpnsq37yb3h676f9n3z0iyp4s4766psf"; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2016.10"; + version = "1.2.5"; }; - uuidtools = { + tzinfo-data = { + dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; + sha256 = "1fkihwl9k9pmygl6c4kdlzqv51hn33bvjnxs4q48gs4s63d8gva2"; type = "gem"; }; - version = "2.1.5"; + version = "1.2018.5"; }; webhdfs = { + dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; @@ -415,9 +1680,9 @@ yajl-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sah2lpvpsh555dcnhgcqylinjj5544md9dh1a0a13da0qv1p57i"; + sha256 = "01bk8pi6h9wdm0ikjqvl1nxlkrxv3q74m3yfg64va9wvk9sqjvvw"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 32deb0c2306..e723db260eb 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { homepage = https://github.com/kshvmdn/fsql; license = licenses.mit; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; inherit version; }; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index a882fe9a9ba..de211d1d1c4 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }: +{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }: buildGoPackage rec { name = "fzf-${version}"; @@ -47,7 +47,7 @@ buildGoPackage rec { cp -R $src/shell $bin/share/fzf cat <<SCRIPT > $bin/bin/fzf-share - #!/bin/sh + #!${runtimeShell} # Run this script to find the fzf shared folder where all the shell # integration scripts are living. echo $bin/share/fzf diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 2f7d5e2a82c..238a60211c8 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "2.5.1"; + version = "3.0.0"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1n7s6j36rs4dj27fz5n7gvxagx6w4lhi1z2xhryc41pz77mjrnkb"; + sha256 = "1jcc254z4xqybm1f5r0g4dfyd9ji0z5g45hcnds32w9h8zqk391k"; }; dontBuild = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {graylog.jar,lib,bin,plugin,data} $out + cp -r {graylog.jar,lib,bin,plugin} $out wrapProgram $out/bin/graylogctl $makeWrapperArgs ''; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index a692933053d..dea71d146ed 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -25,10 +25,10 @@ in { aggregates = glPlugin rec { name = "graylog-aggregates-${version}"; pluginName = "graylog-plugin-aggregates"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws"; + sha256 = "1c48almnjr0b6nvzagnb9yddqbcjs7yhrd5yc5fx9q7w3vxi50zp"; }; meta = { homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "2.4.2"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8"; + sha256 = "09y1s71mk8fm6lsghla7mrh9z5y230r8zpv84klhavh2dacs8gq5"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d5079750859..fa1729b929c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -47,6 +47,21 @@ stdenv.mkDerivation rec { sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"; }; + patches = [ + ./fix-bash-completion.patch + # This patch makes grub compatible with the XFS sparse inode + # feature introduced by xfsprogs-4.16. + # to be removed in grub-2.03 + (fetchpatch { + url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff; + sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0"; + }) + ./relocation-not-implemented.diff + ]; + postPatch = '' + substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' + ''; + nativeBuildInputs = [ bison flex python pkgconfig ]; buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] ++ optional doCheck qemu @@ -57,14 +72,10 @@ stdenv.mkDerivation rec { # Work around a bug in the generated flex lexer (upstream flex bug?) NIX_CFLAGS_COMPILE = "-Wno-error"; - postPatch = '' - substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' - ''; - preConfigure = '' for i in "tests/util/"*.in do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' done # Apparently, the QEMU executable is no longer called @@ -82,17 +93,6 @@ stdenv.mkDerivation rec { unset CPP # setting CPP intereferes with dependency calculation ''; - patches = [ - ./fix-bash-completion.patch - # This patch makes grub compatible with the XFS sparse inode - # feature introduced by xfsprogs-4.16. - # to be removed in grub-2.03 - (fetchpatch { - url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff; - sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0"; - }) - ]; - configureFlags = [ "--enable-grub-mount" ] # dep of os-prober ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] diff --git a/pkgs/tools/misc/grub/relocation-not-implemented.diff b/pkgs/tools/misc/grub/relocation-not-implemented.diff new file mode 100644 index 00000000000..0b7bf947d14 --- /dev/null +++ b/pkgs/tools/misc/grub/relocation-not-implemented.diff @@ -0,0 +1,25 @@ +https://git.savannah.gnu.org/cgit/grub.git/commit/util?id=842c390469e2c2e10b5 +diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c +index a2bb054..39d7efb 100644 +--- a/util/grub-mkimagexx.c ++++ b/util/grub-mkimagexx.c +@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_uint32_t *t32 = (grub_uint32_t *) target; + *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) +diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c +index 9179285..a79271f 100644 +--- a/util/grub-module-verifier.c ++++ b/util/grub-module-verifier.c +@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { + -1 + }, (int[]){ + R_X86_64_PC32, ++ R_X86_64_PLT32, + -1 + } + }, diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 94beff8dfe3..ca4e477adce 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { preConfigure = '' for i in "tests/util/"*.in do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' done # Apparently, the QEMU executable is no longer called diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 0cb839c26ff..f1f2fd9aa44 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,11 +1,9 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala_0_40, python3, gnome3, gtk3, granite, gobject-introspection, desktop-file-utils, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, pantheon, python3, gnome3, gtk3, gobject-introspection, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; version = "1.0.0"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "artemanufrij"; repo = pname; @@ -20,14 +18,14 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + pantheon.vala wrapGAppsHook ]; buildInputs = [ - gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged + pantheon.elementary-icon-theme gnome3.libgee - granite + pantheon.granite gtk3 ]; diff --git a/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch new file mode 100644 index 00000000000..8b32ea4bab1 --- /dev/null +++ b/pkgs/tools/misc/hdf5/0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch @@ -0,0 +1,58 @@ +From 38c202df4db8eddd5e6f6f7d6506ce97912a3111 Mon Sep 17 00:00:00 2001 +From: Dana Robinson <derobins@hdfgroup.org> +Date: Mon, 26 Nov 2018 22:10:06 -0800 +Subject: [PATCH] Updated H5S to use the MPI-2 function MPI_Type_get_exten() + where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent() + call by default, so this avoids needing a special OpenMPI build. + +--- + src/H5Smpio.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/src/H5Smpio.c b/src/H5Smpio.c +index 2bd275a729..e71e2cb858 100644 +--- a/src/H5Smpio.c ++++ b/src/H5Smpio.c +@@ -879,7 +879,18 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, + HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) + } + +- MPI_Type_extent (inner_type, &inner_extent); ++#if MPI_VERSION >= 2 ++{ ++ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, ++ * so we're using the MPI-2 version even though we don't need the lb ++ * value. ++ */ ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); ++} ++#else ++ MPI_Type_extent(inner_type, &inner_extent); ++#endif + stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; + + /* If the element count is larger than what a 32 bit integer can hold, +@@ -1500,7 +1511,18 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, + } + } + +- MPI_Type_extent (old_type, &old_extent); ++#if MPI_VERSION >= 2 ++{ ++ /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, ++ * so we're using the MPI-2 version even though we don't need the lb ++ * value. ++ */ ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); ++} ++#else ++ MPI_Type_extent(old_type, &old_extent); ++#endif + + /* Set up the arguments for MPI_Type_struct constructor */ + type[0] = outer_type; +-- +2.18.1 + diff --git a/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch new file mode 100644 index 00000000000..8dc831dbba1 --- /dev/null +++ b/pkgs/tools/misc/hdf5/0001-Yanked-all-MPI-1-calls.patch @@ -0,0 +1,115 @@ +From 8cf3bfb14bd2a80f13d269a9e84cd99f86f19254 Mon Sep 17 00:00:00 2001 +From: Dana Robinson <derobins@hdfgroup.org> +Date: Tue, 27 Nov 2018 10:31:54 -0800 +Subject: [PATCH] Yanked all MPI-1 calls + +--- + src/H5.c | 2 +- + src/H5Smpio.c | 24 ++++++++---------------- + testpar/t_cache.c | 20 ++++++++++---------- + 3 files changed, 19 insertions(+), 27 deletions(-) + +diff --git a/src/H5.c b/src/H5.c +index d1967e611b..bf4643ca59 100644 +--- a/src/H5.c ++++ b/src/H5.c +@@ -138,7 +138,7 @@ H5_init_library(void) + if (mpi_initialized && !mpi_finalized) { + int key_val; + +- if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, ++ if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_COMM_NULL_COPY_FN, + (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, + &key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) +diff --git a/src/H5Smpio.c b/src/H5Smpio.c +index e71e2cb858..935d27972e 100644 +--- a/src/H5Smpio.c ++++ b/src/H5Smpio.c +@@ -879,18 +879,14 @@ H5S_mpio_hyper_type(const H5S_t *space, size_t elmt_size, + HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code) + } + +-#if MPI_VERSION >= 2 +-{ + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ +- MPI_Aint unused_lb_arg; +- MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); +-} +-#else +- MPI_Type_extent(inner_type, &inner_extent); +-#endif ++ { ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(inner_type, &unused_lb_arg, &inner_extent); ++ } + stride_in_bytes = inner_extent * (MPI_Aint)d[i].strid; + + /* If the element count is larger than what a 32 bit integer can hold, +@@ -1511,18 +1507,14 @@ static herr_t H5S_mpio_create_large_type (hsize_t num_elements, + } + } + +-#if MPI_VERSION >= 2 +-{ + /* As of version 4.0, OpenMPI now turns off MPI-1 API calls by default, + * so we're using the MPI-2 version even though we don't need the lb + * value. + */ +- MPI_Aint unused_lb_arg; +- MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); +-} +-#else +- MPI_Type_extent(old_type, &old_extent); +-#endif ++ { ++ MPI_Aint unused_lb_arg; ++ MPI_Type_get_extent(old_type, &unused_lb_arg, &old_extent); ++ } + + /* Set up the arguments for MPI_Type_struct constructor */ + type[0] = outer_type; +diff --git a/testpar/t_cache.c b/testpar/t_cache.c +index 5e15ec274c..ca5ded9ecf 100644 +--- a/testpar/t_cache.c ++++ b/testpar/t_cache.c +@@ -1217,15 +1217,15 @@ setup_derived_types(void) + struct mssg_t sample; /* used to compute displacements */ + + /* setup the displacements array */ +- if ( ( MPI_SUCCESS != MPI_Address(&sample.req, &displs[0]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.src, &displs[1]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.dest, &displs[2]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.mssg_num, &displs[3]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.base_addr, &displs[4]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.len, &displs[5]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.ver, &displs[6]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.count, &displs[7]) ) || +- ( MPI_SUCCESS != MPI_Address(&sample.magic, &displs[8]) ) ) { ++ if ( ( MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.src, &displs[1]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.dest, &displs[2]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.mssg_num, &displs[3]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.base_addr, &displs[4]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.len, &displs[5]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.ver, &displs[6]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.count, &displs[7]) ) || ++ ( MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]) ) ) { + + nerrors++; + success = FALSE; +@@ -1245,7 +1245,7 @@ setup_derived_types(void) + + if ( success ) { + +- result = MPI_Type_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); ++ result = MPI_Type_create_struct(9, block_len, displs, mpi_types, &mpi_mssg_t); + + if ( result != MPI_SUCCESS ) { + +-- +2.18.1 + diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 3d50b068cc4..ae34cfd3235 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; sha256 = "1pr85fa1sh2ky6ai2hs3f21lp252grl2cq3wbyi4rh7dm83gyrqj"; - }; + }; passthru = { mpiSupport = (mpi != null); @@ -45,7 +45,13 @@ stdenv.mkDerivation rec { ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"] ++ optional enableShared "--enable-shared"; - patches = [./bin-mv.patch]; + patches = [ + ./bin-mv.patch + # upstream patches for openmpi-4 compatiblity + # To be removed with the upgrade to 1.10.5 + ./0001-Updated-H5S-to-use-the-MPI-2-function-MPI_Type_get_e.patch + ./0001-Yanked-all-MPI-1-calls.patch + ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index e7ddcf572ae..372213b92c3 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -24,6 +24,6 @@ buildRustPackage rec { homepage = https://github.com/rschmitt/heatseeker; license = licenses.mit; maintainers = [ maintainers.michaelpj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index ee639245797..9ce06c9cf43 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.11.1"; + version = "1.12"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1yg7071lwl561s7r0qrnfx45z3ny8gjfrxpx0dbyhv3ywiac5kw8"; + sha256 = "1m5506scjbf2820p7mbsdsb2acg9jm74sb1604m9iz8v3dcn9dm6"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index cb2109e195e..65008cc9576 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, ansible2 }: +{ stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { version = "0.4.6"; @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { doCheck = false; propagatedBuildInputs = with python2Packages; [ - ansible2 + ansible boto cffi cryptography diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix new file mode 100644 index 00000000000..638beb2c75d --- /dev/null +++ b/pkgs/tools/misc/mcfly/default.nix @@ -0,0 +1,30 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "mcfly-${version}"; + version = "v0.3.1"; + rev = "${version}"; + + src = fetchFromGitHub { + inherit rev; + owner = "cantino"; + repo = "mcfly"; + sha256 = "0pmyw21zns4zn7pffji4yvbj63fx3g15cx81pk4bs6lzyz5zbdc2"; + }; + + preInstall = '' + mkdir -p $out/share/mcfly + cp mcfly.bash $out/share/mcfly/ + chmod +x $out/share/mcfly/mcfly.bash + ''; + + cargoSha256 = "0asldrf6s23f9aylk9f8zimmaskgqv3vkdhfnrd26zl9axm0a0ap"; + + meta = with stdenv.lib; { + homepage = https://github.com/cantino/mcfly; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.melkor333 ]; + }; +} diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 6913f1c11fd..ca6808effda 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 48714a4b6e8..07561d390cd 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.vanheusden.com/multitail/; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 3cce28df4f3..3896ca77a16 100644 --- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }: +{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3, runtimeShell }: stdenv.mkDerivation { name = "odroid-xu3-bootloader-2015-12-04"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3 sed -i \ - -e '1i#!${stdenv.shell}' \ + -e '1i#!${runtimeShell}' \ -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \ -e '/set -x/d' \ -e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \ diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 282d64befb7..f1589fc8c3b 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -4,49 +4,37 @@ python3.pkgs.buildPythonApplication rec { pname = "papis"; - version = "0.7.5"; + version = "0.8.2"; # Missing tests on Pypi src = fetchFromGitHub { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "1b481sj92z9nw7gwbrpkgd4nlmqc1n73qilkc51k2r56cy1kjvss"; - }; - - # Update click version to 7.0.0 - patches = fetchpatch { - url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch; - sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1"; + sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb"; }; propagatedBuildInputs = with python3.pkgs; [ - click requests filetype pyparsing configparser - arxiv2bib pyyaml chardet beautifulsoup4 prompt_toolkit - bibtexparser python-slugify pyparser pylibgen - habanero isbnlib + requests filetype pyparsing configparser arxiv2bib + pyyaml chardet beautifulsoup4 colorama bibtexparser + pylibgen click python-slugify habanero isbnlib + prompt_toolkit pygments # optional dependencies - dmenu-python whoosh + jinja2 whoosh ]; - postInstall = '' - install -Dt "$out/etc/bash_completion.d" scripts/shell_completion/build/bash/papis - ''; - checkInputs = (with python3.pkgs; [ pytest ]) ++ [ xdg_utils ]; - # most of the downloader tests require a network connection + # most of the downloader tests and 4 other tests require a network connection checkPhase = '' - HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders + HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ + -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url" ''; - # FIXME: find out why 39 tests fail - doCheck = false; - meta = { description = "Powerful command-line document and bibliography manager"; homepage = http://papis.readthedocs.io/en/latest/; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 6caaff37acd..4807f5df99b 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190122"; + name = "parallel-20190222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "030rjhis8s47gkm05k4vc9p886cxvadpgzs8rqmgzvlc38h5ywxf"; + sha256 = "073bj0ji9liq07j6a7y9i4kxfkv06kvavhh7654f2bgfavfbmcc6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 6ef561efbc3..7454a0e89c5 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.0"; + version = "1.2019.1"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1qc1sgzblmgvwr0zjcqrsj7zlvxrb15aba5fzlv0dbhjalzjlyvn"; + sha256 = "1prbb5c8y44p1x7vj4lpap2gbxd9bavbgvi6p7zw6nb0lfral6vg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 4d91c184b0a..4428bf1e625 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lX11" ]; patchPhase = '' cd src - substituteInPlace config --replace /bin/bash /bin/sh + substituteInPlace config --replace /bin/bash ${stdenv.shell} mkdir -p $out export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" ''; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 6127473343c..0680f360209 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.1"; + version = "2019.2"; src = fetchurl { url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "14qk8mq5yc67j3wl3fa9xnhh8ii8x5qdiavf7ybw7mp4ma4lwa8k"; + sha256 = "0sxjlcq15avb0fv6v89z2xrqv095dck4k5s9f0pk6y7sm063n2pk"; }; patches = [ diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index f1df0691205..858b45813d5 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "skim-${version}"; - version = "0.5.2"; + version = "0.5.5"; src = fetchFromGitHub { owner = "lotabout"; repo = "skim"; rev = "v${version}"; - sha256 = "1b3l0h69cm70669apsgzp7qw1k5fi2gbk9176hjr9iypbdiwjyir"; + sha256 = "1z9xjqr72r855899pgfrigdzcir18rpp0nh33r7jdz24q57zya10"; }; outputs = [ "out" "vim" ]; @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 644 shell/skim.1 $out/man/man1/skim.1 install -D -m 444 shell/* -t $out/share/skim install -D -m 444 plugin/skim.vim -t $vim/plugin diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 8b7f1d38744..35233d97d56 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchFromGitHub, cairo, meson, ninja, wayland, pkgconfig, wayland-protocols }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, cairo, wayland, wayland-protocols +, buildDocs ? true, scdoc +}: stdenv.mkDerivation rec { - name = "slurp-${version}"; - version = "1.0.1"; + pname = "slurp"; + version = "1.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y"; + sha256 = "15fqspg3cjl830l95ibibprxf9p13mc2rpyf9bdwsdx2f4qrkq62"; }; nativeBuildInputs = [ meson ninja pkgconfig - ]; + ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ cairo @@ -23,6 +26,8 @@ stdenv.mkDerivation rec { wayland-protocols ]; + mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled"; + meta = with stdenv.lib; { description = "Select a region in a Wayland compositor"; homepage = https://github.com/emersion/slurp; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index e0d1ff20835..0e84f738e80 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: stdenv.mkDerivation rec { name = "smc-6.6.3"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cp misc/smc.ico "$out/share/icons/" cat > "$out/bin/smc" << EOF - #!${stdenv.shell} + #!${runtimeShell} ${jre}/bin/java -jar "$out/share/java/Smc.jar" "\$@" EOF chmod a+x "$out/bin/smc" diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index b5c963307df..2b9f83041a4 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index c4cedf42650..21db09b985c 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.5.0a1"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "88b6ece3ff59a0882b5c5bff169cc4c1d688161fe61e5553b0a0802ff64b6da8"; + sha256 = "1s2jmi46z1as5f7124zxjd88crbgb427jqf9987nz0csbpbb12qa"; }; postPatch = '' diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix new file mode 100644 index 00000000000..5a979be249e --- /dev/null +++ b/pkgs/tools/misc/toybox/default.nix @@ -0,0 +1,62 @@ +{ + stdenv, lib, fetchFromGitHub, buildPackages, + enableStatic ? false, + enableMinimal ? false, + extraConfig ? "" +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "toybox"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "landley"; + repo = pname; + rev = version; + sha256 = "00q6vlc06xbhcjcyqkyp66d1pv7qgwhs00gk4vyixhjqh80giwzl"; + }; + + buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; + + postPatch = "patchShebangs scripts"; + + inherit extraConfig; + passAsFile = [ "extraConfig" ]; + + configurePhase = '' + make ${if enableMinimal then + "allnoconfig" + else + if stdenv.isFreeBSD then + "freebsd_defconfig" + else + if stdenv.isDarwin then + "macos_defconfig" + else + "defconfig" + } + + cat $extraConfigPath .config > .config- + mv .config- .config + + make oldconfig + ''; + + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional enableStatic "LDFLAGS=--static"; + + # tests currently (as of 0.8.0) get stuck in an infinite loop... + # ...this is fixed in latest git, so doCheck can likely be enabled for next release + # see https://github.com/landley/toybox/commit/b928ec480cd73fd83511c0f5ca786d1b9f3167c3 + #doCheck = true; + checkTarget = "tests"; + + meta = with stdenv.lib; { + description = "Lightweight implementation of some Unix command line utilities"; + homepage = https://landley.net/toybox/; + license = licenses.bsd0; + platforms = with platforms; linux ++ darwin ++ freebsd; + maintainers = with maintainers; [ hhm ]; + priority = 10; + }; +} diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index c04c16ae1cc..9ac60ca8b13 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, jre, unzip, runtimeShell }: stdenv.mkDerivation rec { major = "14"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cp -R * "$out/lib" cat > "$out/bin/umlet" << EOF - #!${stdenv.shell} + #!${runtimeShell} programDir="$out/lib" cd "\$programDir" diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/tools/misc/vcs_query/default.nix new file mode 100644 index 00000000000..a39619f354b --- /dev/null +++ b/pkgs/tools/misc/vcs_query/default.nix @@ -0,0 +1,31 @@ +{ stdenv, python3, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "vcs_query"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mageta"; + repo = "vcs_query"; + rev = "v${version}"; + sha256 = "05va0na9yxkpqhm9v0x3k58148qcf2bbcv5bnmj7vn9r7fwyjrlx"; + }; + + nativeBuildInputs = [ python3 python3.pkgs.wrapPython ]; + + dontBuild = true; + + installPhase = '' + install -Dm0755 vcs_query.py $out/bin/vcs_query + patchShebangs $out/bin + buildPythonPath ${python3.pkgs.vobject}; + patchPythonScript $out/bin/vcs_query + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mageta/vcs_query; + description = "eMail query-command to use vCards in mutt and Vim"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 2212ba870c4..37441f85e1a 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -49,6 +49,12 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' + # Invalid argument: 'perform_health_check' is not a valid setting + substituteInPlace tests/conftest.py \ + --replace "perform_health_check=False" "" + substituteInPlace tests/unit/test_repair.py \ + --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' "" + # for setuptools_scm: echo 'Version: ${version}' >PKG-INFO @@ -71,7 +77,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index 7ccc6e9dc27..a655aa9502e 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in an existing instance of GVim or MacVim. ''; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 710c6c61c64..4f1ca8f89ce 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.6.0"; + version = "10.8.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "0g4zvy1ll30jg55ddpfqmlncqd0igg6kqy87j4izs1dpapk7a1ln"; + sha256 = "057gq6j41x9z29az4s21crswm97pa9z4v58m34q8mi3chihc3pj6"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 61f1752823d..ddfdf0f492f 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "watchexec-${version}"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "watchexec"; repo = "watchexec"; rev = version; - sha256 = "15fnf3r4pvl9gyvq0fy0l7p8xjaz44z9g4dzkn1l0fdhldib6z1c"; + sha256 = "0azfnqx5v1shsd7jdxzn41awh9dbjykv8h1isrambc86ygr1c1cy"; }; cargoSha256 = "1xlcfr2q2pw47sav9iryjva7w9chv90g18hszq8s0q0w71sccv6j"; diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 8a411d89da5..bdcdc47ea13 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config }: +{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: let xorgConfig = writeText "dummy-xorg.conf" '' @@ -73,7 +73,7 @@ let ''; in writeScriptBin "xdummy" '' - #!${stdenv.shell} + #!${runtimeShell} exec ${xorg.xorgserver.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index e03f84355ca..3be931a362b 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,7 +1,7 @@ { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool , libuuid, libxfs, lvm2, openssl, perl, procps, quota -, time, utillinux, which, writeScript, xfsprogs }: +, time, utillinux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { name = "xfstests-2018-04-11"; @@ -78,7 +78,7 @@ stdenv.mkDerivation { # wants to write temporary files there. So create a temporary # to run from and symlink the runtime files to it. wrapperScript = writeScript "xfstests-check" '' - #!/bin/sh + #!${runtimeShell} set -e export RESULT_BASE="$(pwd)/results" diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index c39da71e179..7a092e59562 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "xmonad DBus monitoring solution"; homepage = https://github.com/xintron/xmonad-log; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ joko ]; }; } diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 604868f8c49..0ec7d58598f 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -3,23 +3,18 @@ stdenv.mkDerivation rec { name = "xsel-unstable-${version}"; - version = "2016-09-02"; + version = "2018-01-10"; src = fetchFromGitHub { owner = "kfish"; repo = "xsel"; - rev = "aa7f57eed805adb09e9c59c8ea841870e8206b81"; - sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5"; + rev = "9bfc13d64b5acb92c6648c696a9d9260fcbecc65"; + sha256 = "05ms34by5hxznnpvmvhgp6llvlkz0zw4sq6c4bgwr82lj140lscm"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libX11 ]; - # We need a README file, otherwise autoconf complains. - postUnpack = '' - mv $sourceRoot/README{.md,} - ''; - meta = with lib; { description = "Command-line program for getting and setting the contents of the X selection"; homepage = http://www.kfish.org/software/xsel; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0598976ec98..f1482596857 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.01.30.1"; + version = "2019.03.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0wamv1fs4w8jjx67p60rgrgdi6k04yy0h4p3cwscza5pzhpmvnlf"; + sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 43814a3f613..9caf4cf07b8 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.19.0"; + version = "1.19.3"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b"; + sha256 = "0jhvnavjrpwzmmjcw486df5s48j53njqgyz36yz3dskbaz3kwlfr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 589e6717c7d..61945266e13 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { name = "zsh-autoenv-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -R $src $out/share/zsh-autoenv cat <<SCRIPT > $out/bin/zsh-autoenv-share - #!${stdenv.shell} + #!${runtimeShell} # Run this script to find the fzf shared folder where all the shell # integration scripts are living. echo $out/share/zsh-autoenv diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 8bb092f122b..7c0c69e1de0 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar garbas chaoflow ]; + maintainers = with maintainers; [ domenkozar garbas ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index 70005038f99..c53cce49a38 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgs, makeWrapper, buildEnv -, nodejs +, nodejs, runtimeShell }: let @@ -49,7 +49,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cat >$out/bin/airfield <<EOF - #!${stdenv.shell}/bin/sh + #!${runtimeShell} ${nodejs}/bin/node ${src}/airfield.js EOF ''; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 194758905ff..6c440fc48fd 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre, runtimeShell }: let version = "1.7.23"; @@ -8,7 +8,7 @@ let sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an"; }; launcher = '' - #!${stdenv.shell} + #!${runtimeShell} exec ${jre}/bin/java -jar ${jar} "$@" ''; in stdenv.mkDerivation { diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix index 16955f9c4f1..944ba604ece 100644 --- a/pkgs/tools/networking/dd-agent/6.nix +++ b/pkgs/tools/networking/dd-agent/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname }: let # keep this in sync with github.com/DataDog/agent-payload dependency @@ -6,14 +6,14 @@ let in buildGoPackage rec { name = "datadog-agent-${version}"; - version = "6.9.0"; + version = "6.10.0"; owner = "DataDog"; repo = "datadog-agent"; src = fetchFromGitHub { inherit owner repo; rev = "${version}"; - sha256 = "1ddzml9ip5nm5z6cmnsrqxlmcr8411qlyr05hky7yn1dacin9ifw"; + sha256 = "076ww3swlqi7gfmqmnllhif8f6skv0jwc2gq3mi855p4mm6qyiia"; }; subPackages = [ @@ -51,6 +51,8 @@ in buildGoPackage rec { sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ -i cmd/agent/common/common_nix.go + sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ + -i pkg/util/hostname_nix.go ''; # Install the config files and python modules from the "dist" dir diff --git a/pkgs/tools/networking/dd-agent/deps.nix b/pkgs/tools/networking/dd-agent/deps.nix index eddd16e0ab9..cd26e3c6873 100644 --- a/pkgs/tools/networking/dd-agent/deps.nix +++ b/pkgs/tools/networking/dd-agent/deps.nix @@ -892,12 +892,12 @@ }; } { - goPackagePath = "github.com/spf13/viper"; + goPackagePath = "github.com/DataDog/viper"; fetch = { type = "git"; - url = "https://github.com/spf13/viper"; - rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"; - sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis"; + url = "https://github.com/DataDog/viper"; + rev = "23ced3bc6b3751855704445e48da2c53075ade86"; + sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m"; }; } { diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index b9aa7156e86..04652ea868d 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix - name = "dhcpcd-7.0.8"; + name = "dhcpcd-7.1.1"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "1df95lv3cbs3dk718a2vyvzmv7qhpgcxzagb27ylmav96f48x5ln"; + sha256 = "0h94g5nl9bg3x3qaajqaz6izl6mlvyjgp93nifnlfb7r7n3j8yd2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 8205bddc7fe..d7ff19612eb 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl }: +{ stdenv, fetchFromGitHub, openssl, runtimeShell }: let version = "3.0.0"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { # Helper utility cat > $out/bin/easyrsa-init <<EOF - #!${stdenv.shell} -e + #!${runtimeShell} -e cp -r $out/share/easyrsa/* . EOF chmod +x $out/bin/easyrsa-init diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d8aed9ad8e0..f9e334d8196 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -17,6 +17,6 @@ buildGoPackage rec { description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 7a133a0a0cb..6181093a193 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { pname = "getmail"; - version = "5.10"; + version = "5.13"; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; - sha256 = "0qc4gp66mhaxyjj7pfz9v69kxnw76my4zw07hvc4f3kj3balkygx"; + sha256 = "178a1c37z1aia5m2mbq9gyv6hylnxg9g3lp3njcrz7phfmj2zm84"; }; doCheck = false; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index cef5c5538a7..80ea61249c6 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.defaultIconTheme ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 69b23b3e3a4..78dc52905d8 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index a37626c14da..e85cfb52553 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ip2unix-${version}"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "0xxwx1ip5jhkq93b91gcqd1i4njlvl9c4vjzijbdhjrrzz971iwk"; + sha256 = "1x2nfv15a1hg8vrw5vh8fqady12v9hfrb4p3cfg0ybx52y0xs48a"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index bb627f49971..b4886f58cbb 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -21,10 +21,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-readline=${readline.dev}" + "--with-zlib=${zlib.dev}" + "--without-expat" ]; installFlags = [ "PREFIX=$(out)" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A file transfer program supporting a number of network protocols"; homepage = https://lftp.tech/; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 6e41de8999b..6e13d7fb94c 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -18,6 +18,7 @@ python2Packages.buildPythonApplication rec { pname = "LinkChecker"; version = "9.3.1"; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = (with python2Packages; [ requests ]) ++ [ gettext ]; diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix new file mode 100644 index 00000000000..058a36f3ed1 --- /dev/null +++ b/pkgs/tools/networking/nettee/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, writeScript, file, cleanPackaging }: + +let + version = "0.3.4"; + sha256 = "00xbkp99x9v07r34w7m2p8gak5hdsdbka36n7a733rdrrkgf5z7r"; + +in stdenv.mkDerivation { + name = "nettee-${version}"; + + src = fetchurl { + url = "http://saf.bio.caltech.edu/pub/software/linux_or_unix_tools/beta-nettee-${version}.tar.gz"; + inherit sha256; + }; + + meta = { + homepage = "http://saf.bio.caltech.edu/nettee.html"; + description = ''Network "tee" program''; + license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ Profpatsch ]; + platforms = lib.platforms.linux; + }; + + outputs = [ "bin" "man" "doc" "out" ]; + + patchPhase = '' + # h_addr field was removed + sed -e '1 i #define h_addr h_addr_list[0]' \ + -i nettee.c + ''; + + buildPhase = '' + cat README.TXT + mkdir -p $bin/bin + $CC -o $bin/bin/nettee \ + -Wall -pedantic -std=c99\ + -D_LARGEFILE64_SOURCE -D_POSIX_SOURCE -D_XOPEN_SOURCE\ + nettee.c rb.c nio.c + ''; + + installPhase = '' + ${cleanPackaging.commonFileActions { + docFiles = [ + "*.html" + "*.TXT" + "LICENSE" + "*.sh" + "topology.txt" + "beowulf.master" + "topology_info" + ]; + noiseFiles = [ + "*.c" + "*.h" + "nettee" + ]; + }} $doc/share/doc/nettee + + mkdir -p $man/share/man/{man1,man3} + mv nettee.1 $man/share/man/man1 + mv nettee_cmd.3 $man/share/man/man3 + ''; + + postFixup = '' + ${cleanPackaging.checkForRemainingFiles} + ''; + +} diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 4538728295b..81dc7558d79 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3 +, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 , libappindicator-gtk3, withGnome ? false, gcr }: let @@ -25,10 +25,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" "man" ]; buildInputs = [ - gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas + gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas polkit isocodes mobile-broadband-provider-info libgudev modemmanager jansson glib-networking - libappindicator-gtk3 gnome3.defaultIconTheme + libappindicator-gtk3 gnome3.adwaita-icon-theme ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 48848c0ead7..f18e8ad9f5c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ let pname = "NetworkManager"; in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"; + sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index facf1b6a667..1fcbce28cc4 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, +{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3, networkmanager, ppp, libsecret, withGnome ? true, gnome3 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index ad58dc97b0a..d3eb3f79933 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret +{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 , withGnome ? true, gnome3 }: let @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index b44933f7f5f..5fc591f0a43 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan, libsecret +, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix index 0c02569aa27..566179d85b3 100644 --- a/pkgs/tools/networking/network-manager/openconnect/default.nix +++ b/pkgs/tools/networking/network-manager/openconnect/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openconnect"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openconnect networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index afffedac9ee..fa764788e2c 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod }: let pname = "NetworkManager-openvpn"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index 5d77be86dff..3231c276be5 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, kmod, file }: +, gtk3, withGnome ? true, gnome3, kmod, file }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 132ae3cf0da..b0c4a0199c4 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -3,23 +3,18 @@ assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { - name = "openconnect-7.08"; + pname = "openconnect"; + version = "8.02"; src = fetchurl { urls = [ - "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" + "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz" ]; - sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w"; + sha256 = "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w"; }; outputs = [ "out" "dev" ]; - preConfigure = '' - export PKG_CONFIG=${pkgconfig}/bin/pkg-config - export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" - export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" - ''; - configureFlags = [ "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script" "--disable-nls" diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index c682100b438..6d4c77d5198 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -6,13 +6,13 @@ # some loss of functionality because of it. pythonPackages.buildPythonApplication rec { - version = "1.12.1"; + version = "1.13.0"; name = "tahoe-lafs-${version}"; namePrefix = ""; src = fetchurl { url = "https://tahoe-lafs.org/downloads/tahoe-lafs-${version}.tar.bz2"; - sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; + sha256 = "11pfz9yyy6qkkyi0kskxlbn2drfppx6yawqyv4kpkrkj4q7x5m42"; }; outputs = [ "out" "doc" "info" ]; @@ -56,9 +56,11 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ twisted foolscap nevow simplejson zfec pycryptopp darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface - service-identity pyyaml + service-identity pyyaml magic-wormhole treq ]; + checkInputs = with pythonPackages; [ hypothesis ]; + # Install the documentation. postInstall = '' ( diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index b8fa92e3202..98466a800a3 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radvd-${version}"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "1md6n63sg1n9x8yv0p7fwm1xxaiadj1q3mpadiqsvn14y1ddc2av"; + sha256 = "1p2wlv3djvla0r84hdncc3wfa530xigs7z9ssc2v5r1pcpzgxgz1"; }; nativeBuildInputs = [ pkgconfig bison flex check ]; diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index 18f192d3535..44b262861e1 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,7 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq }: +{ stdenv, lib, writeShellScriptBin, fetchFromGitHub, curl, jq, runtimeShell }: stdenv.mkDerivation rec { name = "slack-cli-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp src/slack "$out/bin/.slack-wrapped" cat <<-WRAPPER > "$out/bin/slack" - #!${stdenv.shell} + #!${runtimeShell} [ "\$1" = "init" -a -z "\$SLACK_CLI_TOKEN" ] && cat <<-'MESSAGE' >&2 WARNING: slack-cli must be configured using the SLACK_CLI_TOKEN environment variable. Using \`slack init\` will not work because it tries diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 58f020e1bdd..f1470fc6c14 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = http://www.tcpdump.org/; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ jgeerds ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 4c3c428d3f0..df9eb9bdad2 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { name = "tinc-${version}"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "info" ]; + patches = [ + (fetchpatch { + name = "tinc-openssl-1.0.2r.patch"; + url = "http://git.tinc-vpn.org/git/browse?p=tinc;a=patch;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904"; + sha256 = "0kidzlmgl0cin4g54ygcxa0jbq9vwlk3dyq5f65nkjd8yvayfzi8"; + }) + ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 018ce5407b1..6170718b618 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { name = "twa-${version}"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = version; - sha256 = "10ayxaf8x9md3ijx2w7h1ysnk8ky20crg3kq6ishia6fgsl33g2p"; + sha256 = "1xq35xyz5536nwrwmlp1wqa7q9jgh90ly7vdy3a5rvxnksx0b2l5"; }; dontBuild = true; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index ea40a541a22..0cb8ad5a437 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { homepage = https://github.com/sloonz/ua; license = stdenv.lib.licenses.isc; description = "Universal Aggregator"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 0c7acaad49f..25e03d80369 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.8.3"; + version = "1.9.0"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "1k6fljr7k721vg2ivn5dfr0hs1kn8p1sm003glgd9ypd261jns9b"; + sha256 = "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 7dc0e07f945..7cac5a45570 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, ant }: +{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: stdenv.mkDerivation rec { name = "zap-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/share" tar xvf "ZAP_${version}_Linux.tar.gz" -C "$out/share/" mkdir -p "$out/bin" - echo "#!/bin/sh" > "$out/bin/zap" + echo "#!${runtimeShell}" > "$out/bin/zap" echo \"$out/share/ZAP_${version}/zap.sh\" >> "$out/bin/zap" chmod +x "$out/bin/zap" ''; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.owasp.org/index.php/ZAP; description = "Java application for web penetration testing"; - maintainers = with maintainers; [ mog ]; + maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.asl20; }; diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index af42b579a42..49fe307667a 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,123 +1,15 @@ -{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive -, extraPkgs ? pkgs: [] }: +{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell +, extraPkgs ? pkgs: [], appimageTools }: -buildFHSUserEnv { +let + fhsArgs = appimageTools.defaultFhsEnvArgs; +in buildFHSUserEnv (fhsArgs // { name = "appimage-run"; - # Most of the packages were taken from the Steam chroot - targetPkgs = pkgs: with pkgs; [ - gtk3 - bashInteractive - gnome3.zenity - python2 - xorg.xrandr - which - perl - xdg_utils - iana-etc - ] ++ extraPkgs pkgs; - - multiPkgs = pkgs: with pkgs; [ - desktop-file-utils - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes - libGL - - gst_all_1.gstreamer - gst_all_1.gst-plugins-ugly - libdrm - xorg.xkeyboardconfig - xorg.libpciaccess - - glib - gtk2 - bzip2 - zlib - gdk_pixbuf - - xorg.libXinerama - xorg.libXdamage - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXxf86vm - xorg.libXi - xorg.libSM - xorg.libICE - gnome2.GConf - freetype - (curl.override { gnutlsSupport = true; sslSupport = false; }) - nspr - nss - fontconfig - cairo - pango - expat - dbus - cups - libcap - SDL2 - libusb1 - udev - dbus-glib - libav - atk - at-spi2-atk - libudev0-shim - networkmanager098 - - xorg.libXt - xorg.libXmu - xorg.libxcb - libGLU - libuuid - libogg - libvorbis - SDL - SDL2_image - glew110 - openssl - libidn - tbb - wayland - mesa_noglu - libxkbcommon - - flac - freeglut - libjpeg - libpng12 - libsamplerate - libmikmod - libtheora - libtiff - pixman - speex - SDL_image - SDL_ttf - SDL_mixer - SDL2_ttf - SDL2_mixer - gstreamer - gst-plugins-base - libappindicator-gtk2 - libcaca - libcanberra - libgcrypt - libvpx - librsvg - xorg.libXft - libvdpau - alsaLib - strace - ]; + targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = writeScript "appimage-exec" '' - #!${stdenv.shell} + #!${runtimeShell} APPIMAGE="$(realpath "$1")" if [ ! -x "$APPIMAGE" ]; then @@ -153,4 +45,4 @@ buildFHSUserEnv { exec ./AppRun ''; -} +}) diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 988147d7ab0..2912999fafa 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "apt-dater-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "DE-IBH"; repo = "apt-dater"; rev = "v${version}"; - sha256 = "1flr6cm72cywmwp5h7pbmmpq057xsi9shkczyplxqaqrb2gns5fl"; + sha256 = "1r6gz9jkh1wxi11mcq5p9mqg0szclsaq8ic79vnfnbjdrmmdfi4y"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 3ab7aa99c8d..864c229b880 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1bp0zq3h1ad6rzljmmalkh9ms4y6znk1gmgjpy39as2mhvlk8ln1"; + sha256 = "0i1mwqf60n25f89zfvp7fsa4v5rlqxhkhqah35g6j2k1ffcpqcpd"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 27dbad88413..51a963497fa 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "morph-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "0pixm48is9if9d2b4qc5mwwa4lzma6snkib6z2a1d4pmdx1lmpmm"; + sha256 = "0jhypvj45yjg4cn4rvb2j9091pl6z5j541vcfaln5sb3ds14fkwf"; }; goPackagePath = "github.com/dbcdk/morph"; @@ -16,6 +16,12 @@ buildGoPackage rec { buildInputs = [ go-bindata ]; + buildFlagsArray = '' + -ldflags= + -X + main.version=${version} + ''; + prePatch = '' go-bindata -pkg assets -o assets/assets.go data/ ''; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 74c2fd59d4e..41471b2c8a7 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { ''; license = licenses.asl20; maintainers = with maintainers; [ pjones ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 063c173a401..efedb8b67da 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,4 +1,5 @@ -{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: +{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper +, runtimeShell }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; version = "0.4.0"; @@ -26,7 +27,7 @@ let self = stdenv.mkDerivation rec { let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in { inherit (impl) augmentedPkgs pins callPackage; }; updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix new file mode 100644 index 00000000000..96a283a8ea8 --- /dev/null +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt +, coreutils, gawk, gnugrep, gnused, jq, nix }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "nix-prefetch"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "msteen"; + repo = "nix-prefetch"; + rev = "f9507a655651b51f3a3ebacde85bb40758853615"; + sha256 = "0ykrbvbwwpz348424yy2452idgw8dffi3klh7n85n96dfflyyd4s"; + }; + + nativeBuildInputs = [ + makeWrapper + asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + ]; + + configurePhase = '' + . configure.sh + ''; + + buildPhase = '' + a2x -f manpage doc/nix-prefetch.1.asciidoc + ''; + + installPhase = '' + lib=$out/lib/${pname} + mkdir -p $lib + substitute src/main.sh $lib/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version '${version}' + chmod +x $lib/main.sh + patchShebangs $lib/main.sh + cp lib/*.nix $lib/ + + mkdir -p $out/bin + makeWrapper $lib/main.sh $out/bin/${pname} \ + --prefix PATH : '${makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' + + substitute src/tests.sh $lib/tests.sh \ + --subst-var-by bin $out/bin + chmod +x $lib/tests.sh + patchShebangs $lib/tests.sh + + mkdir -p $out/share/man/man1 + substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ + --subst-var-by version '${version}' \ + --replace '01/01/1970' "$date" + + install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch + install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + + mkdir $out/contrib + cp -r contrib/hello_rs $out/contrib/ + ''; + + meta = { + description = "Prefetch any fetcher function call, e.g. package sources"; + homepage = https://github.com/msteen/nix-prefetch; + license = licenses.mit; + maintainers = with maintainers; [ msteen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/nix-update-source/default.nix b/pkgs/tools/package-management/nix-update-source/default.nix index 7584496f258..cabd1e491a7 100644 --- a/pkgs/tools/package-management/nix-update-source/default.nix +++ b/pkgs/tools/package-management/nix-update-source/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts }: +{ stdenv, lib, pkgs, fetchFromGitHub, python3Packages, nix-prefetch-scripts +, runtimeShell }: python3Packages.buildPythonApplication rec { version = "0.6.3"; name = "nix-update-source-${version}"; @@ -28,7 +29,7 @@ python3Packages.buildPythonApplication rec { overrideSrc = drv: lib.overrideDerivation drv (orig: { inherit src; }); }; updateScript = '' - #!${stdenv.shell} + #!${runtimeShell} set -e echo cd ${toString ./.} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 76d11a03fc4..2777fbcc903 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -164,13 +164,13 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-2.2${suffix}"; - suffix = "pre6600_85488a93"; + name = "nix-2.3${suffix}"; + suffix = "pre6631_e58a7144"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "85488a93ec3b07210339f2b05aa93e970f9ac3be"; - sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm"; + rev = "e58a71442ad4a538b48fc7a9938c3690628c4741"; + sha256 = "1hbjhnvjbh8bi8cjjgyrj4z1gw03ws12m2wi5azzj3rmhnh4c802"; }; fromGit = true; }); diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 4a9cd4867da..a025c69b738 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -3,7 +3,7 @@ let generic = { patches ? [] }: buildGoPackage rec { - version = "1.6.1"; + version = "1.6.4"; name = "certmgr-${version}"; goPackagePath = "github.com/cloudflare/certmgr/"; @@ -12,7 +12,7 @@ let owner = "cloudflare"; repo = "certmgr"; rev = "v${version}"; - sha256 = "1ky2pw1wxrb2fxfygg50h0mid5l023x6xz9zj5754a023d01qqr2"; + sha256 = "0glvyp61ya21pdm2bsvq3vfhmmxc2998vxc6hiyc79ijsv9n6jqi"; }; inherit patches; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 6bdc8570982..9ac62dc334f 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -3,7 +3,8 @@ , gtk3, nssTools, pcsclite , libxml2, libproxy , openssl, curl -, makeWrapper }: +, makeWrapper +, substituteAll }: stdenv.mkDerivation rec { name = "eid-mw-${version}"; @@ -32,8 +33,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-dialogs=yes" ]; - postInstall = '' - install -D ${./eid-nssdb.in} $out/bin/eid-nssdb + postInstall = + let + eid-nssdb-in = substituteAll { + inherit (stdenv) shell; + src = ./eid-nssdb.in; + }; + in + '' + install -D ${eid-nssdb-in} $out/bin/eid-nssdb substituteInPlace $out/bin/eid-nssdb \ --replace "modutil" "${nssTools}/bin/modutil" diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index accb92b13ea..a4a3b919e64 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.6.5_amd64.deb", - "sha256": "c7529b745aa462b56eac17af6fe88d4c1610fd2f446d222aaad9510f19212a7d", - "version": "5.6.5" + "path": "pool/main/e/enpass/enpass_6.0.1.239_amd64.deb", + "sha256": "408a2bb318564307607f13b52fec7667f425c01ac40cbe345ebfa191ab1479ba", + "version": "6.0.1.239" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.6.5_i386.deb", - "sha256": "de46e27d5552dcd9d72abac8e5c3b6161ad551ce191a2ee689c67367b63ff8f9", - "version": "5.6.5" + "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", + "sha256": "3f699ac3e2ecfd4afee1505d8d364d4f6b6b94c55ba989d0a80bd678ff66cb2c", + "version": "5.6.9" } } \ No newline at end of file diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 0f0c4233ca9..97a692d7f33 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, dpkg, openssl, xorg +{ stdenv, fetchurl, dpkg, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype -, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig +, gtk3, pango , makeWrapper , python, pythonPackages, lib -, libredirect, lsof +, lsof, curl, libuuid, cups, mesa_drivers }: let all_data = builtins.fromJSON (builtins.readFile ./data.json); system_map = { - i686-linux = "i386"; + # i686-linux = "i386"; Uncomment if enpass 6 becomes available on i386 x86_64-linux = "amd64"; }; @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ - openssl + mesa_drivers libGLU_combined fontconfig freetype @@ -29,17 +29,15 @@ let libXi libSM libICE - libXext libXrender libXScrnSaver + libxcb glib - gtk2 + gtk3 pango - cairo - atk - gdk_pixbuf - jasper - stdenv.cc.cc + curl + libuuid + cups ]); package = stdenv.mkDerivation rec { @@ -63,39 +61,22 @@ let unpackPhase = "dpkg -X $src ."; installPhase='' - mkdir $out - cp -r opt/Enpass/* $out + mkdir -p $out/bin + cp -r opt/enpass/* $out/bin cp -r usr/* $out - rm $out/bin/runenpass.sh - cp $out/bin/EnpassHelper/EnpassHelper{,.untampered} - cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered} sed \ - -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ + -i s@/opt/enpass/Enpass@$out/bin/Enpass@ \ $out/share/applications/enpass.desktop - for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do + for i in $out/bin/{Enpass,importer_enpass}; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i done - # The helper's sha256 sum must match, hence the use of libredirect. - # Also, lsof must be in the path for proper operation. + # lsof must be in PATH for proper operation wrapProgram $out/bin/Enpass \ - --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ - --set QT_PLUGIN_PATH "$out/plugins" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ - --set HIDE_TOOLBAR_LINE 0 \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "$out/bin/EnpassHelper/EnpassHelper=$out/bin/EnpassHelper/EnpassHelper.untampered:$out/bin/EnpassHelper/EnpassNMHost=$out/bin/EnpassHelper/EnpassNMHost.untampered" \ + --set LD_LIBRARY_PATH "${libPath}" \ --prefix PATH : ${lsof}/bin - - makeWrapper $out/bin/EnpassHelper/{EnpassNMHost,runNativeMessaging.sh} \ - --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ - --set QT_PLUGIN_PATH "$out/plugins" \ - --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ - --set HIDE_TOOLBAR_LINE 0 ''; }; updater = { diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index ad4eae9578c..254a345839b 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv"; + sha256 = "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix new file mode 100644 index 00000000000..cec31cec377 --- /dev/null +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, lib, openssl }: + +stdenv.mkDerivation rec { + pname = "ibm-sw-tpm2"; + version = "1332"; + + src = fetchurl { + url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; + sha256 = "1zdhi8acd4jfp1v7ibd86hcv0g39yk8qrnhxjmmgzn8i7npr70cf"; + }; + + buildInputs = [ openssl ]; + + sourceRoot = "src"; + + prePatch = '' + # Fix hardcoded path to GCC. + substituteInPlace makefile --replace /usr/bin/gcc "${stdenv.cc}/bin/cc" + + # Remove problematic default CFLAGS. + substituteInPlace makefile \ + --replace -Werror "" \ + --replace -O0 "" \ + --replace -ggdb "" + ''; + + installPhase = '' + mkdir -p $out/bin + cp tpm_server $out/bin + ''; + + meta = with lib; { + description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; + homepage = https://sourceforge.net/projects/ibmswtpm2/; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 62b92b7d0bd..2eda1908837 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText, runtimeShell }: let version = "1.4.0"; @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png cat > $out/bin/jd-gui <<EOF - #!${stdenv.shell} + #!${runtimeShell} export JAVA_HOME=${jre} ${jre}/bin/java -jar ${jar} $@ EOF diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index 7c96085d37f..9cd6ccca388 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.keybase.io; description = "The Keybase FS FUSE driver"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ rvolosatovs bennofs np ]; license = licenses.bsd3; }; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 40385940a94..4207bac4473 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme , dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 -, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook }: +, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook +, runtimeShell }: let versionSuffix = "20190205202117.6394d03e6c"; @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { mv opt/keybase $out/share/ cat > $out/bin/keybase-gui <<EOF - #!${stdenv.shell} + #!${runtimeShell} checkFailed() { if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 81164c1eb77..898bfb599a3 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, defaultIconTheme }: +{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }: pythonPackages.buildPythonApplication rec { name = "onioncircuits-${version}"; @@ -10,13 +10,14 @@ pythonPackages.buildPythonApplication rec { sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm"; }; + nativeBuildInputs = [ intltool ]; buildInputs = [ intltool gtk3 gobject-introspection ]; propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ]; postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 82bec2486e8..9c8f47cd275 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.mew.org/~kazu/proj/pgpdump/en/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 3a7e1b5a343..705338634f1 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,13 +1,8 @@ { fetchurl, fetchpatch, stdenv, lib, pkgconfig -, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null +, libgpgerror, libassuan, libcap ? null, libsecret ? null, ncurses ? null, gtk2 ? null, gcr ? null, qt ? null , enableEmacs ? false }: -let - mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; -in stdenv.mkDerivation rec { name = "pinentry-1.1.0"; @@ -30,14 +25,14 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable (libsecret != null) "libsecret") - (mkEnable (ncurses != null) "pinentry-curses") - (mkEnable true "pinentry-tty") - (mkEnable enableEmacs "pinentry-emacs") - (mkEnable (gtk2 != null) "pinentry-gtk2") - (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt != null) "pinentry-qt") + (stdenv.lib.withFeature (libcap != null) "libcap") + (stdenv.lib.enableFeature (libsecret != null) "libsecret") + (stdenv.lib.enableFeature (ncurses != null) "pinentry-curses") + (stdenv.lib.enableFeature true "pinentry-tty") + (stdenv.lib.enableFeature enableEmacs "pinentry-emacs") + (stdenv.lib.enableFeature (gtk2 != null) "pinentry-gtk2") + (stdenv.lib.enableFeature (gcr != null) "pinentry-gnome3") + (stdenv.lib.enableFeature (qt != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 27f2ca04d71..5e622cf68f3 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.6"; + version = "1.3.8"; name = "rhash-${version}"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "1c8gngjj34ylx1f56hjbvml22bif0bx1b88dx2cyxbix8praxqh7"; + sha256 = "0i00wl63hn80g0s9gdi772gchbghwgkvn4nbb5227y2wwy30yyi2"; }; nativeBuildInputs = [ which ]; @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { # configure script is not autotools-based, doesn't support these options configurePlatforms = [ ]; - doCheck = false; # fails + doCheck = true; - installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ]; - postInstall = "make -C librhash install-headers"; + checkTarget = "test-full"; + + installTargets = [ "install" "install-lib-shared" "install-lib-so-link" "install-lib-headers" ]; meta = with stdenv.lib; { homepage = http://rhash.anz.ru; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index e90517f1581..7ccb9efcdd5 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; homepage = https://github.com/Versent/saml2aws; license = licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; } diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 7202f2aa28a..b3ec973368c 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -13,12 +13,12 @@ let ]; in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.8"; + version = "2.9"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "1dfry04gsa8kv7a2kr4p7a4b616sql41hsyff4pmfvrhiv2fz39z"; + sha256 = "14pgi45zqa0zd1ldfj9mnf9jgv5kfrhl78lr8iy7k88p9h6b9n7n"; }; # TODO: Get this patch upstream... diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix new file mode 100644 index 00000000000..84369e6ea54 --- /dev/null +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, fetchpatch, lib +, cmocka, curl, pandoc, pkgconfig, openssl, tpm2-tss }: + +stdenv.mkDerivation rec { + pname = "tpm2-tools"; + version = "3.1.3"; + + src = fetchurl { + url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "05is1adwcg7y2p121yldd8m1gigdnzf9izbjazvsr6yg95pmg5fc"; + }; + + patches = [ + (fetchpatch { + name = "tests-tss-2.2.0-compat.patch"; + url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tools/pull/1322.patch"; + sha256 = "0yy5qbgbd13d7cl8pzsji95a6qnwiik5s2cyqj35jd8blymikqxh"; + }) + ]; + + nativeBuildInputs = [ pandoc pkgconfig ]; + buildInputs = [ + curl openssl tpm2-tss + # For unit tests. + cmocka + ]; + + configureFlags = [ "--enable-unit" ]; + doCheck = true; + + meta = with lib; { + description = "Command line tools that provide access to a TPM 2.0 compatible device"; + homepage = https://github.com/tpm2-software/tpm2-tools; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index ed55fa26451..1c5466db363 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m"; }; - buildInputs = [ ronn ]; + nativeBuildInputs = [ ronn ]; checkInputs = with pythonPackages; [ freezegun diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index aaf5bf136cb..9686ec5d715 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -56,7 +56,7 @@ perlPackages.buildPerlPackage rec { description = "Real-time logfile analyzer to get advanced statistics"; homepage = http://awstats.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 234b40e0386..c3cbaf98a87 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0cyylqmq31if93zz0l1fnm454dsmcx34j4c2r0xprcggihdxbwk5"; + sha256 = "0yjbv6j5sn2yq57rx50h284krxyx5gcviwv8ac7zxwr2qggn8lqy"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 22348ea6ebc..c2d3b33c749 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ddrescue-1.23"; + name = "ddrescue-1.24"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "13cd6c0x91zq10vdlyl6r5rib47bmsn5sshmkin3igwj8pa2vbm9"; + sha256 = "11qh0bbzf00mfb4yq35gnv5m260k4d7q9ixklry6bqvhvvp3ypab"; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 2b918d15581..745139f9e50 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotop-${version}"; - version = "1.7.1"; + version = "2.0.1"; goPackagePath = "github.com/cjbassi/gotop"; @@ -10,11 +10,9 @@ buildGoPackage rec { repo = "gotop"; owner = "cjbassi"; rev = version; - sha256 = "0dxnhal10kv6ypsg6mildzpz6vi1iw996q47f4rv8hvfyrffhzc9"; + sha256 = "0xpm8nrn53kz65f93czflgdgr2a33qfi1w0gsgngrmaliq1vlpji"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = https://github.com/cjbassi/gotop; diff --git a/pkgs/tools/system/gotop/deps.nix b/pkgs/tools/system/gotop/deps.nix deleted file mode 100644 index ceae7857551..00000000000 --- a/pkgs/tools/system/gotop/deps.nix +++ /dev/null @@ -1,39 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/cjbassi/termui"; - fetch = { - type = "git"; - url = "https://github.com/cjbassi/termui"; - rev = "e8dd23f6146c0e0d80f1be0163b8069abfbb921b"; - sha256 = "0jds2mpa7whrwaznlkcn2y92q41zbf2rjj5267kl8zqllbia8cbx"; - }; - } - { - goPackagePath = "github.com/docopt/docopt-go"; - fetch = { - type = "git"; - url = "https://github.com/docopt/docopt-go"; - rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; - sha256 = "0hlra7rmi5pmd7d93rv56ahiy4qkgmq8a6mz0jpadvbi5qh8lq6j"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "51e6519305e4871657c291a6281fcddc6364bbef"; - sha256 = "1pvvaj51m0w2v6bp5hhhzfy27hbicf4ga7r9m073vqcwjnfyz431"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"; - sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6"; - }; - } -] diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index bfbe217c269..7230f55d309 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -19,6 +19,6 @@ buildGoPackage rec { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; license = licenses.bsd2; maintainers = with maintainers; [ fadenb fpletz globin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index 2ca515358a6..b4418e04f03 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused }: +{ stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }: stdenv.mkDerivation rec { name = "esh-${version}"; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . substituteInPlace esh \ - --replace '"/bin/sh"' '"${stdenv.shell}"' \ + --replace '"/bin/sh"' '"${runtimeShell}"' \ --replace '"awk"' '"${gawk}/bin/awk"' \ --replace 'sed' '${gnused}/bin/sed' substituteInPlace tests/test-dump.exp \ - --replace '#!/bin/sh' '#!${stdenv.shell}' + --replace '#!/bin/sh' '#!${runtimeShell}' ''; doCheck = true; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 88d487da9b9..082c61635ba 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - patches = [ ./look-for-ar.patch ]; + patches = [ + ./look-for-ar.patch + ./mdate-determinism.patch + ]; postPatch = stdenv.lib.optionalString (psutils != null) '' substituteInPlace src/preproc/html/pre-html.cpp \ diff --git a/pkgs/tools/text/groff/mdate-determinism.patch b/pkgs/tools/text/groff/mdate-determinism.patch new file mode 100644 index 00000000000..1253d113394 --- /dev/null +++ b/pkgs/tools/text/groff/mdate-determinism.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.comm b/Makefile.comm +index 75efc22..b757000 100644 +--- a/Makefile.comm ++++ b/Makefile.comm +@@ -155,7 +155,7 @@ extraclean: distclean + -e "s|@MAN1EXT@|$(man1ext)|g" \ + -e "s|@MAN5EXT@|$(man5ext)|g" \ + -e "s|@MAN7EXT@|$(man7ext)|g" \ +- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \ ++ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \ + -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \ + -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \ + -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \ diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix new file mode 100644 index 00000000000..73323c784fd --- /dev/null +++ b/pkgs/tools/text/shab/default.nix @@ -0,0 +1,74 @@ +{ bash, stdenv, lib, runCommand, writeText, fetchFromGitHub }: +let + version = "1.0.0"; + + shab = stdenv.mkDerivation { + pname = "shab"; + inherit version; + + src = fetchFromGitHub { + owner = "zimbatm"; + repo = "shab"; + rev = "v${version}"; + sha256 = "02lf1s6plhhcfyj9xha44wij9jbphb1x5q55xj3b5bx2ji2jsvji"; + }; + + postPatch = '' + for f in test.sh test/*.sh; do + patchShebangs "$f" + done + ''; + + doBuild = false; + doCheck = true; + doInstallCheck = true; + + checkPhase = '' + ./test.sh + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./shab $out/bin/shab + ''; + + installCheckPhase = '' + [[ "$(echo 'Hello $entity' | entity=world $out/bin/shab)" == 'Hello world' ]] + ''; + + passthru = { + inherit render renderText; + }; + + meta = with lib; { + description = "The bash templating language"; + homepage = https://github.com/zimbatm/shab; + license = licenses.unlicense; + maintainers = with maintainers; [ zimbatm ]; + platforms = bash.meta.platforms; + }; + }; + + /* + shabScript: a path or filename to use as a template + parameters.name: the name to use as part of the store path + parameters: variables to expose to the template + */ + render = shabScript: parameters: + let extraParams = { + inherit shabScript; + }; + in runCommand "out" (parameters // extraParams) '' + ${shab}/bin/shab "$shabScript" >$out + ''; + + /* + shabScriptText: a string to use as a template + parameters.name: the name to use as part of the store path + parameters: variables to expose to the template + */ + renderText = shabScriptText: parameters: + render (writeText "template" shabScriptText) parameters; + +in + shab diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index ba7d1a336a0..cb1780a6903 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,19 +2,19 @@ buildGoPackage rec { name = "vale-${version}"; - version = "1.3.0"; + version = "1.3.2"; goPackagePath = "github.com/errata-ai/vale"; + subPackages = [ "." ]; + src = fetchFromGitHub { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1yfrn27z3ifdlvalgrnhdrkhxkh09xpyv681sr01wc2hxq6v3hqn"; + sha256 = "0jpklca4m6wpndy6spj30s6ssb5y9ysyncxj7i6fg2g0m4dzzh8w"; }; - doCheck = true; - meta = with stdenv.lib; { homepage = https://errata-ai.github.io/vale/; description = "A syntax-aware linter for prose built with speed and extensibility in mind"; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 5f926f771c5..9240926ab5b 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jdk }: +{ fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { name = "fop-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. cat > "$out/bin/fop" <<EOF - #!${stdenv.shell} + #!${runtimeShell} java_exec_args="-Djava.awt.headless=true" exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" org.apache.fop.cli.Main "\$@" EOF diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index cd3b9c67e3c..61459e48b7f 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -1,5 +1,3 @@ -#!/bin/sh - # Prepare a makefile specifying the appropriate output directories. # # Written by Ludovic Courtès <ludo@gnu.org>. diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix index fef6c9087c5..662f7717b33 100644 --- a/pkgs/tools/typesetting/pygmentex/default.nix +++ b/pkgs/tools/typesetting/pygmentex/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromBitbucket, python2Packages }: python2Packages.buildPythonApplication rec { - name = "pygmentex-${version}"; + pname = "pygmentex"; version = "0.8"; + tlType = "run"; src = fetchFromBitbucket { owner = "romildo"; - repo = "pygmentex"; + repo = pname; rev = version; sha256 = "07dnv7hgppy15bda2kcbrlvfqzl6lhza80klc7133dwg8q92hm6m"; }; - pythonPath = [ python2Packages.pygments python2Packages.chardet ]; + pythonPath = with python2Packages; [ pygments chardet ]; dontBuild = true; @@ -20,6 +21,15 @@ python2Packages.buildPythonApplication rec { installPhase = '' mkdir -p $out/bin cp -a pygmentex.py $out/bin + + mkdir -p $out/scripts/pygmentex + ln -s $out/bin/pygmentex.py $out/scripts/pygmentex + + mkdir -p $out/tex/latex/pygmentex + cp -a pygmentex.sty $out/tex/latex/pygmentex + + mkdir -p $out/doc/latex/pygmentex + cp -a README demo.* blueshade.png Factorial.java $out/doc/latex/pygmentex ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index d18164be3be..43d880fdf9a 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.8.1"; + version = "1.9.3"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "1f3qrnbjr9ikbdvpsyx726nyiz4f7ka38rimy9fvbl7kmi62w1v7"; + sha256 = "1av933421a7g2c984l77gh1fwrhyqblglxr3px5qbng2sh7i33f6"; }; postPatch = '' diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index ff9a13c500b..37c3248b83e 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "awless-${version}"; - version = "0.0.14"; + version = "0.1.11"; goPackagePath = "github.com/wallix/awless"; src = fetchFromGitHub { owner = "wallix"; repo = "awless"; - rev = version; - sha256 = "1syxw8d9y1b4bdb1arsx05m5mxnd0dqp3nj7fk5j1v7cnnbja3hj"; + rev = "v${version}"; + sha256 = "187i21yrm10r3f5naj3jl0rmydr5dkhmdhxs90hhf8hjp59a89kg"; }; meta = with stdenv.lib; { @@ -18,6 +18,6 @@ buildGoPackage rec { description = "A Mighty CLI for AWS"; platforms = with platforms; linux ++ darwin; license = licenses.asl20; - maintainers = with maintainers; [ pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri swdunlop ]; }; } diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 5096c7f9468..012090ba079 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace utils/oslogin_utils.cc --replace /bin/bash /bin/sh + substituteInPlace utils/oslogin_utils.cc --replace /bin/bash ${stdenv.shell} ''; buildInputs = [ curl.dev pam ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 564ad4dfca9..252a87266e7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -99,7 +99,7 @@ mapAliases ({ firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 flameGraph = flamegraph; # added 2018-04-25 - font-awesome-ttf = font-awesome_4; # 2018-02-25 + font-awesome-ttf = font-awesome; # 2018-02-25 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 @@ -389,12 +389,10 @@ mapAliases ({ gstPluginsBad = pkgs.gst-plugins-bad; gstPluginsGood = pkgs.gst-plugins-good; gstPluginsUgly = pkgs.gst-plugins-ugly; - gstFfmpeg = pkgs.gst-ffmpeg; gst-plugins-base = pkgs.gst-plugins-base; gst-plugins-bad = pkgs.gst-plugins-bad; gst-plugins-good = pkgs.gst-plugins-good; gst-plugins-ugly = pkgs.gst-plugins-ugly; - gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2ea5c82ce..c0e5d4b3a90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35,7 +35,7 @@ in stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; }; - stdenvNoLibs = let + mkStdenvNoLibs = stdenv: let bintools = stdenv.cc.bintools.override { libc = null; noLibc = true; @@ -51,6 +51,11 @@ in lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null); }; + stdenvNoLibs = mkStdenvNoLibs stdenv; + + gccStdenvNoLibs = mkStdenvNoLibs gccStdenv; + clangStdenvNoLibs = mkStdenvNoLibs clangStdenv; + # For convenience, allow callers to get the path to Nixpkgs. path = ../..; @@ -64,6 +69,14 @@ in # inside the set for derivations. recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; + # This is intended to be the reverse of recurseIntoAttrs, as it is + # defined now it exists mainly for documentation purposes, but you + # can also override this with recurseIntoAttrs to recurseInto all + # the Attrs which is useful for testing massive changes. Ideally, + # every package subset not marked with recurseIntoAttrs should be + # marked with this. + dontRecurseIntoAttrs = x: x; + stringsWithDeps = lib.stringsWithDeps; ### Evaluating the entire Nixpkgs naively will fail, make failure fast @@ -105,6 +118,8 @@ in autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; + appimageTools = callPackage ../build-support/appimage { }; + ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) @@ -173,7 +188,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dump1090 = callPackage ../applications/misc/dump1090 { }; + dump1090 = callPackage ../applications/radio/dump1090 { }; ebook2cw = callPackage ../applications/radio/ebook2cw { }; @@ -226,9 +241,7 @@ in fetchs3 = callPackage ../build-support/fetchs3 { }; - fetchsvn = callPackage ../build-support/fetchsvn { - sshSupport = true; - }; + fetchsvn = callPackage ../build-support/fetchsvn { }; fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; @@ -239,9 +252,35 @@ in # `fetchurl' downloads a file from the network. fetchurl = import ../build-support/fetchurl { inherit lib stdenvNoCC; - # On darwin, libkrb5 needs bootstrap_cmds which would require - # converting many packages to fetchurl_boot to avoid evaluation cycles. - curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); + curl = buildPackages.curl.override rec { + # break dependency cycles + fetchurl = stdenv.fetchurlBoot; + pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; + perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; + openssl = buildPackages.openssl.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + buildPackages = { inherit perl; }; + }; + libssh2 = buildPackages.libssh2.override { + fetchurl = stdenv.fetchurlBoot; + inherit openssl; + }; + # On darwin, libkrb5 needs bootstrap_cmds which would require + # converting many packages to fetchurl_boot to avoid evaluation cycles. + gssSupport = !stdenv.isDarwin && !stdenv.hostPlatform.isWindows; + libkrb5 = buildPackages.libkrb5.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkgconfig perl openssl; + keyutils = buildPackages.keyutils.override { fetchurl = stdenv.fetchurlBoot; }; + }; + nghttp2 = buildPackages.nghttp2.override { + fetchurl = stdenv.fetchurlBoot; + inherit pkgconfig openssl; + c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; + libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + }; + }; }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -250,13 +289,6 @@ in inherit curl stdenv; }; - # fetchurlBoot is used for curl and its dependencies in order to - # prevent a cyclic dependency (curl depends on curl.tar.bz2, - # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It - # uses the curl from the previous bootstrap phase (e.g. a statically - # linked curl in the case of stdenv-linux). - fetchurlBoot = stdenv.fetchurlBoot; - fetchzip = callPackage ../build-support/fetchzip { }; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; @@ -621,6 +653,8 @@ in autorevision = callPackage ../tools/misc/autorevision { }; + automirror = callPackage ../tools/misc/automirror { }; + bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; @@ -785,7 +819,6 @@ in androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; - licenseAccepted = config.android_sdk.accept_license or false; }; androidndkPkgs = androidndkPkgs_18b; @@ -927,7 +960,11 @@ in bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; - charles = callPackage ../applications/networking/charles { }; + charles = charles4; + inherit (callPackage ../applications/networking/charles {}) + charles3 + charles4 + ; libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; @@ -936,7 +973,6 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow = callPackage ../development/libraries/libtensorflow { - cudaSupport = config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_9_0; cudnn = cudnn_cudatoolkit_9_0; @@ -1145,6 +1181,8 @@ in clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; + clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; colpack = callPackage ../applications/science/math/colpack { }; @@ -1311,8 +1349,6 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; - elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { }; - elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; elm-github-install = callPackage ../tools/package-management/elm-github-install { }; @@ -1363,7 +1399,9 @@ in fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; - filebench = callPackage ../tools/misc/filebench { }; + filebench = callPackage ../tools/misc/filebench { + bison = bison2; + }; fileshelter = callPackage ../servers/web-apps/fileshelter { }; @@ -1491,6 +1529,8 @@ in languagetool = callPackage ../tools/text/languagetool { }; + lepton = callPackage ../tools/graphics/lepton { }; + lief = callPackage ../development/libraries/lief {}; libndtypes = callPackage ../development/libraries/libndtypes { }; @@ -1596,6 +1636,8 @@ in s2png = callPackage ../tools/graphics/s2png { }; + shab = callPackage ../tools/text/shab { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; snipes = callPackage ../games/snipes { }; @@ -1628,7 +1670,7 @@ in roundcube = callPackage ../servers/roundcube { }; - roundcubePlugins = callPackage ../servers/roundcube/plugins { }; + roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); rsbep = callPackage ../tools/backup/rsbep { }; @@ -1765,9 +1807,7 @@ in inherit (python27Packages) pillow; }; - blueman = callPackage ../tools/bluetooth/blueman { - withPulseAudio = config.pulseaudio or true; - }; + blueman = callPackage ../tools/bluetooth/blueman { }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; @@ -1831,6 +1871,8 @@ in cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; + cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -1985,7 +2027,7 @@ in ibus = callPackage ../tools/inputmethods/ibus { gconf = gnome2.GConf; - inherit (gnome3) dconf glib; + inherit (gnome3) dconf; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -2139,9 +2181,7 @@ in brotliSupport = true; }; - curl = callPackage ../tools/networking/curl rec { - fetchurl = fetchurlBoot; - }; + curl = callPackage ../tools/networking/curl { }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; @@ -2270,6 +2310,8 @@ in dirmngr = callPackage ../tools/security/dirmngr { }; + dirvish = callPackage ../tools/backup/dirvish { }; + disper = callPackage ../tools/misc/disper { }; dleyna-connector-dbus = callPackage ../development/libraries/dleyna-connector-dbus { }; @@ -2434,7 +2476,7 @@ in emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = callPackage ../development/compilers/emscripten/fastcomp { }; + emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { }); emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; @@ -2620,6 +2662,8 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; + fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { @@ -2766,9 +2810,9 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = callPackage ../servers/foundationdb { + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { stdenv49 = overrideCC stdenv gcc49; - }; + }); inherit (fdbPackages) foundationdb51 @@ -3060,9 +3104,9 @@ in * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for * objections before removal. The feature is libgraph. */ - graphviz_2_32 = lib.overrideDerivation (callPackage ../tools/graphics/graphviz/2.32.nix { + graphviz_2_32 = (callPackage ../tools/graphics/graphviz/2.32.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); + }).overrideAttrs(x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); grin = callPackage ../tools/text/grin { }; @@ -3363,6 +3407,8 @@ in iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { }; + ibniz = callPackage ../tools/graphics/ibniz { }; icecast = callPackage ../servers/icecast { }; @@ -3749,6 +3795,10 @@ in mautrix-telegram = callPackage ../servers/mautrix-telegram { }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + + mcfly = callPackage ../tools/misc/mcfly { }; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -3864,17 +3914,17 @@ in openssl = openssl_1_1; }; - nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix { + nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodejs = pkgs.nodejs-10_x; - }; + }); - nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix { + nodePackages_8_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v8.nix { nodejs = pkgs.nodejs-8_x; - }; + }); - nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { + nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; - }; + }); nodePackages = nodePackages_10_x; @@ -3928,6 +3978,8 @@ in libhandy = callPackage ../development/libraries/libhandy { }; + libgumath = callPackage ../development/libraries/libgumath { }; + libipfix = callPackage ../development/libraries/libipfix { }; libircclient = callPackage ../development/libraries/libircclient { }; @@ -4038,9 +4090,7 @@ in ltris = callPackage ../games/ltris { }; lxc = callPackage ../os-specific/linux/lxc { }; - lxcfs = callPackage ../os-specific/linux/lxcfs { - enableDebugBuild = config.lxcfs.enableDebugBuild or false; - }; + lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; lzfse = callPackage ../tools/compression/lzfse { }; @@ -4375,6 +4425,10 @@ in netselect = callPackage ../tools/networking/netselect { }; + nettee = callPackage ../tools/networking/nettee { + inherit (skawarePackages) cleanPackaging; + }; + # stripped down, needed by steam networkmanager098 = callPackage ../tools/networking/network-manager/0.9.8 { }; @@ -4482,6 +4536,8 @@ in notify-osd = callPackage ../applications/misc/notify-osd { }; + notes-up = callPackage ../applications/office/notes-up { }; + notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { }; nox = callPackage ../tools/package-management/nox { }; @@ -4553,9 +4609,7 @@ in omping = callPackage ../applications/networking/omping { }; - onioncircuits = callPackage ../tools/security/onioncircuits { - inherit (gnome3) defaultIconTheme; - }; + onioncircuits = callPackage ../tools/security/onioncircuits { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; @@ -4692,17 +4746,6 @@ in pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - postInstall = '' - mkdir -p $out/share/man/man1 - cp man/pandoc.1 $out/share/man/man1/ - ''; - # Newer tasty version works - # https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7 - # Note the patch doesn't apply because we fetch the cabal file from elsewhere - # This should be removed with pandoc 2.6. - postPatch = '' - substituteInPlace pandoc.cabal --replace "tasty >= 0.11 && < 1.2" "tasty >= 0.11 && < 1.3" - ''; }); pamtester = callPackage ../tools/security/pamtester { }; @@ -4872,14 +4915,14 @@ in plan9port = callPackage ../tools/system/plan9port { }; - platformioPackages = callPackage ../development/arduino/platformio { }; + platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); platformio = platformioPackages.platformio-chrootenv; platinum-searcher = callPackage ../tools/text/platinum-searcher { }; playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; - plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; }; + plex = callPackage ../servers/plex { }; plexpy = callPackage ../servers/plexpy { python = python2; }; @@ -5159,7 +5202,6 @@ in remind = callPackage ../tools/misc/remind { }; remmina = callPackage ../applications/networking/remote/remmina { - adwaita-icon-theme = gnome3.adwaita-icon-theme; gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; @@ -5326,9 +5368,7 @@ in quazip = quazip_qt4; }; - screenkey = python2Packages.callPackage ../applications/video/screenkey { - inherit (gnome3) defaultIconTheme; - }; + screenkey = python2Packages.callPackage ../applications/video/screenkey { }; quazip_qt4 = libsForQt5.quazip.override { qtbase = qt4; qmake = qmake4Hook; @@ -5803,9 +5843,7 @@ in tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { - inherit (gnome3) defaultIconTheme; - }; + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC; @@ -5819,6 +5857,8 @@ in toxvpn = callPackage ../tools/networking/toxvpn { }; + toybox = callPackage ../tools/misc/toybox { }; + tpmmanager = callPackage ../applications/misc/tpmmanager { }; tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; @@ -5827,6 +5867,8 @@ in tpm-luks = callPackage ../tools/security/tpm-luks { }; + tpm2-tools = callPackage ../tools/security/tpm2-tools { }; + trezord = callPackage ../servers/trezord { }; tthsum = callPackage ../applications/misc/tthsum { }; @@ -5981,6 +6023,8 @@ in vcsh = callPackage ../applications/version-management/vcsh { }; + vcs_query = callPackage ../tools/misc/vcs_query { }; + vcstool = callPackage ../development/tools/vcstool { }; verilator = callPackage ../applications/science/electronics/verilator {}; @@ -6518,6 +6562,8 @@ in dash = callPackage ../shells/dash { }; + dasht = callPackage ../tools/misc/dasht { }; + dashing = callPackage ../tools/misc/dashing { }; es = callPackage ../shells/es { }; @@ -6635,8 +6681,15 @@ in name = "clang-wrapper-with-reexport-hack"; bintools = darwin.binutils.override { useMacosReexportHack = true; + bintools = darwin.binutils.bintools.override { + cctools = darwin.cctools.override { + enableDumpNormalizedLibArgs = true; + }; + }; }; }; + llvm-polly = llvmPackages_7.llvm-polly; + clang-polly = clang_7.override { cc = llvmPackages_7.clang-polly-unwrapped; }; clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; @@ -6791,7 +6844,10 @@ in { substitutions = { gcc = gcc-unwrapped; }; } ../development/compilers/gcc/libstdc++-hook.sh; - crossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic; + crossLibcStdenv = overrideCC stdenv + (if stdenv.targetPlatform.useLLVM or false + then buildPackages.llvmPackages_7.lldClangNoLibc + else buildPackages.gccCrossStageStatic); # The GCC used to build libc for the target platform. Normal gccs will be # built with, and use, that cross-compiled libc. @@ -6799,6 +6855,7 @@ in libcCross1 = if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode + else if stdenv.targetPlatform.libc == "nblibc" then netbsd.headers else null; binutils1 = wrapBintoolsWith { bintools = binutils-unwrapped; @@ -6958,9 +7015,7 @@ in inherit (gnome2) libart_lgpl; }); - gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { - emacsSupport = config.emacsSupport or false; - }; + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gccgo = gccgo6; gccgo6 = wrapCC (gcc6.cc.override { @@ -7016,9 +7071,9 @@ in haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc863.override { + haskellPackages = dontRecurseIntoAttrs (haskell.packages.ghc863.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; - }; + }); inherit (haskellPackages) ghc; @@ -7107,9 +7162,9 @@ in icedtea_web = icedtea8_web; - idrisPackages = callPackage ../development/idris-modules { + idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { idris-no-deps = haskellPackages.idris; - }; + }); idris = idrisPackages.with-packages [ idrisPackages.base ] ; @@ -7201,14 +7256,12 @@ in (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; - licenseAccepted = config.oraclejdk.accept_license or false; }); oraclejdk8psu_distro = installjdk: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; - licenseAccepted = config.oraclejdk.accept_license or false; }); javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; @@ -7341,7 +7394,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -7570,9 +7623,7 @@ in tbb = callPackage ../development/libraries/tbb { }; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_38 // { - llvm = llvmPackages_38.llvm.override { enableSharedLibraries = false; }; - }; + llvmPackages = llvmPackages_6; lua = lua5_1; }; @@ -8258,15 +8309,13 @@ in augeas = callPackage ../tools/system/augeas { }; - inherit (callPackages ../tools/admin/ansible {}) - ansible_2_4 + inherit (callPackage ../tools/admin/ansible { }) + ansible ansible_2_5 ansible_2_6 - ansible_2_7 - ansible2 - ansible; + ansible_2_7; - ansible-lint = callPackage ../development/tools/ansible-lint {}; + ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; @@ -8481,7 +8530,9 @@ in cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { + inherit (darwin) cf-private; + }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -8534,7 +8585,9 @@ in librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = callPackage ../development/libraries/gcc/libgcc { }; + libgcc = callPackage ../development/libraries/gcc/libgcc { + stdenvNoLibs = gccStdenvNoLibs; # cannot be built with clang it seems + }; libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { }; @@ -8971,9 +9024,7 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkg-config = callPackage ../development/tools/misc/pkg-config { - fetchurl = fetchurlBoot; - }; + pkg-config = callPackage ../development/tools/misc/pkg-config { }; pkgconfig = pkg-config; # added 2018-02-02 pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); @@ -9013,14 +9064,10 @@ in r10k = callPackage ../tools/system/r10k { }; - inherit (callPackages ../development/tools/analysis/radare2 { + inherit (callPackages ../development/tools/analysis/radare2 ({ inherit (gnome2) vte; lua = lua5; - useX11 = config.radare.useX11 or false; - pythonBindings = config.radare.pythonBindings or false; - rubyBindings = config.radare.rubyBindings or false; - luaBindings = config.radare.luaBindings or false; - }) radare2 r2-for-cutter; + } // (config.radare or {}))) radare2 r2-for-cutter; radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; @@ -9069,7 +9116,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; - sconsPackages = callPackage ../development/tools/build-managers/scons { }; + sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; mill = callPackage ../development/tools/build-managers/mill { }; @@ -9361,6 +9408,12 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-common = callPackage ../development/libraries/aws-c-common { }; + + aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + + aws-checksums = callPackage ../development/libraries/aws-checksums { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -9436,9 +9489,7 @@ in bzrtp = callPackage ../development/libraries/bzrtp { }; - c-ares = callPackage ../development/libraries/c-ares { - fetchurl = fetchurlBoot; - }; + c-ares = callPackage ../development/libraries/c-ares { }; c-blosc = callPackage ../development/libraries/c-blosc { }; @@ -9474,7 +9525,9 @@ in celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; - cegui = callPackage ../development/libraries/cegui {}; + cegui = callPackage ../development/libraries/cegui { + ogre = ogre1_10; + }; certbot = callPackage ../tools/admin/certbot { }; @@ -9952,9 +10005,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; }; - glibc = callPackage ../development/libraries/glibc { - installLocales = config.glibc.locales or false; - }; + glibc = callPackage ../development/libraries/glibc { }; # Provided by libc on Operating Systems that use the Extensible Linker Format. elf-header = @@ -9965,13 +10016,11 @@ in elf-header-real = callPackage ../development/libraries/elf-header { }; glibc_memusage = callPackage ../development/libraries/glibc { - installLocales = false; withGd = true; }; # Being redundant to avoid cycles on boot. TODO: find a better way glibcCross = callPackage ../development/libraries/glibc { - installLocales = config.glibc.locales or false; stdenv = crossLibcStdenv; }; @@ -9992,6 +10041,7 @@ in else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else if name == "libSystem" then targetPackages.darwin.xcode + else if name == "nblibc" then targetPackages.netbsdCross.libc else throw "Unknown libc"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; @@ -10047,7 +10097,7 @@ in # A GMP fork mpir = callPackage ../development/libraries/mpir {}; - gns3Packages = callPackage ../applications/networking/gns3 { }; + gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; @@ -10121,12 +10171,9 @@ in # https://github.com/NixOS/nixpkgs/commit/d6454e6a1 then ../development/libraries/gnutls/3.5.10.nix else ../development/libraries/gnutls/3.6.nix) - { - guileBindings = config.gnutls.guile or false; - }; + { }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { - guileBindings = config.gnutls.guile or false; gperf = gperf_3_0; }; @@ -10184,11 +10231,7 @@ in pixman = callPackage ../development/libraries/pixman { }; - cairo = callPackage ../development/libraries/cairo { - glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isAarch32 && !stdenv.isMips); - }; - + cairo = callPackage ../development/libraries/cairo { }; cairomm = callPackage ../development/libraries/cairomm { }; @@ -10212,11 +10255,9 @@ in gnome-menus = callPackage ../development/libraries/gnome-menus { }; - granite = callPackage ../development/libraries/granite { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { - cupsSupport = config.gtk2.cups or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -10499,10 +10540,7 @@ in inherit (buildPackages.darwin) bootstrap_cmds; }; krb5Full = krb5; - libkrb5 = krb5.override { - fetchurl = fetchurlBoot; - type = "lib"; - }; + libkrb5 = krb5.override { type = "lib"; }; kerberos = libkrb5; # TODO: move to aliases.nix languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); @@ -10878,9 +10916,7 @@ in libechonest = callPackage ../development/libraries/libechonest { }; - libev = callPackage ../development/libraries/libev { - fetchurl = fetchurlBoot; - }; + libev = callPackage ../development/libraries/libev { }; libevent = callPackage ../development/libraries/libevent { }; @@ -10981,7 +11017,6 @@ in libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { - useGTK = config.libiodbc.gtk or false; inherit (darwin.apple_sdk.frameworks) Carbon; }; @@ -11099,9 +11134,7 @@ in ln -sv ${libcDev}/include/iconv.h $out/include ''; - libiconvReal = callPackage ../development/libraries/libiconv { - fetchurl = fetchurlBoot; - }; + libiconvReal = callPackage ../development/libraries/libiconv { }; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; @@ -11634,8 +11667,11 @@ in ## libGL/libGLU/Mesa stuff - # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them - libGL = mesa_noglu.stubs; + # Default libGL implementation, should provide headers and + # libGL.so/libEGL.so/... to link agains them. Android NDK provides + # an OpenGL implementation, we can just use that. + libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv + else mesa_noglu.stubs; # Default libGLU libGLU = mesa_glu; @@ -11656,7 +11692,7 @@ in libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; mesa_noglu = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -11771,9 +11807,7 @@ in newt = callPackage ../development/libraries/newt { }; - nghttp2 = callPackage ../development/libraries/nghttp2 { - fetchurl = fetchurlBoot; - }; + nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; nix-plugins = callPackage ../development/libraries/nix-plugins { @@ -11810,6 +11844,8 @@ in nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; + nvidia-docker = callPackage ../applications/virtualization/nvidia-docker { }; + nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; @@ -11827,6 +11863,7 @@ in ogre = callPackage ../development/libraries/ogre {}; ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; + ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; ogrepaged = callPackage ../development/libraries/ogrepaged { }; @@ -11871,7 +11908,6 @@ in }; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { - enableCuda = config.cudaSupport or false; inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; @@ -11881,7 +11917,6 @@ in }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { - enableCuda = config.cudaSupport or false; inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; @@ -11931,16 +11966,13 @@ in openssl = openssl_1_0_2; - inherit (callPackages ../development/libraries/openssl { - fetchurl = fetchurlBoot; - }) + inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 openssl_1_1; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; opensubdiv = callPackage ../development/libraries/opensubdiv { - cudaSupport = config.cudaSupport or false; cmake = cmake_2_8; }; @@ -12105,7 +12137,6 @@ in qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { - openglSupport = libGLSupported; libpng = libpng12; }; @@ -12145,6 +12176,7 @@ in harfbuzz = harfbuzzFull; inherit libGL; inherit perl; + inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12161,7 +12193,8 @@ in inherit perl; inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; }); libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; @@ -12176,7 +12209,8 @@ in inherit libGL; inherit perl; inherit (darwin) cf-private; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12192,7 +12226,8 @@ in inherit libGL; inherit perl; inherit (darwin) cf-private; - inherit (gnome3) gtk3 dconf; + inherit gtk3; + inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12355,6 +12390,8 @@ in rapidjson = callPackage ../development/libraries/rapidjson {}; + rapidxml = callPackage ../development/libraries/rapidxml {}; + raul = callPackage ../development/libraries/audio/raul { }; readline = readline6; @@ -12442,10 +12479,13 @@ in schroedinger = callPackage ../development/libraries/schroedinger { }; - SDL = callPackage ../development/libraries/SDL { + SDL = callPackage ../development/libraries/SDL ({ inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; - }; + } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { + # libGLU doesn’t work with Android’s SDL + libGLU = null; + }); SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; @@ -12527,8 +12567,11 @@ in skalibs = skawarePackages.skalibs; - skawarePackages = recurseIntoAttrs { - buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + skawarePackages = recurseIntoAttrs rec { + cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { }; + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { + inherit cleanPackaging; + }; skalibs = callPackage ../development/libraries/skalibs { }; execline = callPackage ../tools/misc/execline { }; @@ -12835,6 +12878,8 @@ in totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; + tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; + tremor = callPackage ../development/libraries/tremor { }; twolame = callPackage ../development/libraries/twolame { }; @@ -13014,21 +13059,18 @@ in wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; - withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; - withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; }; wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; }; wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {}; @@ -13078,9 +13120,7 @@ in xalanc = callPackage ../development/libraries/xalanc {}; - xgboost = callPackage ../development/libraries/xgboost { - cudaSupport = config.cudaSupport or false; - }; + xgboost = callPackage ../development/libraries/xgboost { }; xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; @@ -13132,9 +13172,7 @@ in zeitgeist = callPackage ../development/libraries/zeitgeist { }; - zlib = callPackage ../development/libraries/zlib { - fetchurl = fetchurlBoot; - }; + zlib = callPackage ../development/libraries/zlib { }; libdynd = callPackage ../development/libraries/libdynd { }; @@ -13332,8 +13370,8 @@ in quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix { inherit clwrapper; }; - quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp); - quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl); + quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp)); + quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl)); quicklispPackages = quicklispPackagesSBCL; quicklispPackages_asdf_3_1 = quicklispPackagesFor ((wrapLisp sbcl).override { asdf = asdf_3_1; }); @@ -13395,9 +13433,9 @@ in packages = []; }; - rPackages = callPackage ../development/r-modules { + rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (p: {})) pkgs; - }; + }); ### SERVERS @@ -13432,7 +13470,7 @@ in subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4; + apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -13470,10 +13508,7 @@ in bftpd = callPackage ../servers/ftp/bftpd {}; - bind = callPackage ../servers/dns/bind { - enablePython = config.bind.enablePython or false; - python3 = python3.withPackages (ps: with ps; [ ply ]); - }; + bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; inherit (callPackages ../servers/bird { }) @@ -14308,6 +14343,8 @@ in inherit (python3Packages) bedup; + bolt = callPackage ../os-specific/linux/bolt { }; + bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; @@ -14327,8 +14364,7 @@ in conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - pulseSupport = config.pulseaudio or false; + inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl; } // config.conky or {}); conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; @@ -14404,9 +14440,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = callPackage ../os-specific/linux/ffado { - inherit (python2Packages) python pyqt4 dbus-python; - }; + ffado = callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -14421,9 +14455,9 @@ in inherit (linuxPackages) kernel; }; - fusePackages = callPackage ../os-specific/linux/fuse { + fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { utillinux = utillinuxMinimal; - }; + }); fuse = lowPrio fusePackages.fuse_2; fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -14632,7 +14666,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.interpreter-trunc ]; }; @@ -14713,7 +14746,7 @@ in nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; @@ -14913,8 +14946,7 @@ in kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod }; - # Using fetchurlBoot because this is used by kerberos (on Linux), which curl depends on - keyutils = callPackage ../os-specific/linux/keyutils { fetchurl = fetchurlBoot; }; + keyutils = callPackage ../os-specific/linux/keyutils { }; libselinux = callPackage ../os-specific/linux/libselinux { }; @@ -14995,9 +15027,7 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; - open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome3) gtk gtkmm; - }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; delve = callPackage ../development/tools/delve { }; @@ -15108,10 +15138,7 @@ in pax-utils = callPackage ../os-specific/linux/pax-utils { }; - pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { - firmware = config.pcmciaUtils.firmware or []; - config = config.pcmciaUtils.config or null; - }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { }; pcstat = callPackage ../tools/system/pcstat { }; @@ -15477,9 +15504,7 @@ in comic-relief = callPackage ../data/fonts/comic-relief {}; - coreclr = callPackage ../development/compilers/coreclr { - debug = config.coreclr.debug or false; - }; + coreclr = callPackage ../development/compilers/coreclr { }; corefonts = callPackage ../data/fonts/corefonts { }; @@ -15489,6 +15514,8 @@ in cm_unicode = callPackage ../data/fonts/cm-unicode {}; + creep = callPackage ../data/fonts/creep { }; + crimson = callPackage ../data/fonts/crimson {}; dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {}); @@ -15584,8 +15611,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { }; font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; + font-awesome = font-awesome_5; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -15661,6 +15688,8 @@ in league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; + inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 @@ -15918,12 +15947,12 @@ in source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { }; - sourceHanSansPackages = callPackage ../data/fonts/source-han-sans { }; + sourceHanSansPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-sans { }); source-han-sans-japanese = sourceHanSansPackages.japanese; source-han-sans-korean = sourceHanSansPackages.korean; source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; - sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { }; + sourceHanSerifPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-serif { }); source-han-serif-japanese = sourceHanSerifPackages.japanese; source-han-serif-korean = sourceHanSerifPackages.korean; source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; @@ -15975,6 +16004,8 @@ in ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { }; + undefined-medium = callPackage ../data/fonts/undefined-medium { }; + uni-vga = callPackage ../data/fonts/uni-vga { }; unifont = callPackage ../data/fonts/unifont { }; @@ -16011,6 +16042,8 @@ in xorg-rgb = callPackage ../data/misc/xorg-rgb {}; + yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz {}; + zafiro-icons = callPackage ../data/icons/zafiro-icons { }; zeal = libsForQt5.callPackage ../data/documentation/zeal { }; @@ -16034,9 +16067,7 @@ in inherit (pythonPackages) eyeD3; }; - abiword = callPackage ../applications/office/abiword { - iconTheme = gnome3.defaultIconTheme; - }; + abiword = callPackage ../applications/office/abiword { }; abook = callPackage ../applications/misc/abook { }; @@ -16062,9 +16093,7 @@ in agedu = callPackage ../tools/misc/agedu { }; - ahoviewer = callPackage ../applications/graphics/ahoviewer { - useUnrar = config.ahoviewer.useUnrar or false; - }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { }; airwave = callPackage ../applications/audio/airwave { }; @@ -16115,7 +16144,7 @@ in inherit (vamp) vampSDK; }; - inherit (python3Packages) arelle; + arelle = with python3Packages; toPythonApplication arelle; argo = callPackage ../applications/networking/cluster/argo { }; @@ -16131,7 +16160,7 @@ in gconf = gnome2.GConf; }; - atomPackages = callPackage ../applications/editors/atom { }; + atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); inherit (atomPackages) atom atom-beta; @@ -16298,7 +16327,6 @@ in bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - cudaSupport = config.cudaSupport or false; pythonPackages = python35Packages; stdenv = overrideCC stdenv gcc6; }; @@ -16423,7 +16451,6 @@ in claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (gnome3) gsettings-desktop-schemas; inherit (xorg) libSM; - enableNetworkManager = config.networking.networkmanager.enable or false; }; clfswm = callPackage ../applications/window-managers/clfswm { }; @@ -16471,6 +16498,11 @@ in fluidsynth = fluidsynth_1; }; + csound-manual = callPackage ../applications/audio/csound/csound-manual { + python = python27; + pygments = python27Packages.pygments; + }; + csound-qt = callPackage ../applications/audio/csound/csound-qt { python = python27; qmake = qt59.qmake; @@ -16650,9 +16682,7 @@ in devede = callPackage ../applications/video/devede { }; - denemo = callPackage ../applications/audio/denemo { - inherit (gnome3) gtksourceview; - }; + denemo = callPackage ../applications/audio/denemo { }; dvb_apps = callPackage ../applications/video/dvb-apps { }; @@ -16905,8 +16935,8 @@ in cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages; - emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages; + emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages); + emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages); emacsPackagesNgFor = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; @@ -16931,9 +16961,10 @@ in }; }; - emacs25PackagesNg = emacsPackagesNgFor emacs25; + emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25); + emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26); + emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26PackagesNg = emacsPackagesNgFor emacs26; emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; @@ -17049,6 +17080,8 @@ in focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; + fondo = callPackage ../applications/graphics/fondo { }; + font-manager = callPackage ../applications/misc/font-manager { }; foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; @@ -17238,7 +17271,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -17253,7 +17285,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -17268,7 +17299,6 @@ in generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { @@ -17497,7 +17527,7 @@ in gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-online-accounts rest gnome-autoar gspell; + inherit (gnome3) gnome-online-accounts gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -17546,9 +17576,7 @@ in gv = callPackage ../applications/misc/gv { }; - guvcview = callPackage ../os-specific/linux/guvcview { - pulseaudioSupport = config.pulseaudio or true; - }; + guvcview = callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; @@ -17582,6 +17610,7 @@ in hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; + hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui; hledger-web = haskell.lib.justStaticExecutables haskellPackages.hledger-web; @@ -17599,6 +17628,8 @@ in hue-cli = callPackage ../tools/networking/hue-cli { }; + inherit (nodePackages) hueadm; + hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK30; }; @@ -17890,7 +17921,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog - keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -17901,12 +17932,19 @@ in inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_7; }; + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + python = python3; + }; + + kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; + keepnote = callPackage ../applications/office/keepnote { }; kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; @@ -18021,7 +18059,6 @@ in libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; inherit (gnome2) GConf ORBit2 gnome_vfs; - inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; fontsConf = makeFontsConf { fontDirectories = [ @@ -18382,19 +18419,8 @@ in # !!! should depend on MPlayer }; - mpv = callPackage ../applications/video/mpv rec { + mpv = callPackage ../applications/video/mpv { inherit lua; - waylandSupport = stdenv.isLinux; - alsaSupport = !stdenv.isDarwin; - pulseSupport = !stdenv.isDarwin; - rubberbandSupport = !stdenv.isDarwin; - dvdreadSupport = !stdenv.isDarwin; - dvdnavSupport = !stdenv.isDarwin; - drmSupport = !stdenv.isDarwin; - vaapiSupport = !stdenv.isDarwin; - x11Support = !stdenv.isDarwin; - xineramaSupport = !stdenv.isDarwin; - xvSupport = !stdenv.isDarwin; }; mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; @@ -18492,6 +18518,8 @@ in pijul = callPackage ../applications/version-management/pijul {}; + ping = callPackage ../applications/networking/ping { }; + piper = callPackage ../os-specific/linux/piper { }; plank = callPackage ../applications/misc/plank { }; @@ -18539,7 +18567,6 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - inherit (gnome3) defaultIconTheme; mlt-qt5 = libsForQt5.mlt; }; @@ -18652,10 +18679,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { - alsaSupport = stdenv.isLinux; - pulseaudioSupport = config.pulseaudio or true; - }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -18719,9 +18743,7 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - openmpt123 = callPackage ../applications/audio/openmpt123 { - usePulseAudio = config.pulseaudio or false; - }; + openmpt123 = callPackage ../applications/audio/openmpt123 { }; opusfile = callPackage ../applications/audio/opusfile { }; @@ -18755,7 +18777,7 @@ in pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt59.callPackage ../applications/graphics/paraview { }; + paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; packet = callPackage ../development/tools/packet { }; @@ -18875,9 +18897,7 @@ in pinfo = callPackage ../applications/misc/pinfo { }; - pinpoint = callPackage ../applications/office/pinpoint { - inherit (gnome3) clutter clutter-gtk; - }; + pinpoint = callPackage ../applications/office/pinpoint { }; pinta = callPackage ../applications/graphics/pinta { gtksharp = gtk-sharp-2_0; @@ -18926,7 +18946,7 @@ in python = python3; } // (config.profanity or {})); - protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; psi = callPackage ../applications/networking/instant-messengers/psi { }; @@ -19021,7 +19041,7 @@ in qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; - qtractor = callPackage ../applications/audio/qtractor { }; + qtractor = libsForQt5.callPackage ../applications/audio/qtractor { }; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; @@ -19067,7 +19087,7 @@ in quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; quodlibet-full = quodlibet.override { - inherit (gnome3) gtksourceview webkitgtk; + inherit gtksourceview webkitgtk; withDbusPython = true; withPyInotify = true; withMusicBrainzNgs = true; @@ -19428,9 +19448,7 @@ in soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; - sox = callPackage ../applications/misc/audio/sox { - enableLame = config.sox.enableLame or false; - }; + sox = callPackage ../applications/misc/audio/sox { }; soxr = callPackage ../applications/misc/audio/soxr { }; @@ -19469,7 +19487,9 @@ in inherit (ocamlPackages) stog; - stp = callPackage ../applications/science/logic/stp {}; + stp = callPackage ../applications/science/logic/stp { + bison = bison2; + }; stumpish = callPackage ../applications/window-managers/stumpish {}; @@ -19573,7 +19593,7 @@ in taskserver = callPackage ../servers/misc/taskserver { }; - tdesktopPackages = callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }; + tdesktopPackages = dontRecurseIntoAttrs (callPackage ../applications/networking/instant-messengers/telegram/tdesktop { }); tdesktop = tdesktopPackages.stable; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -19635,7 +19655,6 @@ in thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; - inherit (pkgs.gnome3) defaultIconTheme; }; tig = gitAndTools.tig; @@ -19794,9 +19813,7 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - vimiv = callPackage ../applications/graphics/vimiv { - inherit (gnome3) defaultIconTheme; - }; + vimiv = callPackage ../applications/graphics/vimiv { }; macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; @@ -19856,6 +19873,8 @@ in virtinst = callPackage ../applications/virtualization/virtinst {}; + virtscreen = callPackage ../tools/admin/virtscreen {}; + virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; @@ -19990,7 +20009,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; + weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; @@ -20129,6 +20148,9 @@ in ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple + ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive + ++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp + ++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive ); }; @@ -20291,6 +20313,8 @@ in xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + xmobar = haskellPackages.xmobar; + xmonad-log = callPackage ../tools/misc/xmonad-log { }; xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { @@ -20299,18 +20323,15 @@ in }; xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { - desktopSupport = "gnomeflashback"; inherit (xfce) libxfce4util xfce4-panel; }; xmonad_log_applet_mate = xmonad_log_applet.override { desktopSupport = "mate"; - inherit (xfce) libxfce4util xfce4-panel; }; xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; - inherit (xfce) libxfce4util xfce4-panel; }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; @@ -20411,9 +20432,7 @@ in boost = boost160; }; - zathura = callPackage ../applications/misc/zathura { - useMupdf = config.zathura.useMupdf or true; - }; + zathura = callPackage ../applications/misc/zathura { }; zeroc_ice = callPackage ../development/libraries/zeroc-ice { inherit (darwin.apple_sdk.frameworks) Security; @@ -21045,13 +21064,9 @@ in stockfish = callPackage ../games/stockfish { }; - steamPackages = callPackage ../games/steam { }; + steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { }); - steam = steamPackages.steam-chrootenv.override { - # DEPRECATED - withJava = config.steam.java or false; - withPrimus = config.steam.primus or false; - }; + steam = steamPackages.steam-chrootenv; steam-run = steam.run; steam-run-native = (steam.override { @@ -21154,7 +21169,7 @@ in ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); - ut2004Packages = callPackage ../games/ut2004 { }; + ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { }); ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ]; @@ -21263,9 +21278,9 @@ in keen4 = callPackage ../games/keen4 { }; - zeroadPackages = callPackage ../games/0ad { + zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; - }; + }); zeroad = zeroadPackages.zeroad; @@ -21334,12 +21349,9 @@ in mate = recurseIntoAttrs (callPackage ../desktops/mate { }); - maxx = callPackage ../desktops/maxx { }; + pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - pantheon = recurseIntoAttrs rec { - callPackage = newScope pkgs.pantheon; - pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; - }; + maxx = callPackage ../desktops/maxx { }; plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; @@ -21357,8 +21369,6 @@ in orion = callPackage ../misc/themes/orion {}; - elementary-gtk-theme = callPackage ../misc/themes/elementary { }; - albatross = callPackage ../misc/themes/albatross { }; gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; @@ -21584,9 +21594,7 @@ in ### SCIENCE/MACHINE LEARNING - sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { - licenseAccepted = (config.sc2-headless.accept_license or false); - }; + sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; ### SCIENCE/MATH @@ -22002,28 +22010,21 @@ in ### SCIENCE / MATH - caffe = callPackage ../applications/science/math/caffe rec { - cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; - cudnnSupport = cudaSupport; - # Used only for image loading. - opencv3 = opencv3WithoutCuda; + caffe = callPackage ../applications/science/math/caffe ({ + opencv3 = opencv3WithoutCuda; # Used only for image loading. inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; - }; + } // (config.caffe or {})); caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { inherit (python36Packages) python future six numpy pydot; protobuf = protobuf3_1; python-protobuf = python36Packages.protobuf.override { inherit protobuf; }; - # Used only for image loading. - opencv3 = opencv3WithoutCuda; + opencv3 = opencv3WithoutCuda; # Used only for image loading. }); - cntk = callPackage ../applications/science/math/cntk rec { - cudaSupport = pkgs.config.cudaSupport or false; - cudnnSupport = cudaSupport; + cntk = callPackage ../applications/science/math/cntk { inherit (linuxPackages) nvidia_x11; - # Used only for image loading. - opencv3 = opencv3WithoutCuda; + opencv3 = opencv3WithoutCuda; # Used only for image loading. }; ecm = callPackage ../applications/science/math/ecm { }; @@ -22054,9 +22055,7 @@ in sbcl = null; }; - mxnet = callPackage ../applications/science/math/mxnet rec { - cudaSupport = config.cudaSupport or false; - cudnnSupport = cudaSupport; + mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; }; @@ -22075,9 +22074,7 @@ in bcal = callPackage ../applications/science/math/bcal { }; - pspp = callPackage ../applications/science/math/pspp { - inherit (gnome3) gtksourceview; - }; + pspp = callPackage ../applications/science/math/pspp { }; pynac = callPackage ../applications/science/math/pynac { }; @@ -22218,6 +22215,8 @@ in ### MISC + acpilight = callPackage ../misc/acpilight { }; + android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; @@ -22297,6 +22296,8 @@ in cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-brother-hl3140cw = pkgsi686Linux.callPackage ../misc/cups/drivers/hl3140cw { }; + cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; # this driver ships with pre-compiled 32-bit binary libraries @@ -22388,7 +22389,6 @@ in gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; - inherit (gnome3) gspell defaultIconTheme; }; gammu = callPackage ../applications/misc/gammu { }; @@ -22655,6 +22655,8 @@ in nix-pin = callPackage ../tools/package-management/nix-pin { }; + nix-prefetch = callPackage ../tools/package-management/nix-prefetch { }; + nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {}; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) @@ -23090,9 +23092,7 @@ in xosview2 = callPackage ../tools/X11/xosview2 { }; - xpad = callPackage ../applications/misc/xpad { - inherit (gnome3) gtksourceview; - }; + xpad = callPackage ../applications/misc/xpad { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { libpng = libpng12; @@ -23203,9 +23203,7 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; - sequeler = callPackage ../applications/misc/sequeler { - inherit (gnome3) gtksourceview libgda; - }; + sequeler = callPackage ../applications/misc/sequeler { }; sequelpro = callPackage ../applications/misc/sequelpro {}; @@ -23300,8 +23298,10 @@ in fts = if stdenv.hostPlatform.isMusl then netbsd.fts else null; - inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) - netbsd; + netbsd = callPackages ../os-specific/bsd/netbsd {}; + netbsdCross = callPackages ../os-specific/bsd/netbsd { + stdenv = crossLibcStdenv; + }; yrd = callPackage ../tools/networking/yrd { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15d4cf3f213..a2f392fb109 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -55,7 +55,7 @@ in { }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; + sphinx = buildPackages.python3Packages.sphinx_1_7_9; buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index c4253973cbb..e60f42e14e2 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -52,8 +52,12 @@ runCommand "nixpkgs-metrics" run nix-env.qa nix-env -f ${nixpkgs} -qa run nix-env.qaDrv nix-env -f ${nixpkgs} -qa --drv-path --meta --xml + # It's slightly unclear which of the set to track: qaCount, qaCountDrv, qaCountBroken. num=$(nix-env -f ${nixpkgs} -qa | wc -l) echo "nix-env.qaCount $num" >> $out/nix-support/hydra-metrics + qaCountDrv=$(nix-env -f ${nixpkgs} -qa --drv-path | wc -l) + num=$((num - $qaCountDrv)) + echo "nix-env.qaCountBroken $num" >> $out/nix-support/hydra-metrics # TODO: this has been ignored for some time # GC Warning: Bad initial heap size 128k - ignoring it. diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1adf66d5eb7..1541bb12ee1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -355,7 +355,13 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { + cairo2 = cairo2.override { enableGtkSupport = false; }; + }; + + lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; + + lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; @@ -1072,6 +1078,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }); + ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { }); + ocamlPackages_latest = ocamlPackages_4_07; ocamlPackages = ocamlPackages_4_06; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2866f6b6ca5..e409895e8da 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -109,10 +109,10 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.49"; + name = "Alien-Build-1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.49.tar.gz; - sha256 = "1wsg794pbqgywyfqdrwrsjcj5qgas3h72j4w2iph9ir6b93rb11p"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.60.tar.gz; + sha256 = "0wzwi5l71sn0wrbjsikjlh2y7yn68m3hal8s9v43rc6w20q3z877"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ]; buildInputs = [ DevelHide PkgConfig Test2Suite ]; @@ -181,10 +181,10 @@ let }; AnyEvent = buildPerlPackage rec { - name = "AnyEvent-7.14"; + name = "AnyEvent-7.15"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "539358d225bad34b4a64f5217f8c2a707b15e3a28c74120c9dd2270c7cca7d2a"; + sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354"; }; buildInputs = [ CanaryStability ]; meta = { @@ -353,10 +353,10 @@ let }; AppFatPacker = buildPerlPackage rec { - name = "App-FatPacker-0.010007"; + name = "App-FatPacker-0.010008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010007.tar.gz; - sha256 = "1g9nff9fdg7dvja0ix2yv32w5xcj963ybcf7x22j61g6r81845fi"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz; + sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; }; meta = { description = "pack your dependencies onto your script file"; @@ -378,10 +378,10 @@ let }; Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.85"; + name = "App-perlbrew-0.86"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0i3d2csihn5x27lfykwgjpq60ij21s19fzbjsacqq93x46qyim9y"; + sha256 = "11qh94am7fghizmjaf5c7w868svjbv9g4ffirykj8qa6q40zdspp"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; @@ -413,14 +413,14 @@ let }; AppSqitch = buildPerlModule rec { - version = "0.9998"; + version = "0.9999"; name = "App-Sqitch-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "5539f15c0e26ad3595e658e2c21481b0748cc89f6dca0a6ded1fdc62f88c8a5a"; + sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3"; }; - buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; + buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = https://sqitch.org/; @@ -487,10 +487,10 @@ let }; ArrayFIFO = buildPerlPackage rec { - name = "Array-FIFO-0.12"; + name = "Array-FIFO-0.13"; src = fetchurl { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; - sha256 = "806a931d5a953255a0416978c39987a75e5cbe592a88d44a7b909f4f86888d5d"; + sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -819,10 +819,10 @@ let }; BKeywords = buildPerlPackage rec { - name = "B-Keywords-1.19"; + name = "B-Keywords-1.20"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "1kdzhdksnqrmij98bnifv2p2125zvpf0rmzxjiav65ipydi4rsw9"; + sha256 = "12jvx5gnypqxal4valkf9lidba9nz7kjk2wvm07q3hkmdqxw1zk0"; }; meta = { description = "Lists of reserved barewords and symbol names"; @@ -885,10 +885,10 @@ let }; BusinessHours = buildPerlPackage rec { - name = "Business-Hours-0.12"; + name = "Business-Hours-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz; - sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv"; + url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz; + sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8"; }; propagatedBuildInputs = [ SetIntSpan ]; meta = { @@ -1029,11 +1029,12 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v"; }; - buildInputs = [ pkgs.cairo Cairo Glib ExtUtilsDepends ExtUtilsPkgConfig ]; + buildInputs = [ pkgs.cairo ]; meta = { description = "Integrate Cairo into the Glib type system"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Cairo Glib ]; }; cam_pdf = buildPerlModule rec { @@ -1299,10 +1300,10 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90123"; + name = "Catalyst-Runtime-5.90124"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90123.tar.gz; - sha256 = "f4484409ee2f7e9dddf148e7509e7a3eaf4df0c22b97a94dddc2171909485f3b"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90124.tar.gz; + sha256 = "2a60cbe7c1f6fec25f0e7fd3f66273386d73edb625748cc0d8c4f20e62983e00"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; @@ -2220,17 +2221,17 @@ let }; }; - Clipboard = buildPerlPackage { - name = "Clipboard-0.13"; + Clipboard = buildPerlModule { + name = "Clipboard-0.19"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KING/Clipboard-0.13.tar.gz; - sha256 = "eebf1c9cb2484be850abdae017147967cf47f8ccd99293771517674b0046ec8a"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.19.tar.gz; + sha256 = "34b9dccac5d559b2b2769e5e315205c8292be2ff9f6e5333112a2377c69abbb3"; }; meta = { description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard; + propagatedBuildInputs = [ CGI URI ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard; # Disable test on darwin because MacPasteboard fails when not logged in interactively. # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. @@ -2276,10 +2277,10 @@ let }; CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.72"; + name = "Code-TidyAll-0.73"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.72.tar.gz; - sha256 = "0py9z3f7ld93a7qibrc917qkwjh7pcl0r9khzg7dlr4rra0xq9fn"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz; + sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -2327,10 +2328,10 @@ let }; CompressRawBzip2 = buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.081"; + name = "Compress-Raw-Bzip2-2.084"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6"; + sha256 = "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx"; }; # Don't build a private copy of bzip2. @@ -2448,10 +2449,10 @@ let }; ConfigIniFiles = buildPerlModule rec { - name = "Config-IniFiles-3.000000"; + name = "Config-IniFiles-3.000001"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "cd92f6b7f1aa3e03abf6251f1e6129dab8a2b835e8b17c7c4cc3e8305c1c9b29"; + sha256 = "48ada0a6c6a5b6cbe1bfb261fe56e3bf8492ff9420f7321b6a972924416659ea"; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -2682,12 +2683,12 @@ let }; CPAN = buildPerlPackage rec { - name = "CPAN-2.22"; + name = "CPAN-2.25"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "c6f2a44cd95ef5989ef0abc83dca38ae645bd5ea09de67461251f2d782989990"; + sha256 = "b4cbef12b872f34e29c3cdcd511c5ed004c4486939001b60e493dc25956552a9"; }; - propagatedBuildInputs = [ ArchiveZip CPANChecksums Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -2695,10 +2696,10 @@ let }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.08"; + name = "Cpanel-JSON-XS-4.09"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "2bc1475b698b5a419bb55127b07732794b495e2a6e0f4ed39bdcbd39a64e7c2d"; + sha256 = "99c0155e554222b0cb24b032ced9a4f7bdfd2b3c98d07657ac020fbe5c3495a3"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2756,10 +2757,10 @@ let }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.86"; + name = "CPAN-Perl-Releases-3.90"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0g90xm43pydfjq794ay4dvgvhjdr4xrjgmravj8wb2kqc65pm2za"; + sha256 = "19pjq3x9nb76m4a5g37miw1js5mmfqhv1z2gyya3kjc8wbjb1qjc"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -3256,6 +3257,18 @@ let }; }; + DataHexdumper = buildPerlPackage rec { + name = "Data-Hexdumper-3.0001"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/${name}.tar.gz"; + sha256 = "f9243cbe8affed5045fe4df505726a7a7289471e30c51ac065b3ed6ce0d1a604"; + }; + meta = { + description = "Make binary data human-readable"; + license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + }; + }; + DataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { @@ -3468,10 +3481,10 @@ let }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.221"; + name = "Data-UUID-1.224"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz; - sha256 = "0rw60wib0mj5z0v909mplh750y40hzyzf4z0b6h4ajxplyiv5irw"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz; + sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; }; }; @@ -3561,10 +3574,10 @@ let }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.75"; + name = "Date-Manip-6.76"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0zdnrdm7bj4qwnmd2r3gj80dm1brr63px04iy5blxa5i5azczyy1"; + sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3638,12 +3651,12 @@ let }; DateTimeFormatBuilder = buildPerlPackage { - name = "DateTime-Format-Builder-0.81"; + name = "DateTime-Format-Builder-0.82"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz; - sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz; + sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; }; - propagatedBuildInputs = [ ClassFactoryUtil DateTimeFormatStrptime ParamsValidate ]; + propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; license = stdenv.lib.licenses.artistic2; @@ -3771,13 +3784,13 @@ let }; DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.75"; + name = "DateTime-Format-Strptime-1.76"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "4fcfb2ac4f79d7ff2855a405f39050d2ea691ee098ce54ede8af79c8d6ab3c19"; + sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; }; buildInputs = [ TestFatal TestWarnings ]; - propagatedBuildInputs = [ DateTime PackageDeprecationManager ]; + propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format strp and strf time patterns"; license = stdenv.lib.licenses.artistic2; @@ -3838,10 +3851,10 @@ let }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.21"; + name = "DateTime-TimeZone-2.23"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "54d685f79df1033c259502cd9c22b1a9d37b627bf815faecebaa27f8e1079e1e"; + sha256 = "6ae40286031853a4319c5b34516f1c09e429d5caa5f782165cc27175c89fe54f"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -3938,10 +3951,10 @@ let }; DevelPatchPerl = buildPerlPackage rec { - name = "Devel-PatchPerl-1.52"; + name = "Devel-PatchPerl-1.56"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0iynq3sgxyidr8d6x0gb1yk5nvzr7xmyslk2bs8hkp9sbxpznsaf"; + sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -3965,10 +3978,10 @@ let }; DevelPPPort = buildPerlPackage rec { - name = "Devel-PPPort-3.43"; + name = "Devel-PPPort-3.44"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.43.tar.gz; - sha256 = "90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.44.tar.gz; + sha256 = "06561decc76f0aaba8e77f72b74624e19e2ad448a654c489c61bc786660832c5"; }; meta = { description = "Perl/Pollution/Portability"; @@ -4213,6 +4226,18 @@ let }; }; + DataBinary = buildPerlPackage { + name = "Data-Binary-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz; + sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8"; + }; + meta = { + description = "Simple detection of binary versus text in strings"; + license = with stdenv.lib.licenses; [ artistic2 ]; + }; + }; + DBIxIntrospector = buildPerlPackage rec { name = "DBIx-Introspector-0.001005"; src = fetchurl { @@ -4811,10 +4836,10 @@ let }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.911"; + name = "Email-Address-1.912"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.911.tar.gz; - sha256 = "10qfc2va6dhshjgw6xvxk88cd88s44kbxp47xmixx297wv3l69zl"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz; + sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"; }; meta = { description = "RFC 2822 Address Parsing"; @@ -4823,10 +4848,10 @@ let }; EmailAddressList = buildPerlPackage { - name = "Email-Address-List-0.05"; + name = "Email-Address-List-0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz; - sha256 = "705c23fc2163c2347ba0aea998450259f7b10577a368c6d310bd4e98b427a033"; + url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz; + sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e"; }; buildInputs = [ JSON ]; propagatedBuildInputs = [ EmailAddress ]; @@ -5025,10 +5050,10 @@ let }; Encode = buildPerlPackage rec { - name = "Encode-2.98"; + name = "Encode-3.00"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "303d396477c94c43c2f83da1a8025d68de76bd7e52c2cc35fbdf5c59b4c2cffa"; + sha256 = "4b538b47459cf5747b7395ccc8c8c9b3b661cc016c50b8a67e10fe19590fea5e"; }; meta = { description = "Character encodings in Perl"; @@ -5392,10 +5417,10 @@ let }; ExtUtilsMakeMakerCPANfile = buildPerlPackage rec { - name = "ExtUtils-MakeMaker-CPANfile-0.08"; + name = "ExtUtils-MakeMaker-CPANfile-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.08.tar.gz; - sha256 = "0yg2z4six807lraqh8ncsq6l62vj7zi0a38ha9nvmhd6lbipmsql"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz; + sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; }; propagatedBuildInputs = [ ModuleCPANfile ]; meta = { @@ -5541,12 +5566,12 @@ let }; FileChangeNotify = buildPerlPackage { - name = "File-ChangeNotify-0.29"; + name = "File-ChangeNotify-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.29.tar.gz; - sha256 = "438d4295ef5f854ace61037a11726ef65dc0bf73e296bd12fc7e2108602a444b"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz; + sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd"; }; - buildInputs = [ TestException TestRequires TestWithoutModule ]; + buildInputs = [ Test2Suite TestRequires TestWithoutModule ]; propagatedBuildInputs = [ ModulePluggable Moo TypeTiny namespaceautoclean ]; meta = with stdenv.lib; { description = "Watch for changes to files, cross-platform style"; @@ -5578,10 +5603,10 @@ let }; FileBOM = buildPerlModule rec { - name = "File-BOM-0.15"; + name = "File-BOM-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz"; - sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1"; + sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ Readonly ]; @@ -5988,12 +6013,12 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.25"; + name = "File-Slurp-9999.26"; # WARNING: check on next update if deprecation warning is gone patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.25.tar.gz; - sha256 = "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.26.tar.gz; + sha256 = "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; @@ -6040,10 +6065,10 @@ let }; FileTemp = buildPerlPackage { - name = "File-Temp-0.2308"; + name = "File-Temp-0.2309"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz; - sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w"; + url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz; + sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; }; meta = { description = "return name and handle of a temporary file safely"; @@ -6093,10 +6118,10 @@ let }; FileWhich = buildPerlPackage rec { - name = "File-Which-1.22"; + name = "File-Which-1.23"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4"; + sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078"; }; meta = { homepage = http://perl.wdlabs.com/File-Which; @@ -6216,10 +6241,10 @@ let }; GD = buildPerlPackage rec { - name = "GD-2.69"; + name = "GD-2.71"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.69.tar.gz; - sha256 = "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x"; + url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz; + sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; }; buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; @@ -6366,10 +6391,10 @@ let }; Glib = buildPerlPackage rec { - name = "Glib-1.328"; + name = "Glib-1.329"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1mb40h76kk1wfcl0dqd1r8wfsn4ik29jln3mcsjhmadasynw5725"; + sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"; }; buildInputs = [ pkgs.glib ]; meta = { @@ -6381,13 +6406,12 @@ let }; GlibObjectIntrospection = buildPerlPackage rec { - name = "Glib-Object-Introspection-0.046"; + name = "Glib-Object-Introspection-0.047"; src = fetchurl { url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; - sha256 = "1d3gl943p27gd42kxc1i9sp5z55gpgcslz1jvx7cxd6mflhdlck6"; + sha256 = "1sk32pcv4ik3sniqbjrz8nlw7f2a76l87wx1rwdjypv6h9pjnrnk"; }; - buildInputs = [ Glib ExtUtilsDepends ExtUtilsPkgConfig ]; - propagatedBuildInputs = [ pkgs.gobject-introspection ]; + propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { description = "Dynamically create Perl language bindings"; license = stdenv.lib.licenses.lgpl2Plus; @@ -6505,8 +6529,8 @@ let url = "mirror://cpan/authors/id/P/PE/PERLMAX/${name}.tar.gz"; sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; }; - buildInputs = [ pkgs.gtk3 GlibObjectIntrospection Glib ]; - propagatedBuildInputs = [ pkgs.goocanvas2 ]; + buildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ]; meta = { description = "Perl binding for GooCanvas2 widget using Glib::Object::Introspection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -6687,8 +6711,7 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; }; - buildInputs = [ Cairo CairoGObject Glib GlibObjectIntrospection ]; - propagatedBuildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { description = "Perl interface to the 3.x series of the gtk+ toolkit"; license = stdenv.lib.licenses.lgpl21Plus; @@ -6701,11 +6724,11 @@ let url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/${name}.tar.gz"; sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; }; - buildInputs = [ Gtk3 Glib GlibObjectIntrospection Cairo CairoGObject ]; meta = { description = "A simple interface to Gtk3's complex MVC list widget"; license = stdenv.lib.licenses.lgpl21Plus; }; + propagatedBuildInputs = [ Gtk3 ]; }; Guard = buildPerlPackage rec { @@ -7425,10 +7448,10 @@ let }; Imager = buildPerlPackage rec { - name = "Imager-1.007"; + name = "Imager-1.010"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; - sha256 = "adc12651e53e9226eb05482bf5f6faf77703af036fb922bc8c3f077f25b98d63"; + sha256 = "fc22e3e302f139d74a98d8068ccddfd92166141ddd4ca5c40f102070bcd7a3c7"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; @@ -7579,10 +7602,10 @@ let }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.081"; + name = "IO-Compress-2.084"; src = fetchurl { url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "5211c775544dc8c511af08edfb1c0c22734daa2789149c2a88d68e17b43546d9"; + sha256 = "1dbd503eda643aa58d1ef9b4d44c57889243d0ce6c54d5b45babceb860d76db5"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { @@ -7700,12 +7723,12 @@ let }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-2.060"; + name = "IO-Socket-SSL-2.064"; src = fetchurl { url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; - sha256 = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c"; + sha256 = "5827c6459ed2dce1da0ba6f442d198fa2c81554e045930e32b92c6d39e3ac3f5"; }; - propagatedBuildInputs = [ MozillaCA NetSSLeay ]; + propagatedBuildInputs = [ NetSSLeay ]; # Fix path to default certificate store. postPatch = '' substituteInPlace lib/IO/Socket/SSL.pm \ @@ -7892,10 +7915,10 @@ let }; Inline = buildPerlPackage rec { - name = "Inline-0.80"; + name = "Inline-0.81"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.81.tar.gz; + sha256 = "1f973868dcca56a3a99b25d253fa18bf2d53670f8bbfa498261267647707b1e3"; }; buildInputs = [ TestWarn ]; meta = { @@ -7995,10 +8018,10 @@ let }; JSON = buildPerlPackage { - name = "JSON-4.00"; + name = "JSON-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.00.tar.gz; - sha256 = "0s0h3a1y74851fgvrhq3qv8kw1z1ccwzz1ghn6vh91l7fl81znn4"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz; + sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -8037,10 +8060,10 @@ let }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-4.00"; + name = "JSON-PP-4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.00.tar.gz; - sha256 = "0g0g6qxcic5p34n51dlpq2s9f23qzlxxqsgprv7x962k894qxx5y"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz; + sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -8076,10 +8099,10 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-4.0"; + name = "JSON-XS-4.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.0.tar.gz; - sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.01.tar.gz; + sha256 = "0p1yjwwrq3x1f831jhwxlb76h92px01a316zv65zzmhzkbin446c"; }; propagatedBuildInputs = [ TypesSerialiser ]; buildInputs = [ CanaryStability ]; @@ -8484,10 +8507,10 @@ let }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.59"; + name = "Locale-Codes-3.60"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.59.tar.gz; - sha256 = "388dea3d088aa0513f21091e0fe4a9c61ab2c173c83052b3120a52b103592c03"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz; + sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194"; }; meta = { description = "A distribution of modules to handle locale codes"; @@ -8749,10 +8772,10 @@ let }; MCE = buildPerlPackage rec { - name = "MCE-1.837"; + name = "MCE-1.838"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.837.tar.gz; - sha256 = "0si12wv02i8cn2xw6lk0m2apqrd88awcli1yadmvikq5rnfhcypa"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz; + sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -8881,7 +8904,7 @@ let sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; - propagatedBuildInputs = [ IOSocketSSL LWP ]; + propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ]; doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; @@ -8965,11 +8988,11 @@ let }; MailBox = buildPerlPackage rec { - version = "3.005"; + version = "3.006"; name = "Mail-Box-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "103v5jiv5mlckss1yardjvil506sx60f3g2ph2kgx9x6sy1sd93m"; + sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502"; }; doCheck = false; @@ -8994,10 +9017,10 @@ let }; MailMessage = buildPerlPackage rec { - name = "Mail-Message-3.007"; + name = "Mail-Message-3.008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.007.tar.gz; - sha256 = "1hpf68i5w20dxcibqj5w5h8mx9qa6vjhr34bicrvdh7d3dfxq0bn"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz; + sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { @@ -9018,10 +9041,10 @@ let }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.40"; + name = "Mail-IMAPClient-3.42"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.40.tar.gz; - sha256 = "1n8fq6j8nxs85v5qwmrr3ain900rvj9i8n7in4r5bw7kiihdv3xz"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz; + sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw"; }; propagatedBuildInputs = [ ParseRecDescent ]; }; @@ -9362,7 +9385,7 @@ let url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz; sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r"; }; - propagatedBuildInputs = [ MathInt128 MaxMindDBReader pkgs.libmaxminddb ]; + propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; meta = { description = "Fast XS implementation of MaxMind DB reader"; @@ -9672,12 +9695,12 @@ let }; ModuleCPANTSAnalyse = buildPerlPackage rec { - name = "Module-CPANTS-Analyse-0.96"; + name = "Module-CPANTS-Analyse-1.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-0.96.tar.gz; - sha256 = "1c38fnbx9w1s841am1i5h33lcqr9bwc9bni21n907nmyp41wr297"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.00.tar.gz; + sha256 = "0r77g2h0d3p81scf294x5qkvi76hzwvbfji0m86abidjav5jk6a2"; }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo FileFindObject IOCapture JSONMaybeXS ModuleExtractUse ModulePluggable SetScalar SoftwareLicenseCCpack ]; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; @@ -9701,10 +9724,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20181218"; + name = "Module-CoreList-5.20190220"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20181218.tar.gz; - sha256 = "1rq8i4wsd9k38djv18j6rpyiya7d6z67ac8gwvsp2yqs1hqqvpfi"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20190220.tar.gz; + sha256 = "0v5yavg3ggal8aj00426wkjw38yrji449lkaaxs0ynwjqhnq01i7"; }; meta = { homepage = http://dev.perl.org/; @@ -9900,11 +9923,11 @@ let }; }; - ModuleScanDeps = let version = "1.26"; in buildPerlPackage { + ModuleScanDeps = let version = "1.27"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "1awin0lfliskrw86mhks6qszxrwbwhr66fc79cv00598mrjzn223"; + sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; }; buildInputs = [ TestRequires ]; meta = { @@ -9976,10 +9999,10 @@ let }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.10"; + name = "Mojolicious-8.12"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "0rfzfc2iy42qnxlzv6rndc3vwfm2nlqdipqfmbpjr42wrf4x3g4v"; + sha256 = "1sc9bdac4p9ha6xfmi3xj2dzip4bhxxzn5zvzyxqgbyvvr52k2dw"; }; meta = { homepage = https://mojolicious.org; @@ -10347,10 +10370,10 @@ let }; MouseXGetopt = buildPerlModule rec { - name = "MouseX-Getopt-0.37"; + name = "MouseX-Getopt-0.38"; src = fetchurl { url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; - sha256 = "a6221043e7be3217ce56d2a6425a413d9cd28e2f52053995a6ceb118e8e963bc"; + sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f"; }; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; @@ -10440,10 +10463,10 @@ let }; MooseXGetopt = buildPerlModule rec { - name = "MooseX-Getopt-0.72"; + name = "MooseX-Getopt-0.74"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "a378411a061ed239554d2b7f86b2b82bf55f600901243a6ec3fd29557d171b2e"; + sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24"; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; @@ -11314,10 +11337,10 @@ let }; NetSFTPForeign = buildPerlPackage rec { - name = "Net-SFTP-Foreign-1.89"; + name = "Net-SFTP-Foreign-1.90"; src = fetchurl { url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; - sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7"; + sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; }; propagatedBuildInputs = [ pkgs.openssl ]; patchPhase = '' @@ -11723,10 +11746,10 @@ let }; PackageStash = buildPerlPackage { - name = "Package-Stash-0.37"; + name = "Package-Stash-0.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; - sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; + url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz; + sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; @@ -11737,10 +11760,10 @@ let }; PackageStashXS = buildPerlPackage { - name = "Package-Stash-XS-0.28"; + name = "Package-Stash-XS-0.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz; - sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13"; + url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz; + sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk"; }; buildInputs = [ TestFatal TestRequires ]; meta = { @@ -12378,10 +12401,10 @@ let }; PlackMiddlewareReverseProxy = buildPerlPackage { - name = "Plack-Middleware-ReverseProxy-0.15"; + name = "Plack-Middleware-ReverseProxy-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.15.tar.gz; - sha256 = "1zmsccdy6wr5hxzj07r1nsmaymyibk87p95z0wzknjw10lwmqs9f"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz; + sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7"; }; propagatedBuildInputs = [ Plack ]; meta = { @@ -12391,10 +12414,10 @@ let }; PlackMiddlewareSession = buildPerlModule rec { - name = "Plack-Middleware-Session-0.30"; + name = "Plack-Middleware-Session-0.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.30.tar.gz; - sha256 = "0cwlhfj1644jq8axv4cghsqqjsx2y7hj7g0y5l179fcgmbp2ndzf"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.32.tar.gz; + sha256 = "00jnyclvggb4g7q6489x4x1sxfpxy9xyxrqkg2aqpn05fcqwfznp"; }; propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ]; buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; @@ -12571,10 +12594,10 @@ let }; ProcProcessTable = buildPerlPackage { - name = "Proc-ProcessTable-0.55"; + name = "Proc-ProcessTable-0.56"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.55.tar.gz; - sha256 = "3b9660d940a0c016c5e48108fa9dbf9f30492b505aa0a26d22b09554f05714f5"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz; + sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660"; }; meta = { description = "Perl extension to access the unix process table"; @@ -12708,6 +12731,20 @@ let }; }; + PerlPrereqScannerNotQuiteLite = buildPerlPackage { + name = "Perl-PrereqScanner-NotQuiteLite-0.9904"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz; + sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn"; + }; + propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; + meta = { + description = "a tool to scan your Perl code for its prerequisites"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PerlVersion = buildPerlPackage rec { name = "Perl-Version-1.013"; src = fetchurl { @@ -12925,10 +12962,10 @@ let }; PodMarkdownGithub = buildPerlPackage rec { - name = "Pod-Markdown-Github-0.03"; + name = "Pod-Markdown-Github-0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.03.tar.gz; - sha256 = "0y555pb78j0lz24kdgiwkmk1vcv4lg3a3mvnw9vm2qqnkp7p0nag"; + url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz; + sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; }; propagatedBuildInputs = [ PodMarkdown ]; buildInputs = [ TestDifferences ]; @@ -13161,6 +13198,16 @@ let }; }; + RegexpTrie = buildPerlPackage { + name = "Regexp-Trie-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz; + sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv"; + }; + meta = { + }; + }; + RESTClient = buildPerlPackage rec { name = "REST-Client-273"; src = fetchurl { @@ -14348,10 +14395,10 @@ let }; TAPParserSourceHandlerpgTAP = buildPerlModule rec { - name = "TAP-Parser-SourceHandler-pgTAP-3.34"; + name = "TAP-Parser-SourceHandler-pgTAP-3.35"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "1q9h5h3m31vfch17djjacnjqvfkyw0b8ndwv1kk8a09bp8sbsh8v"; + sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4"; }; meta = { description = "Stream TAP from pgTAP test scripts"; @@ -14582,18 +14629,18 @@ let TermReadKey = buildPerlPackage rec { name = "TermReadKey-${version}"; - version = "2.37"; + version = "2.38"; src = fetchurl { url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz"; - sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa"; + sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s"; }; }; TermReadLineGnu = buildPerlPackage rec { - name = "Term-ReadLine-Gnu-1.35"; + name = "Term-ReadLine-Gnu-1.36"; src = fetchurl { url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz"; - sha256 = "575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125"; + sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; @@ -14739,10 +14786,10 @@ let }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000117"; + name = "Test2-Suite-0.000118"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "e8877a90655ace2e8302104e0de27faf777397194738b085b209749c091ef154"; + sha256 = "e9225132b585d6730d3de6b0caa2648b9c67995732c0a081efcfcad37b8af227"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -14980,11 +15027,11 @@ let }; }; - TestDifferences = buildPerlModule { - name = "Test-Differences-0.64"; + TestDifferences = buildPerlPackage { + name = "Test-Differences-0.66"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz; - sha256 = "9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276"; + url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.66.tar.gz; + sha256 = "83633a171e83ff03a0eb1f5a699f05b506a34190bcf8726979bbfd9dc16c223a"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { @@ -15167,10 +15214,10 @@ let }; TestKwalitee = buildPerlPackage rec { - name = "Test-Kwalitee-1.27"; + name = "Test-Kwalitee-1.28"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.27.tar.gz; - sha256 = "095kpj2011jk1mpnb07fs7yi190hmqh85mj662gx0dkpl9ic7a5w"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz; + sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; }; propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; @@ -15503,10 +15550,10 @@ let }; TestPortabilityFiles = buildPerlPackage { - name = "Test-Portability-Files-0.09"; + name = "Test-Portability-Files-0.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz; - sha256 = "16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz; + sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16"; }; meta = { description = "Check file names portability"; @@ -15714,10 +15761,10 @@ let }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302141"; + name = "Test-Simple-1.302162"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302141.tar.gz; - sha256 = "d7045bc814cba0426684a32c44d90ced5b83075659f0fcefed88c32f8fd395b7"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz; + sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4"; }; meta = { description = "Basic utilities for writing tests"; @@ -15903,10 +15950,10 @@ let }; TestWWWMechanizeCatalyst = buildPerlPackage rec { - name = "Test-WWW-Mechanize-Catalyst-0.60"; + name = "Test-WWW-Mechanize-Catalyst-0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz; + sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"; }; doCheck = false; # listens on an external port propagatedBuildInputs = [ CatalystRuntime WWWMechanize ]; @@ -16049,10 +16096,10 @@ let }; TextCSV = buildPerlPackage rec { - name = "Text-CSV-1.97"; + name = "Text-CSV-1.99"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.97.tar.gz; - sha256 = "cc350462efa8d39d5c8a1da5f205bc31620cd52d9865a769c8e3ed1b41640fd5"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz; + sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -16074,10 +16121,10 @@ let }; TextCSV_XS = buildPerlPackage rec { - name = "Text-CSV_XS-1.37"; + name = "Text-CSV_XS-1.38"; src = fetchurl { url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz"; - sha256 = "20e16da9c38b0938f308c01d954f49d2c6922bac0d2d979bf2ad483fe7476ba2"; + sha256 = "d6317ae0ed0658e00037ecedaa3da2ff8565c86b0516ef8a93322b959de313dd"; }; meta = { description = "Comma-Separated Values manipulation routines"; @@ -16338,10 +16385,10 @@ let }; TextTemplate = buildPerlPackage { - name = "Text-Template-1.53"; + name = "Text-Template-1.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz; - sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz; + sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; @@ -16695,6 +16742,19 @@ let }; }; + TimePeriod = buildPerlPackage { + name = "Time-Period-1.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PB/PBOYD/Time-Period-1.25.tar.gz"; + sha256 = "d07fa580529beac6a9c8274c6bf220b4c3aade685df65c1669d53339bf6ef1e8"; + }; + meta = { + description = "A Perl module to deal with time periods"; + license = stdenv.lib.licenses.gpl1; + maintainers = [ maintainers.winpat ]; + }; + }; + Tk = buildPerlPackage rec { name = "Tk-804.034"; src = fetchurl { @@ -16774,10 +16834,10 @@ let }; TypeTiny = buildPerlPackage { - name = "Type-Tiny-1.004002"; + name = "Type-Tiny-1.004004"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004002.tar.gz; - sha256 = "e52c7e9593052aed157a15d473b5c25a1dbb3454bf3cd6913df94cc9bb2be707"; + url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004004.tar.gz; + sha256 = "081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be"; }; propagatedBuildInputs = [ ExporterTiny ]; meta = { @@ -16856,10 +16916,10 @@ let }; UnicodeLineBreak = buildPerlPackage rec { - name = "Unicode-LineBreak-2018.003"; + name = "Unicode-LineBreak-2019.001"; src = fetchurl { url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz"; - sha256 = "1cbilpy7ypr26rjr6cmrbkxhsm1l6yx7s1p7lcf0l3vi7vzr4346"; + sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8"; }; propagatedBuildInputs = [ MIMECharset ]; meta = { @@ -16885,10 +16945,10 @@ let }; URI = buildPerlPackage rec { - name = "URI-1.74"; + name = "URI-1.76"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d"; + url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz; + sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; }; buildInputs = [ TestNeeds ]; meta = { @@ -17121,10 +17181,10 @@ let }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.90"; + name = "WWW-Mechanize-1.91"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.90.tar.gz; - sha256 = "038i9nh643cmi4y4r8fsp0xvzz4zfh5srh8sw3w5kzxjq126pr44"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz; + sha256 = "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -17133,7 +17193,7 @@ let description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ CGI HTTPServerSimple PerlCritic PerlTidy TestDeep TestFatal TestOutput TestWarnings ]; + buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { @@ -17370,10 +17430,10 @@ let }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-2.0132"; + name = "XML-LibXML-2.0134"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "0xnl281hb590i287fxpl947f1s4zl9dnvc4ajvsqi89w23im453j"; + sha256 = "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; @@ -17667,10 +17727,10 @@ let }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.75"; + name = "YAML-LibYAML-0.76"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.75.tar.gz; - sha256 = "1jlj6yrh3kv6f6q2x253lds664916fgps0praih5gwxagnld9k32"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.76.tar.gz; + sha256 = "1m94g36sl9rasjlvlsf65xcal5hvkc3gbzd7l68h17az75269kyy"; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 52018b43991..8c7f4830363 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -165,6 +165,18 @@ let sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; + sqlsrv = buildPecl rec { + name = "sqlsrv-5.6.0"; + sha256 = "089iy2lz7p3x9c88zaxrg37m74gh3phxqsldr33nj16rpb5d67bc"; + buildInputs = [ pkgs.unixODBC ]; + }; + + pdo_sqlsrv = buildPecl rec { + name = "pdo_sqlsrv-5.6.0"; + sha256 = "11g07l6mn804hbcmwqwfd6a4yx5bz54bmk5j2dpm8nil1rq9qb7r"; + buildInputs = [ pkgs.unixODBC ]; + }; + xdebug = if isPhp73 then xdebug73 else xdebug7; xdebug7 = assert !isPhp73; buildPecl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52bc679f510..5acc12fe4ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -146,6 +146,8 @@ in { absl-py = callPackage ../development/python-modules/absl-py { }; + adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; + aenum = callPackage ../development/python-modules/aenum { }; affinity = callPackage ../development/python-modules/affinity { }; @@ -194,6 +196,8 @@ in { astroquery = callPackage ../development/python-modules/astroquery { }; + asttokens = callPackage ../development/python-modules/asttokens { }; + atom = callPackage ../development/python-modules/atom { }; augeas = callPackage ../development/python-modules/augeas { @@ -268,7 +272,7 @@ in { bayespy = callPackage ../development/python-modules/bayespy { }; - beanstalkc = disabledIf isPy3k (callPackage ../development/python-modules/beanstalkc {}); + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; bitarray = callPackage ../development/python-modules/bitarray { }; @@ -305,7 +309,7 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - + chalice = callPackage ../development/python-modules/chalice { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -388,6 +392,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + firetv = callPackage ../development/python-modules/firetv { }; + fdint = callPackage ../development/python-modules/fdint { }; fuse = callPackage ../development/python-modules/fuse-python { @@ -418,6 +424,8 @@ in { guestfs = callPackage ../development/python-modules/guestfs { }; + gumath = callPackage ../development/python-modules/gumath { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; @@ -436,6 +444,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + holoviews = callPackage ../development/python-modules/holoviews { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); @@ -448,6 +458,8 @@ in { imutils = callPackage ../development/python-modules/imutils { }; + intake = callPackage ../development/python-modules/intake { }; + intelhex = callPackage ../development/python-modules/intelhex { }; jira = callPackage ../development/python-modules/jira { }; @@ -492,8 +504,14 @@ in { nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + nbval = callPackage ../development/python-modules/nbval { }; + ndtypes = callPackage ../development/python-modules/ndtypes { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; neuron = pkgs.neuron.override { @@ -556,6 +574,8 @@ in { progress = callPackage ../development/python-modules/progress { }; + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + pymysql = callPackage ../development/python-modules/pymysql { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -675,7 +695,6 @@ in { pyres = callPackage ../development/python-modules/pyres { }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - pythonPackages = self; inherit (pkgs) pkgconfig; }; @@ -718,6 +737,8 @@ in { python-binance = callPackage ../development/python-modules/python-binance { }; + python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + python-engineio = callPackage ../development/python-modules/python-engineio { }; python-hosts = callPackage ../development/python-modules/python-hosts { }; @@ -746,6 +767,10 @@ in { python-sql = callPackage ../development/python-modules/python-sql { }; + python-snappy = callPackage ../development/python-modules/python-snappy { + inherit (pkgs) snappy; + }; + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; python-socketio = callPackage ../development/python-modules/python-socketio { }; @@ -808,6 +833,8 @@ in { snapcast = callPackage ../development/python-modules/snapcast { }; + sparse = callPackage ../development/python-modules/sparse { }; + spglib = callPackage ../development/python-modules/spglib { }; sslib = callPackage ../development/python-modules/sslib { }; @@ -842,6 +869,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + pyunifi = callPackage ../development/python-modules/pyunifi { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; @@ -894,6 +923,8 @@ in { aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster {}; @@ -902,6 +933,14 @@ in { allpairspy = callPackage ../development/python-modules/allpairspy { }; + ansible = callPackage ../development/python-modules/ansible { }; + + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; + + ansible-lint = callPackage ../development/python-modules/ansible-lint { }; + + ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + ansicolors = callPackage ../development/python-modules/ansicolors {}; aniso8601 = callPackage ../development/python-modules/aniso8601 {}; @@ -1421,8 +1460,6 @@ in { onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; - pyunifi = callPackage ../development/python-modules/pyunifi { }; - tablib = callPackage ../development/python-modules/tablib { }; wakeonlan = callPackage ../development/python-modules/wakeonlan { }; @@ -1500,9 +1537,15 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = self.pytest_39; + pytest = self.pytest_42; + + pytest_42 = callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; - pytest_39 = callPackage ../development/python-modules/pytest { + # Keep 3 because many test suites are not yet compatible with Pytest 4. + pytest_3 = callPackage ../development/python-modules/pytest/3.10.nix { # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; }; @@ -1543,7 +1586,7 @@ in { pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - pytestflakes = callPackage ../development/python-modules/pytest-flakes { }; + pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; @@ -1567,6 +1610,8 @@ in { pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; + pytest-services = callPackage ../development/python-modules/pytest-services { }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; pytestcov = callPackage ../development/python-modules/pytest-cov { }; @@ -1607,6 +1652,8 @@ in { dask-ml = callPackage ../development/python-modules/dask-ml { }; + dask-mpi = callPackage ../development/python-modules/dask-mpi { }; + dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; datrie = callPackage ../development/python-modules/datrie { }; @@ -2137,7 +2184,9 @@ in { python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; - pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); + pythonix = callPackage ../development/python-modules/pythonix { + inherit (pkgs) pkgconfig; + }; pyramid = callPackage ../development/python-modules/pyramid { }; @@ -2776,6 +2825,8 @@ in { xdis = callPackage ../development/python-modules/xdis { }; + xnd = callPackage ../development/python-modules/xnd { }; + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; lsi = callPackage ../development/python-modules/lsi { }; @@ -2790,6 +2841,8 @@ in { imageio = callPackage ../development/python-modules/imageio { }; + imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + imgaug = callPackage ../development/python-modules/imgaug { }; inflection = callPackage ../development/python-modules/inflection { }; @@ -3426,6 +3479,8 @@ in { pandas = callPackage ../development/python-modules/pandas { }; + panel = callPackage ../development/python-modules/panel { }; + xlrd = callPackage ../development/python-modules/xlrd { }; bottleneck = callPackage ../development/python-modules/bottleneck { }; @@ -3436,6 +3491,8 @@ in { parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + param = callPackage ../development/python-modules/param { }; + paramiko = callPackage ../development/python-modules/paramiko { }; parameterized = callPackage ../development/python-modules/parameterized { }; @@ -3542,6 +3599,8 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pillow = callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; @@ -3647,6 +3706,8 @@ in { pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + pyct = callPackage ../development/python-modules/pyct { }; + pycups = callPackage ../development/python-modules/pycups { }; pycurl = callPackage ../development/python-modules/pycurl { }; @@ -3921,6 +3982,8 @@ in { retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + quamash = callPackage ../development/python-modules/quamash { }; + quandl = callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 Quandl = callPackage ../development/python-modules/quandl { }; @@ -3986,6 +4049,8 @@ in { owslib = callPackage ../development/python-modules/owslib { }; + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + resampy = callPackage ../development/python-modules/resampy { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; @@ -4064,6 +4129,8 @@ in { scikit-bio = callPackage ../development/python-modules/scikit-bio { }; + scikit-build = callPackage ../development/python-modules/scikit-build { }; + scp = callPackage ../development/python-modules/scp {}; seaborn = callPackage ../development/python-modules/seaborn { }; @@ -4110,12 +4177,23 @@ in { sphinx = callPackage ../development/python-modules/sphinx { }; + sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx { }) + .overridePythonAttrs (oldAttrs: rec { + version = "1.7.9"; + src = oldAttrs.src.override { + inherit version; + sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4"; + }; + }); + sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + hvplot = callPackage ../development/python-modules/hvplot { }; + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; @@ -4138,6 +4216,8 @@ in { statsmodels = callPackage ../development/python-modules/statsmodels { }; + streamz = callPackage ../development/python-modules/streamz { }; + structlog = callPackage ../development/python-modules/structlog { }; sybil = callPackage ../development/python-modules/sybil { }; @@ -4454,6 +4534,8 @@ in { sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + soupsieve = callPackage ../development/python-modules/soupsieve { }; + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; @@ -4584,6 +4666,8 @@ in { wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; xlib = callPackage ../development/python-modules/xlib { }; @@ -4979,17 +5063,19 @@ in { zerobin = callPackage ../development/python-modules/zerobin { }; + tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow = disabledIf isPy37 ( + tensorflow = if stdenv.isDarwin then callPackage ../development/python-modules/tensorflow/bin.nix { } else callPackage ../development/python-modules/tensorflow/bin.nix rec { cudaSupport = pkgs.config.cudaSupport or false; inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_9_0; - cudnn = pkgs.cudnn_cudatoolkit_9_0; - }); + cudatoolkit = pkgs.cudatoolkit_10_0; + cudnn = pkgs.cudnn_cudatoolkit_10_0; + }; tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; @@ -5037,7 +5123,9 @@ in { inflect = callPackage ../development/python-modules/inflect { }; - more-itertools = callPackage ../development/python-modules/more-itertools { }; + more-itertools = if isPy27 then + callPackage ../development/python-modules/more-itertools/2.7.nix { } + else callPackage ../development/python-modules/more-itertools { }; jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 6ca370e0b9b..2aa07517fdf 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -67,6 +67,7 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; + inherit (self) runtimeShell; }; stdenvBootstappingAndPlatforms = self: super: { |