diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs | |
parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
download | nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixlib-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs')
729 files changed, 5273 insertions, 4933 deletions
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index afb3c8342731..a99fb80df723 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, - libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify, libsoup, avahi, taglib }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 expat intltool libgcrypt libunique gnutls - libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib ]; meta = { diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 99d6357e9216..bb0615df25b8 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.8"; + version = "2.9.2"; name = "asunder-${version}"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; - sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + sha256 = "0vjbxrrjih4c673sc39wj5whp81xp9kmnwqxwzfnmhkky970rg5r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index e5e8640b4fd9..6890b53f407d 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 -, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib +, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b +, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , neon, faad2, lame, libnotify, libsidplayfp }: @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gettext glib gtk3 libmowgli dbus_glib libxml2 + gettext glib gtk3 libmowgli dbus-glib libxml2 xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 - libpulseaudio fluidsynth libmad libogg libvorbis libcdio082 + libpulseaudio fluidsynth libmad libogg libvorbis libcdio libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 lame libnotify libsidplayfp diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 353865e8ec04..8910fdc1b0a8 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -3,7 +3,7 @@ gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, - libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug, + libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, wavpack @@ -46,7 +46,7 @@ mkDerivation { # Plugin dependencies alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb - libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli + libcdio libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 100bb1c54fd1..b0c47972e385 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.2"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z"; + sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ea0bce368a1a..be70443fd4df 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null # input plugins , vorbisSupport ? true, libvorbis ? null , mp123Support ? true, libmad ? null @@ -30,7 +30,7 @@ assert gtk2Support || gtk3Support; assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings_desktop_schemas != null && wrapGAppsHook != null; +assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; assert vorbisSupport -> libvorbis != null; assert mp123Support -> libmad != null; assert flacSupport -> flac != null; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ jansson ] ++ optional gtk2Support gtk2 - ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ] + ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ] ++ optional vorbisSupport libvorbis ++ optional mp123Support libmad ++ optional flacSupport flac diff --git a/pkgs/applications/audio/deadbeef/plugins/opus.nix b/pkgs/applications/audio/deadbeef/plugins/opus.nix new file mode 100644 index 000000000000..55db00c15bf6 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/opus.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromBitbucket, opusfile, libopus, libogg, openssl, deadbeef }: + +stdenv.mkDerivation rec { + name = "deadbeef-opus-plugin-${version}"; + version = "0.8"; + + src = fetchFromBitbucket { + owner = "Lithopsian"; + repo = "deadbeef-opus"; + rev = "v${version}"; + sha256 = "057rgsw4563gs63k05s7zsdc0n4djxwlbyqabf7c88f23z35ryyi"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${opusfile}/include/opus" + ]; + + buildInputs = [ deadbeef opusfile libopus libogg openssl ]; + + meta = with stdenv.lib; { + description = "Ogg Opus decoder plugin for the DeaDBeeF music player"; + homepage = https://bitbucket.org/Lithopsian/deadbeef-opus; + license = licenses.gpl2; # There are three files, each licensed under different license: zlib, gpl2Plus and lgpl2 + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 6ed6d1ee86a0..4ceafa1e52e8 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg"; + sha256 = "0fwxrfyp15a4m77mzz4mwj36mhdrj646whlrkvcys33p2w75f8cq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index f9c9dc2faef0..1ae9a0e5298e 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas +, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas , makeWrapper, gnome3 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig intltool ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) + itstool libxml2 gsettings-desktop-schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 50689886fdd2..789ee35f260e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd"; + sha256 = "0krvmb1idnf95l2ydzfcb08ayyx3n4m71hf9fgwv3srzaikvpf3q"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 2d63245fef63..42285ba4bf86 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus-glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 4bd57e15fe5f..c2adc58f9ce5 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook +, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ glib gtk2 curl mpd_clientlib libsoup - libunique libmpd libSM libICE sqlite hicolor_icon_theme + libunique libmpd libSM libICE sqlite hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 8c2987352fbb..d111502651ed 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, pkgconfig , gcc , python3 -, gsettings_desktop_schemas -, desktop_file_utils +, gsettings-desktop-schemas +, desktop-file-utils , glib , gtk3 , intltool , libsoup -, json_glib +, json-glib , wrapGAppsHook , meson , ninja @@ -44,15 +44,15 @@ in stdenv.mkDerivation rec { glib intltool libsoup - json_glib + json-glib gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - desktop_file_utils - gsettings_desktop_schemas + desktop-file-utils + gsettings-desktop-schemas ] ++ gst_plugins; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 7ebdce783527..39cd1a444fa8 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, - libvorbis, hicolor_icon_theme, gdk_pixbuf }: + libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { version = "2.1.5"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta gnome.gdl gnome.defaultIconTheme - hicolor_icon_theme ]; + hicolor-icon-theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/gtkpod" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index dcb61119ae76..bcb301687089 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 +, avahi, bluez, boost, eigen, fftw, glib, glib-networking +, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 , ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom , wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf + avahi bluez boost eigen fftw glib glibmm glib-networking.out + gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf libsndfile lilv lv2 serd sord sratom zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 8541ec6e2727..0018f17cac0e 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook -, gst_all_1, glib_networking, gobjectIntrospection +, gst_all_1, glib-networking, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib_networking gobjectIntrospection + glib-networking gobjectIntrospection ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index dbf3cd92b5d0..cc4a781ef66c 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub -, autoreconfHook, autoconf-archive, pkgconfig +, pkgconfig, cmake , libpulseaudio, ncurses }: stdenv.mkDerivation rec { name = "pamix-${version}"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "patroclos"; repo = "pamix"; rev = version; - sha256 = "1d6b0iv8p73bwq88kdaanm4igvmp9rkq082vyaxpc67mz398yjbp"; + sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp"; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconfig ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpulseaudio ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 58054070760b..fe9ed12390a5 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus_glib, GConf, gconfmm, intltool }: +, dbus-glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { name = "paprefs-0.9.10"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ]; + buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 91a270a698e6..8425b48166e6 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm , gtkmm2, libjack2, pkgconfig, python2 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 + alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 69db9d74ee34..d113b8a49b31 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra_gtk3, makeWrapper, gnome3 }: +, libcanberra-gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-3.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''; - buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 88db09fac86b..60c8f90b6d15 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -11,7 +11,7 @@ , dbus , glibmm , gnome3 -, hicolor_icon_theme +, hicolor-icon-theme , libappindicator-gtk3 , libnotify , libxdg_basedir @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release wxGTK diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 534fd2f0edb1..5190fe37d8a7 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -7,7 +7,7 @@ , libsoup , gnome3 , tdb -, json_glib +, json-glib , itstool , wrapGAppsHook , gst_all_1 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { intltool libsoup tdb - json_glib + json-glib itstool gtk3 diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index e91c08c30b77..1afb36571bd9 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,8 +19,8 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + gnome3.gnome-themes-standard gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas ]; postPatch = '' @@ -28,7 +28,7 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gobjectIntrospection gtk3 pygobject3 diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index cbcdc0ecccd7..c68f2cd4a35f 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero -, libcanberra_gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes +, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , makeWrapper }: let @@ -16,8 +16,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3 - gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes + buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3 + gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes makeWrapper (stdenv.lib.getLib gnome3.dconf) gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/* $out/libexec/*; do wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" done diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 2203586c26e9..4140c5da5a45 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -4,12 +4,12 @@ , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs4 ? null -, enableTelepathy ? false, telepathy_qt ? null +, enableTelepathy ? false, telepathy-qt ? null }: assert enableXMPP -> libjreen != null; assert enableKDE -> kdelibs4 != null; -assert enableTelepathy -> telepathy_qt != null; +assert enableTelepathy -> telepathy-qt != null; stdenv.mkDerivation rec { name = "tomahawk-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs4 - ++ stdenv.lib.optional enableTelepathy telepathy_qt; + ++ stdenv.lib.optional enableTelepathy telepathy-qt; postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 7382e84fa073..e46ffec39795 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook -, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror -, appstream-glib, desktop_file_utils, duplicity +, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror +, appstream-glib, desktop-file-utils, duplicity }: stdenv.mkDerivation rec { @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig vala_0_38 gettext intltool itstool - appstream-glib desktop_file_utils libxml2 wrapGAppsHook + appstream-glib desktop-file-utils libxml2 wrapGAppsHook ]; buildInputs = [ libnotify gnome3.libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus - at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror ]; propagatedUserEnvPkgs = [ duplicity ]; diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index a54f0a49921a..ff001b74b8a4 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor_icon_theme, makeWrapper +, hicolor-icon-theme, makeWrapper , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported , exo }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 1c9c5bc78ef2..c7e1dfe27364 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 6a5bc3e7b0f8..23e4449ee2eb 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 +, zlib, jdk, glib, gtk2, libXtst, gsettings-desktop-schemas, webkitgtk24x-gtk2 , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk2 jdk libX11 libXrender libXtst makeWrapper zlib ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index fef508bdf1e5..c69686a0967d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas +, glib, gtk2, libXtst, jdk, gsettings-desktop-schemas , webkitgtk24x-gtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage @@ -15,7 +15,7 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2 + jdk glib gtk2 libXtst gsettings-desktop-schemas webkitgtk24x-gtk2 makeWrapper; }; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index f87cc72f2f2b..ba243629cc3e 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,8 +4,8 @@ , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null +, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] + ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 9288d293b916..23478758efe5 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.32"; + version = "1.33"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d"; + sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 3d623d3f3bda..c24866671f9b 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx, +{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { openssl libxml2 gnome3.gtksourceview - at_spi2_core + at-spi2-core pcre epoxy boost diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 1a164ec08de9..41d1a6262ed5 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -3,7 +3,7 @@ , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info +, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info , libksysguard, konsole, llvmPackages, makeWrapper }: @@ -34,7 +34,7 @@ mkDerivation rec { kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons + kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons ]; postInstall = '' diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 74a83c1278af..c5f8278f649d 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 53ea9741c03c..e8e529b63abc 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, fetchNuGet -, autoconf, automake, pkgconfig, shared_mime_info, intltool +, autoconf, automake, pkgconfig, shared-mime-info, intltool , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake shared_mime_info intltool + autoconf automake shared-mime-info intltool mono gtk-sharp-2_0 gnome-sharp unzip dotnetPackages.NUnit dotnetPackages.NUnitRunners diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index e9932b93fbe0..14659d796fc3 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, libsoup, graphicsmagick, json_glib, wrapGAppsHook -, cairo, cmake, ninja, curl, perl, llvm, desktop_file_utils, exiv2, glib +{ stdenv, fetchurl, libsoup, graphicsmagick, json-glib, wrapGAppsHook +, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; - nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt - libsoup graphicsmagick json_glib openjpeg lua pugixml + libsoup graphicsmagick json-glib openjpeg lua pugixml colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map ]; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 478e9d2b4530..05dd845d7e85 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 = "2.23"; + version = "2.23.2"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"; + sha256 = "1hw9xhhmm404ircmd7aw9n51n23wzjxzmav272ldk1pxb2jk3hcn"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index afad1e6c3af0..09d1a86db8e3 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } : +{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } : let version = "2.2"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; }; - nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ]; + nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 1e8f0e209c06..d034f5d64d93 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 -, lcms, intltool, gettext, fbida +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool +, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida }: stdenv.mkDerivation rec { name = "geeqie-${version}"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "http://geeqie.org/${name}.tar.xz"; - sha256 = "0gzc82sy66pbsmq7lnmq4y37zqad1zfwfls3ik3dmfm8s5nmcvsb"; + sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; - preConfigure = "./autogen.sh"; + # Do not build the changelog as this requires markdown. + patches = [ ./geeqie-no-changelog.patch ]; - configureFlags = [ "--enable-gps" ]; + preConfigure = "./autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool ]; buildInputs = [ - autoconf automake gtk2 libpng exiv2 lcms intltool gettext + gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; postInstall = '' @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { -e '1 a export PATH=${stdenv.lib.makeBinPath [ exiv2 fbida ]}:$PATH' ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Lightweight GTK+ based image viewer"; @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ jfrankenau pSub ]; platforms = platforms.gnu; }; } diff --git a/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch new file mode 100644 index 000000000000..1b8833b135f3 --- /dev/null +++ b/pkgs/applications/graphics/geeqie/geeqie-no-changelog.patch @@ -0,0 +1,14 @@ +--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 ++++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 +@@ -10,9 +10,9 @@ + readmedir = @readmedir@ + + if HAVE_MARKDOWN +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html + else +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html ++readme_DATA = README.md COPYING TODO README.lirc AUTHORS + endif + + desktopdir = $(datadir)/applications diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index d01286e15a64..dea3fd4e3c61 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, - pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: + pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }: stdenv.mkDerivation rec { name = "giv-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; - buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ]; meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 6dcf8223777a..c1f15904818f 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook -, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book +, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - barcode gtk3 gtk_doc gnome3.yelp_tools - gnome3.gnome_common gnome3.gsettings_desktop_schemas + barcode gtk3 gtk-doc gnome3.yelp-tools + gnome3.gnome-common gnome3.gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 161e89151249..03489db933c1 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, - libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison, - flex, hicolor_icon_theme, wrapGAppsHook }: + libchamplain, librsvg, libwebp, json-glib, webkit, lcms2, bison, + flex, hicolor-icon-theme, wrapGAppsHook, shared-mime-info }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -17,12 +17,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = with gnome3; - [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf + [ itstool libxml2 intltool glib gtk gsettings-desktop-schemas dconf exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain - librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme defaultIconTheme ]; + librsvg libwebp json-glib webkit lcms2 bison flex hicolor-icon-theme defaultIconTheme ]; enableParallelBuilding = true; + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") + ''; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/gthumb; description = "Image browser and viewer for GNOME"; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index ac0060ec7f8e..8c3a8bc894b3 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -4,7 +4,7 @@ , makeWrapper , pkgconfig , wrapGAppsHook -, gsettings_desktop_schemas +, gsettings-desktop-schemas , qtbase , qttools @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libraw libtiff quazip - gsettings_desktop_schemas]; + gsettings-desktop-schemas]; cmakeFlags = ["-DENABLE_OPENCV=ON" "-DENABLE_RAW=ON" diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 5743f0c1bcb6..9964bec67814 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook , lensfun }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun + lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index b23ddbf9d78b..437044ba2675 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib +, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook , itstool, libgdata }: # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook + meson ninja pkgconfig itstool gettext desktop-file-utils wrapGAppsHook ]; buildInputs = [ gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk 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 + libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas + libraw json-glib glib gdk_pixbuf librsvg gnome3.rest gnome3.gcr gnome3.defaultIconTheme libgdata ]; diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index e951f3a7a937..c655cadef400 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms -, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: +, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}: stdenv.mkDerivation rec { name = "viewnior-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext - shared_mime_info glib gdk_pixbuf perl + shared-mime-info glib gdk_pixbuf perl ]; preFixup = '' diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 38f63bdb3836..538931c1040e 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, defaultIconTheme # 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 defaultIconTheme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 52a17f5cbeb9..0ed958b4e770 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: @@ -10,7 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index da7cd2e8d79d..cba0b1e59e3a 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, copyPathsToStore, lib, kdepimTeam, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -12,7 +12,7 @@ mkDerivation { maintainers = kdepimTeam; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n kiconthemes kio kwindowsystem qttools diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index b032de848794..89bc171d2953 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,5 +1,5 @@ { mkDerivation, lib -, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info +, extra-cmake-modules, kdoctools, makeWrapper, shared-mime-info , qtwebkit , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis @@ -28,7 +28,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz3 shared_mime_info + ffmpeg libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 17d7da7b702c..b5eca47d6c0e 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -21,7 +21,7 @@ , kplotting , ktextwidgets , mlt -, shared_mime_info +, shared-mime-info , libv4l , kfilemetadata , ffmpeg @@ -62,7 +62,7 @@ mkDerivation { qtquickcontrols qtscript qtwebkit - shared_mime_info + shared-mime-info libv4l ffmpeg ]; diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 3230efd82017..b3cfed91dd45 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - shared_mime_info, + shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, @@ -14,7 +14,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 8abb58b46b27..13585848317b 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info, + mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index 9f3d5e2ea019..f380315cce90 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, shared_mime_info, + extra-cmake-modules, kdoctools, shared-mime-info, akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, pimcommon, qttools, @@ -12,7 +12,7 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 1217c29032b4..e0e80b05ebce 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,7 +1,7 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebkit -, krunner, shared_mime_info, kparts, knewstuff +, krunner, shared-mime-info, kparts, knewstuff , gpsd, perl }: @@ -10,7 +10,7 @@ mkDerivation { meta.license = with lib.licenses; [ lgpl21 gpl3 ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts + qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts knewstuff gpsd ]; } diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 422968be35a5..0ac8ddebc75d 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, - shared_mime_info + shared-mime-info }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { maintainers = with lib.maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; - buildInputs = [ shared_mime_info ]; + buildInputs = [ shared-mime-info ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 karchive kcrash diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index cfd4d6b32de3..f69152820e43 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib gtk2 wordnet ]; + buildInputs = [ dbus-glib gtk2 wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index d9ea487a83bb..4477cbbcc06a 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ]; + buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index b9a160564a5d..edb10a0f6671 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm"; + sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp"; }; buildInputs = [ qtbase qtquickcontrols ]; @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = "https://github.com/Ultimaker/Cura"; + homepage = https://github.com/Ultimaker/Cura; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 575889ad2c6f..c3a19e6551a2 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy"; + sha256 = "1yqpp6qhixzni3ik11vbk5kcdrhlz2j4ylzmh8f6c86r4d73a0cp"; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = "https://github.com/Ultimaker/CuraEngine"; + homepage = https://github.com/Ultimaker/CuraEngine; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 12ceb0958f0d..8e64fa698058 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # For setup hook gobjectIntrospection ]; - buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; + buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ]; meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 4a7c4d7ec304..1ea45c3574a5 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "devilspie2-${version}"; - version = "0.42"; + version = "0.43"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; - sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i"; + sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index ee16ba24ed46..93e5d297ffb3 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc -, keybinder3, clutter_gtk, libnotify +, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc +, keybinder3, clutter-gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive }: @@ -19,8 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify + vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee + gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon ] ++ optionals stdenv.isLinux [ udev ]; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 8c63c8565781..be853e4213bc 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, + pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { file intltool vala_0_34 - gnome3.yelp_tools + gnome3.yelp-tools wrapGAppsHook # For setup hook gobjectIntrospection @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - json_glib + json-glib sqlite itstool librsvg diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 509a54881cce..d4f2a056a9f6 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, - intltool, libstartup_notification, gtk_doc, wrapGAppsHook + intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk_doc wrapGAppsHook + pkgconfig intltool gtk-doc wrapGAppsHook ]; buildInputs = [ - gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index dfe61b57b43d..776a10b7e0c5 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings_desktop_schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook }: let version = "1.3.10"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; + buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index a7485c4ee681..1810d6d5c476 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gpx-viewer-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig - shared_mime_info # For update-mime-database - desktop_file_utils # For update-desktop-database + shared-mime-info # For update-mime-database + desktop-file-utils # For update-desktop-database wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 8b66b23df01a..ace91bfafffd 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, - pango, gsettings_desktop_schemas, + pango, gsettings-desktop-schemas, # Optional packages: enableOSM ? true, osm-gps-map }: diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 21a551bd6314..0a2a17fc8fa0 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -17,7 +17,7 @@ with lib; let inherit (python2Packages) python; - inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome_common ]; + inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ]; pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 51a14fb20d0b..105f7beb98fe 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome_doc_utils -, intltool, dbus_glib, gnome_python, dbus -, hicolor_icon_theme +{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils +, intltool, dbus-glib, gnome_python, dbus +, hicolor-icon-theme }: # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { }; buildInputs = [ - docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme + docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index b908941d2bc9..aec6dc2f58c8 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13265"; + version = "13367"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0mmpxmf17lw1j1m1gfz2jrm3qj2416zgbwgcy7xbvn6qcd8k7dr5"; + sha256 = "1yf7cx8159njxid9qa0id7zfkr7dn83rrkgxp9kzkjn25aqji4cf"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 911be6721acb..5e492fc621fe 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,12 +1,6 @@ { stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }: -# KeePass looks for plugins in under directory in which KeePass.exe is -# located. It follows symlinks where looking for that directory, so -# buildEnv is not enough to bring KeePass and plugins together. -# -# This derivation patches KeePass to search for plugins in specified -# plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; version = "2.38"; @@ -29,6 +23,29 @@ with builtins; buildDotnetPackage rec { }) ]; + # KeePass looks for plugins in under directory in which KeePass.exe is + # located. It follows symlinks where looking for that directory, so + # buildEnv is not enough to bring KeePass and plugins together. + # + # This derivation patches KeePass to search for plugins in specified + # plugin derivations in the Nix store and nowhere else. + pluginLoadPathsPatch = + let outputLc = toString (add 7 (length plugins)); + patchTemplate = readFile ./keepass-plugins.patch; + loadTemplate = readFile ./keepass-plugins-load.patch; + loads = + lib.concatStrings + (map + (p: replaceStrings ["$PATH$"] [ (unsafeDiscardStringContext (toString p)) ] loadTemplate) + plugins); + in replaceStrings ["$OUTPUT_LC$" "$DO_LOADS$"] [outputLc loads] patchTemplate; + + passAsFile = [ "pluginLoadPathsPatch" ]; + postPatch = '' + sed -i 's/\r*$//' KeePass/Forms/MainForm.cs + patch -p1 <$pluginLoadPathsPatchPath + ''; + preConfigure = '' rm -rvf Build/* find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \; diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch new file mode 100644 index 000000000000..ca52e7ef191a --- /dev/null +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -0,0 +1 @@ ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch new file mode 100644 index 000000000000..cde6e7252bc3 --- /dev/null +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -0,0 +1,13 @@ +diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs +index 3d5fca0..4c3f3d4 100644 +--- a/KeePass/Forms/MainForm.cs ++++ b/KeePass/Forms/MainForm.cs +@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms + m_pluginManager.Initialize(m_pluginDefaultHost); + + m_pluginManager.UnloadAllPlugins(); +- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins(); +$DO_LOADS$+ + + // Delete old files *after* loading plugins (when timestamps + // of loaded plugins have been updated already) diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 8479c4e16ace..699cb2fd0986 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc -, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib +, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , xapian, ctpp2, zimlib }: @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index e2290105c925..bb55fc2d4a8b 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -8,7 +8,7 @@ , dbus , libwnck3 , keybinder3 -, hicolor_icon_theme +, hicolor-icon-theme , wrapGAppsHook }: @@ -28,7 +28,7 @@ buildPythonApplication rec { # For setup hook gobjectIntrospection ]; - buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; + buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; configurePhase = '' diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index a514b0ff63dd..0a2a051223ac 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte , libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs }: @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" + "--enable-gtk3" ]; nativeBuildInputs = [ @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs ]; - buildInputs = [ gtk2 vte ]; + buildInputs = [ gtk3 vte ]; patches = [ ./respect-xml-catalog-files-var.patch diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0167132db789..2adea6395eb2 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK -, desktop_file_utils, libSM, imagemagick }: +, desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { version = "17.10"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM + buildInputs = [ libzen libmediainfo wxGTK desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index e8c6c9f24300..76517f874642 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo +, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo , mysql, libxml2, libctemplate, libmysqlconnectorcpp , vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome_keyring, file +, libXdmcp, libuuid, libzip, libgnome-keyring, file , pythonPackages, jre, autoconf, automake, libtool , boost, glibmm, libsigcxx, pangomm, libX11, openssl , proj, cairo, libglade @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf + libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl proj cairo cairo.dev makeWrapper libglade ] ; @@ -82,7 +82,7 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome_keyring}/bin" \ + --prefix PATH : "${gnome-keyring}/bin" \ --prefix PATH : "${python}/bin" \ --set PYTHONPATH $PYTHONPATH \ --run ' diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 2aa04ce83e53..8e8126192dda 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus_glib, makeWrapper, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "notify-osd-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glib libwnck3 libnotify dbus_glib makeWrapper - gnome3.gsettings_desktop_schemas + glib libwnck3 libnotify dbus-glib makeWrapper + gnome3.gsettings-desktop-schemas ]; configureFlags = "--libexecdir=$(out)/bin"; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index a78b98a58cb3..d4847e4ce493 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,21 +1,21 @@ { fetchurl , stdenv , aspellWithDicts -, at_spi2_core ? null +, at-spi2-core ? null , atspiSupport ? true , bash , glib , glibcLocales , gnome3 , gobjectIntrospection -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gtk3 , hunspell , hunspellDicts , hunspellWithDicts , intltool , isocodes -, libcanberra_gtk3 +, libcanberra-gtk3 , libudev , libxkbcommon , pkgconfig @@ -74,17 +74,17 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ bash gnome3.dconf - gsettings_desktop_schemas + gsettings-desktop-schemas gtk3 hunspell isocodes - libcanberra_gtk3 + libcanberra-gtk3 libudev libxkbcommon wrapGAppsHook xorg.libXtst xorg.libxkbfile - ] ++ stdenv.lib.optional atspiSupport at_spi2_core; + ] ++ stdenv.lib.optional atspiSupport at-spi2-core; nativeBuildInputs = [ glibcLocales diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fc7fd95bbb95..0c0de526e601 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook -, intltool, yelp_tools, itstool, libxmlxx3 +, intltool, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll -, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg -, xkbcomp, gsettings_desktop_schemas, liblouis +, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg +, xkbcomp, gsettings-desktop-schemas, liblouis , speechd, brltty, setproctitle, gst_all_1, gst-python }: @@ -30,7 +30,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp_tools itstool + intltool yelp-tools itstool ]; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ in buildPythonApplication rec { ]; buildInputs = [ - python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas + python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 691f3188b08c..47be9dc8200e 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp + gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e01956e36119..e06f4407534b 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn , wrapGAppsHook, makeWrapper, gettext , python3Packages, gtk3, poppler_gi -, gnome3, gsettings_desktop_schemas, shared_mime_info, +, gnome3, gsettings-desktop-schemas, shared-mime-info, }: python3Packages.buildPythonApplication rec { @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; buildInputs = [ - gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; doCheck = false; # no tests diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 763435da564d..88628c63c9ce 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,7 +1,7 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null , qtbase, qtwebengine, qtwebkit , cmake -, syncthing, syncthing-inotify ? null +, syncthing , preferQWebView ? false , preferNative ? true }: @@ -34,7 +34,6 @@ mkDerivation rec { ${lib.optionalString stdenv.isLinux '' substituteInPlace includes/platforms/linux/posixUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ - --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \ --replace '"pgrep -x' '"${procps}/bin/pgrep -x' ''} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index cbf602b75dab..1d0c7d28de6e 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext -, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme +{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte , wrapGAppsHook}: @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib - gdk_pixbuf gsettings_desktop_schemas gtk3 - hicolor_icon_theme vte ]; + makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + gdk_pixbuf gsettings-desktop-schemas gtk3 + hicolor-icon-theme vte ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix new file mode 100644 index 000000000000..9c86c6090a6a --- /dev/null +++ b/pkgs/applications/misc/sequeler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, cmake, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook +, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2 }: + + +let + version = "0.5.3"; + sqlGda = libgda.override { + mysqlSupport = true; + postgresSupport = true; + }; + +in stdenv.mkDerivation rec { + name = "sequeler-${version}"; + + src = fetchFromGitHub { + owner = "Alecaddd"; + repo = "sequeler"; + rev = "v${version}"; + sha256 = "0m5zwl9jfdl1dzd1ymlwx7rx5cr9fdx06sbnidaajh33z02zaph0"; + }; + + nativeBuildInputs = [ cmake ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook ]; + + buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 ]; + + meta = with stdenv.lib; { + description = "Friendly SQL Client"; + longDescription = '' + Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you + to connect to your local and remote databases, write SQL in a handy text + editor with language recognition, and visualize SELECT results in a + Gtk.Grid Widget. + ''; + homepage = https://github.com/Alecaddd/sequeler; + license = licenses.gpl3; + maintainers = [ maintainers.etu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7367c8207054..7fbf11573c49 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ buildCommand = let packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 5fffa6681cb2..980bfb1b0e5f 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils -, shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer -, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: +{ pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils +, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "spacefm-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 udev desktop_file_utils shared_mime_info intltool + gtk3 udev desktop-file-utils shared-mime-info intltool wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks ] ++ (if ifuseSupport then [ ifuse ] else []); # Introduced because ifuse doesn't build due to CVEs in libplist diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 009eb488d7b4..68a192d78b84 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: +, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: let @@ -36,7 +36,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' ant furniture textures help @@ -54,7 +54,7 @@ let cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 37623caa1d4e..6c4b32ca9aa6 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip, sweethome3dApp }: +, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }: let @@ -26,7 +26,7 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ]; + buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; patchPhase = '' sed -i -e 's,../SweetHome3D,${application.src},g' build.xml @@ -43,7 +43,7 @@ let cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index cc267dceaf8b..a337b5eae996 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_38, hicolor_icon_theme, gobjectIntrospection +, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobjectIntrospection }: let @@ -18,8 +18,8 @@ in stdenv.mkDerivation rec { gobjectIntrospection ]; buildInputs = [ - glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist - hicolor_icon_theme + glib libnotify gtk3 libgee keybinder3 json-glib zeitgeist + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index f83ca1b25fef..dc723336a9e9 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus -, gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd +, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd , perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils + autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; - buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus ]; preBuild = '' makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5") diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 05deac81af6f..838e26463cd0 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre , glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage , libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, hicolor_icon_theme, wrapGAppsHook +, libstartup_notification, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification hicolor_icon_theme ]; + libXdmcp libstartup_notification hicolor-icon-theme ]; postPatch = '' substituteInPlace CMakeLists.txt --replace /etc $out/etc diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 9f94b0aa48e9..ea79e29ff020 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext -, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg +, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg , udisks2, wrapGAppsHook , buildPythonApplication , docopt @@ -21,7 +21,7 @@ buildPythonApplication rec { buildInputs = [ asciidoc-full # For building man page. - hicolor_icon_theme + hicolor-icon-theme wrapGAppsHook librsvg # required for loading svg icons (udiskie uses svg icons) ]; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 5af675a82acf..d090878f9768 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl -, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper +, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 27b2a8f7134f..166811fb4ae3 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg -, dbus_glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { name = "volnoti-unstable-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ - dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index fbf68f317dee..0394fa83d4a4 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah , glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm -, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: +, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { name = "workrave-${version}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah glib glibmm gtkmm2 atk pango pangomm cairo cairomm - dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx + dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index a895c9b4537b..bb7b22c40a26 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -3,11 +3,11 @@ , intltool , docbook2x, docbook_xml_dtd_412, libxslt , sword, clucene_core, biblesync -, gnome_doc_utils +, gnome-doc-utils , libgsf, gconf , gtkhtml, libglade, scrollkeeper , webkitgtk -, dbus_glib, enchant, isocodes, libuuid, icu +, dbus-glib, enchant, isocodes, libuuid, icu , wrapGAppsHook }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml - libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ]; + sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml + libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; prePatch = '' patchShebangs .; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e35d894e0e7e..404f25969097 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -5,7 +5,9 @@ with stdenv.lib; mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; - buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + ## mojo_platform_bindings is built ahead of chrome, because of spurious + ## build errors, see https://github.com/NixOS/nixpkgs/issues/35296 + buildTargets = [ "mksnapshot" "mojo_platform_bindings" "chrome_sandbox" "chrome" ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bb5a7046dd49..3be03f65106e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus_glib +, glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -25,7 +25,7 @@ , enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null @@ -125,10 +125,10 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus_glib + glib gtk2 gtk3 dbus-glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - ] ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 426161475369..1f6eb7c178fb 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk3, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings-desktop-schemas # package customization , channel ? "stable" @@ -75,7 +75,7 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk3 + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.defaultIconTheme diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bc9105acc77f..bca9e1c9a1c1 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 = "1ggj1a7v2n4v34kb8gx2hcswlayryr9g62zqlry26bwmvz6qzsx9"; - sha256bin64 = "1ah8088d8p674dj5bijk5maapmiq9iap1w2i81dl0hhpyqxx3h3i"; - version = "65.0.3325.73"; + sha256 = "1kdv6r3cmy7lqynnk4ylkn81x91wkv2k3hqh41sb50h65s7h9b3y"; + sha256bin64 = "18bralcc4frapglcfa5az3z8i74calrblf4zzavisvpkmnil7ypa"; + version = "65.0.3325.88"; }; dev = { - sha256 = "13klppyl6rbkd3ffp8y8d95l4mc72gmj45y34wynyfap6b4z1lmh"; - sha256bin64 = "0w1ipy858p9lbpcrjhs44kncgw7c5qv1929h0w65ybgsggjqh0gz"; - version = "66.0.3343.3"; + sha256 = "1ykg5c3bayv6pwz74dglxcmbsalz6p04c3r0y15xkw2iyv5jjcam"; + sha256bin64 = "1phw755ra3pckvhapm26amr6b3652k8f7sxanjyq118zkpga21w2"; + version = "66.0.3350.0"; }; stable = { - sha256 = "0mf4qjmrjnxs7mx9c5pymavmib7l2a2kxiy0kqk3mma1y90qnc7k"; - sha256bin64 = "0idij274g53lzvgz9h5xxi8l841vvvr78hp25ndbmpv4a2p1d83b"; - version = "64.0.3282.167"; + sha256 = "0q0q1whspmzyln04gxhgl3jd2vrgb4imh8r9qw6c06i3b63j3l2z"; + sha256bin64 = "1sq8mmdw32n00swm4q9q5q3vw6q5sp8yiaxag4rbzvxkfnr3vi4g"; + version = "64.0.3282.186"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 137b463a1e1d..ec585e53fd23 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls -, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: +, json_c, m4, glib-networking, gsettings-desktop-schemas, dconf }: stdenv.mkDerivation { name = "dwb-2016-03-21"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup + buildInputs = [ makeWrapper gsettings-desktop-schemas libsoup webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error @@ -19,10 +19,10 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index e41783ddf5ba..d1741774d347 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook -, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3 +, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3 , gtkspell3, libsecret, python36, python36Packages, webkitgtk }: stdenv.mkDerivation rec { @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ git # required to download ad blocking DB - glib_networking - gsettings_desktop_schemas + glib-networking + gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 680ffe8382a6..bdf91cfc8df0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b11"; + version = "59.0b12"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ach/firefox-59.0b12.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "5e8287db112a59ccdcf9460d66d170538a312583253f3ed98c251820f75ca1de4b4ee7efbc5a9d6b6cba167d2bc451f62801bfee8bf4022cfe640312f0b5c759"; + sha512 = "184de450d6c46ea48d6743f379a093a9dd9b4777d17ef1c0b7768c73b2ddbf27e662b36cc43b24e202c0e685b1ad7230adfb7bd925fe6c50b3cdb176a3074666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/af/firefox-59.0b12.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "43bbad7b87c5b0043177d633bef8cf60136ab78e5f1f5c23b5d5c39dd08940f7603d997dfda84b94b5fd581d25a68f03ac71015c5fad500f6df7704c52b58520"; + sha512 = "35604da3063a740fa5509e6bdf03f7e8ca465131372d4d1d21b627b6fed9fbf601368327868468fdc69fd0c927e0afc9610d8d8ab79b2a87fad4db0f4798ea26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/an/firefox-59.0b12.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "80889c60222d86fe544456c54a2307033f70040edcdba8102f4e11d6be887b5e66c397b31c897f38402ef64565a6d122f7f8f894d8ea7f6180391680949d25a8"; + sha512 = "4cdb596079877fa13820bf911a59b6ceaf89641e455269eb9964004388c3732f10f970d624d6fdbcba6d5ec59de884e6240f5215ed82c6859d6d17db7535fd0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ar/firefox-59.0b12.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "bf85daa07fc424e522f9ad79a1dc849fda667342a4069cb0bb1669001cdeeb4f45811dd19f6c85dd5efcf375c66c5bc3941ff46ccfbbb5e8d1b5bfcdc99a368b"; + sha512 = "63c3c317a6b65a31156ee45e9ccc47bfd3a0f3b75236abeb466a4bcb50eaf286e108d08d394d1e906a26bc8c21c9b53f11e26f969b4426a80b209756cabac1fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/as/firefox-59.0b12.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "aca2c69d98b9a92592b4e8076ca6778a39f2124ad38d541940ea903c7678e5bc5bd823a596d042891e790aa19fa2aa5f98859b9c7e0e08a8c87b3ebb62314bab"; + sha512 = "d5a283891d44c22bc6b7912e1b97c5b214a74feae278cddea2e79d59c652b77ce23fd26447b01d37628713613ba058041df56c8b6a1e6542a272b8f8be182b63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ast/firefox-59.0b12.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5c0dd82ee28fa52cd3935553923909f4b817677b455bd36d4efb93d4669b6cb08eec56c388c4c4fdc60cca26565dc2fcbf42fc2b4b80301dc128fa3483d359cf"; + sha512 = "e049b0de5fd31f7176b4af0b7b07a30250f6f99d3e144e7bb5842087e0b9a57f158d41f3298d7f82b49f06c31490268d9f757b06c681de70f55cf7e7478e37ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/az/firefox-59.0b12.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9f2dca2a53bdd3f0ba26e7e26f4f7ce73704f023c0732c98b0c16399176af91c69bc6d6e05ed8adadc2caecbfa710bf5cd7dc638be9a7457c63e408a6da9a66d"; + sha512 = "f6b732e6d089fdc2a005048a433170e382e2329c02bc3016a0f37a2100964d8aa2dcc9afc78b450658cdc18ae33060f0bd3f9d1d7b615b49e08a7b783e46575c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/be/firefox-59.0b12.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2f4092f1a6fd5f0019307a6bff056f363aadccf4495718476094e8ac888b01df762d96b0b33fa48a37b8c4a85606ea1e1504a855587b8a531c405ccb0b011a23"; + sha512 = "d6248b42724e454d74e16f650766c8b2c158f4664dac53111fb73e309b66a1d8def27a41ac799a5e3ba57ef8bef0b55996916d08f4647ed37816c6ef008d5f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bg/firefox-59.0b12.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "c0a61c4ab8615b7315edcc70eee200f742c37dfe9287fd77f58a982cabac233b00ce6725e1bb6d66194db5f1e6a4f5351041e11825ed98573e75320713638e69"; + sha512 = "df8729f5f5e59e1b48b070970d72e6f7c86b5a8a8793aa5900648d44117d9495d98acfafffd89d1e4a20ed77c38f8ec82d7c12372278de2d06e57bcc05c34938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bn-BD/firefox-59.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f6fc7d1f9a459654e2775782e0355385840ee6cf7f43d47084e5e60866d785dcff25f08a6de17d8bec8169b069566d599cd6780a3ba71458bcdfa2253b718231"; + sha512 = "613738ccb2dcca3d69f52d3a5d62ebb6f1348a9502395e528b8f2a3a2f3e4f88accadeb0db9d245384b09fc14bd9d82484ee50577609c26548daa10f1194afb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bn-IN/firefox-59.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "6dc654dc8c10070fcd0fbe57928a1c46bd2392fb4b85d91fc40d8537fb62fb30e67f34cd8c5f02965bad5aafef98c305693ee37858bdebced83793e819227d7c"; + sha512 = "09182f21c3dc3471438f300b7ecf2ad5dc2c74655e44c1b18410882c927ac4a1d0be589203aed06c4bc5d9868f5edc229a10abd4b4423eb40999cf3329d9aa76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/br/firefox-59.0b12.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9dcb2f6eb272095ae7dbe61360187f558093147887a848e4cf1bc936d199942ee0c621e063e06ab5e73f265d59710eb162a2b86a8bbe676088fb641c69e1a50a"; + sha512 = "648b641def4697476534783279eb5c4375d6a9b5579854c1e55b8038faea5afbd8a0140e7ef65eed59cc593848f04dd8befa9591a4f23d149214beca8ab9f6b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/bs/firefox-59.0b12.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "eab54247b96ac8a9c51b6f40dd12548832c802169f2159ab5e6f77427b5677d21226a7eee541e4f9beb936c4d3078d39eaf6349fce85a0c668cae75e11d1256a"; + sha512 = "a2f9cb0297b8b63c0d3249bed7b2f96b2c7814489f6fcfb846fa53ff06c62f93de6c11512d39f6963af24a7c56b5075c6d64d007ebbfc1bcf46308077f106642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ca/firefox-59.0b12.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "0f1a155975a6a8103ad02c8c1c32d2401812b23e2315321b0c54c34a1f96a0dcbc6c16376e1dae6dffc747c3c9bb2ada4c755ed2d8cfe3c2bf482044d4efeba2"; + sha512 = "b416568cc6adee4d23fd81ce2bd0446f7b53e7743bbde4039fdf3df928ffe303b3669fcf111b3d9e638c78920f7958c27635cf1c9beb260f1be0c76a35929f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/cak/firefox-59.0b12.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "3b3fff95934ca14c93a0720d641f4f7320d013d9f739a82390420cc6da38c8039d25dfad4019dd01df6efdf68a1dcea3fb34683c8ed7f2194e0b949b983a49fe"; + sha512 = "b3480e4983f79d9e92b9229875b05112ac3bd2424207ed93accddaa6e9b2cd1807fc0905d268d990c4c3b5738a5562a6135095173ed77d91ed02111b3c5e40e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/cs/firefox-59.0b12.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "96a711881213abf84592ea646ce4804d419cd879c8ed004b8497e90478e976c536523e9aa9bc000c9deb61a0bb5ed3fee3dd8d3befb6a6ecf85956b675f11c50"; + sha512 = "15fe628d7ae1e8ca6d003e1bb4ec26886f1560fcc12c0f329d4e75cdd002c42c60260f0638194eeb9920a9532c2be2439a4ad3917e66041ce24efba67f33b7e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/cy/firefox-59.0b12.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1eefeeb063198b1475553d76874914e5afb1627c991fa355c8c2ef3b1ff0566fe9145515a66cca4369ede62f12fabc4f87a6e80d191c0e4196a6760b56baeec6"; + sha512 = "0e31334a51588f312d909254003127c083704ed608384014e1f96bedfe82ac0055850bdf86a2a2f1010463b666d9a2626b2d7a51c0a0036dbf10021515ba991a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/da/firefox-59.0b12.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e5d2c6e14230811ebe306c5f47667a8264b1cad26eddb44b44f9c3930bd31f58a9c942c5f095dec88b2df26e2bf21906f8d8564da383c19dbec117fb432219eb"; + sha512 = "45bbcf37f662c09f6ce7c957a12200afa3ea5c2cc950be21e5ca5df1bc3d286d5ee63ab2dc8a60a2f8c8b3c83ec40f69fef8b5f77e928e65729cbb1869b49fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/de/firefox-59.0b12.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5a154a843d7e4fc84b3c38dd7227e7cc7de3d663ba8dd66883c748db05b553e6c9f2b412911636432c2a0140376553b831a6a311b41cdbe11c7794b7719cebc5"; + sha512 = "d899808dad1ae7230d65ec45951bfba603a866b14d5b8a99833b8a2574ce89fd0dc62e290c215acca87f6eb56d529eb7f8235220dbb16d30b8e68663481ef79a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/dsb/firefox-59.0b12.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "82fa8750374c5f0e85826515ff6ce9e0dac120b3ab84b855a18609ce747fb45924f26b905aebaffded693c6d822e817a521ed9bc3dfcbfdcdbfdb83047a2e7b3"; + sha512 = "afdb53d199b63cdd9d9b4e8c700a1780e5441b97391e6692fe4cc5258b1c2465671d7eb8185a4c471c3435f784c0c2587331cc12111edc09df4bcb4702567e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/el/firefox-59.0b12.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "52a6b477511d5a3d420cae94a7f3354019eb87687086429a7c3e37687af64eb5bca84f0990a5e033856a2c20a2b1e7ab9f66dfe5c8d19adcf989412086815cb5"; + sha512 = "5a2f934d63ad7b5d8e58ac6754bf2cd27724680f2a0e35649893455ac87d2b489bb68a31066137d02a632270a17bcd5db2ff181eab311e4b8d7660c54043106d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/en-GB/firefox-59.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6163056518c7d9a24de67972e841e369459350af371427a52394827549de1861639395e69b12c011edd381224fbace0818723e638f5c2076634b39a86e0c2d17"; + sha512 = "4a114c0d9ac7969698e251d6d700196d6c06576f2e2eb93939591b753c545967dd09a3ca454b80f953da1ed4509c1d489b5fecaa39632c5cc0bc23a3219147ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/en-US/firefox-59.0b12.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a8424651320f18d16b4efb6efa4275bbad5bd35ad557cfa02e901025c442d65fffdda2c7bed0d0de7090c708797614fa6d5e3886e6d665ab8d0455c7e329ac91"; + sha512 = "353658f9869bcf554d8be108a501bfdb39010d1b8fbf9d8f703ad04441252bbb55952a21b48f313dd42577ee8263d9bf25aab997f6a01471b7f7c815d9dc5698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/en-ZA/firefox-59.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c590b69168717328765f6bccb70af8878358501b33ed4171b2b2458e426a67bf11c9aa6860139feecaf8b4028240ae9818056650924845bb28bb6609a5aac157"; + sha512 = "d4b8c02d2b4e9299ada1dd993ff880975d6f74a2242875a50c3a7e15d8b5650592f3c855a395c6c43ad1159e7e3f2dbd1bc73b06d40e809b38c7d1dae3b0fa9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/eo/firefox-59.0b12.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "b1b2eaa555a0b2eefe5927f87cff7eee2548c81a8f2cefe60891520f68d3c7e2e6593e8944ce535f0018b303b7f93fed39f62fecfda56e6ae210261cbbcb1e51"; + sha512 = "2c7e4f878652efc1763195b2a0b2488afaa2fb0942f69c8cf58ad125b7f769f47433fee8e650b88cb41873b8a91326eefe24673199e929fa7351c4ccca854847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-AR/firefox-59.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "18e575ef4e0b31426c723ef57c2ad665ad6bbce8bfc12373bfaba0d73fcd5d389035488cd84fb2f0a550cfe3a9fd486d287c5d5319899a14e66f2a7c1dc43272"; + sha512 = "f26ffa471288f1861919f2065018872a4098a4d4f79320beda47dd9450907283bd73569702e2f362c282c31c4de44e69f118441e4693d58b26ae543921c61586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-CL/firefox-59.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e01055ad3db6ea4795f4f87e0e4776db93db368a82eabfc4dac79e04ba19466070642adf5b72130f6f3f5ed6b85386f219125e3dbdd862abac6f57b7446c6f99"; + sha512 = "7cbeeebc3bfe27a9752812e25de54080de1145cf9ba43ea994faeaa8f44b5d2036c1d831efda053eaaec6ab66b82f46d94aaf38b84ef48cec7a3525fa61a8a60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-ES/firefox-59.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b4424d6ba4425198555ab77180b11473b6e3c26f088ec690ae5d6b4e8722ad8fb7f4875077bb5242679d96223b69c610e98df75c26d18687c5d0fb4487e292fe"; + sha512 = "107d892c92e721a4aa444f64684955f6e9e8f4252812127cd83ecb814397cb2aaf9d9d761238b073324d62ea71058c6955d50b5ab9e07422b8cb0bdb4024d325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/es-MX/firefox-59.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3d089a3372c65eefb747d14061907eb60f00fa5d27117107fb265e3f4e5f9404810d0d0fe5543cabc721eb93995dcaacf037eb76aa4d015fd251fbc4c2c833e9"; + sha512 = "9571f1d991377db96748671fc18b4e5b7e5cfae9bdaacc3e26add7a2008d3ee19eb2dcb891d7d12b21fcea9240f4c37d6327cbe4e568f145e1eef58eeaaec377"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/et/firefox-59.0b12.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "8dd518c48e298cce2163d293627b4231ee858637cfac3b740019c8005a8d9e9c04647c6cb8cc3959cb363cf56ee6e4575d3a1d906090730ef196023298dabbd1"; + sha512 = "27a6a1be0b5396ae5dc389b6abe01f802ac869f86c4e2189943fa0a19a4305bdd66630046160500f4567b212c8fb516c7d29435e191222bdce5baf8f2705a5dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/eu/firefox-59.0b12.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0422e886daf75a2486725b70b2b12a8a6646bd7db0bc7676a6b534cb93daabb9de502b05ef4bb4041be7a823f8a5fab7dbe0576061a6128fe41b2cfdf6a5831b"; + sha512 = "1ab7b7590cd46ced04f8585b559f5501132caa9be8a4333eddcd54656de3b8eeedda18407a2d7559cd1d5bee3943b0aa9bdb061320398cb0a138c0a8041f7700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fa/firefox-59.0b12.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f084cfb1120973bfd0905dcf1e24fa2b719c36906531af4f67b5231db7ad59bba1e0a1fe89a30a58a81d17ca44d7035a916f472c6737c06daac308f6b4947706"; + sha512 = "91c86796f3ef04fd5ab03cde6c9ea529126f3bbba7243108add72f63ae82d8208ab82cc431504b8b5e52215175d1c80098d7f306e5b76e4714d64629b8e23963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ff/firefox-59.0b12.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "17523d5781d7aaa0a8b31c07da9152c54995d376e5c4cc4b88a405784af54aa59744a948e8676e8670af2ad16bae8f2dd5b9c9f421df6db2c00bc2d3ea6a5c70"; + sha512 = "d7c9e05a86ba508546815a9df5931926c44dcfc9d66f941b97ae64321c284bbb9a896fa487c951892a43d2e31e76935f027d518d33e4521cb9eafd1570a3a144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fi/firefox-59.0b12.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1af9a35f7d617773d039807e8d02db50d715c30773e2b9577ddf93b92ac1851293260f96e3d6e185f20ffd40cdaff147e30854cd7c7ffb21c8f7cb938f3831d9"; + sha512 = "5b10dd3a99eb1eb766f1bed117aeaddb796eb2b92f858657105a08e30224d89b1e93a7622c7a273cb94ed5ffc9bffad67ced8f236e473dbd4c4fab8afd53d62e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fr/firefox-59.0b12.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "4967cf0e9b639bbfda7668b02c94d19488c5416384362f3f2b308e034a975bc995c0cb74cab952f5b5963a35e7f01e2ed55883b10a3fd63763fa35459449b5c9"; + sha512 = "e656c62702b08d5162febd609b776c3dd7478ef6954eb40aeef7e296e76c3a218c493cc2312df9b8a94aa14faa09398f8f3da5bb01944eb17e2f47b5b66a6d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/fy-NL/firefox-59.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ce2317827a41016b1b08edd1d4f5119aedcf3e924064c8a07f207a41b62c83dcaca1d2d2b72be94e889be0997af597b535bdb707638b16fd4685a0aeb1e87efa"; + sha512 = "593afb200a7311a01e54387aad3a74427fc70f019edeb3358859a6c6b4e362584e434d0327c0c916d0e48bb8b7794ee63c87aeaee452cac1018d4b7e4c6e3568"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ga-IE/firefox-59.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "939870c715e8330abf71fbd6223e5d2314b43cdca7f84629205844b651990a840eefdd701e4eede711d3231da32fc0451eee5eaa4e6cd0f585c8c8887d7b8bfc"; + sha512 = "bd161023f59b54605b00dae8b3993b975b2c11068dbbdc63e8910997babf3bf614b339079a071f81e7c78e0d7ca3b4287fc485ce5418dc527694677e0595696a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gd/firefox-59.0b12.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "38136a88b6254bac3b21f5bf29997df2e256e603beed11c6d42de4f49d7f0a806eb1a65a624c3e2b3b53c8bf0be660039139aec29c3e4631f058f4ba6c38f505"; + sha512 = "6823f7279281f9f5a5504998f2023895267685f85d9ce50c49f1813cfdfade3aa02d4613482daacc1df94cd497761d5b74c1f4d828a61f9098a543e03658dbbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gl/firefox-59.0b12.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "63a039bcfe1aaaa42da8c38cbb1d82a7e3128f9924df8cb9c703cf2d076fbdbb77ebe36a99b12384d929b104b92e5438c26eabb367b7e38f17d17c1adf93ee53"; + sha512 = "e6ab127d895b2e35c02ba51b6fce270d4a59f4c924c72ab57f3dbf8da264ddabd1ec8a151e568cfd467224381cd8f410ca17fdaa805ee40f82b18ed3ffec5980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gn/firefox-59.0b12.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5a8e13184bc491d7d64cd302765b2c13937aa172e2390e93395cbd7e000bc1e5478ef953f6b6a3fd37813a83d1f4661ce52c14890cf2ac9c79a53108556a41f6"; + sha512 = "fa3d2680daf98be9121737ecdb4f655001f018c3f40fba285bb7ca067b8b302faf9f1b10c663a4c3121a5f0ac3364f4f6e691906b73fc2f17a86f0c5cd5af48e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/gu-IN/firefox-59.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "28723577b5df745f711a8a01834a040ac07d3d6468a2b69c3992e8f850a22c9e68495c647d717bfc841cc31121626bae2b5010cbbbbdabf08917042de4fa7363"; + sha512 = "08e19279d20308d16c489ebd3eafa3de12161f0d8cd627361afb52ce78e69e675c3c680ec971c301aaf501c6bd5394487dc5f320170e51649cd9319a349002cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/he/firefox-59.0b12.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "37e9f8be66c57077ddb514ea43639b33796540c76db2f2e9bfb52852b6356952d0f4cd9c3ae8a2addca2ff4a4e586ad5aabdbdeef614af3e2cb647c5a0ffb095"; + sha512 = "5b0cae8dfc369fd4067b9f23385b15a15f61530226048f022e110f05b91f3a917b45a0230048d53a5697306d3dd7f3526e99080d0dcd54551c3ce81536789b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hi-IN/firefox-59.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "4eea2f03baa7cbba4f7ebcbd58e580f3e4278926051757e8bd2e3653e2fdd60d2aaf9615cb9abe71a2039263fd76d8e5cb18431c8d68dc55605eedcc9a2950f7"; + sha512 = "5c895015536a84af378f37d875f875fc56eb33a295456b4df620e9ec6cad236b321712b411102aa5fd22f728f034e15674b2e1f38148e0a420f1baac41df2058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hr/firefox-59.0b12.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0de2795cfba7f8dac2ac0198dd5ea35610c803bfcccc444de0ba9a3c702e03de34f49f378331df7638a0a3cc6bc1a29749aca789ba58fb72549ab6875c5c98ca"; + sha512 = "9aa00a0032cdae3eabd71306dc43b23b262f3db2305fee0f5f8539abfab75032703ef1477b8d7803a82c7e2284a090284b80ef8cb02f05af12821e46fe9e5650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hsb/firefox-59.0b12.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "59747fe7f291b3ee889b2ecc8582cc24a4aff9d6db6f85049b7e0e29d47cb5cd73b67d3fd16022cc03f682a454f967bc4d68e5300770509132dc1d0c3cde9fa7"; + sha512 = "a79bc454a796e8c71e2af466ed80238472aa78efcc7fb44aca6f226d3ed957541c38317cba6c6efa8d79465fb75390065e98b7a0ceda358fb92c8737594c6e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hu/firefox-59.0b12.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6f97f366c038985e98ba269a80deeef883bbdc20347827f52cb8334f310fc9cd8f3b29cead4531e6dcf886473064a364efd5fe8c2ff2957cfc0552ba5e432ca1"; + sha512 = "3744d60fa83f925c26ac9bc8a49fd67e6be1200587c8f78e42bab46a0d4066104842c75ff0efc9f696f2e8c0aac8e7f1e8691d90fcb4d8b556dcce8c312f9b5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/hy-AM/firefox-59.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "382c39f92a3cf8856bbdc188e672bd75613c8ada0146b5a852f77714c106f649f009e80c58706397d247ffb39821f7c0ca18860362053dfd42dc323bfcf8eae8"; + sha512 = "82dc527dbd5222b0af3c20d23ab266224a4310771251b395928cc12133ff6e60372dae9b139f4552285fae2534d903eca67d7f08d3310ce7a0d0820101d6a32f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ia/firefox-59.0b12.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fabbd2e9d30b78254e5ac07ef3f02c6800f3f6331680653ec65598d3733a07d239433ba5b45e9e4e101e094fe59650b527d0189c6f87c89b6251439906b76afe"; + sha512 = "3827e28ee549145b415d0af774efdc9537460903fb9faea98f992205f2eb44f0c8ea490dfc003bfec21dd5d49d3a5a427896e02f4ffd4f9ca9375802aafda653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/id/firefox-59.0b12.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "db0156e7d76699e6d858360c805387f0b8cea468bfe04c73ac18c87c4b53596488c6d10c44e1a4d5951ae00d13f8c6c23d36edce05ea49ee5f90a578fafa715f"; + sha512 = "8ee5b84527595ad845cd2741828008d749a2722b893e21bdaa07a7639470fb0ed9166584a5bec7c87747810046f5bc2c944f6ef6f307f6287e21b76dcda0e7f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/is/firefox-59.0b12.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "b369005d3f30b01ba743b57c8d6b22b68c7e2b408b5e67693b770980a9f71f8f0c5fdcad5a72332282be5af68c583a39b5fa498264dc6f85ff0ec4e84664cc5c"; + sha512 = "1f5be6804a68cb940ebd4570b6be3ca7ae3585d904595fad8969390310b14857c7ff037d988081c340ea0ee35f59dfe754706632fe3bc311c34055dedbe1735c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/it/firefox-59.0b12.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "43363c9addab855c88a07c257ab6f380ec39fc94f28f88ba3aea88ca4a46772a1f7a0aeedca35402b0acc0712b132921ae8ff05e46611d0713dd7544064c5362"; + sha512 = "14c29109ded478c8a9953596ede874a012b219ab93ddea64a57e0f3f52e478b9ba94dab7448ac2be58efba7e8b0b4b1d5861cff973c05f6ee1aacdf3e4817fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ja/firefox-59.0b12.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "717f484edbf2aff96e6e6b0b8ddc55cc5095760fd4d46487dd766da0861d91572bb689ec9c408bd417a4e312e2a3c7961e46c0674d7578272057308475f26cbc"; + sha512 = "8fa121cac9131e18ca3fba9299059d14b6f5920e4ea5b28c22c320fe1d44caf99b14a6d1f05450fdf001aec0ff3a2cc1a81a2e26c67305abbc50e087b67d22a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ka/firefox-59.0b12.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5806b59257be4cbc8bf983268f32cb14524fc6b28d317f44cded5af0750adae4d44686af280b015f2c04db8c158b6b943ab0f224077720f742620ed4c69bc1d2"; + sha512 = "193f11718b8ba0c44b1aab4ea2cae8427773c2e025fec49fa0a5e970a5d446ccbf6d75e0be9ece45d9cdc89199002f278b08dc1572ce5e38d74ef1df54b858fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/kab/firefox-59.0b12.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9c3d5f864cbc9c031989a50ca89ccb7b6c57178eb9927e0d103612c6b00e68a18dcf40d9766b57b88c4be2c814d1dc72bd6ca1c8d2e84d797ba2bbb9be21c6b3"; + sha512 = "a92921bb74ba3776c825804e568d0256c102dc00495efa75d6c5f4d1daa1cc934a4ee448cb53f5f59aaf3a4d955bbd57e1a1c42950bf6e934516bdf67da33922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/kk/firefox-59.0b12.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "30758f1b97f8ea7d80239f0ae0cec40f6689b00a5a6311b5bb77137b01d41e65fcac3f143bcf15ee3d46c28beda0e3a5642c72027f50621a2d96f0fe31025f54"; + sha512 = "c98d590988cedbc2f3d357919c695eba3e3a13e728e2b66e24e6c174254ff3dcedcdcebc7baa2f71868709edf47712e8bf09155b620ea6f6737167d529fd62e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/km/firefox-59.0b12.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "05a559aba77681303ffde44c8aef306ab01633ad045ef35c9c7249fe364e3d52d580a80945054ec99abbc75c5e04d3c271b8abb24714579d1ef3fdf6248ed161"; + sha512 = "6c1b5180c712378657fcb1cd216405105b8d7c6bd1c20f0fce646c7923b1e512fa0b069095bf9b0920685c115069a00116b2ef5937743f12f15b0c035d5194a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/kn/firefox-59.0b12.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3717b9d17b8a3ab0057b0fee943200b77586c65193c21edb06971a861b55f1a976ee25859c6ca57e0056ce6c2f499751dc849b8b6f49bef350b7a4715ff39696"; + sha512 = "4d5715b26b3b9d98c9db980e4eae9a77956d55cdbfb91129b04948b53b31777d0cfe235205e00fbc43f038415973d96a516d498b5dabe1a9b6d68cc08b7f0f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ko/firefox-59.0b12.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3ab2890869a1e5845822b7ad53638b908d9d300ae3ed26a545dbb45d991a80d45eeb04b80a277aec26ea0d1be0ec55ddcd896a80ba1af5e10b756136f653b5cf"; + sha512 = "5142cac908a577f73b749887cab98f4ada4ccdfb07aec8da620759f146a9b10f27c160375e01f9045cfc2f9f92d81b6376cbed0a63165161c4ce44825dd85cbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/lij/firefox-59.0b12.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3f9e5a92862fc440a88d38cb2a520c14f76cce550b9d3ecdfb07d255d95d24b9ed073318093c2f6c9eaa14fbf26eb4be22f86190c3a8404209729c672cd026af"; + sha512 = "6c47b9d43a9504bdc6476a63a224e75946487c0617686bdf22cfd6f46777ac70d52e6e174dfa2d6f11295d5898a53855fe374f20cb80b3018ee747bb6f9248a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/lt/firefox-59.0b12.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ddad89fd08ae2f5b09ae9fd92c3bca701c50441786126ed4abd284f6096d0816c40d603bd8e5965a92399e6ed52bc303c133a4eaa1b993c81e43ca9859583d74"; + sha512 = "7b0fe2176d1595f06a5aa7d7d7ac029b9bcda6368299303746bcff5654ee852438a18fb57371ac1808a9ba9a5427b635c1e5861e29ee9ee512991d4d1f503fcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/lv/firefox-59.0b12.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "30f2239338c0cf7671b46e9b872fa7bcaa960fdbd3dbd3300463c7a69f046f48ccf8ffd43a0409f276177612343be10f825d4ab3f2b64e479b715d5402d3f704"; + sha512 = "26b10d4062ea14e7e39440f6e90ee728bfae5b611df2759bd2d4b49c0e429316c276c7318ba252448465a811ace4d19aa241906af10618833b9fdf73d22461dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/mai/firefox-59.0b12.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "af099e3f62745ab8ff9af72c00ba00b1858fa482974ddef743b467f9b9a3b782aebf80b393bbf151a3725cb829326acb5a1de42e30b3c84707cc8bec78a94751"; + sha512 = "f1791cc5a9af2ab2861dfb231d6b9bf123522c3502900223c14a30ff0b8e6ce29b633d0aaefeddc03a595cb3c9efb064bb66ac76eee2e786c98e233e934f2291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/mk/firefox-59.0b12.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f7309c33a3d556ae9143cef3c0e2ca517aa47c12517fa5795971bd8c7366863383418d6be0270455582f495d45fba5573ddb33558896373f16e53f78040dd800"; + sha512 = "aed91736e3fa428d87c47310a52a77590573e8a22b975d3fda049288e9f1cc27186005cec7c3aaf5ef26425556be5b1bc9c69e3e2930a28c976a4795a6262e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ml/firefox-59.0b12.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "aa3e62b53ae32806dab1d529cf5a112527dafc95b356d81c6ed1a957f5dfda751daba07401e17510b619644ea2a51175c7b565a17883856681d6b8c209f35915"; + sha512 = "a171b03c683e01e3abde1a40447ce0c62d867d13f0bec08ff28ca3a45f7b908a0f02f047be7a638ea24c0717985ef5f50ba08caecf816152d351e188433599b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/mr/firefox-59.0b12.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ed7a677fe3f14850f040f3a072b4b678c2c1905511cccc92fe591f279802d49f7a76a93149c2bd6bd1a515bdf05e1431d258a255a30ace51bf3108fd3fed9066"; + sha512 = "0f1f6ea73c02f8d1ca84e3189f438b64949e720b8bbc207a52b50ceacc6548edfbe7c898aa9640908bc59f535863897fe51989b9a94e412f1414823cd998e283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ms/firefox-59.0b12.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7357df06cafc75408d365587ff18a7a907f97116c04b45fa4ee17403914d81752fead616bc51514c238829849842c5cf61c4da4778754401886fe71a13b4d93c"; + sha512 = "596f543051dfcfcacffa31fc6717fa1c19c6adf54b1c774de54455569c8001f8c525042935bce98ee9db581f3a700e703a2e9cb11a238142abc5bf5c9408607a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/my/firefox-59.0b12.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bf295939f3dddada01678f2da983e03a3ef1091bae02ae85140c8ddc960919b96dd845e372cd9949be80ecf3778766ec855c533e38f4b7c7b20a9a307236eb2a"; + sha512 = "a349a3a6e753fc0990d22b39f449899a319949382c17e6b646d6a457fc0d04c5ad19bc0ac8ff67fba75eb2652f8304b57e6d9eeb1db5a25e50d529dc18c7eb72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/nb-NO/firefox-59.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bbc645329b20eba4bab5e8a9e959ca5dac19ca44ce0a0b4e590b30a31ac0731bb423496c30b908dfcd056a484a7f87a62e2e6b26cd61a0a0f00ae09c8b49e7c9"; + sha512 = "546e1679d62352c0d60bc17e6d34964760d41d2eca2578f0679adb613b809b09d1c1fbd88020d5a7a610e6915d60fe262b7d295f435141bdfcf06c0465c6de03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ne-NP/firefox-59.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "36f2e47d2b7c8e01bc9ea8383238f4d513e7a40bef71c29302e41f994b26a33281fc315653105f3aa564db48556bd91c80f52c7be2a0385205ecca32ce82cdc6"; + sha512 = "b544710208aa30c371e319c16cefa3b1b838e7f481be3831441df4a5c687a2183c6a74c33305c8b75599bfea20f25c24031a7f367f8ef2432e9e0ae0584ee070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/nl/firefox-59.0b12.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "19747468727ca8fb857b9b49bf21fc074691431bae03aac650b91a29d055a4e105142e7931fd8de5914552fdd26334655c5a42ee0bf83a1f1c316d9c9a47c5a9"; + sha512 = "6372beca3997dc83140ba5f32a19f0d382d6cb92e2390bbd5d527dd58a381e1dfd698524a91f0cfae86519b673d67a23d7f92a9f56357c5fa25c42625a04a95f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/nn-NO/firefox-59.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b4082b5e9f71b50480c1cae8a62c0c5bec8f6c6405050651882137132109fde58bd57b6abd0fde5c6bcb55b0a275793458248c38c7c8c5ea83848259870f6a5d"; + sha512 = "a7f82fa0b25aa3430bf7a17789e3673c1bce5fd8ad3603368281ef358369511b69f2777faaf0e8dc4fd6921bfef729c2a4a0e7bab086741071ee75092482f852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/or/firefox-59.0b12.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "fe48530b18e8c0d555fba6b0cb7bbc65b02bdbe79096445e47f2f66a0ad087420d2bd60eb5bb80e7444207a6a14f8e5de59cab84b467196242e3fc2f051628a8"; + sha512 = "cbdf8a7da8af33c46a6275d6fae9032f7b5dbb0cc5ae4cf05b1aa685273290a1443fb1c8598f07fb0c3669f894f1d6bcaa4824789e148a3d0671e5952c2f9fab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pa-IN/firefox-59.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c6c16d428e897cf5432c33677f3b64292d58769ebf162a7f4dc25a6c78ea8008f11ce85c62ff5d0f42995a3f9fb4ecba71a0e6b3d0c2c92a851fbbfd0eb8d7bf"; + sha512 = "f835dec2100872e719f238d3b44381277c097824342ede6a6a8fb45db808af15f805bbfca89fa5b927e70ecea347964a5ff1d80df7b718afe4d15a08142ea0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pl/firefox-59.0b12.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "15882656083843e2cde539d5cdf839e0166ff51555dd5b4ab8ad28e93973b31d44713be494b24659bc819033027209eb8f95be8689d044e9a208d243128b4537"; + sha512 = "111d4e7d15748bf6baf6272b5a916cc49e91b4649c69cf916b6cb3630a2d2faac8c711581381ce83476b5c174cdf3e67fd26733ddae32ffb2252518775c2c9bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pt-BR/firefox-59.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c3258178f904021968f09fd87b94eb0ad6424181527828720870694884707f0228648476b94ee60bf96bfb603bceadd95606aed9fb10fb736520f5c055133996"; + sha512 = "a3df297b8b4c3357e6f2b3cd647317d45405211e01e661e271ebca2204ccfa1d2a69215172f57684b86f9e501560fbe368eeecfb52301bab0ab9fbb9e7f38ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/pt-PT/firefox-59.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "318ce1d62ff293cf7c0aed22e9e75a865f888321c9251f32501cafbd960bb0860c802e78a1f7b31878f861e579a4fed6c6c61aa896552246c6333618f1a81889"; + sha512 = "c7c9d257113a2207599b3a3a7b8057cde53fffae826b569247fa8342d3a20b2cb8d72c61f0c891feb834d6c97eee35df4699774d4aba9082f4e850583f66aebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/rm/firefox-59.0b12.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "11310f3c8c3c9445a33c8280b2a38841a831f508dabe30a08caa8f70150b72747a9525e10df17058ea5c12c8fcef823283235a449b4df4363daf772317c478d9"; + sha512 = "573b8ae64ab486336a1c32994903b56cfc363ebeee8945634f2e19ae4d8ba6b6a32c665aff5321a9d0562da0c511d2f3cec6c45a047da57f22e7956998116175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ro/firefox-59.0b12.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bed06a8c8bf4a0df45399853b7819bf8245fbea050dde07f51409948026056e033adca3c1de27158376d5e6d2d3eb1b9f524580fe259bd628089ffc2388511f7"; + sha512 = "45cf3681cfdf27b6c78a304679cccada5e69d98c025b9103d8f423adb85fcf6e4fdde2a79069429400d74bb8d0fea935d6b8e11cf6e8117260904da24f02b3be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ru/firefox-59.0b12.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7bf800406f71bf280742aa1cd627d58235487786c40dd94026c694b777cdebd04404dcf4ef36f0fd7f9a72c4a503f2a48d32715e27d95e7d3a96f968cbad0a22"; + sha512 = "24927659e62aa45ab3eff8782831474803e0f7633465afbd1c10789848899f9fd0aac5c0dd518b5dca3a750bac63666be3d9ae2d330b9c778f56364b54cae57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/si/firefox-59.0b12.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5541f53f62142e4f7d46682f9aefe32a4da41f15d746accf00c1cdf06296d40e951600b0d74e1f6e3fe6875d2d78d4fe79391b806954eb8f9c9e4efb59ec1d2e"; + sha512 = "14ccfa0532d25053bfff89c9f238d3ae8eb422c09bfc4537bfe2cdaa93c3609b4d90fc6d7f914c18a2f0a1d5d2ed357532cab104eab4bc73374f4a94b62623dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sk/firefox-59.0b12.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "316ea3f50801cea1deaded1a27690b43de6c04a2b29517da90b9365c4d9ed197617435723ecd17827487d4245b08af063f8b7b230c03f89e412cee63336962ad"; + sha512 = "1f3129d3e20cbef798ad582ff23945eaa5036fcc902eda4bf1ab49b4da2e3922bcf94dbc5807e263d44e462f238b4151a1c35844e65f7bcda9e70dd13d6e966d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sl/firefox-59.0b12.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "29296ae0bd9e2e60e245b716ca5f4910017a9e673e7bcb5fdad45db2eda195b89d1dc9ec1574c6545a759d21a6fd4feb7e72cd66c729e9f58e47e08dd44b0bb6"; + sha512 = "3c22f9937187cb90261f6f7ebd80b9a3704d71cc77df5757a6d11d0858fdfd63b7c07c3dab67a7df7a3391ac727178fcb900d5429472f53598bd0bb1f9bd5348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/son/firefox-59.0b12.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "cc8d29ac7421138d33207e182eba6211b732bd264a8085ffc46b4db303d8be1fbf3b59d1f438fde019ba585bb479f5a007a2faf2bd16686425148537b023c46e"; + sha512 = "c63b6524e4330b66e99a12c7d76fffc5a7511612109573e8302fb3696cee63e133e1252e3933da74ebe501f842cfb67d3f5f99f2ef0529161f1c25c6e894d039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sq/firefox-59.0b12.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "be90f1b2ac1dac382362b408f60c3da942c28a4008da1fbbf532d4637bb64c395ba29c234e55f7cbdb7663ebd0bb1d4f9cc9056b6ededd07c2dec6d16a7ae3c5"; + sha512 = "260aaf5c239fd4f12d2259b7a2f15c70e7138c969dd25f19d3450a1f2b0de6db848222c599e1682690750aabe4f6921e1b2261daf97af066367440de76bee7f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sr/firefox-59.0b12.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "24c7aa567c7e79a6c280ddf6da0e5127f5f170e7bb0da9613869bdc6f621ff980c6ab2d3b8f35056d1b5c32ac885bff9f50fa3e3b8e3b55ba6d492859d8f2ce4"; + sha512 = "86296ccd8648487df16bbd95605d31fcc74112566d979bcde062787f5d1569564096e1f699f439113a4f07358749101e91de007661e268fa8c03051a404454ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/sv-SE/firefox-59.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "34cb14dcff46a421dd52385f77ffd9146f3c6ae09ab1ac2e4cebafd02f101f9582b908ea91229343acd46dd4f1ac28093bb166e4872025877167ecfe45e4f0b1"; + sha512 = "a92a29bad68d52428b444bd995258f8e72db5e36a427b75d2ae377f148412f8422f868e297332b8a4cd5f5d3bcae320e8c603d1e77fff2a75b9623385f939130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ta/firefox-59.0b12.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a63433395895a5cf17c06f5639839c1f3416e10b4247f0b1100e7ab81aa38c4a72e3607e3693e114e78fe54ae151d47da3a9396ad6b61fc178d3d51fc40ce8bd"; + sha512 = "41c2fabbfbe848f6bc6d6b725f8a119e7056fcd441c32034a3cbc7315ebe59d359c465cac35bf5007ad241ee2827f1a5db88fc691531aead659b49d0361cf9f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/te/firefox-59.0b12.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "505a5be2a0d0efafe1990dc2870cc20b8c73946d5a5c18c7f2d568f630b9aef08e99a69ae74505dda5544206cd9ce61b7414eea682a9dd1274bd58d291ef4f58"; + sha512 = "aa02885b61dec800f814f8e5cc88e7bfe499bc8ec0af43aae515f023e8efc3065e22c2dd691abfbac4e405e7cf484e90462eea93685cf5f37877cb8a71fc1802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/th/firefox-59.0b12.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "050917ad7bf99d5751ac952830337385f198962c4680806e868585a87d4eb30810d840c2815cd198b67c5c2a0d7d4bfd908eea5f205752f90231ec94dc0d0525"; + sha512 = "8e0908abef1dab7a41a57ad17073948ae597978b7a43a9d7ace3c08aad30c2919b6d4c64283cd08df1d084f55750438af0abf6732ca6bec9fa4a52ca2c983e01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/tr/firefox-59.0b12.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f133c13521a069551dbc68afa8de4bcd888589766645f0aaf069c6309a98a2b62614ee4033daa0f63cc5b78828210c4bf0aacdc646e357e488db83ebd4083023"; + sha512 = "5fcb8cd6ca756e0d296be793a475d4baeed0e158ae8903ce689d42fa9befeb2a031e5873793ced82448578697af629c23b7f384e6cbfa735d5f3bee7ebad9ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/uk/firefox-59.0b12.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "5dfb898e9e4aa446746abd7261edb03e6f8685cbe1a3c0e35631e48abbed990cbded6be9b348b5b29a77c6907c3aa2d70765fa04e737426848c74428fba17c45"; + sha512 = "aa62685170ad9180ae0452ea046c269c4e3556b297fcf612b947999e77bc733a2abf18ae294bccd55116765a51f11c7c52341c80c4b51b757b20a77f411f09de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/ur/firefox-59.0b12.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1c3130ecd3f359c3a090df07c816513d6f74bf2d8073d71c9ce9a56daa76d860f1ced9185e7858fc64ad7d1f80704a1ac8913dbfc9392fc1bcdf033ff3c05a69"; + sha512 = "e902346ff8d2048764f7e1eecaace445836e2c76afd412127c7d28021afb8fc433ff7459c0a3308eef8ede03f11d1eae6e34018eec7f06b38d5fceea1464f5c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/uz/firefox-59.0b12.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e3fe6faba1c3063dd9e3be709f19ef547e05b87a31b0977eecaf4ef913c538a0c83f904753dcb01dadcc21e7d2787eccfde47a79225fe494b336b1167c9d43e5"; + sha512 = "e676a635eb2b0655bf8635f93eadca533fc992abd94378acda28a2d092b2610cd47e216b1a13a92b324aa17d410935681b7dff2217dc0ef51746539f3b99e4b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/vi/firefox-59.0b12.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "65460c0d41d790835a7019327fc74c1deec4eb2f72e96f8bb72f714edf3ce6c905d05469aa4cf831fec1781abd575dc1e6304e19a9d6b056e0ebca2ecbe5b857"; + sha512 = "85f49ecdb39c7108163063fa604c31af0d41d2cd30cfd59eb4708a95dc051d4983706df5eff0f35fbc4e04ee8393a45ff8296851864fbfce74fb53fef9d2e01b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/xh/firefox-59.0b12.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "f937ae6a3c9dc875f0d8d7715742e10cdfabb1ef0a2ef9dacb31c95f21883713c847668f8946fe5eae2f7fdbe1441dc0448fa5093dd36446fb3230c354bba83e"; + sha512 = "19340122eaac2421c266ba6393d76e125844b5a6e1cc813cb805292ecfebe65d11be1ac0e74e0c28c9e1bb968a8cca55b17fa28dc420cacdc0bcb72ac89898c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/zh-CN/firefox-59.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5c21c7b8c6457d6cb9956ef01a2ecaecec20b64e9be5e0899553718928de99da70fd5522db7e5fa5fc710489f787e55a40b4a28ba58a68ad37eb258709b8aa45"; + sha512 = "82968091db88b6897d3b4034ce24ca258f39c755adceada2b2e14342f9a3ab39c5ac074c9d46d139e2c85442029627c22f76fcd7bd7e76bd45d4fe300e26e5a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-x86_64/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-x86_64/zh-TW/firefox-59.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0e99176fbdd3809fb7fd7810fe64bedfb2545ed9acdbea7f72a77ae6eb57fc3abb8a491c63d5af46ad1057de196d7538d1436aaf497a32ee8fc71ebb756cc69c"; + sha512 = "132a920853d159b9c4713c85ae9b428c4f2b5b461dbed4e48606d7da1d82e4a3dd34bfa710b360a64196ce6852533a3fc99fe06ebb9edd7876297849907a71bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ach/firefox-59.0b12.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b98ef8e28148db58bee66490f2dc9ea596746335ca13aeac7f3d632326248a1cd5fe6a7dc977a9457e7f67b1fdc8543d4ab28554dc9df7cf413d7cb751bb9a1c"; + sha512 = "19f992b4c83bf0ccb81ab90bf3d988adf9dfd41aced30daec98f806a3b1a62a3bdd12db1e0fd36bbade9a6842aaf1b444a45b5cf283bec5e5c8361ee7aaf9524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/af/firefox-59.0b12.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "d4caedb1a904233af77cbd0d5e5a78e9b757a66ec94f77d2affdd78bd4796c3fefcffcf70f3eb216bf8969b246256c21524a24b6be5090a6b01f2895898d8142"; + sha512 = "e2942bba0c1de9f11bb1020e3794502af1726958fe8427e7cb74c6c718ba5b58d4f7fd714284dc494b7c556b0006bad42d65ddbba171c4f5fbbadf71a44d438d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/an/firefox-59.0b12.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d84dc052758b127cbaf7c2e4c3eb2213eb005dc7dd60ec4626face1b27322e0d1f64e26388aefdfb3a43d917ffcac7454574b475c275f46f46bdef3040d844af"; + sha512 = "ec90a184eaddc5289d5fcc727eae31d4a4fe2c372fefa831cfc2fbefe3b38ac694bd879d9bb211e6ae69909332cdf8ceed4b151fb93d1ec098fddcd446825ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ar/firefox-59.0b12.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d74200b02e5afd3d217c48308b4b09a27cad92feabd1bdaf9f1fdc7fd08df3cebc2b5f2b39de38aba13a2a34edede7c99e41c36eff88acbc4b62daf244197878"; + sha512 = "9a0e84e6c48e7417cd626a16d0378f0c061970a7736aa4998e84e5bc64d25a25a04f32cad6a687831d0f0efa50184afa529c11418c4b07d27c5e22783a538b78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/as/firefox-59.0b12.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "f8274da94a79078aae3d9ed1aaee007af76592e7fa267968d814f9964a20b99eea120c4aeedc6fa99a7483d7f8c8ac393ab26ae175802da81f80858c1ac324ec"; + sha512 = "9e1f3cc4245a71dcbd0ce362cd6dff4c8f89b4477d7400dfba22d4dc35db71abc3524f13413ad6e524671dae2cf76e0bf6a37f70b3d5585f53c26f611f9101bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ast/firefox-59.0b12.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2a9958e4472f2f38d30a695307b8fbaedc68267dd9ce543cce8c986119cc873013d3928fc438027693384e7b2d72f2407451b3dfb0d3e1409c625f1da80bf63c"; + sha512 = "7c4fb873538c056145f770baeb5d9e3d33884142bf5079f57e1e5d9356a808c7a3aa9205831f8395b635c7083be92638e6778fcca1e34839fdd9c9a1495c11bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/az/firefox-59.0b12.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a16bbce416f98e645063fd8ff10c724f8ea599155c2d9fd24c07e47900730d71e603139465e6d20ea565dc503377926e838de92cf202c79b207efadbcd5a012c"; + sha512 = "137aa3791db9211d534e5886951dab5c93eecdfd86833b096441533feea5054a4a935f73a6fa16945b220e4be7d7f012bd822c41d69c0fb005c9f4f4fe3242f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/be/firefox-59.0b12.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e16acf988b4089bff160011bfbb4729f7883a6f7646907afa44f99605b24faae5b264cd782fd4e7dbbbe9213dbcb6739b4f1d57fb403d2909ed044e8ab1ea50e"; + sha512 = "41fae12fcdcfa0dec5b9dc9edf3e2e48eae365b8941e7a9b5a18273f5b6355c406bd13a96598359e177310e87ee21994e61ceb01ef27cb138e0273395f084261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bg/firefox-59.0b12.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "24c8cc468f05de748f50e6d855079025206893d0ebeaa1d6ce95f3bd0623ce72e04233aeee27b375ab1ff7d42bec2e4223ea20f9e54f81821600e456f8d8e5b2"; + sha512 = "bca20f5dac228af16ba0ada416f55dbdd3c9059f0b03c41d7577cf0f04e6f6c63f5d1de1124ebb8ff0de90c982c7b35a3d7d1285a846e01247e2eb2b9546d15e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bn-BD/firefox-59.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "df83982e60936344ba5eff4b1266c9af7d3cdc8e1ea79ebcc69feec876712148f3945a05651c1517c71babb8839418ecdf277db78c1d52b9a9d0d6b5f6499881"; + sha512 = "9ead51360fe4833fd7907819a6e11a88362f03a849cc597c345efecdb30f389e9f1479761282d63c0d279ee586396dc4b4c1a287ee72dbead3c6c0a6a69d7bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bn-IN/firefox-59.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "878a9e4f7871656c935ee226f78c55132ef403342a4419fe6d83db90abc74700f35332ac25e4d4286f3d12cb1215b3e72b948a7ff38668ec58b2938c9d2d760a"; + sha512 = "e17dc49e7736afd71aa231d93ad405cca548608054b92aec966950099d5cf0de1585cecba26ab757f6cad23650ef1ffa0119e210696cd0551997cfb429093b14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/br/firefox-59.0b12.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "108a25a3233e0382477fe32a424ee333bbabdfd19b2226eedd42ec39192b76ea73105e6ec1940fc1fe791feba94681b942a8ced1da1c3050e9bdd9a3e9208007"; + sha512 = "372bf55aae3f8b82ea1a8dadf7153e0c10391393e81972c23fdca4fba61d10dc6ce43fbe6e93190e0a45987cb6bc12fe3bef1ae948a5d35805029b7a901f1264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/bs/firefox-59.0b12.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47dfe8708b8d61638289122bd37faa3e825a93cf2f3b1b8744ee6792688e2d881af5180c599131510a8fd01aee5cf4615002909b07120714921c8a0bda65c467"; + sha512 = "e21c10011842cd8ef41ed6dd1d864750161e177bfd834ffce3807e2eaa9a1dd479fd0c613fdf07086d50d02207d21447cb027498e649a5ea770222359d7e5f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ca/firefox-59.0b12.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "19aa45a4f1cdad6e526365b5e73546400adf14126220edd1818f2d4b7057213f2b84bc171516438cb17ce12142e5601c107fc43da754a7026cbe3d2b14633fdd"; + sha512 = "056e37e201b6f7b0511472bd8e126a3b23072bd19b0a83d55fb2f03960a78bd7800380e77e255b38f38b851d766e4c08ea429da49551619df9d144edb9576e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/cak/firefox-59.0b12.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ea5f9c626cffa8c7f3da891add01f329df780fd39e3e6fa1debc152cad21105eec118a8b5c0a7aa695d9b9132c8817a0fe430b1f462280092c4cfa66ecca9c6d"; + sha512 = "2e985686c3db0952045d6ad53d9bb9486f305fed3bc5129da7c571d3aa142fc51522463254a2346251705884bd28f96f19337f74cdfd70eb33b9ce4d96054a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/cs/firefox-59.0b12.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4f323128b30db5db79e3eec2d631e56e9978cd12920aedb29eb58d1a632a0a5a071cd70f0ca081d12a809d0e1eb2197f3337656b511ae0466f6ea1dfb9e47b9"; + sha512 = "4fa36d4af8891365e1731dc71134a3a5ceb3252dc99559e1c66ebd9033b31d05fbccf7bec974a97d6b184dd343e3f85081c0cbf387245cd31c33c5402f062a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/cy/firefox-59.0b12.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "89f06c767f249181e207e7de7d48bba09552f867952f4e93d2247f0061643fc4081db8358f06049c1939887278ff14d177ae36d2ffd96c9e0da8cc72570f1fed"; + sha512 = "e1e53929351f818d9e5d1849d5e0169ca9d6a76c34e837b3a1e9dd29374ae8b052c5393b5fbebf8f7e0e7af82956fa6d4c39aa0fe250d72ecb5aecd3f005abd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/da/firefox-59.0b12.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "008c5c4bed5dbc5cd4e0d503a013ebe8cc365b36e987e8c58437fd4edd99e160eb0c565f1f46c8c0f049a199bd5eec6ccc54e9a4b0e6a7a3431bfc0e75ce16ef"; + sha512 = "2fda22084391b97bc08a273f86be49c7630e280356db6599c78f118e44812964a8b2fb0061f08f2c39b8e0e65bc39b8d476005f28c8ad2f9535848469b84a5b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/de/firefox-59.0b12.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8b527ebc7f8b5905a97feeb955a8b9eaccce70967f40737b834bf6253024e784576c9e9c8e60cc346fcee2d13f33bba52b6079c6d9cdb2e34f1729b1a9e1652b"; + sha512 = "55a001654698044ea71e6ea6006c8d8ffcadcde643f129d1d8a5c0993efa7ed46b23ebb9571e9cbf475e341f6aa75d9431b4e66a3179261afaffc991bc37aec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/dsb/firefox-59.0b12.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2bffb16d886ae457b26fab9b1c75355928f67456cf643068a99bd51349d857b56215c9bb8458e45a5825e605436ef1b915a293b58863e55d3d512d285ea0478d"; + sha512 = "f5eaa97294743c981fdbbbefa1fc50c6e318b95e3cee13983efcfb3c8dd34c427d7f34316faab37c5e4bd2b75e05f57a694f4232efd5069025d504a610e85530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/el/firefox-59.0b12.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "20e3e6154252650ef9fcd4203c940857d366f62407db14ba1c822de83501906af854d5062a0f0bef9e8c27c721cb71f72bb6ee19fcf28af319f2e0dae0b2a60d"; + sha512 = "a0c5e5627b17e1e06732c73c457fa474c1ca150b3b1547514d7b52684d56399362365f87521e6b6d5b33c4360e571bace10924cb368809448a9c70aa1ebd9c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/en-GB/firefox-59.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0dd26f7b3db2907cbdc1dc600c6a56c09b1fefcffd768eb8328a51c2e171e8655d9abf56fcdab312f8084d6903578d3fb8e27ec1334a0d03dae28f06ce0c5276"; + sha512 = "48ad4c8f83b96953437478acfe20235a82792e6de81ce4c1a703483c88496e14946676483124b1effd27893cfe16cc23335ff587aab163b9d47a02b449af510f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/en-US/firefox-59.0b12.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f3ee82714a6ba5bafca51d89fff03c4d0d97051ab7110b1164734dcea843bf557b2b6c3ea39f5d890044f24162a01cbeb6bef1ff9c630eb27b56ef8e97463f4a"; + sha512 = "4d35d7dd10bf5602695b39f77f1c03e5f432ff1c583814e905b86199542bbc98f520603b34b1d2ab204c8bd6a042e57460f390002c438b892129c041a65a1f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/en-ZA/firefox-59.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "cd001c3c6307d0b5087cc9324ec6b144d337445f591552a839c6641c1522f40a63aae96596ee6c3acafac0a9a53b5a5e480f02c4c9928ba6ab8650e7f8cdd05b"; + sha512 = "1ef650ab59f4c821e2c6536a95fe842f69a9fccc39ceaaaffaa92cb3ec36e2d5efd1e18cf187d393ff7a480c87f0e0dcc49503f09a62b126093a40594c31002e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/eo/firefox-59.0b12.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a5e7b7a5f1363d1d2ba47ee573c55a15d4295532221e669d4b17ea0466d532a78e059ebfd358ffbfbc1c2ae72b28c99c3272f855e427576dbbddc0e2c887f701"; + sha512 = "ea349110d62e391ca707658a1dbd83719b763953867ac4a67af28df7fe9fb0d54741f937e13dec46c3670eb6e9e6692d928c01b93f6b999f56e9d7e2d789db42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-AR/firefox-59.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "79c26f3a3fae3da70c751cc54d99c79e960c2a0c69ce69ce0b732fe22148b40b3ef1df01da593d514ca47d5832e003fe960d73425f6a05fdef2269caa81c0263"; + sha512 = "5e3791e89c3fd6c3019d7920b30fe9941c985805fcf5f7b8eb5bd565bd5de74379b9612252e3afceebcefeb27792e917121d21c98d12a20eb7e0de02d6234733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-CL/firefox-59.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c0333ecfe5cc92b9facf6f87497b5f23ca18eb2819e12c950bef6c3b394c9e9f2f160af06abaf131a662322cf708b07a840d1aff8b8d8c4e3ba4143a920f4888"; + sha512 = "20cfb102e58b59af0ea765d15b3dd658e9cba674a854e616c34dd158a695fff28a7260148199773460a3618b661e3de29c514a946aa1f546c935031493caeff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-ES/firefox-59.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6e050fd6bb081fc732e04928478a89646934283ab20c25f4484fdfc8d018da32c5b87f4916942ae4d8a649bac43063519a38f90f92ca0d28c077d5637847e381"; + sha512 = "f628ca64290a37769ec10780633dfc22f80bdfaf3054e0a3b6c0d8c8e4721dab405515ac588a101912082f050263d44ec8009ba2e97a9d5707a598d95115e1c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/es-MX/firefox-59.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "6d7901d5e59ea8a8eff600005a0b49ec4a0d66363d85c25d8870faee70078aeb396fa7a83ac5d465919d0bc32409d6b37829edebdc0a06c44bd764fd3c26831a"; + sha512 = "159aefa0be24137a29e6d41acc6ca31949e8d2c04f7b1a4207d07a081569867131ac55208effda80245f7aff58627a6e4c1750f870d369685e27efb582e6f0c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/et/firefox-59.0b12.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3e912ebabd17061bce56b3899b47ee2510bdaf530d73f4350fe98c60dc21f76b46e2484e02581ebe48b4fe57c0ccd5683d9e7e7a5c75e1bed4e43856613c26f3"; + sha512 = "67420de67c8b36ec17ecacf552928094adcf16eaff89acc68d02c4ca13221c0b875476efdf8ffc6ed7c940e06686399da969e85deefe56357c8c5e563e0d8f58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/eu/firefox-59.0b12.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ae776bf858dcb545ed000cd76b12650bc2753fd674f553e5231cb9699d00ae0a444ea04ae54a36abf05c4c8bb826098dfa516a0884b7626448727bb9fa01d20e"; + sha512 = "6ea39915cf9f11609680a94989694c9f5148bf4d2df51c9a6be0d4dae22c63ee59bb3a67dba51c4a73572795be8a54d129da847c9cb086803f88b53cb239f859"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fa/firefox-59.0b12.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "53752951301ad68f85b05301041886b06970971c7fba90fffcd8bd1c988401d1fdf91bb3c254a148ef2f614cb48595572efe6c0c1a5888feaf8aebb38771ccc5"; + sha512 = "0b0578bf25c7ff6f8f2240645d1108b4f62178975a894d986694c51cd31dd38ff2a50a8cdddb655eff78a6d2daff9072da7edca0cd0a158dd433ca5627425062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ff/firefox-59.0b12.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b1ea20edf1d179714fdd64395eae1252a51664ad407fddeace0e09d38f8a54f2180e5cdaae79d80dec8007a3a97b382da8a61843a615c853bb0e48c18c639122"; + sha512 = "fe9f1f20a8d16a495cf3d1d73abf47adbded5b083f2e2daedfeb200766cef6fcd3e83795edb1f6fc87e38057eb1b43c9a68b19d4ccf2b5cec91ab1b8a44c5347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fi/firefox-59.0b12.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e36087e3b026c3a83951969e562539898d3e12f8a4b996e9bda02c4a2cd934f92bbc7808b478cc431e47d9ff206270b484f34fd30a6a8264eac09fc81d10788f"; + sha512 = "73d7c5691dc4a7f2daacbb54d13f8e3fe99e61563c7342266a6b43b0a98664ddb58d10b3acf5efaa3e27b02f1027aba4297deb177c1cf47fb3e4a8a54f458b5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fr/firefox-59.0b12.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4a4b653865bf2cef107a52eea796e58a39fd6565654d61b3658a3af9d91f6dd9351a8669b916fbea855c4661f9db5a2e7d003dd2fada9d6f3f76a6e4d1dfd431"; + sha512 = "b262150f25ee37064c0e2dc72acb8c35905032ead049ed436fd8c3dcdc3476717e6f3338ce21200862af1d6bd2a55fad87e7f7cb48da8937e8fb20f43949541c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/fy-NL/firefox-59.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7cf956dcb909f26827d1f97ef4f4165f4793bc0836ca40291f963571557f3d008c2704c0aa7d407563afd5dded2bc261d9ebc49026a76fff420fde3b19892422"; + sha512 = "94ac090ced43398681481634f7e3691d307f7059e44ef7cceddd969711c7f7160a046c6cf752c8dc7ebeed75e5b0aea542550295ea9858df0c4764a85140a204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ga-IE/firefox-59.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bf12342349050f63d0638cef84e81974ee2af5b1bcf7d0a86d9222d161a1affa45dbf99d9e6f17dac82a67c7f63688973569bf58ca70c625a552ee5f1ded5eb0"; + sha512 = "7ca79b03ed78de62fa5aee9e485cd7260cdb90cff649d9fdf4e7b25cfe0fd5bd2ee5a5f199e658f9f0ed53c28ff475bebb167dbed70c35e9ae16ddbe5694ca93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gd/firefox-59.0b12.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "959828de66c70b15d1afc4dc224ab01ee370a9e935acf83b1cac2322005cb294a5b5d59356cc5f0ce3382534e440b8aec319b10af75ed5bcd76b2f1d0f2112ea"; + sha512 = "52a0c53b8a4f1c8a83781ac8ff2a13306509f0dc8da4239299c907887fbce49aa72468c9c66b6f1bc3105022f4d54e83420016dfe0bde9e3561f07f208115652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gl/firefox-59.0b12.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c20f84fc26ec76e55132639b299f2d41ad1e4b4e68e888395c2575b81004d0748a97b1f3e1f9b04c96f83f8ab0bfcfd601d806165549e26e71868c2522c92cc4"; + sha512 = "b28f4918fd530d9f60e3be5675afaa03d34910051b921dff649184df95bdc4a61264c86e5a150cd8c91a2af7de90c514c1697c8d39bd5186b2bb5cbaa2418af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gn/firefox-59.0b12.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd708bd6d56e3cc3e87b44b6c01a0fdf26b6bf32c57ab96d50a87a58c75e102ee956dc5e809e93130532f815b1d54ee09200e518a30e042a3ba409c3a02b3eba"; + sha512 = "b9814ceb521cada0b0104e1e67fb8ab1f9c60d5e060aaf8bc41103135836808dbf7828f1de56db14d27658f9d2b396e8fafd80d8e0af9546497ff1e4562ffe41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/gu-IN/firefox-59.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "968cad1094e728264f4f97efc5e0f26d014553632248841c67d8f704d3c5926dcab21d5bb748a67bf04caecf587b178bfd236af2db15b953ca5b2d5d1c7e5384"; + sha512 = "8b8d318c6582cc92e17187fd4b965c0b86ecd62babc81d40bfd605d3e40dd748575452149fd6c8b9030d1fbab27b1f7e6048030150ac4a9d4f057cc398f6c7be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/he/firefox-59.0b12.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e209b137371be9a5a833c9821d80b938fc4213f78f4be3135f904aa58f3ca10f13510939a8c6271adb9d7aaa62dd0089bc05343b67c510678d57e14e850c8389"; + sha512 = "030f7c6e6973fd46f6afbd42edb50d71e18bfc99214705ac90b8201382fdc39175a2b8056de87517e1aafc0037460a398943538e1547282d3480e71bfa736d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hi-IN/firefox-59.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f25073c665a37454c8ae34404c83409dc17b8f851b3555f0cb57866eb80924fcb8028d4c401b1ddbd548d15d9e4b40eae467dd28930ee19e89ae314cd6c4bf0f"; + sha512 = "bd4423f60836ae696f76547838427aa1db63d96e949829f0cca17b6a57b2f5c812580439c1305764b1f3dc9f1989d8d12c31c564c5065a2a67ef71204f8962f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hr/firefox-59.0b12.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f8a4c2d533c7e9d0010058eeee1ffb9157334b2d9f6130bfb05ad2bda4a32db10a56627f44ced77bb00ab7ec71fa8817bf100b623250dd6e06d790497d71d5b0"; + sha512 = "49b07d74c0ff293ac634c4e5517e2a6c26d98f34b40827c6de5cb08c6f151bd8379f8a106fa5bfc391f90cb49d0e5188c507444483e91cb1e01acdd888fdded9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hsb/firefox-59.0b12.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7349923767652d9d8a8d00b13428e8df29c284fcdeadeb59a8bf9df272575392f7620eff189c4ed2e07f8fa4b231a3fbd421373b5b2266faad62aca8fb45f1cc"; + sha512 = "7f1616f5876993586e2852eec3e39f801a1b96ee0a13758142047fb5df4b2c4874bb9c6dde75b2bb96582476c1bd546fd4a0fba3f9ef67d8f03779e8a678f51b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hu/firefox-59.0b12.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "66d205670538c0e0e6986b661462263a62c4276be995fe51a802b9fbd57085a00b6ebd1afe956f464aa06fc7f2eb1228f1376e00580a1a958136e3b876f76f7d"; + sha512 = "51a7b57968f11f22820a11b6ce71113f9d831cea57ceb766d33454b6b2d3f5512ea6548c3df6cb32dbe9e6e4a32e54e1946c6bc662c8b95bb8b4a4aff736d6c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/hy-AM/firefox-59.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ebce2ddcccd5c8cb3da57676ff89270465734306e9132cfb8414b22d7a30451d8b45222944a59efef088979acd272f434a64f0bd1689b91333e3d0b8fb4257a7"; + sha512 = "9cc7e5bdcd6e52a9a0e633b376b144ca77380ff948f69d19b37b011c072dda4c4cc83ebba7331d96eea3f678ad9ade3e32bac95fd2d5523718fef508d3cd4b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ia/firefox-59.0b12.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e3ff0946659cf0fb6bdafd0d322c1aaf6ebaa17c46375dc27e06c014505ccc0f07b601ba5a13b831eeb6be11dff592f13600884c8cb30a94bf324f41526db3fc"; + sha512 = "ffd1e8f96ad053e4dd6431f2d4869432156acb77965ec52be1cbe66bbfcc80cbde89cdab061b9994ba6586c73f5c5b92330ec11e02fa7c715a995aa89a6c5e13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/id/firefox-59.0b12.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b8032081d2bb40398a0689c620d0cb8159530718fc66241df3b4bf09976fc98fd54c6a4c82585f04f9d906e1a12858499dbf14f622ff7099ac3132a6c264e80e"; + sha512 = "25c406c5324ef17f8521eccd9774c689222d3922fb5980d45a414b25b4786b5ff430ea9aeef85024eb2bbfe4cc4c33767597ea5e748ae440db51a55262fdb01e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/is/firefox-59.0b12.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1c6bbbca91ad5f3cae5f7bb990807470819be84a4d69276554e179d0edf2f752964e50c8dceda54bd8b32cbd4da10c860b8620bc5adfb693c5df5da0ad1173c5"; + sha512 = "7f58dfa8b716b5df3055d87723ebb62a3b1fea4a8490fff1d3a7343ae542ad68b2b0026f71ac3358bf01ad4906a2ec0674b7f902f056f108b810311f071bd099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/it/firefox-59.0b12.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1325b6f7cdf02dd33dd7a83372d66417325a74d09fe523d894d2ae10c8484ef459cfd160e1ec93c638ac9929f48e363b9da3e05715644802857f1ecde6657d13"; + sha512 = "e8deb322f6c6b843a3375db40633dae5d951e29321bce83758df76a1a3407bda4b0bffcf5d8ad83bef14ed518d7524324de1147db0dddfa3146b23636722b780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ja/firefox-59.0b12.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2fa743ccfd571bedca7b3798aa1fbeaf5bc44374a22c6926e0bb7079a41ea9829d62c84015caae6a6b4e0b39ab46fe8a68d1244f15effabfc74b1a9928209d7e"; + sha512 = "fa1040a763f8a39efaf84b4a1fe2c828013e321acd3ea583b4f168297b4eb91b2b34304eb2d8460afd4cafae279f91c57c207bf7e0d13bfbf79fa1990dd07abb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ka/firefox-59.0b12.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9e7afb40a0bed3c49a315c8fb886464b1d3c6703ec02ff33168e41b7d4320471221e428fd46e3a3d3831dd5bfddec6dbf0f86e3de466159a6c2202c3d2708402"; + sha512 = "1456d1cd74ad2b2670e5f4b9e9d508c4d09745eee4b91bcede239b68a34eb6e4dd886d1faa71b9e2400e792a5a83a3523f69e5c0e61e9fe1b042aeb7f36164dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/kab/firefox-59.0b12.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f9bb72163ffd63c705286dedcbb3fbe4c853cf6c863ba2a1df9e686a8e52fe877ddf55ee58fbb49667e43af3f1870b6bb67c3c8f45b85081c328a4c4a0717ed6"; + sha512 = "9e4396777582b9c225c5b856ea210a3a74b7aaed2298132da308553f6283e6b7982f7e8c85cacafba8190565c714618a9c993f80bf65c13294483ab781888788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/kk/firefox-59.0b12.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "ba7f103a5aab139950a1db8ec433ede6e8211d333276f30ee3870046ae9194ce291e291f408ce91c2e1379efd4c5010a2af4e1f39c83b80a6e6c3f414e3edada"; + sha512 = "70dbec454af08d1f09e8cb98e7c6ef58a7be49dc27008f0e7ebc7fb1fcef498a6b23543a813906d95b05aa48d8fb465b7e3512c2b274592cca05f2778110a63f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/km/firefox-59.0b12.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "bc4c924bd0865a0c3ff8d28a9ab3e3cde2238a647257b2f4ebf4ae7980a53a89bfa5b70d6bf18ad4de4af3f17774393330ad15ab7862f2654688cf481a5344d7"; + sha512 = "e7573a67fe1e572e90dc2ca466da8c86381c0d3b2aca9ae999ffab53337e312487b30b174b34c759816de89561509fc588dcd07a7c19cd28f35424142155e954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/kn/firefox-59.0b12.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0d04a46a8b965edce1be1c3195c7a6839f1c5550e9f07b10379ea64bbefcd7248748262b1eb00bbf1a14c8aa40355c4577408cec689aec4f2238ab9f7dec88d5"; + sha512 = "f843ea108a5421af409d4de4f7b23e279cc7123a2729c42ccbefe3e1883041525bb8688d98cc9ca0e541e570e159e29a7bba251896490b82fbe1ed3f19bd630b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ko/firefox-59.0b12.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "44141c817165c32f6f16b50f2592bf531a32c29075baa7575e41f3746467575b6df8e1535bee6cd72744a9a8e6b28b34f9c9cee381fb5a19434606c34f25fb7f"; + sha512 = "6e9bb9faac92f4bcd81a1b1bf2eaa3676eac7b5fd327c0a1f7acaa920adc8f507946aa6e9bf7ae9b2f51a61804a69b36c101571e938a4af3fd83b89513ae1183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/lij/firefox-59.0b12.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0781f6b5caa3b8f7c535f928d08450aebfb5edefb83e6660d188e6df90f53619d3703cb299e8fdec5bb97d2127a94f0e80d48e3f27ee32e7b3458403a0d402f5"; + sha512 = "89fa09f1738c44d43cc328e806d3cc90a78da56731bd1a3d1789090a27cead1de1358f14ff5613e84939366b341fc32cfed5b8040af5173633d5e09d3ffc5b2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/lt/firefox-59.0b12.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "80a8d5b244a42493ede5331c6f5370e7966ec6fbcd964c32fdb9e20dbcf89f3c34d21195a45c5197650d4a3be6492af5b18e30de3b4bdda00c8dff627af6e5c6"; + sha512 = "f56417b8ae3e2e5343e4289fb18718eb25984f1eda4958706ab2d23a940032b16dc1b3cac556a735b34b50c8d9dddfd201db20e86799a42bf0b3bf07c9cdf425"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/lv/firefox-59.0b12.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "39cc0a4d68154f860c8a6bf2062584d94ea6491edfde4069c764eef4dabbdffcfe66773917c51ff33a633861a0ba29272471355ffce8256a28908cd8e0fa935d"; + sha512 = "e1418fac0a563c00f0654d5e2fe46badc260f4f92b272d69cb96e1cde822a068420268617f2099b30ef7f777575cc66dd9fc6bb2823d882c7683b30b0402013d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/mai/firefox-59.0b12.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "92955f4b41fc65c3c6e926a5fdad99a0d9bca32bee5cfcbd1c326cf05e35d685f5d1d1c57a2040c926b831be9827db9222bedf2cb496f340f77f4f400081de2c"; + sha512 = "5dd4c15027a2a1468d0c60b57ee35cdb7ded3ea15326a7bbc5712698cc58d0e1a3ef65ec360620b075e78dec3068a4035ed4303edcb8c1ee20de2b0ee00ec726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/mk/firefox-59.0b12.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f57cac6c0214a958d1648fbd43a54a8580e6f7ad046b11470b5d3c9f8cfae34225534928bd2ad3aea9967277ce10f18c3f0301a9b9c38e3dad872b27ffb10a94"; + sha512 = "1010989d15299a581cf5a13c3ae9ec8a12e04a8fffda16368e09fe0b883991465040070456ab1a0eb4cb903b8aa32e20f3ffcd8c4d5d49c757a267f3177f2ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ml/firefox-59.0b12.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "81cc17c6466db2ae0fc28be10826069091a1d06979363bf67ffa0459d6d6f5c93c48e98ca4faf6471d8502c3f455feff0e3e7335ca27a9d0ea3b81d1bd94e555"; + sha512 = "6191f6b956c4d76c591deb7057799e2e74fe22be4f1c3802780e8668d7133b27ffea1b60c8ef4f11211a8c735c1d3bc482e654f6d7645dfc6ff1d010cc32ad67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/mr/firefox-59.0b12.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b8d0c5061dd6a916d6b4415ac0dbfca7d9fb750892015095880356e1240bb6b8e72e544e6db98799a52a0107901a6b49ac19489e8ef6c5ed91864594dec190e2"; + sha512 = "a82a3a32ab2b4115b0b971b7f5999d3d640e5dc3d4c5dfb2ac70692523fcd84918938e974fb16e7789d6d22d12f0d328b285e3fa6982303e558569703d5f36fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ms/firefox-59.0b12.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3a084c3e2298a7181011b879afa07317bb4d7b963adfecb5b41afadd5c6c746c3dca0dd4135fcdaac84b3d8273e8b93f401ba7474da77aa4cae434d86cd47cf0"; + sha512 = "b75c48831d82717a69763fc8a2e6abbe08c421865eba659c6c3e341da552cff25a00f7442cf041913364eac4c3c8010a0aefc5617d824bb4902116e58c913846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/my/firefox-59.0b12.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0de79e2d0e0bd3260d0903f69a3c86de2304b7f27c6c6d216d644f8c0a853f5dccb01839a7f5dfb9a27f507d43cf71bd243826c7ebb2705006deed35b738eb8d"; + sha512 = "1409b5db535f8580628812cdecb03e80ce9c8c4b7a493b4289448383e1292807f8dc4eeba538d0144ddf561d0634ed8d680d0e4fc3aacf4f85e12941c6e172e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/nb-NO/firefox-59.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5e8b71ac547cb914c668bf7eb2ebdebe6757f5dee906a5993866e761b500869e8af5da37403ea46986f44ff990d677ae132049099392981fc954ec60691aa14c"; + sha512 = "11e06f45cf7a1e2adbe1b0a2ba5b59239cb75917754d251f07ac4e4a403c7457f2953af4a4fe5f06409c1b34b0d56b1104487e22819d3b0a5b4c9bf0f8b5b5e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ne-NP/firefox-59.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d153e1302594b2244f5d603be66e2dbc1e531458191a550563ab28eb89898b317c6a06bfde92b50e6b01a9a8f3cb06a5c611fb8d99f6a82ce2e86c0024eba7a9"; + sha512 = "4ac6af943e4f43498f9d5d5f69324c05abb05b0821d9e083e4469846893c8dc2938e1becf59d19591c3f74dd37d8bbb609fdc2ad80573389b2e23481fd505472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/nl/firefox-59.0b12.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7de66e82c057f7b1d1c89ead7641cb9d9a811742606c864d22142566b99420fcee57b2f54759daefd02429a037832e4f1a55606e2be9a90586f4b9053267024d"; + sha512 = "eec10e6f508adb9f8900ec129ef3491c7968f235f1cb7b260b472f8831d1d250392c77d61455bb86040d3009a127e6b2f5831be8507456f555fa8ab903f3c887"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/nn-NO/firefox-59.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "99ed4ae5a3cd291fde33fbf56d93afeb076da9759df985779e5378b39703c61fb0979c7ba32a134ad9657251a56aaeb5a170f03909d964d9a2ed5f19f30640ae"; + sha512 = "db0b18d20529288a38bc91d2f37c4dd1dbbace9c88ac86e0668a559051d070291f4df0e27bb7f757766cce7db5a637ccc3d40664736fdfdb0bae6ed0871b4c16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/or/firefox-59.0b12.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3969df7368dde47a62f9c1ff806afd5c101c2094580db904c857fc8d9fd6077fc9b3e60011d827e92bd87c7ff0ce5a7a21db1e728eb7bf953b604beb2fa3cb46"; + sha512 = "4ece66e3d89847381bf3577c817dcfa38a6f250d09d880e6932c5c088e2947c0aae076f880cc5764ecbbe0bd78f8108160352cd5730666f7c1d7c6c60ac27d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pa-IN/firefox-59.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c98ffb3b939eeeefe9f6f2e9c8406427561ae3a9cf067e0e5ee8334f2901c527298079666a7f376604765c66381211d04c04284ea4a19c881f8e73cc94f1cf72"; + sha512 = "bd32b6fda55490e16fdb2e3fe01778e469de82b0298a74a53d165d67b77f74f8ae8002deb4bcfd4aa6c56068d91ca2563800a054269812e904207ee796e04d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pl/firefox-59.0b12.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "40631417b2e99ec4b546491be975012192ec4f69a4db349a22672d64484544c13874663cd19c2c19ba92b8dbddc02e898fe1cfbc3c18d4212a1027b740a26936"; + sha512 = "0361d68cab2375cf6c23cc0f32adf26e5ed4971d69f35846a027a09c067351de4cd493045d772f3f5be251828eebf6b8c44c7a6fa96ae28e42d30b6af1b96f8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pt-BR/firefox-59.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "a2d5877bf5aec74c14975ba6bee84b12c88aa28644d3ff4bd27e1179c26f3f5b808244a3b20c536c678bdc982c3d73a8da2ea5266487f42134cbcfff8db733c5"; + sha512 = "bd1e7513c3dea9c4687f73b25a84397d49054ef0453676e5a3ee9ed4b605713f44da213b2933677e1d130f7bd6018cc49157eb6433695ed3197122a0127d50e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/pt-PT/firefox-59.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d69182e5591ba76ceec47b83095460df45364daf0d6e7cf21dcee3a1bff6942ea2abad7f13a0fd4544399cd037ffca89dadf90059da4a447386ffa86eee2420e"; + sha512 = "d4c6f9ec0a9af683953d9e9b7857b29ecf1cd91c881bfea26f544f1ce8c39d6a53baf1a69a415ebf8f5c8ed74fd5cbc10e17c4ba8e71227e9512e604b9aebf93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/rm/firefox-59.0b12.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "32b46a34d5b703c5b6edcb8e2503101ee064364a14ba856e5c48d5c8df51962b56100cc5b61c8437ab0ff2f1e900ee0e34571c4efc8253419c2523304623e0d3"; + sha512 = "e3429d1c53ed64c21158229fb446913d3901343f5d7f1e6145a3a0c7ca8eea384436162af88025612e5176221c52efc30de27296c30529a12689da2b6f46d08d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ro/firefox-59.0b12.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f86a41c5c1c7d85a6efe7fd47301e0a5f35be16b0d88491912bc20de8b77162d7ba00b1abe65fa84b7b72c6f85371994b654c6dfdc6056800fb07ddbd8a4b401"; + sha512 = "4837f0819c646b85271da39cb97b1b8d4fad98c3960b5f11350a6e84e76900c5d71a91ce873709833e20462627f08d1c8f0d9cc29d31fcec7b9961155c2361a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ru/firefox-59.0b12.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "a13aa6b8f6daa1e235a450b0bf3b19c78a58d8eb9fb2c1d627e2de22ece41b82176430f8aee3d5a9b4aa291cafcf74183642bcc7ad48d4d97f093cd1f37c2295"; + sha512 = "83afab121109fad7543a936540f74e7bf7274fd111e6c3bbb5fd18ddbdd6355ba655c79c567c082f98d8cb9286b60ca85cf787d02b7781d171f2f507f04622be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/si/firefox-59.0b12.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "96d29e93d36edab9b3bf5674aa770d1ea5a4220d4dbb084e339d519a6ca459f12acbb188e118b162bc97dbe18e2ce0204b2256ec353991281808e189a436e570"; + sha512 = "2d1722a5ff66a5f9e0451f79aa876368fdf4722024c14d4425c709febc9d503229a4b7f74b29533ed1ff3f9f7288156f372e2b73bde7d4d609b44f5ebbc9ef50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sk/firefox-59.0b12.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6e6a82d1993d880fb2bbd557307b71880cdd4e7065447755fdf1d1bd0a87a82e1a5026a3da0ee7b403bd6c263d963a0d10faa6bc935cd90fb22f7a6f13c3e6f8"; + sha512 = "d46def7cd726aa677a6279b049fd590bfbbfe1ba095dca81599b53ceb20c2588d1635ba16e6ac9cd600b05722250cca80c8b3158a9efae46e85f4ebf05d4a54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sl/firefox-59.0b12.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a65e9815f2ce6994a7562598016755a228ec3cf50048b97a9b7c553fb04c09fdca6bbe99f83a2a32e39a2ffe89dfd8e43aa92e405e50bb641d54778df2de1f0c"; + sha512 = "1e4f059ebdc0056e8db15f5e669dbb4bd2a3f1ea11fdb9e3a1d733ead324416ba4f5a2ae3be8e7623f205a8c6c55ef50e2aa4d1e18bfcb36644b092f5e2ecd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/son/firefox-59.0b12.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a5748561851a9b06e41411723216132b5d92b8153a7559b0e16de7dc7170c12f9714ad0a27e7c37c2bc6dc8a82b1887cfb87591d92ad1437f782314d9a0187a9"; + sha512 = "0c2200c882b5c78a76e58f11354cc67ca0091da6670693803f659bded98ac03ae9944dc38b174ab4dbfd8c00e8bdb74acfc88d37633d4979b41ca45091171865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sq/firefox-59.0b12.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e88dd7eed9882e47905d2e2a10b3d12572644eaa9d7b3ed91e6973cfcbef3a42a7ab3c4683ced33fdb89a8c5257bafbd09728c43f61a665eecb61e908cb56c5f"; + sha512 = "b44b8f2bbd58e78a2e0b7d10248e53274fa2021741646e65a98210e8454fcf2f59369ff568e9df0aaac3aab152d19bdebdfb1dc860864d3d1a57bbda760096c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sr/firefox-59.0b12.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ec3d240e6ad2f1052aab917c840da3afced7762e49aab68b4a131765934aeac6edeffa7dbc381890736260bda4ea5c8d189913661b2fa8b529b49c9c8611a6f8"; + sha512 = "954ae4a9e3aef24389b10b2439c11b6cdbd035e2909cf52961d8547fc4c801c88568d337b3b05ae6c51a9ed8646bff75adf8c3f9985df6cd36d9517c2e55ccd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/sv-SE/firefox-59.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "d39abc95ebf6c35abe223302c77b2ccc31f82dd111388d813344686eaa156c402df1ba7b6f80d8c4c69d4738a6159326c96d7eaf4d73740bd84dd4801bfbdb2f"; + sha512 = "c0abcbfaa65140d6b39794f49ac80330e9cfe67cb4c802dc99390ab91701ba19c5e7cb54e7502f8c04af9caa0c99a476deb6d7c58e1ee3d45daa2a45b274f15e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ta/firefox-59.0b12.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2ceed73689f05c535698f768c3ddd99046ac82117ac15010b60cb1575335c48708607ec8d173ad35096b0a04bc74bde33d1edc1d1b29e5a0a1877e2caee73c48"; + sha512 = "437430892223927941fa1b38c48115afca0848b2a0a0f035b8f14feae3d24afd5a33048d62054a4de3c67182f3db32a58bf53e74c1ef75aaa93683fd256771b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/te/firefox-59.0b12.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7321023b94a3cb251cca32d492e3583a50bd6ca117851848ae075b2e5f0f9d345aa5e9d26c6e1c97d06f04b663f1cea25a501d3d643eb8783aeec52dfeef857c"; + sha512 = "c79572d1ffdc55197f6e6fea56904c00341886c2ee45489914f32eb42824d2f21ddae34ad6549328e07ac86a862cd19df315952a1d61e05ead994bfcf50db9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/th/firefox-59.0b12.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6641339942984ee1e8bfbd9b5f2e70f4b1cc94520967432271e6c750081df673b06fac1012915601499074c5f8361da6eb843bc996a01b7ed85834d47db3758e"; + sha512 = "e2e707cefd47863a00fcfa2e0353cab988e2bc3b9e263b15ac19a34b467ceef6dc97805fed5942cf645779e32146ccae17b13092042240d8524fea45dc707c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/tr/firefox-59.0b12.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3448b624d980caf109daef94dc037a3256c804aa2014d2d4ddd6ff4d6d2bc1588aebb0f1c7524a9572ca247ee37e835ca34df70b124142d627ba5c23db06ed47"; + sha512 = "02f7db82833aedc163301f413f83919de6488e92bacb2571701f4cc74c8858abae39822a9cd4c289d3c2f632669fa07c10f9db0867edf016305b48c7e4cc19d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/uk/firefox-59.0b12.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7e12823066607c5cd53e1a310fa9952760b5213a7baf0c375e107441532612a39d114b528c3d341745b45c19a808d85e21d9a326b855bc6639395f46d1833a0f"; + sha512 = "8ec5bf4f4ff8726fe2905447558a8b39d817e71640d2aa3914925e09ccd401c6a02da4535f2bd1d25043a7d59bcaee80cbb1231b8c4030295fd36ad6118ae16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/ur/firefox-59.0b12.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9cf39d4a2fe34a55fb3a445d2fab33e2d56710696c55f6d92e7b61e58143d6895fc43bee2271fa0631ee18e22a3d0a601ee60f4d595e26429e6cf82eeab2881f"; + sha512 = "f48602af1e8250fd9b2e24a93c3ba391c700206890955f4278bb538555b411a2b41eaab0b4b169492f57e938ba2a96c1733810558a3807f81a4cf4bccfdd2c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/uz/firefox-59.0b12.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2be0c1b0c205a43bb018bf7a8e6a0b015183b8c28086f2f7475078da57d7a63b53989702b05833a32cebe3e69145510e51a2091e6529bbea13e04de017f68529"; + sha512 = "7783dcc48245f66b75bcd6ebdc494a1846051e0b175c01fc0e55645c379ae1b94e6908aec1896a76cadea5f5384ff4e2c569d77ff32921217829090b78a85f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/vi/firefox-59.0b12.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1e7edd38f3a7f4a31d02bb2c3f2672ed505890c7909353cee82956bfa2651a66b2b4c564748a6f6da228fb2c015e3ad4da70cb40c6e680e2d7df8d9ccdbda51e"; + sha512 = "4d67cb69465e8a254c26d8ad1e44aa3303601d567b1bbeafd8833256501f68d78b1eeb17fe8911a8e1419a70fb33269be53a264d8a9aab2c2c43e66b272afdd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/xh/firefox-59.0b12.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "59a5948b986d699e1eecabf3fa413fa3a1f8ef026c2546ff67ead161d577e2f66919239a002f25d21a8ee2e407b7d31b4a1c7e9e5cf63436c8e079885978c804"; + sha512 = "1c8349853afa7b6daf5e5ebca92ee0627a531546e76a0967934e5f57c3b0d32578ebd4bea82ebab4eb289904666254c7e4543768739e8e8608c406761aa89c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/zh-CN/firefox-59.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "66bfd09feadfb609106301690276acce840779dcddbf230992654a8b542c7287448c7e03f32779ad2d3368ab346945b6c5bcb8ca521a11716ed2ccee7411e221"; + sha512 = "645836c722a15e69606252aee00181ecce3ded146cdee5991a63d601f77371760e7e71b021b13a0150e204b628f58c4a2c3ceaac718382246020b3fb38c62232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b11/linux-i686/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b12/linux-i686/zh-TW/firefox-59.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "120811946f1070f710ea761c1d73afab2eb8c8147c73e062982f3bff6a7898170e7b2b47c8599ee00c745e0bfb9e48c5e6b544482d38807b7047129d4c185e11"; + sha512 = "4b1f2e81b76f280cca25100f2a6bd52d62adeb5d3dba58a18a8812efd4f23a97d38c86b40777a6ba6f8e2d69e50d043950d4be5b2e3f1e4c2cca61e9037508dd"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 347ceba9ab4a..c1a440009b8f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -4,7 +4,7 @@ , cairo , curl , cups -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -92,7 +92,7 @@ stdenv.mkDerivation { cairo curl cups - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -115,7 +115,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index c2b867beb3e9..ccabbce2c1c8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,975 @@ { - version = "59.0b11"; + version = "59.0b12"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ach/firefox-59.0b12.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "81368baaad6be4496f71572a72eaab3f4feb9e6b75912acd8088b9532e08c90129e03ac6358fe932cda97ed709befeb961ddfb6e5e200a5cdd16f99f99c464e7"; + sha512 = "76b5f6dd1202673f2fa56fc53bb727ce20eb8b9a15590044affa07a24a15d845ebcee129579a56da913b7ef297528f4a45b88c8ef0ff6ebf23bd82a017b85439"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/af/firefox-59.0b12.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "bf8aad24962923522db88384ac84777b7ca50e25043c3e12cb6ef68ce526450d0a95306db42fdd3c08dcb2b9bfb48729150080616d2839e16acdd0ae548bf152"; + sha512 = "835739b8f0f89245b1fad9c74836d7249bb6021527a42e646d937fdc88b69c7a4c773874cd15e5a297d6d71286970b839bffce12077a0df0b8e6f0b96cf43ffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/an/firefox-59.0b12.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ecab3ee9d4df2beaa6dfa1f9519b3e5dddb2a573a6fb8084db5b285987ecc88b543c006064798cfb10b66a64d44e64e388f783e590ba98ed666973e5eaef7cc9"; + sha512 = "1f10dd87ff48f28934336b6fb5c3f1a34c7a15c431e44230f87515b114e86213ecce7be15886c857574d2eb20a3e809f3a7b63e69afd265d23562ca795f62ba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ar/firefox-59.0b12.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "10225de3404ccd60bcae5e283960551c16274aaaaea9695d5efa03f9e0b8eb0f52b4dd245cb6db99d11c9a3c4c614d8382a8e65348dc09fe4c2c33e02b144264"; + sha512 = "ea5dde04df8c2cbebb79e973ed4829a530ffff174922918965b6c69c0e1ff3debb3387a93ac6f75042daf261b678340c1d63c766199b235642e7c9cae99ccecd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/as/firefox-59.0b12.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "324df2949c740aba66fb5afe7b461c3d8efdd3f35b4dd9cffb5abed40ef9a7eb3eddf396fa3b48bf70958b6ba19e63caab1dbb5245b2c48598afca471dd635bb"; + sha512 = "f60dadd2c7d6a0fe96ddb9616810255387161e13b9a996e664c1041bb7c71807d5d0437368a2dc4ab88e70fbf61f4d1ac39efbf4e4dccde7ee46fc19bbd95d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ast/firefox-59.0b12.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "79a49e07b3deaddb575d9a00262a0d21d316fda95ce6d0968b074a18689635271eb00d43a3a9dccfc969a5fcf4a9908c4d821f2d9af972ca378b995baf75027d"; + sha512 = "02228122502cf9fceae06f874ccd86399a2b69b668dba0887503ddee83574bf997365248b063791d7541785573b3fe095d1952d8d6cfd16ac5a9d0b96710ad2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/az/firefox-59.0b12.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "48b513d827ca582f137b5b12b7926cefff53313cb51961a7f256c90c8b532a81118567f7bd98f30fbe0ffe23006a2a9b5ede14d9f5ac5b1033f52f4b64c1daaf"; + sha512 = "987423a79ac63c7d9c4d7c306b6bb3b9dbae6c1f44fd1d62c0efd97f2f531dc520e66161089018c6ddb69d5bc6c9909fd49725efbe000df8be8b1c7946d5601b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/be/firefox-59.0b12.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3c4494c96c798b5e4a1e5f2f07b325b006e16d7139993b8d7ba40d251d43a194adfd1a6d8378107fb5d4c5a43a5c21b6af618872cb0216f0b5bda3fa1dceb358"; + sha512 = "4b2e99d9812d7d042f3a66f0444c3cbe9de4210c1c93e5d4dba3c6f86723c0465036f574b02c59286f9254abe31f2edd6b0b9ac273da344afc6c641bfb8d57a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bg/firefox-59.0b12.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a25da34be9a79dca9d2ad85ca6accf48b59f7f1bd9395f222fd39c679387c91f8a985af8fa421e0d5612998ed58c25389869102a3dd8370bafb3aa5c5f26b5c3"; + sha512 = "7f12bf4908cdb35370ec3ab3c219d71d4ddb7815d41eae77293fbc223435423ba21294d431b48293d0182aaada5e2c7b7b0b669154234fdea24c78b44a45bc0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bn-BD/firefox-59.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "9e8bef3f9b8a108bbcd2f3b0312670482dc368e78c1c0616af937b13a29808a50b8f5a64bdc1bc3a7e8140790e6913220d2e4539b7a41a47582710dd077c262b"; + sha512 = "bc0df029c024dc09ef56c98e94bee2e25b7cd6719d4943f26edde52b13456232c61cbeed7aa20cc1ba21c85f6a650147d62a3c597e4c124406ed8cd96d3e6ecb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bn-IN/firefox-59.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "709a91b866e14f9567c54ce7de579426997e44510cf3f98766355bd97a1cfd4fa5cda2e1e74c56c44c8eb4defdbc3a6212d047e04940c88a81fb3e240d262f5a"; + sha512 = "a37ceda406fb81d6a9e80c1fdb0fe721742596ac0b4feaa0a8170537836c90ed23fddbc08e7d0fd4a645feaae06395ee89309333df0021086054e0813f1de69e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/br/firefox-59.0b12.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "439330193ec220e1f34bf878d51869eb6889e8fd917080e387e308d4adac20fb3827c42afd5aa85c59408f779132c8ae1bcb9b7d50563fa53f0fea1e60c40abf"; + sha512 = "66b2d83f46fd22030594df06ff2ec9dbbe4f945c2cc9cf2700907411b95fbedc34535d9cc278186331536a72669b08b45ce24f854bcba1026aad6e0a346488c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/bs/firefox-59.0b12.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b578820c0429dde366e0f6435b0a91acccf63efc83aad89f2eb9be6a767c03d14f4daebf43fbeff1d684d3bbdcf0cd262c3fd7ec96e50dd2450bec846267c56a"; + sha512 = "511490960028d760f894d1f6fba23b1cc409c258445d27d68c74f9b16d5454832f35123fbcbe4824117d715ce9a559fe95ed9b70154daf605000916bb5ca53e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ca/firefox-59.0b12.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "800c292841be780805bc4f5650a7fe1603218f3be9c109956e297641de3d178ae6772f5c643db77c556e4a7e8362c587624cbee1f510fd19f8b853f18d937b2e"; + sha512 = "841182ffe9835abf641feeae551e0664aee1c4aa9696a036c69383ffd2925e96d1e8a74c2e1d7634310fef2737b4d059c9cf4e34687c5f5fca60d8a4a167feca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/cak/firefox-59.0b12.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8bec0ae474b0e9ffed58d278ec4b632eba4d746254a94d3ab9a542337ea26e44a1664d994c38dbd91c9859a64dded35b55fcf6f0fe3e69b9c969313306650171"; + sha512 = "105cde802f47c7d736f9978f6d02be6ce15f68e9300d64c85dee847d90beb8ca62790a800488e40a542afcc97331569baaf24edab3489e8bd159394011ce95af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/cs/firefox-59.0b12.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3e0252397d8eb3012f967f8816920fa00d1e4803906a1f455b9ab86f1ac50ba7814f1818947edbf4b647977e75827094e65097a60de8a08e3950a63ed2702ed0"; + sha512 = "f9203d2037924728bb1970fb0235d195c658dbd140f267e53c7d72fabdb74b4d5e81be81fec912a9bda5f25d78c981fbf52dd7067c1583d190bddd1133f5944c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/cy/firefox-59.0b12.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f7f5f41bc94523dd496e40668194a8298f925e59fcf89c7a0a1935ad0d873cfa18efc9b85cb05df9e1477ae319a7ab864a69f3aeff79826454bb0d842f721dd7"; + sha512 = "48a39bf509f6ca70c2bdb6fa2afca40a3add1ef01bca7f5086f7dadc5a86dbec6ee562c2c03aac7fda5de7c0e32bc2bfa180b19688dec2170a3d8ab5f1871f00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/da/firefox-59.0b12.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dea984a55e2d9e017c63977172f3a443af33cce4e5e2565d9beca715dd3b1bb0a7649103d3d7401277b3b0d696fe337450d864918195db59ba6aaac6f7f7d557"; + sha512 = "2bf58ac0d8c258b3cb8fde4493714913584d5790c7d21a0de9ee1053dc8ac14c4063ad21e1bcef4581a2f2a0c53cfe99225943c4bb975b90e0d1d27346ef6ef8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/de/firefox-59.0b12.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ae4b5122f9f2b04dc224080b506086ddf67e00074315f9d0795d22b7e12cf8b4bc727b3ad44f75dade74578c835b532833afe420860db5836d5db0b15ccc916d"; + sha512 = "dbfabae327e7c4135ae52f2a726abfebe25e82c70d796c5a550e29aa476d69562bee0c229d49f2396bc931c31d1d9dadc34a808190672c5c5eca4d51c1936d6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/dsb/firefox-59.0b12.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "76bdc3d9abc14f5b4358b63853bcc526774a38a3b4b9ddb589b5876ea6c224a8e7a122bf488438b8923f1d3140620ef5f81cb3c7d30ea0814b520bc0ae1a680b"; + sha512 = "2e601dc121842888122cd91360972290efad5bd3ef8b0a32a48dc18cd5a4e4a1adb0283a6fef4ce5d3f398afd324bc17e4032631abc04df3ddbbe00489ef76ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/el/firefox-59.0b12.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "a5016bed5e22749b42e6b680541b9c91ac455660acb2f857eaacd1280cd6025bf247ec016bac9d6204c7632d23f95697013dc6e0037c0c48090e0e79cb1ea3e4"; + sha512 = "3d88ba7e3491d21901e767a45b9b63f00fa7edadda86c03ebf4c85fd3bf5789289a119569c4142027d29b5f8feef0fca7950d88d57ed6573772abda3e0c8713d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/en-GB/firefox-59.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "25c0923e552583b9469079d0d2fc2172aa6603389452c680482afab4c796340b9761473d34caacb67d10bff537c299f2b05fa91a1c14a79804e0a44755d44171"; + sha512 = "a032d233d9d296d0acd3da7f8319c67df6c0934e00063332dff12d74ecb6cdc771427f0a97d8e9dc44ef42bbb10b83ec4771d750a95e7f566679e874ec59ea6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/en-US/firefox-59.0b12.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "d0a5c41a1fafa0c853f6abd5118c76a7c83a344e5024cd0a418d52418ade49293fd268cd35b3cfe60aa0d9646841026fcceb76040c588921d38940f5a49bd6d0"; + sha512 = "9ff68729f80dbafbec3ef96a2022fed7b77340238bd5fc4a14d6b3b71819a821398118fb57afd5ae2df10f0ec29d77c22b07eb447b56aa3a1a69d3dd5114d220"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/en-ZA/firefox-59.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "cd4a4777830ac0273405a9f78a5aaeaa15f657ae673fb1b1e326909a53b280b7a84729ab75425737187a4a8b1a1ba6383f5064a460df27e63477e9115bec7d16"; + sha512 = "eef030adc910b3503fee38253cf671d3f384c97b458a667847c75bd3498492413f0f96223ddfe2694f83b0cc15bfb9f235eb57786e5a34d2f72da84dd6cd69d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/eo/firefox-59.0b12.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "1720cd5551675a3b43c3b1a9d54272b0b04ec70b883831f54cfc1530a7852ea7c8a298670f3ca1f63641f3bb53fb9170d31470e960bc5197941253a67423f403"; + sha512 = "79d54503503d27ed0b37b279fa610c2f9905812bedd845ed7e0e560d7c797288241db8fd92524f8092ad1f691dca0bc92c8c9ba63c8118574ddf749f69a46290"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-AR/firefox-59.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "970eae87a941b42fc4b23d8c2cd882a60da643a106bfa1be056a8790b788d4da18a668f18a92d39d25e22d8b12548d849c7da04b751980502eeca67eb3776e5a"; + sha512 = "3f55035170caa2b744b02b9b357b50ccaa6d4e0b0cec68c2e87414199d0ec59582ff2ca0c0d15fa7d72918285308dd2364ff4cda9e8ce46bf606836d3f0eadc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-CL/firefox-59.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "a9b861009f5c6f72d2c7a6714422690a665c4b7d527fbafba0cd6951ecca11cc4cc0d5b68eec6afdd652cd2c3fe751a86eec82a32ea93ad29231dd7eaa9dd36b"; + sha512 = "4549f07ded930255964bb9f6b80f08bc4308d09106bf22fc766ecb42620aa558cd6c3812f32d5f5cfca93075dd737b2b2d774b99ad629f7b7c94445bf0d95f55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-ES/firefox-59.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c0a3a2474dacde01c4fadd41c4ae196e80a531fd20fa17d129d22dba69f0910c50250711c3c6f95da5825f30273d839c6a2746c81a171d08f9e6572de8640bf9"; + sha512 = "a81d1a4b08a2df595f57fec61ca2d189f0a2742b4dbd02ecb2f6094cb17d82c37ba8cf8bf7e27c9e29829a5d3b46f471b3a8c00ad37b60b1b83df6c4403efb7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/es-MX/firefox-59.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "7a72edbca19cc9199abcd7ef18e3e3cdecede5704e3a375d7d94d88971ae39a4814510d2afd3a5d0c18223dc40ae6c78576b58064406c639fbde3ad289d3f53c"; + sha512 = "ec4855478633811aef744358c7d6cfb316b8acfa797ffa750679366f62678381134888c0941bddb73c5003d8739cd8ed0a73bb4b8d6691fc9b9ecf754573d040"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/et/firefox-59.0b12.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a19677eb4307e70e2c533adcfded110cefb0ceea32e8674c77b58d8888bd8544b21ded902228d1124e64a9312004619539ad06f017d252c30ff8e5aa2e2cdd78"; + sha512 = "c623a9562ab40ba41a931355f2997469010223938f61db24a70b123a3ad6b7313de31f7ebd400eb8f2b479776b2417f94b920d4d9574b515698a23c8e9fe3465"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/eu/firefox-59.0b12.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a8f6d4296d75f40ccb147901277be4e639806dd0ce38dab9eedfab8ad4fe95ec95ebb98512ec034fd3dbf7bc2540ed4cecf08d9ad25fca586f35a55f1cfba214"; + sha512 = "f34c4889cc8d186ecf995855c782258f855d7308638c2182d639e02d41549432316e1ef506c5ec4b73ea2af9fd433127a909b2d9198afe430a422f14952cea97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fa/firefox-59.0b12.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a10951a2c9327e5323ca3bb19ddc7ff217fae4e6fdad08b6c7957d99bc2827bfde50bfb056fe823b9d469c2f03a12b5ef211c3bc2743429f5d87e0daf6419589"; + sha512 = "98ac96c6e044830b36bb8d30ad0ba11d79bbd75059688204103454d70e3ff703f061d79765cfb986cb41dbacd2891664e2edb426fd860fd491534a19a6c9f037"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ff/firefox-59.0b12.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7aaab75d2a70792b15b6644f5974803aeaa4d5738e64ebde26f53568764451d28aa8f53495bebb9f495a9b8f00ec8037bb289d3c4f4b925e6f432549fcea4ed3"; + sha512 = "37abe707566acbeb143b7570e5172ca75525df701dbbfb2aabb234bbe4691dfd2d8a54a73772530df9b5243627a44f034be2f5d7481b89533537248c231de3ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fi/firefox-59.0b12.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "146aa988c6b1aec4bd80d8494691274dcf914bae0cc16739eacae15a4e92f90846e5e0e3d505be724db20480919f1f1f804ab3864b2bdc6df0baad33ba968d91"; + sha512 = "baf37e00cf5c8705be80ac71202bad6efc4073c8a857a1652f44c6b5453674dc01e31754302659f9b8a02962594521564ee3712127b7501e6aa8248b32f2388d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fr/firefox-59.0b12.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "13919827f884274949f2aa1f59f6dbb7cc5b0b68f3f9c7a7c0c48ba57d1122f47b5860756d9be539b390536a016c68da5326aae72c8013ff3eb5fc7b7169f4d2"; + sha512 = "c7b4ffd1ed3da813a93fcca7230e0773042a18697defe26e19f75a5ef14feadc49917b757796f268a271c74ff32c9165b9836baf3b2cc74da92e3b73d73a78e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/fy-NL/firefox-59.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "00a22dba34622ac793b926b5e36427dd08e12d5cc620e36761fd0beee42b44b5f975395946d2633fd856b4a658917422e95667a1dfeda4548c42dbf81c0dca48"; + sha512 = "97f6f4ef8e412e5fbc543c2eb4f71c94bce8a56c419bd96bb1fdd0a3637d6ab0efe7c9b212da92d24113d5ed1e1f66f37261ac5a26ea2bb49908e7d1f8781abf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ga-IE/firefox-59.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "0ea311ba94bfe3208789c3bf4bb82f0f01ea6022564b7f8e1f5b147bbf6fe56f05eeb5072d9aff6d1fd1db3b28b1c0aa203f62ab295d5b3be94fd26c789e0a25"; + sha512 = "170773fef230ecb6a0b36b30388065d49eadae312cd3ed63d78e57a75aa1e553a37270e39410709804db2e5635c6215d03c0a4e101d933b07f0e08a8b75ab7a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gd/firefox-59.0b12.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "811c9979b05a6846dd13406a169c044f31f20cd79aca2373bd00079bf77f5472a44872d51e3dfada0d06ca620e1625d6646a8a49279cb5231acf1849b3fe5bc1"; + sha512 = "4b681fda7400e27a94d2e4867525ab6924d5b2eede227706d37b1d6f48385bc11604c3f509edea0fff7fc5e55260600ac4915c4195f02f0c21391a35cb99a47a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gl/firefox-59.0b12.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "c94ceab554f41def1d561207fa6135a02520c3e99579eec3e89cec9cb6f3b1823cbb85bd2654e14799d3112c4268d686a5291e8abca614ba758090f3da7aed74"; + sha512 = "e9384b3e35af0584ab8f5d565ace7462ff6ec81a02d2630e853b6e00c5c947df92e0b8f2d6070189bcfbffcce3db360bae57724a16c9e0584ee7b7d4f28452ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gn/firefox-59.0b12.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "3e61e5c8aa3b1243cc2d2a067af204657c0ce1220b38be4aa29769c6bafaae27c361981c70b7036abf2222e1db9fd668bf4df8ec84078332fcb3ed6bf57376af"; + sha512 = "d7e6e67824f1abc95105e2159c4b5477753c71705c042f4d5a020bf3a6b7fd8b40ea832795f0059ee6b1b8f1846fad0c5d1ad4d9c58bb676387dfe404921f4bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/gu-IN/firefox-59.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "3c75d4ddcd8d6acd86bf1b47e818fed59f2a640d7f7f865d2221c1a00072b55fd59b9f043f4cefd1214b2d857a6385116840f29de13c5a6737ddfa15cd4f8a33"; + sha512 = "acaa45a4b33aa16be8f9207ae94294b67f090f2beee7fc1bda7ca3ea1a7a143bc8e015f0b66c129a8423068179eb1386379fc93ec46c5b4228b7e22a9be20688"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/he/firefox-59.0b12.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "0f3f399e6223819243a06e7a4db56391b46e791afee6e4efeaaaa37923fabbfa7fbdde9d3ae5899b7f6aa23cb0e868be03fa0526109bf4f5f05f481584875efd"; + sha512 = "d6a899f84a98f380cb1ad14c520e737e5e01e6718616c2e4fb6694539cbf90df15399dd6f00dd34243b5238da12388add3f9d330611df7bb166f110c252b9fb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hi-IN/firefox-59.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "342af0d1f435b814f52b93895e519858f6963567c2b35fada1ac530143a741249a7d55a0726709f116de18852911ba8d04e29caae11d5e286080fe731b603c81"; + sha512 = "693d99da1cb75ed371de56bf6a81d84904d2964de288e1b6043587a4786fe4b512c7519c3aa2cb1a7d923c40f0e7636cc85be8563ba9259054a4ce1bdf07f966"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hr/firefox-59.0b12.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "07d2b74ef1a1f8da9e4e43034743104a9b97e0e6349587bc695f6592b940bd5bd355311be22e376e675d1061c19e1b00248b0149b5d7fc2c6ddbc002cff67bf2"; + sha512 = "17e2698fa8ba3b9c68813887961670af7233644fddeade8dfafc88ca85e8794d9ad101884508bccb9525b45056da05ea098f46c225b7969c08da8316537af9fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hsb/firefox-59.0b12.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "89a19fa159aa03cf56af3002a2991fe2ae33f491a8549cf54e41ff168427f5116c31e990c9d1377b0afc4e6a51bc16301778de0c231ad460c41e438f5c12ff3e"; + sha512 = "9d17853cb8731c89a06a05a556381c5d26593958b44fa607dc0d1943a03eec14e8159dcc58b3934b135bc3dae1d6e240f70cc72d7a65f65f621dd7e013eb1edf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hu/firefox-59.0b12.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3248c07d0ab3631569afa6c975025b7b59f04bff103a9c4bd26b1b0f60013f188d67ac9f7b177152f6800a56d594fcca75afe32c1a94522c89a8daad9d9e47a9"; + sha512 = "248f209efc4c6c0ad9dc17b3f243112fdcf5ca5562f2787a143098ac4c13f053ae6f67eb17d54319e1dd45f0d295d3c2e2bff3167081accb08a8666827790f5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/hy-AM/firefox-59.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d4b25189be36d036cd681d2261e6792c67b2f81fe29b4d66ccd117455a6426c451be2af1fed80c1a6a9f62f1dbd1210a3a4997d98f8ec3c1ee8b67632dd85163"; + sha512 = "b02548304612539258bbb9e9274c78d067def342fbf4aa9e5e33e01563cfca71eae82db4404e38636f65845362cb8fa4558a5997ac02edf215ad80892e1a7dec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ia/firefox-59.0b12.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4862ce32644bf06333f753016c3910ec10e41676669c5061dab9b4a9d7de269a934b9316efd472d80bd6f0e8077e1ee79435e39b3ec5e64ba90d07ea54dc218e"; + sha512 = "d76d4821d7ad76c58a19ca9ec858de17bb5fbdc35f5c0d48de254e89fc1481cad6c646b8ce51c495bcc568b9c1ec8ccee5fde89e322dc38e3b916b0c04236f89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/id/firefox-59.0b12.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f0e4e6d7ba40c614cf690ce9f7ddb00dd1e783370363930b19aa909a50a1d7253bf6c806a5d85d3bebcfac4d02dae0a07818bd89870e2803502de62e9de9d7bd"; + sha512 = "ffb410f2f320f9430e8f0e3f9ea9f7c4044781a91926f1b2f7e916d5b5a3e406b6aafbb0e90facba47c843834135e979357bb58fb3678debd93e401922062d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/is/firefox-59.0b12.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "dfe293c56597538890451f64f75bc21db53e0639c9a3e07df3ca488860e1937817091dac051c611e1aa659d664741d92e73a07d468873d0fd1b533bfc55c6fa2"; + sha512 = "7bc5c3b7b9fa7ec04022eb25afeb6ca663af4ac4c7aee85fd95e1d7744f67fe8135c9b08536dc1f7ef52fec84a813c0d49c5d67794c2d3ca94b25fa43977807a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/it/firefox-59.0b12.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a37a584dfcbb4607ce77185175a90c5806ded234c0a7f4eb4855b09dd7c03cd87f9beb8b029db63f64b3879382d3ca0956bee4a4d8cec8af3316a5e510947246"; + sha512 = "39769d4e2cd12c8a1f10d5fe142be2dcd67044b3c657272f703626a5d54d1de648d243125ff9cdf00f8d743cc30e94f39504d12074cddceaccf3b0d076bca911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ja/firefox-59.0b12.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ce01130f06a6c2513fd15a91a18166f4ec7573898cd38f3af49297e91813ce40610e3a24d62a885c2952d4d9d729201d902db6fbbb2e10a14b2467cab9218810"; + sha512 = "bb0040df3765c1165f8da3533bada5df740450a2b9bd2da25299bb0363b518fd8b8b22f2f30eda622321453110e5685bd35de0445628ed8564aabc587ba5ab43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ka/firefox-59.0b12.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d4f6c60eb72b2854c0b7edae05c6fab01042f019c56ae9cb9aed277f99cfa8fb9b27a9815094fb59edc2245b3ba5f5406dbd9d3ef032718080c1cd059141af13"; + sha512 = "bc7ba6b0cfb7343976350ac3133f12bbd2312bec45717356565e9a6005fd25a48237d139ffc036eba35ab3b63da23f56a88adde8174043bb45923d8221fb3c00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/kab/firefox-59.0b12.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f9c5f81391e330b642fcf18ca31e647bb08c97941b6a7229dda8df536c893220a65ae268a37ce7f8bddbbed23ad0042cd33f0f641bddf54353ae0de930151c21"; + sha512 = "45accd008b53479a5232b82e0e31c68a90042866f25cdd473cc9232bea94f74d51da9d85343b25d453ab466d54396ed9bbbbd295f7b6c40975a4e86002cca4d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/kk/firefox-59.0b12.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d9a2b2bc582c614cbd9ba633029b6c0109538dbfdf974489be41a0582bf31d419e6ef30130859a45ea87c9caa10428cd5778b092a618e9ebc2dbc801890fb83f"; + sha512 = "fa09b247dd1e8efae1e18956cc8f560c0230397d02b8279992e563cb444b340f02ccefdf66e5140c24da5c2f40d2b15968c83fc703f88b37869f016e5aa36da3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/km/firefox-59.0b12.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b83844f56c20b51b9c64891c4283c70ace54c7da65dbf8d73d4b78941b2022907b60cbcde7b35943c16957b4b021e2f0b19c93ce082161beb35ae35bcbdc7756"; + sha512 = "05cad8c071aa43d463d3dcf4df262950358564ef0bfdae5c72fa2f59d306af36f74786ea6ebee75617a78648fa329aa7869059146836decbe49ef2e2614cc509"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/kn/firefox-59.0b12.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "23f281b9fb24134a6a431bb1001686123042afc21b7b9f714a4875f4001d6dc5ab95584cb18f455ff30010024fe379a6cb525ae24b6910e28693c65dcf5ea46c"; + sha512 = "375b7792672a6b835570ea13514ea4d73b880da3d917500d9165780dc617aed3e5b5509f309b9511440c9c009052944d3254f6f14a4d24ecfc7a33d0d5013cd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ko/firefox-59.0b12.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6319c23d33f5203cf6889e3521c58bfab6aff1fa5ab96b76b4cddf7657709a48c3d57cf646a77064e2ed680a43b543f588f033f6a3577b5fc905a882b4058c12"; + sha512 = "8edb7a4c0f07954fc9d453838203b72138f6b5f8c83da8957e7bf53eae38735b10d694a4e80acb44c8c65e2c54f554fe5b0a551a7aa57d96c54c515851b7d56e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/lij/firefox-59.0b12.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d24882005211ec9aa8efcfa22d0940ca82c8d5574ec499f2d7956db42b37fdf8dbe7abf0414d64f3344b79c77b0daaf7ab537a4d675f06373ddf65cdaf9eb30c"; + sha512 = "73b2217d8a7af31223a5278c59e5a1e4dbfd426fdbb083cc1c8f3387735ae5cb7229434a513e37691e4dbf342b6bc1c0d1374c873c8a9ef6619d8ba9a273fc8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/lt/firefox-59.0b12.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "b0652f42e36f101b1a8c6c82bff3a9dad00703fe75e702ef595cadbd3f2b2f4e6e139e7e8e8a54b15e7db612adf443782bdd138e77a6e85ab9089cc3aaae23ab"; + sha512 = "98a89578b14589fb4a049b75f3d165a8bf39d21a28eef83b88bb62829c04f30f8e7b18846db8cde2588ff0b4d6dc5ecdba410c184ee6bd1cdd6446c00d471a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/lv/firefox-59.0b12.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f2a39cf0c6c4a536711731ce46f943f875d2f02bb482152c81eb974e66303bf6968175a32a7bcf7bf3a281d551ae7f4d9d6bd1ab17249106835ba98a53102b1a"; + sha512 = "e8482cfc577644dfedad3332a57a35b1209e41aa13d2b239fde02bb26c6ec3d5f98867da5283d5156d04944893261a9e589ba38e249329b3a6a00ac7b0d119c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/mai/firefox-59.0b12.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "38db02caaa1e380f9a9c29ceffbaf466ff4bc5e2cb7191fb3e7c745fc23e56f1f12a78a54893ccdee307f7b52ca2bcb12241d8162665cf6abf1b5fd04b2fa7e6"; + sha512 = "e7e53fd52f1ffb4e5c4246e01192044a4262a8cfebabb980a0f0a0c66368b27d9df44dd19bc7bc15f9e61e896bdab5d34a4182244fc53057ef658a0858991a96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/mk/firefox-59.0b12.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "1c7d555e17b69af7274bde550353db2501ecc5896592f391ec235350da77445b73969ec61a49eaf8da4276056039c846f8db82fcea6eecbdc99d38f8421ed222"; + sha512 = "5f57aa88443258977ed0d40bb36b8c279385183f0d8ba78b2cb5f7c2ff77575977aebbb1bc5eb7fe2ed329981e776b0301290c8742c76fdfa9eb21bce3e83499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ml/firefox-59.0b12.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "838065437947ecabbbaee0892b38dcd06efe9fc3e07af01e4409051aed9dc91b79afdc6a8519d726e0997a6c8d52c6b764f5f82aa6389da003b5514af6781948"; + sha512 = "29445af99dc7dc5c257b2c5e819acb12e7c56afb69b8f756588f2ed25a27a7f5662891303c259f572c556c5a637cc870fa4b88750643f13c594bb346a116da96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/mr/firefox-59.0b12.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "878938e50ab54b4008f292e6423e936ade2be23f2a9eaae6ab9630b2a655e7bca5392a95d040ad8145b1899e43dcb21d52ec8b8d3d1e9b8c01090af1bbac93cc"; + sha512 = "8f863de4611c353093fbb12bb45c71e3e867d2388cf20d2204c8826977a7c9e4b6d7be63ea31f20ea7818c3d860ac8ac2563bb85f323f99bf21a83a9247db742"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ms/firefox-59.0b12.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "da1730d9dbfd180dd9179bfbbc9d5e3e8b1ccb40660f2f12559743844033de5a0c50141417eec876e8a990c022b9c08c64ef3ca084184d974e65e7e204da9223"; + sha512 = "722be877919cc1749e16a99e8d5b9cf434f2de45785c25a6234e9fd150c50c1a34836d0687289174940ccbf864b94b7073deecc909e0316ec49db0ea8767a7dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/my/firefox-59.0b12.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1e017679a203e499a2cef3ac232a2af0184801eb6842982f8558d4d59fd45ccad5c7d439b1ffdde13789ef5fade73726d74f39cb010bdf221487a99fa7a7407c"; + sha512 = "2c5001b9fef34a091f181d81c3857a9316dbcdc44e04574e9ca7b6473cdeea8c8f0176bd2e4929f5b7350d4bd22d1448ed7f08813279578699d011534a00cc9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/nb-NO/firefox-59.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "879733aea82fbe7a11d43510ab08d16bf7b9ef65f9cb128f273e607f226389765ac02c536cd8d7b2445ad5011c1abcd0a89310a143c028fa2d53718ab73a35ca"; + sha512 = "84638330ba597364b7e137bbcfb40fcdc71eebeda9baea7f586736f8ec34cdd6c537821ee0dc1af42ac1f15d5aab475ab07615fdf5a62834e9025fa93a1c0535"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ne-NP/firefox-59.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "2509b8848fc3a462cae70c596ce95517e46a9e829981aafc5935c6031fa5aac5efcafde2f60981f8060e169182a9355d9e039be66f46a99dc1618147b3f6f6b4"; + sha512 = "f3dfdf5396b8a47df1c550a4edb96020bb7a295f60ae8a0fdb02204d16edcf6ed9f78f47a4797a0514583de2f134a4fe7a8e61092b93f757e01a31932ef227f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/nl/firefox-59.0b12.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a47d869d65256e49ee1e51ae6a659c4a645ba6e4ae716c3771c15f043d0417ea5000aac11eed105dae0786f426b9c2e424d8199c55b5c656aac93ce8e76c881d"; + sha512 = "8df228b2a309af2d0fe5937688660899d2c21dd617ac6aff9aa29a81a34f4776d6547aee7679a0586e6ca3da549112ebac0f887491b300bffaf50350c8cbcd8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/nn-NO/firefox-59.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b5d0637e4039dc1cd7eca596ebb835263a781baf2e411550cd078e1e851ef2c795ed848be48d51edf9f83aeeb2ed95726f2759d59656161ac6b67a44690274d4"; + sha512 = "aeb6851a866462b8bd273d9589e1cb9b555b781b000bf779c8cb54151825eec534d7e63d401c78c7f5ec419871e786a414bade1f586e9ba1ebf712c86e651036"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/or/firefox-59.0b12.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "917bae041919402d4fcf6396e0e94d89666044b975ec7e8d9f7408bec232e4988764aca83b98374eccd53b11512548023f235a4a1e40bda3d51a2b78170bca60"; + sha512 = "0cedb8f36d910a346b0cd242a50ea62611ef14b90bb17a7b11bc0694117ace402489f072e5465bc5a1f502b56e056ea11f1a4b118c14c7ba60f6642d5b5c20bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pa-IN/firefox-59.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "31986cea24479949f4f4c432fd8d1a8974734325c30c915ba78c9a8687e1f6723368fb6f8337ad8ffcd3a41e3ae94405ee5fa33ca43cb7eb46ff07fd4c6584be"; + sha512 = "f1085cdac53aa694730f124e6feecbbbad5fc6bf4a01bef7ea5d8997c1f417b6dbce5aca92022bc29fcf57e47d1b83f7e094e78b2e3248cb460b2b698e822fb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pl/firefox-59.0b12.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "4c17870a4246ee20f23f5a3c899180df124c418be0c6f4690cbc0806d81c947f5ca6f60749282c9e2c67216c71aed7993a8fa66e2711f2e36cf2130276454dbf"; + sha512 = "a8196bc00626726cea642b25d52199f9f6a16027ff3347080403183858f615db1a93df180a39825396da0809334e7c82b118a241e2bbe998021bb261a9e70851"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pt-BR/firefox-59.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4b86a1d9468be66f6fb4b58667e026a92be58feac5b760353c05411b6ace0224ae0326542a6b6b00492b72b1faec2119e1111a410dcca633fa253db7c07708c7"; + sha512 = "7784118a72f558c700d3e796607020fa786903bfbe4d0abbe4cf954f217ab8e1e61445638db1d64da44290d98004329b3d4fbb98c54fbd20f06e42ec5c335894"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/pt-PT/firefox-59.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e8adf87f5cad3e871c0b81332db5393e5aad70372fb8bddcfbf922be80cf0f1bd40ccfa49ec972aa95966d972a48400c8c2820f3fe1e67204bafd1272e8b42ae"; + sha512 = "08875162a408a4ea90afd42b0e4796b7467c00ae943660055c75af2be69a83b9638764113a4847a1d7da14707a75e632fdaff195b87e737d0b726b4b42f8b60b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/rm/firefox-59.0b12.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e2785922eb50092f125df5d6082b58964b11a14a19f139e9fddd687f552f67f7d559c6b9031ecf74592fdcaa3218110a60bc0459c9a5341a493e6f607d77ea77"; + sha512 = "a720e330b6ac4bd439723f7e09ea0a2d2f6ac3396f38b4838461b165b7516952083509b4016cb191e694357fe672a4b4bb391c32239ee80262f84d514753d76b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ro/firefox-59.0b12.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4362555d79853b643ede451b77a8ff58ab4e1dfc29a2a0bdf55f0f11eba387dfbba4d0009340be1d8d6344f423b89a26ea6cab5c738b0eed5f9076d2f591b396"; + sha512 = "cfa7a8594ccaf5127704a033f4358374ac2a1241be65396a2ff425ef8d15f33420289c40ff7ead5464ab28e03e97dbaee906df736af68152c5292b97ac8d9214"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ru/firefox-59.0b12.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1aa522488a072e62e8014fdcd1c717fad2e5ff6e8cc42bb63edb876a552fc9b98cc5361d345213bdff3a2854c833b8afee93154ecc21fc4ef27680dd2943c2e4"; + sha512 = "11a504743ed4fc55977cf58f378a5952197580bceb24ec5e3db4bb98e9e6b5ce5a4aee108b4f1cb5315c3aacde7f48809a84624f9536b9cfc784b4ab65533c6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/si/firefox-59.0b12.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "6419386bd2f5c731f2b500b59bf6ad54ef09240fd5bb65b7aeec1a9d977d70a3ca036591f51c107a4e14546d60588dac5cc3add15f6178850e8dd0b73cecff59"; + sha512 = "987d9c68411b63d5d048011fe6132751e2860f86ad41da170ac1fda67682245b8abf526ac5ee9608e056e9effab40d6e5fbf909039609cc528abc15949347dbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sk/firefox-59.0b12.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "697de5ceeeda98191afa564587a926936717304523147d171f53ad5e6da94f5c132f21582c8e86eb079fbd20b3d15d302182490147e527cbfcb9d8d6f69aaada"; + sha512 = "c425ba05e70026300f7158a30eb1a6b2f56910a1d8bc18e58fc7d62b297d5fd269efe001834f9f5ac5c0e7b38b644a555b5b7c2831d629fc7baa820e22870cb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sl/firefox-59.0b12.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "57323cd3ac194f90e31f5a4c830432f20522892d2d5adee73ab434df540177d5766099a004a939f6cce22b53d341470fcfc79f07269ddeaed1923d6cc10a8d9f"; + sha512 = "1f6a079617586d0f61a103b069a2d900355371d6155d7f37c0a63632c6624514935f6ccf73fd9ec24050cca8d13e5904da5a4785d6504e29528324c2d2bf6a14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/son/firefox-59.0b12.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "50f4e1d7645b992c8fe0b8354684c6b5ee1db6ad4981a4b5b9709c75d65e8f09a2c7a633ca1bed322e150991c709cf1b012afe2b7faf3c9cb35deb392390fe98"; + sha512 = "c1c906b97127309ee031dcee47cde296fb519918c576d969702703426f02d33442ed2e6ec2c774b15563a741e6652285322cc44a1cc4d1837cc5ec3546ce3d3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sq/firefox-59.0b12.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3ce204bd28a1bf181f1b3f7b4e906e05412f412fe345670f235684791f737c05bdf6f9a9b2c9bf4066f5419300a2bab77c2ef34ff0efd3db543a0ea8125e8547"; + sha512 = "eabfadbb0f25b54de213f441a3e71f6e2c9b4d4510c6ab20edf386522a3646d34a6ece545c9892bd87feb6e50e612652122c2b5b18e73dcb1f8105b9948326f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sr/firefox-59.0b12.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b0c498b589523faa34d54e6e1b5db6e3a1a06e0fbf2333ea22fe7118efbea2d4c9e852c48c0c073921ac602bd2586068da1f142b6ead6f83119066411b8d6044"; + sha512 = "de2dfafce444e7185da8ff0d2c2a6d509c7e9d399085769471ba96f34868fc639cbd6b5bf3db66c2f52140ba87915cdd9f5b906cddb57cca0a7057f0283c37d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/sv-SE/firefox-59.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "56a03c0c8d129c18f8331168afbc96951e70fc9bceeed41b059d376ed0760130eb43b5ca53d288f55ef4ec7da0693015d3dfea85bc7e973961064b7c2ca5561d"; + sha512 = "df9a729b93965d275580d5cb5ed7be9b76da29eb1b854c3f81bfab61ba07af0e406b20be90eaa6e6fc254b95e952503b6c1dd7857b0070685d70d056c0c63f60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ta/firefox-59.0b12.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c314a9ef07a32b4e01d6ced306cfd3b10e23387dbbac155b6ca2d8649b76009c8caebf666e92b7dfb90e9c52233fb1f552a46c983dd79f765b99f28be2c67fe9"; + sha512 = "f35fd118ec67abc3c3023632b0451bd23d98077c2a8e5233a3a1b4def09e346d158b1e1267e1ca3a924df8995927831caa2ac6440b8c7fb168a73969178cb73e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/te/firefox-59.0b12.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "cbf9e62c2a6c746a442150d84637e8c02db89417f725a261b343d2d87acd046df364d892131f5adab384bc5dee51378ffbd6d8d9ffc43d10ac2f5ab5dd394f60"; + sha512 = "0229c33f18985bf9b5bd5d9c3eb9f3a7319602552f12a43b7ef4fa993c502797db7677268ac0699b9f68db77f7871bc665b8537473a78ab1e62aa8750bfc08f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/th/firefox-59.0b12.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6584a4103b466ee21d887861adbacab9429e7f68e4432fee3a5a32ec59809990e50dd20df7275f3c8af00bab9fdef25a7dfeb23beffcf58f3cd0326d17544c5b"; + sha512 = "878d3e255be1f8a4453972238c21c65ad17ee1138af8bae252e207af065c3326ac9ba76279f54c10a6b1c1b8f8b8b518cb5200ead157ed1ce4b05abeb695522b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/tr/firefox-59.0b12.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0e4e8dfa5dae13b7b2763329c41cf8783f4e4dad844ae990c9ba36ce846afb9849aeafb10f0d6ac95bb79235876979c327d6ce3bb337a5b4dfa92e0a0acb1994"; + sha512 = "5c159577e3cadeaab76b7abd36d0c903fa386941e2f1f6e2f39328634d99bd41fe3d7b2e3f1e9f5c153cf5ec257a4f099cf9e946fc07cd8bb41b34e239a403c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/uk/firefox-59.0b12.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "719ffe6b28a3b23afa238cfdd6d6b97642f2ca0a7c73e9e7f4558b2d37a7e7e7b62da1e85a669446e24a34ad54d2d495e3439d7672af1a3e95bf2035e453cbc6"; + sha512 = "5e9778bd95329c7f48944fcd95f78348ec6311338be843c1b061e6816277f953d15ada5470a46fc99998cea7d1a24e4e8c1b1ba7df5a2f0dd0ab66ce25f0673a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/ur/firefox-59.0b12.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1bdf8f56cfeaf566bee011d325cad698ee99d1cef77da7fe8a90e29ed2a69ab56b0643c975d2a1ffe2caa90bcc8e32a08502071e40ebd6aff2c61512d052f16e"; + sha512 = "2244ccbc7ba1fe284c53423aa54b243e7ef19f8e4be0ec666818a7fb4d1510ca43f16a06240ed215cfe8033b540d6770c371b203d7b8101ec0cf1faa45a88658"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/uz/firefox-59.0b12.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3c212e672725c170e45f88dc422d1aad81115a7c428e794f99464b49b819a6e5cb353a1d17b795a5f7b0146a06d7ec92e44e8e897c9897ff5a44f058c3317747"; + sha512 = "658abde702b98e541cf9373eb8dd26d73a8646827f8dfbcafb037079561edced69864568828b379f3639a27f4a9f82ccaad77b06a13835a9508eeb5660ac549d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/vi/firefox-59.0b12.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "55c56e451b8bfe66f6a2808408013787c7ad0dcda3ea96ce8e5d7948a73104f1d3c803750e8fc256420daedda6a2f239c62e877affa94cfb0265b68d2d7b6164"; + sha512 = "659aa8ff1f2b2990e05a48318eacfe7175e71256baf90996dc228edad52cc27af679a3d6c59442e5e1341ee6f1f59cfcc06445ade7951d7d76bf65a1e8183877"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/xh/firefox-59.0b12.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "0af098c785b7df94a59f0ada2c1c5fd2c005f01cd7668624dd3e5532953ac417f0d27295adac551a1695ff9300bae1684fb879454117d8149d412e8c53016afe"; + sha512 = "ce90fafa7d78a469d1fd84eb484226122e2aced7dad938c5db060a6188a6d50c16e487ada6ab60414d7179ab26f4dfaae53872e074a492cb2d962e90012d59a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/zh-CN/firefox-59.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b560b43afdaddbe218e8e557d8b15b78295823cb1c80db7d55f7243b4d79a8fb1d03e2ae9fa8a825f817d599131cd121aa682ed2d784251bea4fab56389a04fe"; + sha512 = "3b49afc196e51cde57601ba821db9af43403a56da1fdb5ef7125e08083f018e4df0fdc730cd262eb701554c6981a0f924eca372246e6f9199f95187081f0c28d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-x86_64/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-x86_64/zh-TW/firefox-59.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2fe3b14b7d1e58cfa9bef71b2105d28be2871c527e1a551c5902f5368c7ab4f67b330b46716c83917e8cb7d8b494fe2770e535d528f96e6cd469b53c9998e883"; + sha512 = "4a285291211b4a3573e2dbad56208bf1aa6ebafafce5b573e5a4657cb7fd0e611e26749801fd19eb1f0a695d260d3b53854b887a43f5c0cf7c722a830da778b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ach/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ach/firefox-59.0b12.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c1e6e7e1a6490ec4a177a122048d3f405182c22039026d325b9600e8b12e1b1a670c1ea4f9c41fa3d0ebe5d95889db4078f1b96029c78266c00d346931a4eff6"; + sha512 = "0039392ffa80144663f9a1247f49ae70b48836ba66be6626d8c68d34f4b70725e1cf2351d139e8006b0414e3dd5849948737757e95505b67d5274c8184cc7c12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/af/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/af/firefox-59.0b12.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "45ba70b3952e5faa8643b75587c08076fa31a97f650e8950e6adf3a4ece770dd19641cc368623030e0766ccb1a30af585547c410f7a77714c408761e0e86572c"; + sha512 = "c1cf80763ff3984120983d8ed094746b6b59c011c64d413878ffd1731ab96ee30eca98fe54da84c875df8eedc8bcbaa69951956f58297273dad5e83db21339d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/an/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/an/firefox-59.0b12.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1e692c5a39a19913599382ec25ef3ecf7ba36db94784b7d33a7d2db9db29d87eb1a5b5499ae4d266c608b0e638cfa06db1228ee6072c113a435440be5286a96b"; + sha512 = "860c4438660b72756b026a39f037a0146ad0808db8afa4abc13f62e33bfcb8b5845e7c5952e4ee776fad60b891d031452c1254f6afadc6684013a873c7435ca5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ar/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ar/firefox-59.0b12.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "561ba5eb55cae1d9d6ac59b223a07b9aa7420b3643487010adc6516db3fffe7fd0db363f0b098262cc9d94324620d381db9bfd2e590c56c85a4adb7cf2d8ef68"; + sha512 = "8756a32ceae7dadfed10eca4393664e388f928ec0f91b882af148124743748ea6570108c63fdf8ec9d769c942b8e89502b59f6934b8a14529ab5258fa8cad0bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/as/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/as/firefox-59.0b12.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7de5a42a995e927a8deaeffd7aff5b752f7156613bd6d8722904dbad87317eb4a43d649d0ff2f86feaabeecdc67cb95be0dfe015464ef2b2edf9200a7b7ef65b"; + sha512 = "ffd8d061fabd774e4a08210a15a88dd4d2b762f31750fa16d420341704583d659094b44cf781703f5cbcc7bd03a680fc6ac79ff13278dd5d04814124cabb9906"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ast/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ast/firefox-59.0b12.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "080df53eec28de87ab1a8058419da1c829dddf54aa15804498fb8819e35a2f892ad69af0e5c3c3c5b385b4892988a9171ebbdd10fdbeae31bd621c88c2b60c7b"; + sha512 = "758e5f251d3961c5ed8472ecd1296c6cea52662bd4502453cf11bc6f6c6b4a33fe69121137bc842f4003f6b7600f30c1b3ea32e8eb79a4b621d0e26a5fb012fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/az/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/az/firefox-59.0b12.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "68b1c5c1bc5f5064ecf5baa9f8f420ab460f0781b2c6f838bd86bf88d248d3384df0b1c5a88e5c1cfc8363212dd9708ef229822418400392ed16d7bd9afba63c"; + sha512 = "2ef62281bf67750161b277bc99349934f88fd2906dc53c0e7e876f7ead39f36bd7312c136d32121867fbe17cbd5c44731803f42329f6d84fc08551a4d5d8c0d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/be/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/be/firefox-59.0b12.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "de1910ca4024e4b449735532969b30039fb52d9eb4fd2fd103169ae99456a90f9cd629e153931f5812e44659151055bba42fe438675fc1d2d6626230c8916c2d"; + sha512 = "f3e6bfa10caba43d5c9200d8860f34f87281917233327676dff44c5fa218190fc77e65b2d7dd48fb28b780c80c1c86cbf947b3dee21c8e752fe543dde92cf8dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bg/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bg/firefox-59.0b12.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "1e2c044b76102498307594bb13872244dec23ae09c9a730e37700febf22a6925ecbb03014b0d1122c4d5258b0a9a277561170a57394e920d620c42b3de609c2d"; + sha512 = "1111c5925749e8cbf151b17f5dbfd45b463d614f013309cf3d899879f49f08dcfde610e07cff09b41693167fa6ab53e34ad48d5881ed1ee376ed2e0e98f755dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bn-BD/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bn-BD/firefox-59.0b12.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0d9b027eb0f539256514e851e0e5bdf98f171901ea5d7783262b5f7bd6f7a568ee4352ed4dbe3a30e5b364e4bcc6f3883fd9998b84223fbd30827650e28a3d56"; + sha512 = "9161bbb51eedeec73243e6d9ce2703895725e5218c11fe98d613fae925a11a41bbbaf1eec34a08a88909e50500749779b83c3df1c3e2bf780c2154d6e8b57015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bn-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bn-IN/firefox-59.0b12.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3277c2130fa526e9f38853a379d8418915832292ad958cfbc0d1d26d752fba6a9c153c3816a3e398803e5c6365a9ef81e522de7166424d54dc15eec067e10e97"; + sha512 = "169ebe60d7f42f00399ad200b8980ac654a903d131222ef3c7126fcbb809040faca454219d885def598c7e3bcdd74fc6395c3ed3e0cb6a4f68bdaf08b6616b97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/br/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/br/firefox-59.0b12.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "f502069507f54da1d691f35cca3581d5d26a8699f73f421d927251a1061b7add5f21453823bc36c4a18e697e154697fd9127f4e1bb09137cd00ebff136ffa420"; + sha512 = "eee02a85ece0b3f8982d05a228c18f830ed17eecb40e1e6c8373eee5d0849905ccc2c4eba0b3679dfef7b01e4c376a002388ba0709a0dc3ed3da7b4711c31384"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/bs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/bs/firefox-59.0b12.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "76468f8aac7402b00abb4977d6b9cd76c5ae4eab3ae9ffa0940a4d6a9899c4987074aae45295e6fabf5c53b000475db1ee151838c43f7d4a42b9d02049e8ea76"; + sha512 = "6139ba5c93f1734b86ebe907e7f24d62a46b6343acb201b6de7cc9f1a91eaf96f711be08446225188960f0937b45cb15bca8f2c2754dfd2d40ebd20611155d7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ca/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ca/firefox-59.0b12.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "84d691e63fb9239aa857a2a94c0fb4bdbe445b4d463a4ef4da396c4ea521a17f99592f80b603e7aaa0997459daef5f7e9f843d864459307e73b468a346e868fd"; + sha512 = "2e0e78cd5f8e8897a19101769370e39dca863fd4f2174b1aeb9542ba61aede150eda7a8afdf47a194f7836f6fb605ad6d8b2e3f5dc42916f89c0cf236ea42855"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/cak/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/cak/firefox-59.0b12.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4eb8f38bca6e8925d20e870b6caafe8659fc429f4a748471273ef3feb1df3855b0b8e20ccacb2e19a8ac5153eae7f046069a5c5512cb35bb83691d1efbcad56f"; + sha512 = "6f7164dfc2224b4191d5bc9e62edc01ce343507959539f7c82ee4fd152f848a4eb21225d1fa61146ee58fb32c2048f9ab66e247932fad6abd37ac25045437180"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/cs/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/cs/firefox-59.0b12.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "6a0cd1776280940bc06d55985ef56eca1892fe9f846a2b442c4f8444207ebcef87113994624588c05e3667afc306430e0ccd1f29d8b0e8e1315eeae7fbee42f8"; + sha512 = "39c06e79317717851244f73e25c516be2b24db8c33ed8126938fab5058ea0e5ff7507090e9a32e35d2d3ba922fb60a3910669f5449b7c20f4d69f3d2f6c5a3e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/cy/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/cy/firefox-59.0b12.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b6d87a46bed0b1af3b632ec6af1422f916364e27775bceb61b23ca101711748a8233795c7e5ecc1a41b422a49149a48c94a8b183eb3b7348f3c849d635e5cbe6"; + sha512 = "6c021ade280ba1611b7a6851b5aece24dc83034da7fd26b7057a280bfb114d2d5bd643f9210845c3c1435902b3158d52a37f2542f8d87a1776ea7484a5cdf442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/da/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/da/firefox-59.0b12.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "164dc380f91042fe0d9d476f202d2ce1a437bb0aebe266bee8f47bee9ea85428493f250deeb74d4e4555e8ab6aff0c7b804088b3d6e93f53e0c5b08bbdf65b1e"; + sha512 = "afb721ed3fc9f96016ad11359b8ddb9037439be684bb43778b76fc0f2e2d169931c280a4a84939bf6e3ff5b5cb65f349eb2d20b053473a0a2e71045b6aac2b86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/de/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/de/firefox-59.0b12.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6c934a5e40ae25be9653775d80a913a933000f1a78cfa6150d2d0f2cd1056d728f73f67facc3a1be57ffa3034d32c4265f66da92e040ea656e254442063604a5"; + sha512 = "b1aa0629bd6ab23da6cff3d66c71607944f54b6da74af56fb9e64d222c7aa797379c23c915f99e5693226960e3b745539b6d7e76ebd13a078d51f4a1f4b7ed6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/dsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/dsb/firefox-59.0b12.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "905200cd7d4901fae4004ff17241eb1a207ca74ed20e3586c639231cc6c2f23505511f336028d5807da1756bbed8114de318b43c392ab741350fee472324ca12"; + sha512 = "3e9e382763a622be7c638cfbfc31dd003aeb93b7b447a413fd6bb54f536a6c5ef263e8da903f3613f80b40fa14f08bb1bb761de81d7b4628c35e7f5364b41d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/el/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/el/firefox-59.0b12.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "12efe2362343b63f312dfe22cc23feb2bc449ee1737da7dbf85a123294d3ac9d4fad60684e35f520bfd09028ddac67e0998c1b7b722fe1851056f13e079f2afb"; + sha512 = "2c6bdcab1fd20ee6de0d6f198a1bfc88c57e1afd3d277f9503c29fd118d79cbcbc3d57784cbe4cc26b6dc0ea90a4fb4308dffe0224725d41996ee37062c28d6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/en-GB/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/en-GB/firefox-59.0b12.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "90d231e74c761a0f312dcc8a63a5a1a065bfac62c7ae60decc2e3b79df0165f68b12a2280c976752a80494a8c0e9b04fc758974fdd779b7c8767f94facd45c13"; + sha512 = "70bb2ad5a3a58293161c753873bec87b91d3c95dd25cbddf6354b655ec047785c61c273cc433b23220247f1736968f5eda5c41cc26e47a088d577aa2bbf9508f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/en-US/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/en-US/firefox-59.0b12.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bc8505de96553aafb61b5c1fd0fe3fd4114fa6ccb7e3596a5b9ba40030aa0ce4bbbb2f7d4c7e68b77e42e1f88aa55672b9e784d6e71bee1d1aeb555f6ee74921"; + sha512 = "186d0dad2699c3f6050c46417cb3c8f1dc837e3c4fdd4b6907b05bac6a677554d161982cebc7387172ec73c04dfac53445fbfe4fe4215eea69f311f71259239f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/en-ZA/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/en-ZA/firefox-59.0b12.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "b87f829afb774a45b780341a8d0ca52b2a433ab2b166a75751fce03350a68bd2bb28870f35f37c2b7277a9cbbe6b7c4ba97ad3c80f2c35ff7a341b6afa39601f"; + sha512 = "0d49ba4450859f0569ec1eefcc9735692f410664bc9010a657bfb69657b52673c898465686d053fd3c0cf62d58d1d2bb5d8a35c342c28439c55f0315f5ca1629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/eo/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/eo/firefox-59.0b12.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "08e9ae1e5d8dc26b4ba408955574990f3da7a8e5ef08c6b0630102e79829ba983081b03465dafce3e7efc3f6ab7f3be6fba4df63076c3b5fa158badcf1efff3f"; + sha512 = "6f063ac1224e406a01d758f5970caa53f5cb2e657df172489172cf5a218d1b3fdcac58cd05693de3edcb5736673d736ea31e9da60ad426a7eb70934f54d9f373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-AR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-AR/firefox-59.0b12.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "f1fc2a5c2f7de0c24ec1d9471c13589735a6e2b1e83111bf44f9f23317c69ba6e9c8bd7eae9e6bec5b9022808bdfebb9e203bb33fe3cd1564e0a864abea9c287"; + sha512 = "0d099751b32754ba169d5382a433f2f333b5166a6cc7f4b6f9761b7290e69f379d4941d57814fe56b1b96cbe812d124f48daecb39b14dd95ea502d6a4e1bafec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-CL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-CL/firefox-59.0b12.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "90c608eccf19e1034d77e9852194bf6858665d29cc4649a538bf07e536bf3d32ab6149c702f71cdc809dc2df706811f386a4af0491a6e3fb6fe5830688ccaf1d"; + sha512 = "4a0384eea57499e0424e7f2223da7881e35bf8826109981083655ae09aa93b97e3224bbc886cbe00e70ab641aa835da9636c87eb3463e1040ffb84f2e4c23bcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-ES/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-ES/firefox-59.0b12.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "a42837bb0fc2aef78f6489d4126df2ad33a7464bfa7496e879d97112b5afab730bf1d0728dd08294d594241176ed9200979fce2eb135c5f2ec532885e0400646"; + sha512 = "b2aae50ad3112c12b2f258bdff580e00604f3c38f06612dbf297e6924f7f207a796c171cc138463487eb34b9e990eefae1c19401cead4fcb8bb47b68d3a5cb10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/es-MX/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/es-MX/firefox-59.0b12.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5697ff24400196cfbb27dbbb7f21d893ecc9f5ae536d94833dcc4f46ef65f838cd17266f52b97b296edc854aea776da39a7a880cf06698842e24f6df87a91811"; + sha512 = "02d978685b34c228f32d9338c5d0c182acf972df5a6738f9cc99718502a455e17171802839806d9c11772f05bf9c4e2b586a4868b656e14bb7ba515b3ac6df85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/et/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/et/firefox-59.0b12.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "255b1a89aab21713279434cae424ed0d22da8e2f93ac0cfdad9fa641ce9c807ee5e3a4240b0be8b3c436315a883343a68a4b01080b2fe5049985561cb2e01cc6"; + sha512 = "fdbd8224fffb9278033663b183bf6655953a1447da48f361659e3963a98603ebacce94572969760b8a9ee9487268ac84a54ce1b83ee0ea2cce05e619b595b052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/eu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/eu/firefox-59.0b12.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "418472bd40f5bb7c2b0a6cb4da00e030b04de42b687deda303a61f9e463403271747111a53fd3ab6514f700c84c441c591736c777dcae89980764958f05b1a34"; + sha512 = "02a3a7da9c00a409415580697740bbc142e7096d47b67d90df2190c21fc4fc1c78f23784069610be232e640b3ba2a1385fe80436bf59f5a9d54ab5892e90e965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fa/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fa/firefox-59.0b12.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8f3344d643f81acaab0d6309840c6f7e66b5bea8dcbc1c62964ff991efc4cbb701bdd18042638122ada090869cbd2ad6e24f3a57088d5fcc81652e69b0e20389"; + sha512 = "abc53cc196033c63d76f001419cd44eb520f0b995a7f86efa78cc2a613989225160e3736dbb8834f6005b01b6ad36659d3043ba23d9327ee5a615db20daa8cb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ff/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ff/firefox-59.0b12.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "88e9e20d3672dc99c510995db6b0734a7186ce49cb04a6ae0de1f88945814d094f38200253d517cf676a95cb2a3925e92f44ff0459bb3b1ce1e68936d838aff6"; + sha512 = "3c09d6172102f4245da55d8acb0f5bcc04a219e7b0c81af1f298ff444cf042dc3e6f6c30e69c2526f01d8edb2614f28f41d49f034608a0c3612aeba0b26cab21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fi/firefox-59.0b12.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "2a478fdb12790ace99f2b7691b3b70b5702f2620f3cb44d2b2d12f5b6bf7f4643b403985001b109e6e5f84ee57561f0a24c2080b4639ea03e8eb37e9eed30916"; + sha512 = "910fed919c02955f4a9898951bb3b4aa20faaff12e585a9834b0e23f1eeabf788b8f9b4b4ef8a0d04cd0ba9d9b420a602c1e8929874dd47bbc9da746b5439945"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fr/firefox-59.0b12.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "79e39dfa2bd8b7bb0b9d953f1dea8061cb808756c07432f6132d18b83064588b97b2c25efd5aca6513ee8f0ef6454f1b978aa5168f55af7455ea2e5addd4d429"; + sha512 = "6e27f8a87ac14a7b0c457d67350c4d54fd2fa53f97a4670a77015160620e323ab551a423b0903ccdc6110ade4d8ec25a04f90ebf10bd1c1bd725135041f7600f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/fy-NL/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/fy-NL/firefox-59.0b12.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "6e64f606d17646365e08d7f908c339472fbde35a8337fa4333b49aa28f99c47bc07ea8eca4097c9f7139fd46117262f59a79553c97c108d5492cbcc40b783f14"; + sha512 = "ff8a8efaec34c63aa7723eee4851f0d3e8d4d3cb1801e8febc58839df37a0ad4bb1e3ce0443b901c6804f308079365a330c8ce8c031d600c87d8e35c732cbcb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ga-IE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ga-IE/firefox-59.0b12.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c2e1c5fba29f1ffd85195815305b2f134d0b354df1d2f78539a53d196f0fb2d58b6ffce9242f63718e2062472a44c38efeee4fc845425d6d8a0f6eb4fb5e0c5a"; + sha512 = "9c7cd82dd70e48c0815c8f7dd7ff0596bf29fbf7345b6666b9e195363684e2cb290a1bd98e596f37d5a6885d194eb44aa6f41b0bc03500902734d1cb949056d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gd/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gd/firefox-59.0b12.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "0158aa15c1047f07d4d2db65ce352313254025b9133ebc0b01dbb136cf4cbf4cdf568cf30a2f3c7f9161659ac56ef0231f4dec28a4f3a982c339d576dfcd124a"; + sha512 = "df6e2942ec9c70c7ed287bcdfbdc7659a3673b4ac90cf517987e8123e918387b8849c59ac50e2c2cd349037b81b53eb935d8f3746df87304679a18dc3d1d4d91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gl/firefox-59.0b12.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "986da4b58288b2c24784ef44ba94a5748bf1bdecb36779d9f8489fe466fcd7f530e7fca31bc7394085a1bbc3d4bded92a68d7b6596bb9f3534cd5452486089c4"; + sha512 = "2facbb179b3ba7b888a56526a35e2477d08545959f22883df1d3d96f272048b434d6420cfcd8f57085d08cf9d5120a5bd761b343376db71d19073065b07f6440"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gn/firefox-59.0b12.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "f76b6bbd7f1fd244998cfe07b6533143def56d57bbfab6228f471ed62ac5ca3b9edfa90ebe7209b51d09cbd3d83e8112abdf80df4bfe5e21862e202a5c5718ce"; + sha512 = "255887a39c47dd256010427fe9a48070bff9cccc6703b68298e4063a56dbce04e06516d6d49a5ceda348e84d8183c15b8605d66523247433a9d43388abce5543"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/gu-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/gu-IN/firefox-59.0b12.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "68683b0841a3d5a5a5df49576b47ddd5dbce872607da12e3c14924038f2c81d4f85607455f11bf35ec9acc909084558b9eb227871e2cd1d0201a1ead86114601"; + sha512 = "32c69a99bdaf65b091523acb898e4025ed85b38ed4042f55c5641ca4374ff968334d89fd87364ffb1ababe4802c2d7d858abd9c64e91235f3cb7ae337656b7e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/he/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/he/firefox-59.0b12.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7b61eb2350f501943882fca5355813c4f5081520fa9b8c20879177b6f175e6512637f8265040c327fd1241c108c85c7e2b996c05266cadef27f29d0b1539b88a"; + sha512 = "ad5280dd00a210dcc5d7be26a10c4d4c98c9d7df6d723efa6b2cb1c3825407fe9ccf6b85f2c55a1eab30c112ed65b562469e0c111add5e1eba3de9eed969de66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hi-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hi-IN/firefox-59.0b12.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c2b33af66ed682f306b29a4d729bae59663fd5e9f956d458f7218166020e1a63e3563ba9ac3a91a3e9ecbd206f238536dfac611c71581ee144ce7797bdd804ad"; + sha512 = "f276b69eeb73b4c53d400670829bf838929affb13ffb078f92a5fa22c534ea9622dc73b8f20dc0c32b02f1316cf9a973b19d9168cc352e03716eb9b057a31e8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hr/firefox-59.0b12.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b0e9824f7d8c1635ad995c9bd1e4a18ae93bd0d2683a137b71a3871f3843ba7b594b633ff36e98cb56fb21d6d6d3dab80852b3e5168ce90cae7fe686ae91ed22"; + sha512 = "4a8ec3dbeb98b2f6a42a6f21fc625232d84aec5624ef3d23af606060efaeb3b79f4c28a098985a5f16a213ed73710debc51082c2cc1e9320fbf31d4eba037e6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hsb/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hsb/firefox-59.0b12.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "47e6cc57cbe8710f3a2afae02a91c33f502886a61b4dac45cb98e88baec7f9c3132244a66ccec173441bd986aa4c2270a42d6f6244785ed1a683b67f24acf619"; + sha512 = "f28881bef53d07b0015fffd51766ab408fc90759e68da230be1aa1a09866a400cf261e948048ca8e2030625bd40d3cdeb4f974972b246ccec3555b7370414373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hu/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hu/firefox-59.0b12.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8560321cb3f64ecd5aaefab112dcbcb93cb50f30fbe8885e8239e569e1cef24abadbed6d0c90967fed1a5249ee4ed109807b967bf0879c83644d37e0a9c88e56"; + sha512 = "943058206a95982701a6ad28d9726e2331a3203ec5392c3063ecca69c145ed5b1163856a758d37f9d75b6a33a736739b20bb2b8f157de90afe981f699f72010a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/hy-AM/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/hy-AM/firefox-59.0b12.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "bec109b912cd15708ade7b9aeb8f6ab159e3e2d1834d161f1bbb000d4f7c9bdd31555618f445f79cf5fafefcafdd446a5d83ada0ae6845c805bcb6d437a23eca"; + sha512 = "a56f447feb84edc507074588169b42fa4603b72f3793b76d2f13623f87e1a381b4d9d1a3ad330a21dab85d42b314629e15d2a3270db4e943c3576de3f2492b11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ia/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ia/firefox-59.0b12.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "faadf2bfe1dd2724914803427caa58d320214e916fb12b0880ad0ed44d76b3a584390ff2c2cedab7d1d38f9243c82ec797b12af64f81b23cdebf0e033cc2f27c"; + sha512 = "c0a3fea5105fd8bceec15575962d758f7d8ca124fb52ca175917115a6f81765b9ef91316775cc6ddf0e5c7d3490cc6f13bfe916645520771cccae4d57699a962"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/id/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/id/firefox-59.0b12.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dad006e8f0f5c67a955f24eacdeb7a7cb5788fce9a09df2fed0f22010be88270ed50fecb82133be896966370e78e107b6209c3600f042b2266134e4ee94c0f78"; + sha512 = "e8ead5b2940c02e9058f94a389161e6f73e6a1eafd37db26431c03f7b42c7188f1abfbb983072082849043b306e4011e7d116b042c084e479798d5283b4577bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/is/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/is/firefox-59.0b12.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "3112783656ada68ee9bcd365527c6b5ed764522f960c295f767fbc01fc19cc6ab4d3c5ea7288219f97ce662721ca514c7204ca18ba0bc518bdbc113df145181c"; + sha512 = "e2337b22861d1d682c656b75a34aa61bda66caa27239bf07410ed73ee67845952dbcdac2b83aa1fb4e34c88695094584d563683f08ff0b2165426f63b8afe18d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/it/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/it/firefox-59.0b12.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9821dfbe30bbccd6bc4f3e0d642668eab1792d322763bbad81e0306f03f3f20303697c96ade084da0f708251d33160b60fb9246f6ce77408be288a8d11c39bb8"; + sha512 = "9430b020d6ea7632b8303861c5cfed02f31f1dd8bbe0fd8e89502d83011cd4eefd51ae1b487341efb3886b7cba41069bee42ef0b2da4c8663be72a3c230ec74e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ja/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ja/firefox-59.0b12.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "131000fdca4ef12d0ea6c398131cf1cb5ab437673375607ef75fa8e462c38873e9a7ac072732c7ce9901cee7b1d33dfb048c21e77ef621d257df5bfe69d64d4c"; + sha512 = "bfc209e604e20c29afe1aae3caaefd1544f61c47f473e10c517e1ab0c13b2e31744c4e3fa54af0f82d92bf87b5294f4806d023c4499681465e1653aa663fe398"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ka/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ka/firefox-59.0b12.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f00ea919a614149aeb76e08af31f302de80b51be5e0b5060f650f4e9310fb6a1126c95cb13dd60b5ce651c61c1e6b247af4e37546642c6db7755fd2af5f78d42"; + sha512 = "62b24e280de2b6446a9bd01fde4e801243163f1300ef3196358173a3e40d633386c286d88497e81be94587f69930569cc50a6e8ac0524540c39fd539d87ae5a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/kab/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/kab/firefox-59.0b12.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "e0c86a1dc446b0bbb158ad98590ad538ccd157ee3376c65f22d4b36a415f1e68656bcfc3ea88525102093e742c2ed960e372cbe37975528cbee47cf78ad69301"; + sha512 = "d919e85ec10d9082df6bab5fc79ac8e5ea68b933c5adf0677371ce7b554e3e4585c314a312e5ed1f6dbdc6da528443572554051a3fba33fa62fb52ad59778204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/kk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/kk/firefox-59.0b12.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "eeebd7dac03df501a469d59c912d8d0a111036d812b7281c6491ce2344ead0c4bb81f34354f73457908e5ba612e7a09e489403bac546bd4049fae67ae0e4346d"; + sha512 = "8667f4ff1ee071783d525b8bedcbe27274308e2691709250cc0479aad8ceb0d846837e57dd95287e7c3c7a98b85d95a11fcac594f071089f0f390f3df662d1fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/km/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/km/firefox-59.0b12.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "50563d2898ca832f8b4a6ef2cce321ee0539489720233b077962768526705dcbe7817cde2e6e9d87c0be14f9496332b1ab07fc4faeae0cd65f502258a155198b"; + sha512 = "81ddd2c2c2d26caf3a9f31bf48421969c9e1539d268ecae77f520b1ed6f44fb9eb957940f43dfcfc1af45661d74cea51f5bbe45c50e9639d34e749740b5a7484"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/kn/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/kn/firefox-59.0b12.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "ae0a8ef75d58676b5a106945a9f9901950ac22e311dd1375589523fc2015a059d8aa5b2d534875be16272da77a0f992326a4155e92d82cd3d9d07169686798f9"; + sha512 = "07d337bf9d4dcd769982314d9561b00f6b379d19d719284d4191509c09f378260105fee0cd70ad707e560d22c629430da5c7f2eb7a34004cc5451e5c02bb1f3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ko/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ko/firefox-59.0b12.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dbc1aa84fc5d9829b4a7058593b8751233cfc688afd88397b6019cfa3a9666473e766fcc33b2321f8dbc33705aec4abb4f18048d7931ea6b1cd382f4977b4c2f"; + sha512 = "40c07eebaaeb05aa8d807a50532097c5c52a95d2d3c1f9e39f750f7b8b4c3b9b3f000b66ce354b44b7287dc9067faec409bdbfefd1c2c36559df365678925254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/lij/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/lij/firefox-59.0b12.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e96310c0dd8a670ae1a0d4751fd9bd79f2974afb66ca16903b021abf5bfc44475772ef54752d1c2949979ca157c936fc6a3519b4e90c5f841eaf0da935c7ceff"; + sha512 = "8c1d35526b84b053d685db6d7890a7b58a07e1f2f7b9fb63eab1a76f5d6014386de28cae144ab78890c2adfbe29219635215f9b59770d7c06f6149c09037d707"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/lt/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/lt/firefox-59.0b12.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "76c4ea7eb3f4ead3df02e4f8c7280d86b03beaf96797556ef430c2966933201bbe7b7b8ae8ab3a97baf3102252641746eeee770bf4653e56af054d850d1dbc13"; + sha512 = "1c96af7c40b59014ae681d2a5cc5742aa7c413de142c17bdfc2886840c2a601e513ad83e7e12e86b02fc750ac6385faddf10abd098f0d80b8fd10d2fdab49e58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/lv/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/lv/firefox-59.0b12.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a2a85562351352d8b72776bb66f0d89d3f7af12ac59b1ccc86e78316fd59e841f7c4e0947326bbfed09f82ea23b179c5647e2444eeecfacb2e3caa12834e35d8"; + sha512 = "acc84a8d49aa4b0321359a598b9ff672cd3235b825d132ad0af2f70131d8c033292dacc87120dc1a39a0975563abdf8001ec8d867d43e29c74b4a8e38a41a261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/mai/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/mai/firefox-59.0b12.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "dd993da327eff1f53bb2d13ac04527e3e55016e45a77157d88155b4a741fd25a842914d772f313d73b03bb97974b9803a86c281d5b25b9716226d16adb4d3b7d"; + sha512 = "4d5e55ef11ecc0e9c683d226f458eb214aac2ef1655cb052a45665ea5c0d4e09dfb4e83aa8b23099e2c18a8497e31f6d52e7ca91fe21a8c91b71092e2bab09eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/mk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/mk/firefox-59.0b12.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "91be59e096455bedebbe9b279ac56b247ca507d42cd6bb1584744552b3e3ec4e16654e73ec53276dd5fe63ded1e2614ab47f276aa40caee780a249663abb88ea"; + sha512 = "cf99c9a0f83ea01ef9e379c8842362bd5c5b82894bfb0f73b42e59b0f51d3bbc04c89aebd354f80ffe8fbde2c1a464a45f9c5e3d8f083bd7f39a4264568decbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ml/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ml/firefox-59.0b12.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "54fb3b09607b84f6b8fd1f43749e5a0a194921af2b56e41aa6d649847267e59c41d7480c3f885d84170bee42da3265ba1c31b07d5355937afaab0af59ac385bd"; + sha512 = "f05f665310ce6f519350f262c799a1375942e2fef71aae6061a31bb0ae9ea897e8c81db80f1c265a58ee8b9fbee3a900d1aba4151a3b4310fbb49cf28d60c36e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/mr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/mr/firefox-59.0b12.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "52973f72b89455232d72cb557f375a7f95ee783c7677e1465f952a551a5308a258a71069471e6893c5e048596116d5380739ee726559339bc1f615eadfb2c605"; + sha512 = "e0bd6bb184618df655cadea7e77bbb26d3850d4cd3d70d4bf3e92ac5d49ff9dfacb922616887756b32619f36bc76ef26fd5bfd5f6e3bd40a1acd7aaf4d079ef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ms/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ms/firefox-59.0b12.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "7b171a04eefa609844ef6bbf75751d1b506e2a337cc01c9c77a17cf5620453ec8ef8938553f89e9c7feb114088bd0def039d0310667adcf672d62aed598b3002"; + sha512 = "b36410385d4e71e6ad35ded3f7189f964948f09269c07aa53a371b5678485234ea2d9e44729a43d274af8ade7c63602c5cddac6eb65d0f2eb6fbbe9fa26ecfbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/my/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/my/firefox-59.0b12.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f8af8c0cb3eb7776f0f1b1b1b8a0e66c38bbdf897a7e755f8bf714ecdb4f0117f5a52c49228fe51ecc1c34fe8075189b13563bbe625c45e304c0f88830e79989"; + sha512 = "d19e3e13bfa320280e1d670a5125a4071a37dc5f8cf065f27117c91a3fa7627aa52e158360b55058bbe36fe25e747de4cbecd00e32f1f3831ff27c510313aae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/nb-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/nb-NO/firefox-59.0b12.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c6bfe140b38a5f0a7b826ab6a99aa4acd8b7b163c67e33f43e13f6fc662df5bc40b376430e5d0386a854af11d23570b7196d4d5faf188c521e36d7969b0c5874"; + sha512 = "f6fd6bf32bb68b953b67601c96861c5a3960fef10103df1fca796dd1d66263a5c42ffaf0684c7901375e970ade5bcfc707c8ffb1787a10dd58b94d111be470c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ne-NP/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ne-NP/firefox-59.0b12.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "643ad4aa1759da139b63fdce91266fa11b1390d32a4a508708aeebcb309a828563ba3387335f09f28b9eab7b87973e0f852789fa26f8d734968373ee1b16d987"; + sha512 = "d3e226fcf97a48a950327ade5f898d8e0ccbd4e7fd9b1e9dc2964faed87c1816113e4eeb0d6bbd1cc127ba81bf5950c4f7355eaa6b771f8b9e5797cd11a3a752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/nl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/nl/firefox-59.0b12.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "9d68a99f0299f914d18685fe7cd651e7498b5b68c53c4dfd72756fc7d21f35a672b479792943e240195d9bc7d5ecab0a83eb5f2cc611b5d619bc7a884bc83d1e"; + sha512 = "d10926550c9ce47395576403b78a18d47c03b0bca8c6a0057103732f99d8b349aea315d3e2bb6cef4f69cc6ad2fa9ab8cfa4b4b2610bef261bc8fb82d1196d9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/nn-NO/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/nn-NO/firefox-59.0b12.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e5c15c53747b6284bb95dd0e1b701311e89bddde2bf491969595d3e5299cdc5d2c3a8370b9b153bd9eb44bcda60a28cc918c6ac0b6616c49aa484cf4076eda98"; + sha512 = "b9848a188000d6bf883c2a42bfb2a62c8a9df95b02073744028776b9b5d7cfd5173c543476819e16be8b6500f6edf39c41e86f4e3d458693f1667e3e757354ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/or/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/or/firefox-59.0b12.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "0b3c9695476c42aae8b10f8f5437bdced049900f928a682aae378a45f049d615a7932df7c09a4f09d28f971d6a649758e5438b9f5001f4424709d3e49844beb4"; + sha512 = "b556fcd7d6a156d6cca51c81c4315b61e7fb856fcefc8b7753d0b9e3631c1a69a0b195f6c29be2b646b820482caa543c911b4ab814d2800617d7d27f0c7be1f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pa-IN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pa-IN/firefox-59.0b12.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "663e6dc3bba8ba42428a6328ee74bdc9ea7be9a1703c4d4ba894a507f47c361b7967101e7861805c3d8487e9ffea28a5ade3db5603a41cffd6aa07a8e48df0e1"; + sha512 = "d7a80e8e8057ea3b80b80e265f00bcafe75099215f90053829bfd08de8620f22822979cb413bcbaa0856e8ac1d6adb579556b43a1f3dff20cf6c6c9417696f42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pl/firefox-59.0b12.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f7c9085bd201f574c63360911896c515a2b690eafbf6c7d4410923c89889ffcf640701ee088e8a479ae26b0d991d295a7e4dd35df3a306008aca634d1155982b"; + sha512 = "0af024d6ed1d27acdbf0d1e2f7ada4c2c8a22e104f3269d61b186bbcfd527a4c09a36d973fd7c0730bbbac2ca7145a7c8fc9cc46d01f58e9f4a8415110827edb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pt-BR/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pt-BR/firefox-59.0b12.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6554fb1629bfd38f9e55adaadcc1568a512e7852a52cd53543fd0b308ce13785a5916361990351346d1921138ffc87755800547c92b0988cf3fe13dd345b79eb"; + sha512 = "d4d0c999c37c2533d4b5bfc9606edbc7b40544fc0c4b756a120f8746cbc66a6c6b16153cbe41cd1f7ac9ea67e7c3602381a875953bb3ed7774b23ea4e5e6e163"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/pt-PT/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/pt-PT/firefox-59.0b12.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "be22ec464e340a18776c7643a88da2c301954cb1ef7c386e8fcf536932f3541c38474d4c3ac8909bbac1c7f4721d7fefbe277ef4bdb8b78c73c6727b5867bb49"; + sha512 = "4cb6bf559c23e12134d69404080d465ba3174a03ca9e6228dbe35882fae7cff7b8ead8f8da3a8f7c87457b41febd288586b8b1452c1e201e9520326c426656b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/rm/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/rm/firefox-59.0b12.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7fcdb0dfc6829cc238f83323a509f783342abf56c80d52ed255837be02ce767972dd05c74ea1e77d9fa1cb94e6920ff32b5d2c67e9075a9a1cdb4bcb1a69eda8"; + sha512 = "ca588c4a22e21b37803c4ba1b6805f57d926fe19d4c65b21e396e3593582745f261bce01ed66c3fa1754fbd705fbf12e6f8fd7fa5988e03e989275ea5ba23ced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ro/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ro/firefox-59.0b12.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9a0f07b7c6e579fb28b5fcd98a7f6a8f6766e5bfd6a0cb239cc48dbc0217ce8c5c82aab1e3fae70e5d9c343bdd8aa87ce19e4ce16b0d2c3b0cb49f92bf6b413f"; + sha512 = "3d23f197639d2e573c0e8fe4b72b603a7a3574cdac019d60c7ecaabd51693d6f90977de85a38417d836ad008bcc9aa47eb44628d4f7c758d18a17b434fbf4206"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ru/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ru/firefox-59.0b12.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e19dc9b21f7b29bea0ba0ef3eb5fc35eb1a9f901359fe214c41ef9c39a111d35fe715cd499ddb125dddfaba10f3b2244563fbb58604cedc4c6bf6357c06e0eac"; + sha512 = "cc49672de738148f8fdaffd25b9d595fff8944dcdb262b4033f2ca233fba4b8bb2dc0127bcc2b42a9c39ead8db713da47d33c637cd0cce70dc800668d0fd9996"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/si/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/si/firefox-59.0b12.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6cddbc30cff60818077669e37bbfa9570a6111c9621a0a3ecd9d6c2724b2f7f4e2f1a656193e44d4b411af6d607d74db8eddc192e06d13e80fc14c30d53632b6"; + sha512 = "37287cb9d5f690439972b49657c9ea98dbd693155649f7f9ae72a40325979c6616f07c8228c692f19e532ae5c4d6d31a29d970094dfd9659943b51610f48faf4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sk/firefox-59.0b12.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "2379543aea8a76edd1fdf37fac7b214de6efbd38bac775177d4f43777df2aa35bb70cace7102cc82f5014b5121e85de0ad548845e4ac47774032f486c5f40e61"; + sha512 = "7d9e0fc4e80809850f95629d4ef5373b2e1f04a8038d5dc54396c20ce84f8f8156558a424bc55670c599fdbb51086d2f231d35eb00cca883e3967b9ab762e95f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sl/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sl/firefox-59.0b12.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ebe4ef7bfb6a2539a9b02b3d2acaa919136ae5d3101ff8d3f6209db2492cd79b1df6ed6bfd98ac1ecce711ce006f04e260585d184e7e066372f42986941c86d5"; + sha512 = "640c6fe5e6d1c6b2bd81a6f01b009be0cae2c4627529523d6e03e4d59742361287e5533d7ea7fd7c3b633c0866fbb775b335903a1dee28f42007b87b36036aaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/son/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/son/firefox-59.0b12.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "066deb32e0a8884c3d10ec2a2966224e5fcd62c352bb4d33a1be0256eddd4d73f097462cab7606e3a2713bb65f0e0329d538174656676db7370f68bd8597bbc2"; + sha512 = "abb21c84e8be1cec9a01928806e96ca4f09ca064a34a2ea7306a0aff9d4c81a53fb2e2f9cb573e2def8581c850570245ced007e5408185aba7d099cd69b3f4be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sq/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sq/firefox-59.0b12.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6ffb6dd81cbaf86585ad4db5978dc115f7ce0cf150faf2e468df0d637e5ceb17454825f3fdb29b4114d24ed1fb65e6f6688c73185b5e4a733c9a1018aed7f4bb"; + sha512 = "918de73cc6aedc5743bd0c514ee3f8c54b82d2f1c9903a0092136ea6dc935481bd37423398da34f24f92531307a0d24f1ccbfb48649cc713c0351c9ee4b0e57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sr/firefox-59.0b12.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "aa92c2bf8c5dbb9b4779677fbf841ffb2a0bf83e4505d74a6e7d8b92864eac2157bd5ab3b237fce6a1038d04590c72d371551d493ae8776b7b43415f18b74a2a"; + sha512 = "07a63dab95a898f62f0f8226fd37e9b49455a8685eda0f6d0eb742b71e8b298e1e26bb65811e0b116ca9fc63893ad73092ef602f33ea3adcb10c8c2e740bf505"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/sv-SE/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/sv-SE/firefox-59.0b12.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "accb3f5e95a869f62c80c4f36a8e522c26b35280ed053defea42c89fc0284ec42c7f25b23d7179359f9b77dd009a40189040149c3bb68d844af9f4aa90034159"; + sha512 = "a0954abe69891d5b61e1266bad58de40c3358232116d5130cd149d5496fef2d476d8aa1c0045939621c78259a7086001ba60d815c5430318a9c0c298e1f3f10f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ta/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ta/firefox-59.0b12.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "323660ec8e3e783127f81faa86381c6a38946deb090dbb94d1c27df8a2056a04d73bb95c915d67c7331bd5a72eaaf7b1deaf7885f181946dc560e2106e38dba5"; + sha512 = "627048d83c9e1988aa5a85a660f28f073803d5cd66499472cc8f47db1856231206954879934501bcaa69a41dab25e56bfac53c23a842296662a7093add7482c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/te/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/te/firefox-59.0b12.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bcb8887e396ad68fe8543a90a83cbac88c5e73b450e134a658ae29b52eb4c930af0a25682535367a08bfe29b942cd57a7f1c1a3cb1eced97c7c1f148c991555c"; + sha512 = "4a7f5162db00935f753cff193af57d634be3a2766f0b611165ab605c19a40de5ef66e1485e9010cb1a4b631f0e4368c25495716d0cb8c8813a5faaffd99ed8e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/th/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/th/firefox-59.0b12.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "aedb446c60aabef0851ce249178ca43a1e7e908660d1c2391d9565346c7dbbe9f2bc7b15a1f0c1bcd3bba35dcab1872035121143af9593748c5ece81eaf9671d"; + sha512 = "8acf03be030c07856e105faef11ad9f3e445c1767c58cc524589a9ba26a45a593fcf299eb6e98adf20147ccd1aaf4f4d03b49af4e4f4dd859600eb95de77de6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/tr/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/tr/firefox-59.0b12.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ad62e59b5aa4278df0e5127da5bcdac63d68032e0a77e666973c01c936057756b888b04916eeaa5be3aef2d953d0e5ff84f17dde3bd8521e68451e5bb9f05c05"; + sha512 = "c4ad953689c6826b34d81c35c7c978b44d4ad17a53411298d8ab459772895309988d74e0f05f16376d079bd084c9a71213d375bbd98075177cd4818260737709"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/uk/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/uk/firefox-59.0b12.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bd07b0d5813452b98e9d1c5985b628ada4a2904703b9a2239a89a0f277a7f7d9e2e4db66ab32a988dd7f95f56be3bf09db68964f57c1e8a0a24e8eae44b7359e"; + sha512 = "e1cf1ab9c87a4fa00e3bdad41b6cd2c75d8fc432ad3696c8ec1c2f8d79958ced32c3cef0003b3311766c2502a637b4be27974df1ef7fd0a918c2adb33b2bfebe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/ur/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/ur/firefox-59.0b12.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ef7e8108b27e106073b838ec09b4d0abebcabdeb288a62855be0d076cc481278006f7cfe3ff79ac38ef125157eb06645f44d56fec200d4b1b0ae238da4c16312"; + sha512 = "8e583c0d856dfb4e9dc56a01d56dce5d89a2a9dd57df2c86e641ab35a6fc00b4146ca0f09e7d2c025e3f39aaa680519a54c6d7a52032b2a86aae056f6bd74261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/uz/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/uz/firefox-59.0b12.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "73f23a0b9d0bbdbff8fe2d8461442b83d0f8d36e95c46b65b6dac257d2a62ade8aad71401d3bdca3c65b59f794ea9a918205c4b5887e7e1e63756d5133464337"; + sha512 = "079f95cb3e6b4c40360d08b33781772e9cc4457417d1aebb04e798925e4c69bdda686081bad82b816debb99d2869102748417acd22ce273e74fbfa212dbd9cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/vi/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/vi/firefox-59.0b12.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "48e8c0f5d28f527b2a3f979dfdeebc39efcde646d146e4ca6cc3b35a827019b16c31a841582594179dfadec7a933ff0da0e4d35e2b8f2c50dee0c5260228b723"; + sha512 = "4a75c892973bf3ec6a4a4026bc0af6d222d8b8b657bb9dbbf157045c708781e82804501dde5e0bb9054632ea393359ad18f2771098265c4c264615afbdb5314e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/xh/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/xh/firefox-59.0b12.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "5da170e2a95e38c20fd5d130eaf097d19a166c6f66c90d770460dd520dce89a62b368a818202fff3ba35b7740ce75b775eb5a792de529c81ff4bd08edb75bed2"; + sha512 = "bbeaf2f0565e1aba63cce423f9203ade7896360619f059ac1b002e126c3e29a0a1edf4522b7e37e85d9552559219ba677a349f0eb287897b73fa53fd7892c2ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/zh-CN/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/zh-CN/firefox-59.0b12.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7a07ce7713d66358852cda20fb6ccca921e7255bd35c9ee8383de6fbc70b978042916b7ec86b44fdb93908ff5e01df581fb0ba68d5e7999f31968966fd901922"; + sha512 = "23d6f3324af5206d2ed2c085ffafef0b1f5aca00b443b17b7a445fc31c0915acb2c47c78ba508dba8f5d93d85db19051734bb014797229e5825cb6dee4f21168"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b11/linux-i686/zh-TW/firefox-59.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b12/linux-i686/zh-TW/firefox-59.0b12.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "1ac549170fa1cb76b5dc2924577b1ec1af482d47822ec1451d3bdcefaa345381f7637b77989fad1d369c2218c01ae0294c1a105c637f327d378725e19273d771"; + sha512 = "c04971cb9cc1efc9396c5e03e744a99d91a76efacaa2dc4d821b3f397be6528d6e485853344c1def6c8235d83ec59eeb2aae4cc8f5fcc6bec75c4fb4d50e6ad2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 69e935d78762..0abf3753dc6d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -3,7 +3,7 @@ , isTorBrowserLike ? false }: { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr libnotify xorg.pixman yasm mesa xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 12ea714fb234..8d08eceb1692 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,10 +2,10 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 +, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome_shell*/ +, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , vlc_npapi , browserpass, chrome-gnome-shell @@ -52,7 +52,7 @@ let ++ lib.optional icedtea icedtea_web ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader @@ -73,7 +73,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra_gtk2 ]; + gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { inherit name; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 17c285d9bdf7..eaa05726f1c0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk +, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk , kerberos # command line arguments which are always set e.g "--disable-gpu" @@ -33,7 +33,7 @@ # Only needed for getting information about upstream binaries , chromium -, gsettings_desktop_schemas +, gsettings-desktop-schemas , gnome2, gnome3 }: @@ -57,7 +57,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap at_spi2_atk + bzip2 libcap at-spi2-atk kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { patchelf # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings-desktop-schemas glib gtk # needed for XDG_ICON_DIRS gnome.defaultIconTheme diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index e013f54a39ea..26a7e883c60c 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper -, gsettings_desktop_schemas }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; + buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index cea6d5dbeea4..f7d4f1a69417 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 -, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core +, glib-networking, gsettings-desktop-schemas, libsoup, pcre, gnome3 +, libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at-spi2-core , zeitgeistSupport ? false, zeitgeist ? null }: @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr - libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core + gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr + libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core (libsoup.override {gnomeSupport = true; valaSupport = true;}) ] ++ stdenv.lib.optionals zeitgeistSupport [ zeitgeist @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-lX11"; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules") ''; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 461db272b12e..e56066e156f5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, libpulseaudio, systemd, pango +, dbus-glib, alsaLib, libpulseaudio, systemd, pango }: with stdenv.lib; @@ -36,7 +36,7 @@ let stdenv.cc.cc alsaLib libpulseaudio - dbus_glib + dbus-glib systemd curl pango diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index cd4f95097889..c17e16f0d695 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus_glib, file, fontconfig, freetype +, dbus, dbus-glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify , libstartup_notification, libvpx, makeWrapper, mesa @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification libvpx makeWrapper mesa nspr nss pango perl pkgconfig python diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 9142ecde8598..2f9170eff87b 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchzip, python3Packages -, makeWrapper, wrapGAppsHook, qtbase, glib_networking +, makeWrapper, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -43,7 +43,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ qtbase - glib_networking + glib-networking ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 1aa9bf044b05..88680414d1c6 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, wrapGAppsHook -, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , patches ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; + buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; 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 d64c7a20cb99..299ec43a8b90 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -9,7 +9,7 @@ , atk , cairo , dbus -, dbus_glib +, dbus-glib , fontconfig , freetype , gdk_pixbuf @@ -42,8 +42,8 @@ # Wrapper runtime , coreutils , glibcLocales -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info # Whether to disable multiprocess support to work around crashing tabs # TODO: fix the underlying problem instead of this terrible work-around @@ -62,7 +62,7 @@ let atk cairo dbus - dbus_glib + dbus-glib fontconfig freetype gdk_pixbuf @@ -261,8 +261,8 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} # Generate wrapper diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 508ab6ec432e..65ebaa3f80c5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -8,8 +8,8 @@ # Wrapper runtime , coreutils -, hicolor_icon_theme -, shared_mime_info +, hicolor-icon-theme +, shared-mime-info , noto-fonts , noto-fonts-emoji @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { # Generate a suitable wrapper wrapper_PATH=${makeBinPath [ coreutils ]} wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor_icon_theme - shared_mime_info + hicolor-icon-theme + shared-mime-info ]} ${optionalString audioSupport '' diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 6ac8d9f1f6e7..8c9f23996ede 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python3, makeWrapper -, webkit, glib_networking, gsettings_desktop_schemas, python2Packages +, webkit, glib-networking, gsettings-desktop-schemas, python2Packages }: # This package needs python3 during buildtime, # but Python 2 + packages during runtime. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preFixup = '' for f in $out/bin/*; do wrapProgram $f \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" done @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; - buildInputs = [ gsettings_desktop_schemas webkit ]; + buildInputs = [ gsettings-desktop-schemas webkit ]; propagatedBuildInputs = with python2Packages; [ pygtk six ]; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 5b10932e73b3..251315619cfd 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking -, gsettings_desktop_schemas, makeWrapper +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib-networking +, gsettings-desktop-schemas, makeWrapper }: stdenv.mkDerivation rec { @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings-desktop-schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup = '' wrapProgram "$out/bin/vimb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e6275b2f9592..54abc7dedff4 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, - pkgconfig, webkit, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl, + pkgconfig, webkit, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "1.4.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings-desktop-schemas ]; hardeningDisable = [ "format" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/vimprobable2" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2612df3efcff..6bd9614e08de 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 -, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at_spi2_atk, gnome3 +, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3 , nss, nspr , patchelf, makeWrapper , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at_spi2_atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 542bcbc41b0d..11aa0ce706d6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch -, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss +, dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss , pciutils, pkgconfig, python2, xdg_utils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; nativeBuildInputs = [ - dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig + dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig python2 xdg_utils ]; diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index affcbcc4b3c0..d5b327723276 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32 +{ stdenv, fetchFromGitHub, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_32 , automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook -, glib_networking }: +, glib-networking }: stdenv.mkDerivation rec { version = "1.7.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib_networking + gtk3 json-glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib-networking ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); meta = { diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 7ae3e8c73611..577252bc69e0 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -2,11 +2,11 @@ , geoip, gperftools, python, swig }: stdenv.mkDerivation rec { - name = "bro-2.5.2"; + name = "bro-2.5.3"; src = fetchurl { url = "http://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "0w5rynw278nl6pdl5s7gsmxjwkl6z1g5pcm6byg930k26yyb35db"; + sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 5261bd451e0b..8f4b54cec86a 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: stdenv.mkDerivation rec { - name = "daq-2.0.6"; + name = "daq-2.2.2"; src = fetchurl { name = "${name}.tar.gz"; url = "https://snort.org/downloads/archive/snort/${name}.tar.gz"; - sha256 = "1jz7gc9n6sr677ssv61qvcxybdrmsll4z7g6hsmax2p0fc91s3ml"; + sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w"; }; buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 94490d9f0341..9793fd234a18 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json_glib }: +{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - buildInputs = [ bitlbee glib json_glib ]; + buildInputs = [ bitlbee glib json-glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 35cb2100254b..810422dcd3f3 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext -, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib_networking +, gobjectIntrospection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup , libgcrypt , epoxy -, at_spi2_core +, at-spi2-core , sqlite , dbus , gpgme @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection - glib_networking + glib-networking glib gnome3.libgee gnome3.defaultIconTheme @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon epoxy - at_spi2_core + at-spi2-core dbus gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 283d38ef5c74..003ffbfc7d1e 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,7 +1,7 @@ { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool -, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook -, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret -, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme +, perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook +, libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool - perl perlXMLParser evolution_data_server gnome_doc_utils avahi - libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite + perl perlXMLParser evolution-data-server gnome-doc-utils avahi + libsigcxx gtk dbus-glib libnotify libXext xextproto sqlite gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index fbfd36a59282..457e76d0a82c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : +{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { name = "pidgin-opensteamworks-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { unzip releases/icons.zip -d $out/share/pixmaps/pidgin/protocols/ ''; - buildInputs = [ pidgin unzip glib json_glib nss nspr libgnome_keyring ]; + buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; meta = with stdenv.lib; { homepage = https://github.com/EionRobb/pidgin-opensteamworks; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 7ab9b1947915..6e589febe6d9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }: +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { name = "pidgin-skypeweb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib ]; + buildInputs = [ pidgin json-glib ]; makeFlags = [ "PLUGIN_DIR_PURPLE=/lib/pidgin/" 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 632f2543f57c..37b490304c4f 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } : +{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json-glib, mercurial, autoreconfHook } : let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [pidgin glib json_glib mercurial]; + buildInputs = [pidgin glib json-glib mercurial]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 07cf66e572a7..460143e35494 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, pidgin, glib, json_glib, protobuf, protobufc }: +{ stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; }; - buildInputs = [ pidgin glib json_glib protobuf protobufc ]; + buildInputs = [ pidgin glib json-glib protobuf protobufc ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libhangouts.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2bf67f44c948..a6d893fd95a4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json_glib, glib, http-parser } : +{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } : let version = "2016-07-11"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin json_glib glib http-parser ]; + buildInputs = [ pidgin json-glib glib http-parser ]; installPhase = '' install -Dm755 -t $out/lib/pidgin/ libmatrix.so diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index d02c437945e0..ddb9217d5e22 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus -, dbus_glib }: +, dbus-glib }: stdenv.mkDerivation rec { name = "skype4pidgin-novas0x2a-20120411-6c53f7c48f"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus_glib ]; + buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ]; meta = { homepage = https://github.com/novas0x2a/skype4pidgin; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index bd3fc82f7cba..3ec45702b175 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farstream -, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn +, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn , lib, python, libICE, libXext, libSM , cyrus_sasl ? null , openssl ? null @@ -33,7 +33,7 @@ let unwrapped = stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr farstream libXScrnSaver ncurses python - avahi dbus dbus_glib intltool libidn + avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9e7377699bd7..87b2ee223815 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -27,7 +27,7 @@ let gnome2.gtk gnome2.pango - gnome2.gnome_keyring + gnome2.gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 34f0d16a7b43..67b116274a2d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchgit, fetchpatch , pkgconfig, gyp, cmake, makeWrapper -, qtbase, qtimageformats, gtk3, libappindicator-gtk3 +, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -31,6 +31,11 @@ mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' + substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"' + ''; + nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 77645371359b..1b9ccb98d0fa 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ] + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ] ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 4e4a2a9b6a96..a1669183bb3b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pidgin, telepathy_glib, glib, dbus_glib, pkgconfig, libxslt }: +{ stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index b4fd71b01d44..7894554eee4f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus_glib, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib telepathy_glib dbus_glib libxslt telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 9206aea5c542..111970ab7112 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig +{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig , gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }: stdenv.mkDerivation rec { @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig intltool libxslt gobjectIntrospection ]; buildInputs = [ - dbus_glib libxml2 sqlite telepathy_glib - dbus_libs telepathy_glib.python + dbus-glib libxml2 sqlite telepathy-glib + dbus_libs telepathy-glib.python ]; configureFlags = "--enable-call"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 82485de58fc1..18b3bb06e98f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, gnome3, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { name = "${pname}-5.16.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; - buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing + buildInputs = [ telepathy-glib telepathy-glib.python ]; # ToDo: optional stuff missing nativeBuildInputs = [ pkgconfig libxslt makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index cbae6af97b85..e060eaabf281 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup +{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkgconfigUpstream }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 - buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite pcre telepathy_glib.python ]; + buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl + sqlite pcre telepathy-glib.python ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 93efdb74c083..cf3725c35e3d 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.3.17.36167"; + version = "1.3.22.36179"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "0mvg22psiy4x9g7k1fm9pigz2a70jmin7zg2nfzapfnqjlnrbw3n"; + sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140"; } else throw "${name} is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index baa0b10fd756..b9860fa42273 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy +, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool -, desktop_file_utils, hicolor_icon_theme +, desktop-file-utils, hicolor-icon-theme , autoconf, automake, autoconf-archive }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus_glib libcanberra_gtk2 libproxy - libsexy libnotify openssl desktop_file_utils hicolor_icon_theme + gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + libsexy libnotify openssl desktop-file-utils hicolor-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0324012b278b..610b16dab5bc 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas ]; + notmuch boost gnome3.gsettings-desktop-schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index aee4d8ca04e6..b2a26bb6f0be 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,8 +1,8 @@ { fetchurl, stdenv, wrapGAppsHook -, 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 -, glib_networking, gsettings_desktop_schemas, libSM, libytnef +, 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 +, glib-networking, gsettings-desktop-schemas, libSM, libytnef # Build options # TODO: A flag to build the manual. @@ -45,19 +45,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/procmime.c \ - --subst-var-by MIMEROOTDIR ${shared_mime_info}/share + --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = - [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme - libetpan perl python glib_networking libSM libytnef + [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme + libetpan perl python glib-networking libSM libytnef ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra_gtk2 + ++ optional enablePluginNotificationSounds libcanberra-gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; postInstall = '' diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index b1ca80fc7e47..75f34952394e 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3, networkmanager +, libgnome-keyring3, networkmanager , wrapGAppsHook, gnome3 # otherwise passwords are stored unencrypted , withGnomeKeyring ? true @@ -22,7 +22,7 @@ in pythonPackages.buildPythonApplication rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gnome3.defaultIconTheme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3; + ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; nativeBuildInputs = [ wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 6413c1407dc1..63a97519f31f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }: let @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20171215"; + version = "20180223"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1c7vjl5cl0k41vrxp6l1sj72idz70r2rgaxa2m1yir6zb6qsrsd8"; + sha256 = "1q0zwm8p2mk85icrbq42z4235mpqfra38pigd064kharx54k36sb"; }; buildInputs = [ @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxslt.bin makeWrapper tcl which + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which ]; enableParallelBuilding = true; @@ -48,6 +48,12 @@ in stdenv.mkDerivation rec { # and use a far more comprehensive list than the one shipped with neomutt substituteInPlace sendlib.c \ --replace /etc/mime.types ${mime-types}/etc/mime.types + + # The string conversion tests all fail with the first version of neomutt + # that has tests (20180223) so we disable them for now. + # I don't know if that is related to the tests or our build environment. + # Try again with a later release. + sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c ''; configureFlags = [ @@ -73,6 +79,10 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" ''; + doCheck = true; + + checkTarget = "test"; + meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.neomutt.org; diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index 76231dc7abf2..766aab39ce30 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -5,7 +5,7 @@ , coreutils , cups , dbus -, desktop_file_utils +, desktop-file-utils , expat , fontconfig , freetype @@ -14,7 +14,7 @@ , glib , gnome2 , libgcrypt -, libgnome_keyring +, libgnome-keyring , libnotify , makeWrapper , nodejs @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { coreutils cups dbus - desktop_file_utils + desktop-file-utils expat fontconfig freetype @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { glib gnome2.GConf gnome2.gtk - libgnome_keyring + libgnome-keyring libnotify nodejs nspr @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome_keyring ]; + buildInputs = [ gnome2.gnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ $out/share/nylas-mail/nylas - wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib"; + wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome-keyring}/lib"; # Fix path to bash so apm can install plugins. substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4f714cabf79b..69a63bbb0549 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, config, makeWrapper , gconf , alsaLib -, at_spi2_atk +, at-spi2-atk , atk , cairo , cups , curl -, dbus_glib +, dbus-glib , dbus_libs , fontconfig , freetype @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra_gtk2 +, libcanberra-gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -82,12 +82,12 @@ stdenv.mkDerivation { [ stdenv.cc.cc gconf alsaLib - at_spi2_atk + at-spi2-atk atk cairo cups curl - dbus_glib + dbus-glib dbus_libs fontconfig freetype @@ -108,7 +108,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra_gtk2 + libcanberra-gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bfbd97001973..6368f1991e91 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg +, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, mesa, sqlite, unzip , hunspell, libevent, libstartup_notification @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 - dbus dbus_glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr nss libnotify xorg.pixman yasm mesa xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ed6fe17cc7e8..965a8ec58dc8 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook -, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1 -, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg -, gobjectIntrospection, glib_networking +, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1 +, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg +, gobjectIntrospection, glib-networking }: let @@ -18,9 +18,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; buildInputs = [ - glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas - libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection - librsvg glib_networking libnotify + glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas + libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection + librsvg glib-networking libnotify ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]); diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 63d7f29d7de6..ad35c49c0146 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,6 +1,6 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null -, perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify +, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify }: assert spellChecking -> gtkspell2 != null; @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 perl gmime gettext intltool dbus_glib libnotify ] + buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ] ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a7deb0b75b54..f61b887cd873 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome_keyring }: +, inotify-tools, withGnomeKeyring ? false, makeWrapper, libgnome-keyring }: stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { $out/share/applications/nextcloud.desktop '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome-keyring ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 0d7a41735ea4..950187ed9c60 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome_keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index d37f5293ef80..688f908c798c 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, zlib, dbus, dbus_glib, gtk2, gdk_pixbuf, cairo, pango }: +{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }: stdenv.mkDerivation rec { name = "tixati-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus_glib gtk2 gdk_pixbuf cairo pango ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \ tixati install -D tixati $out/bin/tixati install -D tixati.desktop $out/share/applications/tixati.desktop diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 20c3540b7f45..eb88d1c24c20 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,6 +1,6 @@ { stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig -, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib -, hicolor_icon_theme }: +, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib +, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pkgconfig intltool autoconf-archive appstream-glib ]; - buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ]; + buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ]; meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 6f87e55e8ea3..00332754c264 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -169,7 +169,7 @@ let ./${prefixWithBitness}/hinst # Run the installer... - ./${prefixWithBitness}/hinst CDROM "`pwd`" + bash ./${prefixWithBitness}/hinst CDROM "`pwd`" echo "Deleting broken links..." for link in `find $ICAInstDir -type l ` @@ -202,7 +202,7 @@ let makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 959608b04f5c..6d32036def55 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl, gsettings_desktop_schemas +, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core +, openssl, gsettings-desktop-schemas # The themes here are soft dependencies; only icons are missing without them. -, hicolor_icon_theme, adwaita-icon-theme +, hicolor-icon-theme, adwaita-icon-theme }: let @@ -33,13 +33,13 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake wrapGAppsHook gsettings_desktop_schemas - glib gtk3 gettext libxkbfile libgnome_keyring libX11 + buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas + glib gtk3 gettext libxkbfile libgnome-keyring libX11 freerdp libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret spice_protocol spice_gtk epoxy at_spi2_core - openssl hicolor_icon_theme adwaita-icon-theme ]; + libsecret spice-protocol spice-gtk epoxy at-spi2-core + openssl hicolor-icon-theme adwaita-icon-theme ]; cmakeFlags = [ "-DWITH_VTE=OFF" diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 84e10fb18bca..682b7d311d71 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch -, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null +, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation { gettext pcre perl libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls geoip c-ares python glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] + ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 5e4f9738d445..5e48f85852df 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { gtk3 (librsvg.override { enableIntrospection = true; }) libnotify # Schemas with proxy configuration - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix deleted file mode 100644 index e5e554db67b8..000000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/syncthing/syncthing"; - fetch = { - type = "git"; - url = "https://github.com/syncthing/syncthing"; - rev = "d0061c172caecd3baf61f3ff720f56fdb805186e"; - sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; - sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; - }; - } -] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix deleted file mode 100644 index e33501a17158..000000000000 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "syncthing-inotify-${version}"; - version = "0.8.6"; - - goPackagePath = "github.com/syncthing/syncthing-inotify"; - - src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing-inotify"; - rev = "v${version}"; - sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl"; - }; - - goDeps = ./inotify-deps.nix; - - postInstall = '' - mkdir -p $bin/lib/systemd/{system,user} - - substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \ - $bin/lib/systemd/system/syncthing-inotify@.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - - substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ - $bin/lib/systemd/user/syncthing-inotify.service \ - --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/syncthing/syncthing-inotify; - description = "File watcher intended for use with Syncthing"; - license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 1537dd9b03ff..8449cdf05def 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, - boost, qtwebkit, qtx11extras, shared_mime_info, + boost, qtwebkit, qtx11extras, shared-mime-info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross, @@ -36,7 +36,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ - boost qtwebkit qtx11extras shared_mime_info + boost qtwebkit qtx11extras shared-mime-info kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 14c954c0c831..c768f4c7fa34 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper , libxml2, libxslt, perl, perlPackages, gconf, guile , glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice -, webkit, glibcLocales, gsettings_desktop_schemas, dconf +, webkit, glibcLocales, gsettings-desktop-schemas, dconf , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # glib, gtk... glib gtk2 goffice webkit # gnome... - dconf gconf libgnomecanvas gsettings_desktop_schemas + dconf gconf libgnomecanvas gsettings-desktop-schemas # financial libofx aqbanking gwenhywfar # perl diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 29c30204ddbe..62dcf5dd8a88 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "grisbi-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 3d63b4195a27..f4e59d1ca049 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook -, hicolor_icon_theme, libsoup, gnome3 }: +, hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "homebank-5.1.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor_icon_theme libsoup + buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index e7b821834546..5dfd03570121 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings_desktop_schemas }: +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, jdk, jre, wrapGAppsHook, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "3.8.1"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { exec = "jabref"; }; - buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper jdk wrapGAppsHook gtk3 gsettings-desktop-schemas ]; unpackPhase = "#"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8948d13cf7f..12989a4b8eff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf @@ -242,7 +242,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 5070de5262e5..bccbd722a396 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -6,7 +6,7 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen @@ -235,7 +235,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core - CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig + CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 6a741e0ab9eb..fbadd442ce7b 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, dpkg, which , makeWrapper , alsaLib -, desktop_file_utils +, desktop-file-utils , dbus , libcap , fontconfig @@ -129,7 +129,7 @@ stdenv.mkDerivation { # Patch up link handler script wrapProgram $out/bin/install-mendeley-link-handler.sh \ - --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] } + --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop-file-utils ] } ''; dontStrip = true; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 953499c21b91..14cde8415fd7 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,6 +1,6 @@ { lib, python3Packages, fetchFromGitHub, gtk3, cairo , aspellDicts, buildEnv -, gnome3, hicolor_icon_theme, librsvg +, gnome3, hicolor-icon-theme, librsvg , xvfb_run, dbus, libnotify }: @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ xvfb_run dbus.daemon ]; buildInputs = [ - gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg + gnome3.defaultIconTheme 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/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index b59d55d3ea08..680b3fd40d72 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst -, gdk_pixbuf, cairo, clutter_gtk }: +, gdk_pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { name = "pinpoint-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf - cairo clutter_gtk ]; + cairo clutter-gtk ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 6a43f6ea24e7..b82531ea0348 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -28,8 +28,8 @@ in stdenv.mkDerivation { autoconf libtool - gnome_common - gtk_doc + gnome-common + gtk-doc GConf gtk diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 436644ef247f..0e0cb2ecf1d2 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -2,7 +2,7 @@ cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, - kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared_mime_info + kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info }: mkDerivation rec { @@ -15,7 +15,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake extra-cmake-modules kdoctools shared_mime_info + cmake extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index ddbc880690e7..e26471de5761 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -6,7 +6,7 @@ , gtk3 , granite , gnome3 -, json_glib +, json-glib , cmake , ninja , libgudev @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { gtk3 granite gnome3.libgee - json_glib + json-glib libgudev libevdev - gnome3.gnome_themes_standard + gnome3.gnome-themes-standard ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b259623bf91e..8e2f6bce0b14 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings_desktop_schemas, gtk3, gnome3 }: +{ stdenv, fetchurl, buildFHSUserEnv, makeDesktopItem, runCommand, bash, wrapGAppsHook, gsettings-desktop-schemas, gtk3, gnome3 }: let version = "5.0.25"; @@ -18,7 +18,7 @@ zoteroSrc = stdenv.mkDerivation rec { sha256 = "1y3q5582xp4inpz137x0r9iscs1g0cjlqcfjpzl3klsq3yas688k"; }; - buildInputs= [ wrapGAppsHook gsettings_desktop_schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; + buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ]; phases = [ "unpackPhase" "installPhase" "fixupPhase"]; installPhase = '' @@ -32,7 +32,7 @@ zoteroSrc = stdenv.mkDerivation rec { fhsEnv = buildFHSUserEnv { name = "zotero-fhs-env"; targetPkgs = pkgs: with pkgs; with xlibs; [ - gtk3 dbus_glib + gtk3 dbus-glib libXt nss ]; }; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 148963d64c08..96e8e0d2d250 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, pkgconfig -, gtk2-x11, glib, curl, goocanvas, intltool +{ stdenv, fetchurl, pkgconfig, intltool +, gtk3, glib, curl, goocanvas2, gpsd }: let - version = "1.3"; -in -stdenv.mkDerivation { + version = "2.2.1"; +in stdenv.mkDerivation { name = "gpredict-${version}"; src = fetchurl { - url = "https://sourceforge.net/projects/gpredict/files/Gpredict/${version}/gpredict-${version}.tar.gz"; - sha256 = "18ym71r2f5mwpnjcnrpwrk3py2f6jlqmj8hzp89wbcm1ipnvxxmh"; + url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; + sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; - buildInputs = [ curl glib gtk2-x11 goocanvas ]; nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ curl glib gtk3 goocanvas2 gpsd ]; meta = with stdenv.lib; { description = "Real time satellite tracking and orbit prediction"; @@ -27,7 +26,7 @@ stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - homepage = "https://sourceforge.net/projects/gpredict/"; + homepage = http://gpredict.oz9aec.net/; maintainers = [ maintainers.markuskowa ]; }; } diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index db12fc00c87c..5e899568a7df 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "10prgmf09a13mk18840938ijqgfc9y92hfc7sa2gcv07ddri0c19"; + sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index f04b81ea9795..829672d64cc2 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.4"; + version = "2.3.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "15k86ln1xgqkyk8ms09cgdhagz49jpvr6ij6mha1f9ga5fxnnp1m"; + sha256 = "07cvcy6483araayj41arjzpxjmf4fmn4iqyl6gp6zmrbzw72wwzj"; }; buildInputs = [ zlib tbb ]; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 6b792310e8b4..b540df816eef 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared-mime-info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 47077c2e255b..3257977f5b5a 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cryptoverif-${version}"; - version = "1.22"; + version = "1.28"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "17fbmv0askgfnhs5a0ilhizvrr93jkmq82ybm3cgyxhh2zrk0rq1"; + sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 8dc3e3ce43dc..d7357c5048d5 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -7,17 +7,19 @@ , hdf5-cpp , leveldb , lmdb -, opencv +, opencv3 , protobuf , snappy -, atlas , doxygen +, openblas , cudaSupport ? true, cudatoolkit , cudnnSupport ? false, cudnn ? null +, ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null }: assert cudnnSupport -> cudaSupport; +assert ncclSupport -> cudaSupport; assert pythonSupport -> (python != null && numpy != null); stdenv.mkDerivation rec { @@ -35,14 +37,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ - "-DCUDA_ARCH_NAME=All" - (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") - ] ++ lib.optional (!cudaSupport) "-DCPU_ONLY=ON"; + cmakeFlags = + [ (if pythonSupport then "-Dpython_version=${python.version}" else "-DBUILD_python=OFF") + "-DBLAS=open" + ] ++ (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DCPU_ONLY=ON" ]) + ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv atlas ] + buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn + ++ lib.optional ncclSupport nccl ++ lib.optionals pythonSupport [ python numpy ]; propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 7643c912db4b..6de77d81be6f 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2 }: stdenv.mkDerivation { - name = "cbc-2.9.5"; + name = "cbc-2.9.9"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.5.tgz"; - sha256 = "0kmsg9qpajh5jhnql04m6akpdjzlppxfz99q320vw5bkzgl3i18w"; + url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; + sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; configureFlags = "-C"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index bef695fc650a..07740f4c8aea 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -12,28 +12,22 @@ let cub = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; - rev = "1.4.1"; - sha256 = "1lcdwblz03c0yq1lxndg566kg14b5qm14x5qixjbmz6wq85kgmqc"; + rev = "1.7.4"; + sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66"; }; in stdenv.mkDerivation rec { name = "CNTK-${version}"; - version = "2.2"; + version = "2.4"; # Submodules src = fetchgit { url = "https://github.com/Microsoft/CNTK"; rev = "v${version}"; - sha256 = "0q4knrwiyphb2fbqf9jzqvkz2jzj6jmbmang3lavdvsh7z0n8zz9"; + sha256 = "0m28wb0ljixcpi14g3gcfiraimh487yxqhd9yrglgyvjb69x597y"; }; - patches = [ - # Fix "'exp' was not declared" - (fetchpatch { - url = "https://github.com/imriss/CNTK/commit/ef1cca6df95cc507deb8471df2c0dd8cbfeef23b.patch"; - sha256 = "0z7xyrxwric0c4h7rfs05f544mcq6d10wgs0vvfcyd2pcf410hy7"; - }) - ]; + patches = [ ./fix_std_bind.patch ]; nativeBuildInputs = [ cmake ]; @@ -48,8 +42,10 @@ in stdenv.mkDerivation rec { "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" "--with-mpi=${openmpi}" + "--cuda=${if cudaSupport then "yes" else "no"}" + # FIXME + "--asgd=no" ] ++ lib.optionals cudaSupport [ - "--cuda=yes" "--with-cuda=${cudatoolkit}" "--with-gdk-include=${cudatoolkit}/include" "--with-gdk-nvml-lib=${nvidia_x11}/lib" @@ -85,16 +81,12 @@ in stdenv.mkDerivation rec { cp bin/cntk $out/bin ''; - hardeningDisable = [ "format" ]; - - # on 2.2: fatal error: tensorboard/tensorboard.pb.h: No such file or directory - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with lib; { - homepage = "https://github.com/Microsoft/CNTK"; + homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; maintainers = with maintainers; [ abbradar ]; - broken = true; # Never succeeded to build. }; } diff --git a/pkgs/applications/science/math/cntk/fix_std_bind.patch b/pkgs/applications/science/math/cntk/fix_std_bind.patch new file mode 100644 index 000000000000..df97a0c66669 --- /dev/null +++ b/pkgs/applications/science/math/cntk/fix_std_bind.patch @@ -0,0 +1,11 @@ +diff -ru3 CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h +--- CNTK-old/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 1970-01-01 03:00:01.000000000 +0300 ++++ CNTK-new/Source/CNTKv2LibraryDll/EvaluatorWrapper.h 2018-02-25 18:16:16.330269647 +0300 +@@ -9,6 +9,7 @@ + #include <boost/noncopyable.hpp> + #include <memory> + #include <vector> ++#include <functional> + + #include "CNTKLibrary.h" + #include "CNTKLibraryC.h" diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index d2f3d0c5f337..ce9c214b3f0c 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,7 +8,7 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { name = "mxnet-${version}"; - version = "0.11.0"; + version = "1.1.0"; # Submodules needed src = fetchgit { @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; - cmakeFlags = [ - (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF") - ] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; + cmakeFlags = + (if cudaSupport then [ + "-DCUDA_ARCH_NAME=All" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ] else [ "-DUSE_CUDA=OFF" ]) + ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; installPhase = '' install -Dm755 libmxnet.so $out/lib/libmxnet.so @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; - homepage = "https://mxnet.incubator.apache.org/"; + homepage = https://mxnet.incubator.apache.org/; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 278194d57fa4..b02a65532577 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz"; - sha256 = "14q89l6laa7v7d9qx7v71a0r2m65saxqgr9r871fasm400a9x8pw"; + sha256 = "0sf4ywz8hsszaf0yr0ncdlp7mwjk6b276bwl0j9vf1j925c89pbn"; }; patchPhase = '' diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index c355b193dfd1..79af80ea75f5 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, file, which, intltool, gobjectIntrospection, - findutils, xdg_utils, gnome3, pythonPackages, hicolor_icon_theme, + findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, wrapGAppsHook }: @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { pythonPackages.pyxdg pythonPackages.ptyprocess pythonPackages.pycairo - hicolor_icon_theme + hicolor-icon-theme ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 07ea2be7ad34..597429c0cc7a 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.3.2"; + version = "2.3.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97"; + sha256 = "1gw5ia6cl5b0q91kv4vfg35my2p49np23aikxqf5gn00zhqrkfap"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c7f7a4b02e4d..93b96dd87460 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib +{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig , libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libXrender gtk2 gnome2.GConf - libgnome_keyring + libgnome-keyring ]; nativeBuildInputs = [ makeWrapper ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" wrapProgram $out/opt/gitkraken/gitkraken \ --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ - --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" + --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome-keyring ]}/libgnome-keyring.so.0" mkdir "$out/bin" ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken" ''; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index d5bd24cf9382..18e986e437f6 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -17,7 +17,7 @@ in buildPythonApplication rec { buildInputs = [ intltool wrapGAppsHook itstool libxml2 - gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo + gnome3.gtksourceview gnome3.gsettings-desktop-schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 5a4fdbe9316c..5c6e65915da5 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "0fvxv9x971s5qvhw6gpbw9ggsxynkwfy1fn5rln50gn9yrjf7612"; + sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h"; }; cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; diff --git a/pkgs/applications/video/avidemux/bootstrap_logging.patch b/pkgs/applications/video/avidemux/bootstrap_logging.patch new file mode 100644 index 000000000000..8f45251d26c2 --- /dev/null +++ b/pkgs/applications/video/avidemux/bootstrap_logging.patch @@ -0,0 +1,26 @@ +diff --git a/bootStrap.bash b/bootStrap.bash +index 646a5e048..6429199ba 100644 +--- a/bootStrap.bash ++++ b/bootStrap.bash +@@ -4,6 +4,7 @@ + # + # By default we use qt5 now + # ++set -e # hard fail if something fails + packages_ext="" + rebuild=0 + do_core=1 +@@ -66,10 +67,10 @@ Process() + fi + cd $BUILDDIR + cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ +- make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR" +- if [ "x$PKG" != "x" ] ; then ++ make $PARAL ++ if [ "x$PKG" != "x" ] ; then + $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package +- fi ++ fi + # we need the make install so that other packcges can be built against this one + make install DESTDIR=$FAKEROOT_DIR + } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 76b42acef3e1..62b819c600cc 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite -, yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, yasm, freetype, fontconfig, fribidi +, makeWrapper, libXext, mesa_glu, qttools, qtbase , alsaLib , withX265 ? true, x265 , withX264 ? true, x264 @@ -12,9 +13,18 @@ , withFAAD ? true, faad2 , withOpus ? true, libopus , withVPX ? true, libvpx +, withQT ? true +, withCLI ? true +, default ? "qt5" +, withPlugins ? true }: -let +assert withQT -> qttools != null && qtbase != null; +assert default != "qt5" -> default == "cli"; +assert !withQT -> default != "qt5"; + +stdenv.mkDerivation rec { + name = "avidemux-${version}"; version = "2.7.0"; src = fetchurl { @@ -22,112 +32,54 @@ let sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; }; - common = { - inherit version src; - - patches = [ ./dynamic_install_dir.patch ]; - - enableParallelBuilding = false; - - nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ] - ++ lib.optional withX264 x264 - ++ lib.optional withX265 x265 - ++ lib.optional withXvid xvidcore - ++ lib.optional withLAME lame - ++ lib.optional withFAAC faac - ++ lib.optional withVorbis libvorbis - ++ lib.optional withPulse libpulseaudio - ++ lib.optional withFAAD faad2 - ++ lib.optional withOpus libopus - ++ lib.optional withVPX libvpx - ; - - meta = { - homepage = http://fixounet.free.fr/avidemux/; - description = "Free video editor designed for simple video editing tasks"; - maintainers = with stdenv.lib.maintainers; [ viric abbradar ]; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - }; - }; - - core = stdenv.mkDerivation (common // { - name = "avidemux-${version}"; - - preConfigure = '' - cd avidemux_core - ''; - }); - - buildPlugin = args: stdenv.mkDerivation (common // { - name = "avidemux-${args.pluginName}-${version}"; - - buildInputs = (args.buildInputs or []) ++ common.buildInputs ++ [ lndir ]; - - cmakeFlags = [ "-DPLUGIN_UI=${args.pluginUi}" ]; - - passthru.isUi = args.isUi or false; - - buildCommand = '' - unpackPhase - cd "$sourceRoot" - patchPhase - - mkdir $out - lndir ${core} $out - - export cmakeFlags="$cmakeFlags -DAVIDEMUX_SOURCE_DIR=$(pwd)" - - for i in ${toString (args.buildDirs or [])} avidemux_plugins; do - ( cd "$i" - cmakeConfigurePhase - buildPhase - installPhase - ) - done - - fixupPhase - ''; - - meta = common.meta // args.meta or {}; - }); - -in { - avidemux_core = core; - - avidemux_cli = buildPlugin { - pluginName = "cli"; - pluginUi = "CLI"; - isUi = true; - buildDirs = [ "avidemux/cli" ]; - }; - - avidemux_qt4 = buildPlugin { - pluginName = "qt4"; - buildInputs = [ qt4 ]; - pluginUi = "QT4"; - isUi = true; - buildDirs = [ "avidemux/qt4" ]; - }; - - avidemux_gtk = buildPlugin { - pluginName = "gtk"; - buildInputs = [ gtk3 ]; - pluginUi = "GTK"; - isUi = true; - buildDirs = [ "avidemux/gtk" ]; - # Code seems unmaintained. - meta.broken = true; - }; - - avidemux_common = buildPlugin { - pluginName = "common"; - pluginUi = "COMMON"; - }; - - avidemux_settings = buildPlugin { - pluginName = "settings"; - pluginUi = "SETTINGS"; + patches = [ ./dynamic_install_dir.patch ./bootstrap_logging.patch ]; + + nativeBuildInputs = [ yasm cmake pkgconfig ]; + buildInputs = [ + zlib gettext libvdpau libva libXv sqlite fribidi fontconfig + freetype alsaLib libXext mesa_glu makeWrapper + ] ++ lib.optional withX264 x264 + ++ lib.optional withX265 x265 + ++ lib.optional withXvid xvidcore + ++ lib.optional withLAME lame + ++ lib.optional withFAAC faac + ++ lib.optional withVorbis libvorbis + ++ lib.optional withPulse libpulseaudio + ++ lib.optional withFAAD faad2 + ++ lib.optional withOpus libopus + ++ lib.optionals withQT [ qttools qtbase ] + ++ lib.optional withVPX libvpx; + + buildCommand = '' + unpackPhase + cd "$sourceRoot" + patchPhase + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext}/lib" + ${stdenv.shell} bootStrap.bash \ + --with-core \ + ${if withQT then "--with-qt" else "--without-qt"} \ + ${if withCLI then "--with-cli" else "--without-cli"} \ + ${if withPlugins then "--with-plugins" else "--without-plugins"} + + mkdir $out + cp -R install/usr/* $out + + for i in $out/bin/*; do + wrapProgram $i \ + --set ADM_ROOT_DIR $out \ + --prefix LD_LIBRARY_PATH ":" "${libXext}/lib" + done + ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" + + fixupPhase + ''; + + meta = with stdenv.lib; { + homepage = http://fixounet.free.fr/avidemux/; + description = "Free video editor designed for simple video editing tasks"; + maintainers = with maintainers; [ viric abbradar ma27 ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/video/avidemux/wrapper.nix b/pkgs/applications/video/avidemux/wrapper.nix deleted file mode 100644 index 7f05b81baec7..000000000000 --- a/pkgs/applications/video/avidemux/wrapper.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ symlinkJoin, avidemux_unwrapped, makeWrapper -# GTK version is broken upstream, see https://bugzilla.redhat.com/show_bug.cgi?id=1244340 -, withUi ? "qt4" -}: - -let ui = builtins.getAttr "avidemux_${withUi}" avidemux_unwrapped; in - -assert ui.isUi; - -symlinkJoin { - name = "avidemux-${withUi}-${ui.version}"; - - paths = [ ui avidemux_unwrapped.avidemux_common avidemux_unwrapped.avidemux_settings ]; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - for i in $out/bin/*; do - wrapProgram $i --set ADM_ROOT_DIR $out - done - ''; - - meta = ui.meta; -} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index b00aae61d36d..ea8cb5aa3ffa 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which gnome3.gnome_common glib intltool libtool cairo gtk3 xorg.xwininfo ] + buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with stdenv.lib; { diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 9f98d46d53bd..fd8cc8d86306 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib +{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; - buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ]; + buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ (substituteAll { diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index 0b4bd5851341..1bb77ffc4a80 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja -, gettext, pkgconfig, desktop_file_utils, wrapGAppsHook +, gettext, pkgconfig, desktop-file-utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ]; buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 7d0cfb455306..3e796275907c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -16,9 +16,9 @@ libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, lame, ffmpeg, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, - fontconfig, freetype, hicolor_icon_theme, + fontconfig, freetype, hicolor-icon-theme, glib, gtk3, intltool, libnotify, - gst_all_1, dbus_glib, udev, libgudev, libvpx, + gst_all_1, dbus-glib, udev, libgudev, libvpx, useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx ] ++ (lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev ]); diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 8653305f908a..862032572dcf 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: +, gtk3, libwnck3, keybinder, intltool, libcanberra-gtk2 }: python3Packages.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./datadir.patch ./bug_1190693.patch ]; prePatch = '' rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra-gtk2}/bin/canberra-gtk-play" ''; # no tests diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 28577a429bd2..4eb4bb095eaf 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 , dbusSupport ? true, dbus_libs ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -78,7 +78,7 @@ let preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; - buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ] + buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; nativeBuildInputs = [ cmake nasm pkgconfig ]; }; @@ -118,7 +118,7 @@ in stdenv.mkDerivation rec { src = kodi_src; buildInputs = [ - gnutls libidn libtasn1 nasm p11_kit + gnutls libidn libtasn1 nasm p11-kit libxml2 yasm python2 boost libmicrohttpd gettext pcre-cpp yajl fribidi libva diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 3a297abb15c4..b3cfe21b7d69 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup , taglib, sqlite -, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas +, libtorrentRasterbar, glib-networking, gsettings-desktop-schemas , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg , enableBonjour ? false, avahi ? null }: @@ -65,13 +65,13 @@ in buildPythonApplication rec { mv "$out/bin/miro.real" "$out/bin/miro" wrapProgram "$out/bin/miro" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup - taglib gsettings_desktop_schemas sqlite + taglib gsettings-desktop-schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index 2c5d3d365c12..2d5d2d3b102c 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome_terminal ]}:$out/bin" + wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin" done rm -r screenkey/.bzr diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index d55f0aa1b35b..a60b5ffc0bbd 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook -, gsettings_desktop_schemas, gtk3, keybinder3 +, gsettings-desktop-schemas, gtk3, keybinder3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; - buildInputs = [ gsettings_desktop_schemas gtk3 keybinder3 ]; + buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index c4d80344080d..48074a86b552 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook -, python3Packages, gst, gtk3, hicolor_icon_theme +, python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify # for gst-transcoder: , which, meson, ninja @@ -34,9 +34,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome_desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas libnotify + gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 536b4ba0fac4..3683973824a3 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, - desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, + desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - desktop_file_utils + desktop-file-utils enchant gnome3.gtk gnome3.gtkmm @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { gst_all_1.gstreamermm gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - hicolor_icon_theme + hicolor-icon-theme libsigcxx libxmlxx xdg_utils diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b417489c14c0..5e44116415ea 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl -, lirc, shared_mime_info, libjpeg }: +, lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { name = "xine-ui-0.99.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; - nativeBuildInputs = [ pkgconfig shared_mime_info ]; + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 86b6535e5396..8f456a2a49a8 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; + sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e9cee2503851..bd014dd60d37 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig +, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig , libX11, freefont_ttf }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig + SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig libX11 freefont_ttf ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 694026d3bac2..00303be12da2 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -9,7 +9,7 @@ , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , hostCpuOnly ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ]; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 74da6c4ab167..15ae244b3291 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, +{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice_protocol glib + buildInputs = [ alsaLib spice-protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9e18a6738c38..f913ab688cf8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, python2Packages, intltool, file , wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3 -, spiceSupport ? true, spice_gtk ? null +, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, spiceSupport ? true, spice-gtk ? null }: with stdenv.lib; @@ -24,8 +24,8 @@ python2Packages.buildPythonApplication rec { buildInputs = [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo gtk3 - ] ++ optional spiceSupport spice_gtk; + gsettings-desktop-schemas libosinfo gtk3 + ] ++ optional spiceSupport spice-gtk; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index e723cd02bd05..9316496a547e 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg, qttools -, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol }: mkDerivation rec { @@ -21,7 +21,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtsvg - libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol + libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2f5a6192c86c..eb48e1d3d300 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen -, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen +, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl , libapparmor , spiceSupport ? true -, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null +, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> - spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; with stdenv.lib; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info - libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen ] ++ optionals spiceSupport [ - spice_gtk spice_protocol libcap gdbm + spice-gtk spice-protocol libcap gdbm ]; postInstall = '' diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 22799a7af8e7..48f74ce72e5e 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -9,7 +9,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -29,7 +29,7 @@ let }); qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index b1fcf36a46c1..be6c4e3fcc7a 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -8,7 +8,7 @@ , withLibHVM ? true # qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir , alsaLib , ... } @ args: @@ -30,7 +30,7 @@ let xsa = import ./xsa-patches.nix { inherit fetchpatch; }; qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir alsaLib ]; in diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2808c8552eff..c23284d0b527 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,7 +4,7 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, libxkbcommon, xcbutilxrm, hicolor_icon_theme +, libxkbcommon, xcbutilxrm, hicolor-icon-theme }: with luaPackages; stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ with luaPackages; stdenv.mkDerivation rec { docbook_xsl findXMLCatalogs ]; - propagatedUserEnvPkgs = [ hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification libxdg_basedir lua nettools pango xcb-util-cursor diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 1c6b8a84c952..7aa604690f9a 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }: +{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }: stdenv.mkDerivation rec { name = "kbdd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ xorg.libX11 dbus_glib ]; + buildInputs = [ xorg.libX11 dbus-glib ]; meta = { description = "Simple daemon and library to make per window layout using XKB"; diff --git a/pkgs/applications/window-managers/xmonad-log-applet/default.nix b/pkgs/applications/window-managers/xmonad-log-applet/default.nix index 906ba0efda24..def5766e5ee1 100644 --- a/pkgs/applications/window-managers/xmonad-log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad-log-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus_glib +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib , desktopSupport , gtk2, gnome2_panel, GConf2 , libxfce4util, xfce4panel @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ glib dbus_glib ] + [ glib dbus-glib ] ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] # TODO: no idea where to find libpanelapplet-4.0 ++ optionals (desktopSupport == "gnome3") [ ] diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 346fd0e7908f..488fcb943721 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, - openssl, sqlite, zlib, dbus_libs, dbus_glib, gdk_pixbuf, cairo, python3, + openssl, sqlite, zlib, dbus_libs, dbus-glib, gdk_pixbuf, cairo, python3, libsodium, postgresql, ... }: let @@ -45,13 +45,13 @@ in buildInputs = [ pkgconfig dbus_libs ]; }; gobject-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gio-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gdk-pixbuf-sys = attrs: { - buildInputs = [ dbus_glib ]; + buildInputs = [ dbus-glib ]; }; gdk-pixbuf = attrs: { buildInputs = [ gdk_pixbuf ]; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 642365bdeb5c..8ab1fbc88731 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -748,571 +748,85 @@ rec { rpmDistros = { - fedora2i386 = { - name = "fedora-core-2-i386"; - fullName = "Fedora Core 2 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/core/2/i386/os/repodata/primary.xml.gz; - sha256 = "1nq1k2k0nzkii737cka301f0vbd2ix2wsfvi6bblpi748q6h2w4k"; - }; - urlPrefix = mirror://fedora/linux/core/2/i386/os; - runScripts = false; - packages = commonFedoraPackages; - }; - - fedora3i386 = { - name = "fedora-core-3-i386"; - fullName = "Fedora Core 3 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/core/3/i386/os/repodata/primary.xml.gz; - sha256 = "13znspn4g1bkjkk47393k9chswgzl6nx1n0q6h2wrw52c7d9nw9i"; - }; - urlPrefix = mirror://fedora/linux/core/3/i386/os; - archs = ["noarch" "i386" "i586"]; - runScripts = false; - packages = commonFedoraPackages; - }; - - fedora5i386 = { - name = "fedora-core-5-i386"; - fullName = "Fedora Core 5 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/core/5/i386/os/repodata/primary.xml.gz; - sha256 = "0lfk4mzrpiyls8h7k9ckc3vgywbmg05zsr4ag6qakgnv9gljijig"; - }; - urlPrefix = mirror://fedora/linux/core/5/i386/os; - packages = commonFedoraPackages ++ [ "util-linux" ]; - }; - - fedora7i386 = { - name = "fedora-7-i386"; - fullName = "Fedora 7 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/7/Everything/i386/os/repodata/primary.xml.gz; - sha256 = "0ssfa01jbwdf566rsxm443yi8f9b1drgfpv51904bark4glgvs33"; - }; - urlPrefix = mirror://fedora/linux/releases/7/Everything/i386/os; - packages = commonFedoraPackages; - }; - - fedora8i386 = { - name = "fedora-8-i386"; - fullName = "Fedora 8 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/8/Everything/i386/os/repodata/primary.xml.gz; - sha256 = "0kwf0jcp63pygpvgvwl4w58pph24xbcy6db6fnq2f3ly5myhz53n"; - }; - urlPrefix = http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/8/Everything/i386/os; - packages = commonFedoraPackages; - }; - - fedora8x86_64 = { - name = "fedora-8-x86_64"; - fullName = "Fedora 8 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/8/Everything/x86_64/os/repodata/primary.xml.gz; - sha256 = "11bfmpy3nz82zzmj5lfravvzlw514v4718adi4b06ps9zv3zpy8r"; - }; - urlPrefix = http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/8/Everything/x86_64/os; - packages = commonFedoraPackages; - archs = ["noarch" "x86_64"]; - }; - - fedora9i386 = { - name = "fedora-9-i386"; - fullName = "Fedora 9 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/9/Everything/i386/os/repodata/primary.xml.gz; - sha256 = "1qd7wb5hfxg4mkpf4k3w49hy0qqf704dqlj3igaibyzmrn9rvk7h"; - }; - urlPrefix = mirror://fedora/linux/releases/9/Everything/i386/os; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora9x86_64 = { - name = "fedora-9-x86_64"; - fullName = "Fedora 9 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/9/Everything/x86_64/os/repodata/primary.xml.gz; - sha256 = "1qv68i5s6gis4fbj4lxkibx8zxw5kqxapk95lvm76ml59gm7axxx"; - }; - urlPrefix = mirror://fedora/linux/releases/9/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora10i386 = { - name = "fedora-10-i386"; - fullName = "Fedora 10 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/10/Everything/i386/os/repodata/beeea88d162e76993c25b9dd8139868274ee7fa1-primary.xml.gz; - sha256 = "17lyvzqjsxw3ll7726dpg14f9jc2p3fz5cr5cwd8hp3rkm5nfclv"; - }; - urlPrefix = mirror://fedora/linux/releases/10/Everything/i386/os; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora10x86_64 = { - name = "fedora-10-x86_64"; - fullName = "Fedora 10 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/10/Everything/x86_64/os/repodata/7958210175e86b5cc843cf4bd0bc8659e445e261-primary.xml.gz; - sha256 = "02pzqmb26zmmzdni11dip3bar4kr54ddsrq9z4vda7ldwwkqd3py"; - }; - urlPrefix = mirror://fedora/linux/releases/10/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora11i386 = { - name = "fedora-11-i386"; - fullName = "Fedora 11 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/11/Everything/i386/os/repodata/4a59e5ec0a3a55979f2045c9e6824b87feb1c8c3df12d893e9ee3057ba482485-primary.xml.gz; - sha256 = "4a59e5ec0a3a55979f2045c9e6824b87feb1c8c3df12d893e9ee3057ba482485"; - }; - urlPrefix = mirror://fedora/linux/releases/11/Everything/i386/os; - archs = ["noarch" "i386" "i586"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora11x86_64 = { - name = "fedora-11-x86_64"; - fullName = "Fedora 11 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/11/Everything/x86_64/os/repodata/b3e9f0d474893d14b0352deddabc7e3ee017d038614e82d7c6d7717510d6ce7e-primary.xml.gz; - sha256 = "b3e9f0d474893d14b0352deddabc7e3ee017d038614e82d7c6d7717510d6ce7e"; - }; - urlPrefix = mirror://fedora/linux/releases/11/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora12i386 = { - name = "fedora-12-i386"; - fullName = "Fedora 12 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/12/Everything/i386/os/repodata/e27694b7824ee6bbf87af629950e6953eaddf91c73e489f5de690a7ecb9d726e-primary.xml.gz; - sha256 = "e27694b7824ee6bbf87af629950e6953eaddf91c73e489f5de690a7ecb9d726e"; - }; - urlPrefix = mirror://fedora/linux/releases/12/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora12x86_64 = { - name = "fedora-12-x86_64"; - fullName = "Fedora 12 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/12/Everything/x86_64/os/repodata/6b142ef02acbc77f405fbfdedd82451e692a01201471665052a0e00ba8ac0959-primary.xml.gz; - sha256 = "6b142ef02acbc77f405fbfdedd82451e692a01201471665052a0e00ba8ac0959"; - }; - urlPrefix = mirror://fedora/linux/releases/12/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora13i386 = { - name = "fedora-13-i386"; - fullName = "Fedora 13 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/13/Everything/i386/os/repodata/be70ac9e1031fd34222b2ec6cc8a337bc6fabd1d06969990955c5f358d138e35-primary.xml.gz; - sha256 = "be70ac9e1031fd34222b2ec6cc8a337bc6fabd1d06969990955c5f358d138e35"; - }; - urlPrefix = mirror://fedora/linux/releases/13/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora13x86_64 = { - name = "fedora-13-x86_64"; - fullName = "Fedora 13 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/13/Everything/x86_64/os/repodata/01996e6d20b0a4bf3390767bd26709932e42c54422b39005ec2dd4ef2e8b0f3a-primary.xml.gz; - sha256 = "01996e6d20b0a4bf3390767bd26709932e42c54422b39005ec2dd4ef2e8b0f3a"; - }; - urlPrefix = mirror://fedora/linux/releases/13/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; - }; - - fedora16i386 = { - name = "fedora-16-i386"; - fullName = "Fedora 16 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/16/Everything/i386/os/repodata/8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118-primary.xml.gz; - sha256 = "8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118"; - }; - urlPrefix = mirror://fedora/linux/releases/16/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - }; - - fedora16x86_64 = { - name = "fedora-16-x86_64"; - fullName = "Fedora 16 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/16/Everything/x86_64/os/repodata/3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107-primary.xml.gz; - sha256 = "3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107"; - }; - urlPrefix = mirror://fedora/linux/releases/16/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - }; - - fedora17i386 = { - name = "fedora-17-i386"; - fullName = "Fedora 17 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/17/Everything/i386/os/repodata/82dc1ea6d26e53a367dc6e7472113c4454c9a8ac7c98d4bfb11fd0b6f311450f-primary.xml.gz; - sha256 = "03s527rvdl0zn6zx963wmjlcjm247h8p4x3fviks6lvfsak1xp42"; - }; - urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora17x86_64 = { - name = "fedora-17-x86_64"; - fullName = "Fedora 17 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz; - sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh"; - }; - urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora18i386 = { - name = "fedora-18-i386"; - fullName = "Fedora 18 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/18/Everything/i386/os/repodata/935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d-primary.xml.gz; - sha256 = "935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d"; - }; - urlPrefix = mirror://fedora/linux/releases/18/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora18x86_64 = { - name = "fedora-18-x86_64"; - fullName = "Fedora 18 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/18/Everything/x86_64/os/repodata/463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea-primary.xml.gz; - sha256 = "463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea"; - }; - urlPrefix = mirror://fedora/linux/releases/18/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora19i386 = { - name = "fedora-19-i386"; - fullName = "Fedora 19 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/19/Everything/i386/os/repodata/b72220bcdefff8b38de1c9029a630db4813e073f88c4b080ca274d133e0460d1-primary.xml.gz; - sha256 = "b72220bcdefff8b38de1c9029a630db4813e073f88c4b080ca274d133e0460d1"; - }; - urlPrefix = mirror://fedora/linux/releases/19/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora19x86_64 = { - name = "fedora-19-x86_64"; - fullName = "Fedora 19 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/19/Everything/x86_64/os/repodata/d3f67da6461748f57a06459e6877fd07858828e256f58f032704186a65430fd3-primary.xml.gz; - sha256 = "d3f67da6461748f57a06459e6877fd07858828e256f58f032704186a65430fd3"; - }; - urlPrefix = mirror://fedora/linux/releases/19/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora20i386 = { - name = "fedora-20-i386"; - fullName = "Fedora 20 (i386)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/20/Everything/i386/os/repodata/ae9c6ae73a12a64227e6b8e7b2d7e1c2a9515bd9c82f2af006c838e7a445dcb9-primary.xml.gz; - sha256 = "1ffw8njfff680vq2lby8v5dm3af2w7bv5rxqwqkl59hj7bknm75f"; - }; - urlPrefix = mirror://fedora/linux/releases/20/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora20x86_64 = { - name = "fedora-20-x86_64"; - fullName = "Fedora 20 (x86_64)"; - packagesList = fetchurl { - url = mirror://fedora/linux/releases/20/Everything/x86_64/os/repodata/d7777ea6ec66e1c86c3fe1900adf5bf8d877fb77dd06e439bd76bbbec4e82094-primary.xml.gz; - sha256 = "1510x32bxfvnplwy81nxfzxpgn7qbgghm4717xnciqb6xjk7wxyp"; - }; - urlPrefix = mirror://fedora/linux/releases/20/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora21i386 = { - name = "fedora-21-i386"; - fullName = "Fedora 21 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/21/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "a6ad1140adeef65bbc1fdcc7f8f2b356f0d20c71bbe3f1625038e7f43fc44780"; - }; - urlPrefix = mirror://fedora/linux/releases/21/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora21x86_64 = { - name = "fedora-21-x86_64"; - fullName = "Fedora 21 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/21/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "e2a28baab2ea4632fad93f9f28144cda3458190888fdf7f2acc9bc289f397e96"; - }; - urlPrefix = mirror://fedora/linux/releases/21/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora23i386 = { - name = "fedora-23-i386"; - fullName = "Fedora 23 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/23/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "0d1012e6c1f1d694ab5354d95005791ce8de908016d07e5ed0b9dac9b9223492"; - }; - urlPrefix = mirror://fedora/linux/releases/23/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora23x86_64 = { - name = "fedora-23-x86_64"; - fullName = "Fedora 23 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/23/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "0fa09bb5f82e4a04890b91255f4b34360e38ede964fe8328f7377e36f06bad27"; - }; - urlPrefix = mirror://fedora/linux/releases/23/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora24i386 = { - name = "fedora-24-i386"; - fullName = "Fedora 24 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/24/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "6928e251628da7a74b79180739a43784e534eaa744ba4bcb18c847dff541f344"; - }; - urlPrefix = mirror://fedora/linux/releases/24/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora24x86_64 = { - name = "fedora-24-x86_64"; - fullName = "Fedora 24 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/24/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "8dcc989396ed27fadd252ba9b655019934bc3d9915f186f1f2f27e71eba7b42f"; - }; - urlPrefix = mirror://fedora/linux/releases/24/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora25i386 = { - name = "fedora-25-i386"; - fullName = "Fedora 25 (i386)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/25/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "4d399e5eebb8d543d50e2da274348280fae07a6efcc469491784582b39d73bba"; - }; - urlPrefix = mirror://fedora/linux/releases/25/Everything/i386/os; - archs = ["noarch" "i386" "i586" "i686"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - fedora25x86_64 = { - name = "fedora-25-x86_64"; - fullName = "Fedora 25 (x86_64)"; - packagesList = fetchurl rec { - url = "mirror://fedora/linux/releases/25/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; - sha256 = "eaea04bff7327c49d90240992dff2be6d451a1758ef83e94825f23d4ff27e868"; - }; - urlPrefix = mirror://fedora/linux/releases/25/Everything/x86_64/os; - archs = ["noarch" "x86_64"]; - packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; - unifiedSystemDir = true; - }; - - opensuse103i386 = { - name = "opensuse-10.3-i586"; - fullName = "openSUSE 10.3 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/10.3/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "0zb5kxsb755nqq9i8jdclmanacyf551ncx6a011v9jqphsvyfvd7"; - }; - urlPrefix = mirror://opensuse/10.3/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages ++ [ "devs" ]; - }; - - opensuse110i386 = { - name = "opensuse-11.0-i586"; - fullName = "openSUSE 11.0 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn"; - }; - urlPrefix = mirror://opensuse/11.0/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse110x86_64 = { - name = "opensuse-11.0-x86_64"; - fullName = "openSUSE 11.0 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn"; - }; - urlPrefix = mirror://opensuse/11.0/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - opensuse111i386 = { - name = "opensuse-11.1-i586"; - fullName = "openSUSE 11.1 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j"; - }; - urlPrefix = mirror://opensuse/11.1/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse111x86_64 = { - name = "opensuse-11.1-x86_64"; - fullName = "openSUSE 11.1 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz; - sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j"; - }; - urlPrefix = mirror://opensuse/11.1/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - opensuse132i386 = { - name = "opensuse-13.2-i586"; - fullName = "openSUSE 13.2 (i586)"; - packagesList = fetchurl { - url = mirror://opensuse/13.2/repo/oss/suse/repodata/485e4f44e3c3ef3133accb589480933c2fe48dedfc44a7e5f9d5437cd9122a99-primary.xml.gz; - sha256 = "0klzmk680as4sb6h1wl0ynj0dds3m70qim66wwbiqlnnp6xkf83y"; - }; - urlPrefix = mirror://opensuse/13.2/repo/oss/suse/; - archs = ["noarch" "i586"]; - packages = commonOpenSUSEPackages; - }; - - opensuse132x86_64 = { - name = "opensuse-13.2-x86_64"; - fullName = "openSUSE 13.2 (x86_64)"; - packagesList = fetchurl { - url = mirror://opensuse/13.2/repo/oss/suse/repodata/485e4f44e3c3ef3133accb589480933c2fe48dedfc44a7e5f9d5437cd9122a99-primary.xml.gz; - sha256 = "0klzmk680as4sb6h1wl0ynj0dds3m70qim66wwbiqlnnp6xkf83y"; - }; - urlPrefix = mirror://opensuse/13.2/repo/oss/suse/; - archs = ["noarch" "x86_64"]; - packages = commonOpenSUSEPackages; - }; - - centos65i386 = { - name = "centos-6.5-i386"; - fullName = "CentOS 6.5 (i386)"; - packagesList = fetchurl { - url = http://vault.centos.org/6.5/os/i386/repodata/a89f27cc7d3cea431f3bd605a1e9309c32d5d409abc1b51a7b5c71c05f18a0c2-primary.xml.gz; - sha256 = "1hm031gw0wawgcdbbhdb17adaclw63ls21fn7cgl7siwgp62g7x8"; - }; - urlPrefix = http://vault.centos.org/6.5/os/i386; - archs = ["noarch" "i386"]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; - - centos65x86_64 = { - name = "centos-6.5-x86_64"; - fullName = "CentOS 6.5 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/6.5/os/x86_64/repodata/3353e378f5cb4bb6c3b3dd2ca266c6d68a1e29c36cf99f76aea3d8e158626024-primary.xml.gz; - sha256 = "0930c9cf3n53mrv9zybcqclix2nnqrka4b6xng1vcjybymwf6lrk"; + # Note: no i386 release for Fedora >= 26 + fedora26x86_64 = + let version = "26"; + in rec { + name = "fedora-${version}-x86_64"; + fullName = "Fedora ${version} (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "880055a50c05b20641530d09b23f64501a000b2f92fe252417c530178730a95e"; + }; + urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora27x86_64 = + let version = "27"; + in rec { + name = "fedora-${version}-x86_64"; + fullName = "Fedora ${version} (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "48986ce4583cd09825c6d437150314446f0f49fa1a1bd62dcfa1085295030fe9"; + }; + urlPrefix = "mirror://fedora/linux/releases/${version}/Everything/x86_64/os"; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + centos6i386 = + let version = "6.9"; + in rec { + name = "centos-${version}-i386"; + fullName = "CentOS ${version} (i386)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/i386"; + urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/i386"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "b826a45082ef68340325c0855f3d2e5d5a4d0f77d28ba3b871791d6f14a97aeb"; + }; + archs = ["noarch" "i386"]; + packages = commonCentOSPackages ++ [ "procps" ]; + }; + + centos6x86_64 = + let version = "6.9"; + in rec { + name = "centos-${version}-x86_64"; + fullName = "CentOS ${version} (x86_64)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; + urlPrefix = "http://mirror.centos.org/centos-6/${version}/os/x86_64"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "ed2b2d4ac98d774d4cd3e91467e1532f7e8b0275cfc91a0d214b532dcaf1e979"; + }; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages ++ [ "procps" ]; }; - urlPrefix = http://vault.centos.org/6.5/os/x86_64/; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps" ]; - }; # Note: no i386 release for 7.x - centos71x86_64 = { - name = "centos-7.1-x86_64"; - fullName = "CentOS 7.1 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/7.1.1503/os/x86_64/repodata/1386c5af55bda40669bb5ed91e0a22796c3ed7325367506109b09ea2657f22bd-primary.xml.gz; - sha256 = "1g92gxjs57mh15hm0rsk6bbkwv3r4851xnaypdlhd95xanpwb1hk"; - }; - urlPrefix = http://vault.centos.org/7.1.1503/os/x86_64; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - - centos73x86_64 = { - name = "centos-7.3-x86_64"; - fullName = "CentOS 7.3 (x86_64)"; - packagesList = fetchurl { - url = http://vault.centos.org/7.3.1611/os/x86_64/repodata/dd86df27191d231cc6b7c5828fadb63b08db4725aef8e2613351667e649c9ca3-primary.xml.gz; - sha256 = "18wwkij7wrji6dhy5y5f4m3xn21vnsnqz0n5nz31q8qx34kxz1nx"; - }; - urlPrefix = http://vault.centos.org/7.3.1611/os/x86_64; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; - - centos74x86_64 = rec { - name = "centos-7.4-x86_64"; - fullName = "CentOS 7.4 (x86_64)"; - # N.B. Switch to vault.centos.org when the next release comes out - urlPrefix = http://mirror.centos.org/centos-7/7.4.1708/os/x86_64; - packagesList = fetchurl { - url = "${urlPrefix}/repodata/b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5-primary.xml.gz"; - sha256 = "1mayp4f3nzd8n4wa3hsz4lk8p076djkvk1wkdmjkwcipyfhd71mn"; + centos7x86_64 = + let version = "7.4.1708"; + in rec { + name = "centos-${version}-x86_64"; + fullName = "CentOS ${version} (x86_64)"; + # N.B. Switch to vault.centos.org when the next release comes out + # urlPrefix = "http://vault.centos.org/${version}/os/x86_64"; + urlPrefix = "http://mirror.centos.org/centos-7/${version}/os/x86_64"; + packagesList = fetchurl rec { + url = "${urlPrefix}/repodata/${sha256}-primary.xml.gz"; + sha256 = "b686d3a0f337323e656d9387b9a76ce6808b26255fc3a138b1a87d3b1cb95ed5"; + }; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages ++ [ "procps-ng" ]; }; - archs = ["noarch" "x86_64"]; - packages = commonCentOSPackages ++ [ "procps-ng" ]; - }; }; @@ -1324,207 +838,6 @@ rec { # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. - ubuntu710i386 = { - name = "ubuntu-7.10-gutsy-i386"; - fullName = "Ubuntu 7.10 Gutsy (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/gutsy/main/binary-i386/Packages.bz2; - sha256 = "0fmac8svxq86a4w878g6syczvy5ff4jrdc1gajd3xd8z0dypnw27"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu804i386 = { - name = "ubuntu-8.04-hardy-i386"; - fullName = "Ubuntu 8.04 Hardy (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/hardy/main/binary-i386/Packages.bz2; - sha256 = "19132nc9fhdfmgmvn834lk0d8c0n3jv0ndz9inyynh9k6pc8b5hd"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu804x86_64 = { - name = "ubuntu-8.04-hardy-amd64"; - fullName = "Ubuntu 8.04 Hardy (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/hardy/main/binary-amd64/Packages.bz2; - sha256 = "1xjcgh0ydixmim7kgxss0mhfw0sibpgygvgsyac4bdz9m503sj3h"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu810i386 = { - name = "ubuntu-8.10-intrepid-i386"; - fullName = "Ubuntu 8.10 Intrepid (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/intrepid/main/binary-i386/Packages.bz2; - sha256 = "70483d40a9e9b74598f2faede7df5d5103ee60055af7374f8db5c7e6017c4cf6"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu810x86_64 = { - name = "ubuntu-8.10-intrepid-amd64"; - fullName = "Ubuntu 8.10 Intrepid (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/intrepid/main/binary-amd64/Packages.bz2; - sha256 = "01b2f3842cbdd5834446ddf91691bcf60f59a726dcefa23fb5b93fdc8ea7e27f"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu904i386 = { - name = "ubuntu-9.04-jaunty-i386"; - fullName = "Ubuntu 9.04 Jaunty (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/jaunty/main/binary-i386/Packages.bz2; - sha256 = "72c95e4901ad56ce8791723e2ae40bce2399f306f9956cac80e964011e1948d0"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu904x86_64 = { - name = "ubuntu-9.04-jaunty-amd64"; - fullName = "Ubuntu 9.04 Jaunty (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/jaunty/main/binary-amd64/Packages.bz2; - sha256 = "af760ce04e43f066b8938b1abdeff979a642f940515659ede44f7877ca358ca8"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebianPackages; - }; - - ubuntu910i386 = { - name = "ubuntu-9.10-karmic-i386"; - fullName = "Ubuntu 9.10 Karmic (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/karmic/main/binary-i386/Packages.bz2; - sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diff" "mktemp" ]; - }; - - ubuntu910x86_64 = { - name = "ubuntu-9.10-karmic-amd64"; - fullName = "Ubuntu 9.10 Karmic (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2; - sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; - }; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diff" "mktemp" ]; - }; - - ubuntu1004i386 = { - name = "ubuntu-10.04-lucid-i386"; - fullName = "Ubuntu 10.04 Lucid (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-i386/Packages.bz2; - sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa"; - }) - (fetchurl { - url = mirror://ubuntu/dists/lucid/universe/binary-i386/Packages.bz2; - sha256 = "13nvsb7na9igps2fdbbfpq4y8ihccmcs6x35pfyfp6rkhjgpzigy"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; - }; - - ubuntu1004x86_64 = { - name = "ubuntu-10.04-lucid-amd64"; - fullName = "Ubuntu 10.04 Lucid (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-amd64/Packages.bz2; - sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0"; - }) - (fetchurl { - url = mirror://ubuntu/dists/lucid/universe/binary-amd64/Packages.bz2; - sha256 = "112lbnf8rcsbbh89aci4m6gwac0jy16838aij0av8n076zwkvlj9"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; - }; - - ubuntu1010i386 = { - name = "ubuntu-10.10-maverick-i386"; - fullName = "Ubuntu 10.10 Maverick (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; - sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; - }) - (fetchurl { - url = mirror://ubuntu/dists/maverick/universe/binary-i386/Packages.bz2; - sha256 = "1g5pnhx730wj32221ic8p2q6zcka23knpyg190mvq9x7kflcbfzy"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1010x86_64 = { - name = "ubuntu-10.10-maverick-amd64"; - fullName = "Ubuntu 10.10 Maverick (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; - sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; - }) - (fetchurl { - url = mirror://ubuntu/dists/maverick/universe/binary-amd64/Packages.bz2; - sha256 = "0m26viwah29gh47p8m3jpnx6l84dhpwnms29m9bvqn1vwcrgjh0s"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1110i386 = { - name = "ubuntu-11.10-oneiric-i386"; - fullName = "Ubuntu 11.10 Oneiric (i386)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; - sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; - }) - (fetchurl { - url = mirror://ubuntu/dists/oneiric/universe/binary-i386/Packages.bz2; - sha256 = "1dr59j8pjdhk07fpc0x73afcd9630kkdsbabx3bj92q71104yigz"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1110x86_64 = { - name = "ubuntu-11.10-oneiric-amd64"; - fullName = "Ubuntu 11.10 Oneiric (amd64)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; - sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; - }) - (fetchurl { - url = mirror://ubuntu/dists/oneiric/universe/binary-amd64/Packages.bz2; - sha256 = "1v3ldxn5jnnfgs863ryd6wl3fsb3glainr1ma2zn2l5vpzhpi2h1"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - ubuntu1204i386 = { name = "ubuntu-12.04-precise-i386"; fullName = "Ubuntu 12.04 Precise (i386)"; @@ -1545,7 +858,7 @@ rec { ubuntu1204x86_64 = { name = "ubuntu-12.04-precise-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; @@ -1559,119 +872,17 @@ rec { packages = commonDebPackages ++ [ "diffutils" ]; }; - ubuntu1210i386 = { - name = "ubuntu-12.10-quantal-i386"; - fullName = "Ubuntu 12.10 Quantal (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/quantal/main/binary-i386/Packages.bz2; - sha256 = "bee3200ac8f037700ccd2311fb8b0de665bd02d46bdb2ae946cf50c5885001c3"; - }) - (fetchurl { - url = mirror://ubuntu/dists/quantal/universe/binary-i386/Packages.bz2; - sha256 = "9933ce12e7830b9c68a4aead08b86fcbb8d6ef0ea1fd133f0cf9d7126ad8c9bd"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1210x86_64 = { - name = "ubuntu-12.10-quantal-amd64"; - fullName = "Ubuntu 12.10 Quantal (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/quantal/main/binary-amd64/Packages.bz2; - sha256 = "ef14073f335ef118ebe1c7d45f5a0c17ef28f72abb57c10b9082ab5e04b5d003"; - }) - (fetchurl { - url = mirror://ubuntu/dists/quantal/universe/binary-amd64/Packages.bz2; - sha256 = "329a98312248c98092f8b91f232fc68fd3e6e2337ea4f348b3785465ae8dae17"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" ]; - }; - - ubuntu1304i386 = { - name = "ubuntu-13.04-raring-i386"; - fullName = "Ubuntu 13.04 Raring (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2; - sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181"; - }) - (fetchurl { - url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2; - sha256 = "c1a59dd9132654194f4470932fd0f1582496465d8f96909b22accaf9f404024a"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1304x86_64 = { - name = "ubuntu-13.04-raring-amd64"; - fullName = "Ubuntu 13.04 Raring (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2; - sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356"; - }) - (fetchurl { - url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2; - sha256 = "8aba137ae18540a12de03a564c11496431a150ab2d4d1e93e2b4b691fa2a4850"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1310i386 = { - name = "ubuntu-13.10-saucy-i386"; - fullName = "Ubuntu 13.10 Saucy (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/saucy/main/binary-i386/Packages.bz2; - sha256 = "9b35d44a737e6aa7e1cb5e2b52ba0ed8717c8820b3950c2e7ade07024db9c138"; - }) - (fetchurl { - url = mirror://ubuntu/dists/saucy/universe/binary-i386/Packages.bz2; - sha256 = "897f64c19a742ac8524c17c1b5ec31b33ec8ab20c85463010d8bf04f5d14aa0f"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1310x86_64 = { - name = "ubuntu-13.10-saucy-amd64"; - fullName = "Ubuntu 13.10 Saucy (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/saucy/main/binary-amd64/Packages.bz2; - sha256 = "d000968f9653d7c25928002b0850fe2da97607682f63a351eb2c89896a219a12"; - }) - (fetchurl { - url = mirror://ubuntu/dists/saucy/universe/binary-amd64/Packages.bz2; - sha256 = "a899ce5513ce8540ce9b8da4c1cd85b16b231900881b3aa559f7ac3182cdbfc8"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - ubuntu1404i386 = { name = "ubuntu-14.04-trusty-i386"; fullName = "Ubuntu 14.04 Trusty (i386)"; packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2; - sha256 = "fdfc38663915c5cef3029872deb8c3bf52b98092073058086e2f1db0c71ebeb4"; + sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; }) (fetchurl { url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2; - sha256 = "2afcf259332d88c5e02f5446c4926edd567ef1a00ce24ca7cb400cbf44e2a90f"; + sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; }) ]; urlPrefix = mirror://ubuntu; @@ -1681,116 +892,14 @@ rec { ubuntu1404x86_64 = { name = "ubuntu-14.04-trusty-amd64"; fullName = "Ubuntu 14.04 Trusty (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2; - sha256 = "7095917eb8e4ac9161bc3b2ceeaf86e9265aae7b855a0e15d72096ecb05f1fc2"; + sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; }) (fetchurl { url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; - sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1410i386 = { - name = "ubuntu-14.10-utopic-i386"; - fullName = "Ubuntu 14.10 Utopic (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/utopic/main/binary-i386/Packages.bz2; - sha256 = "dc33a906ccb5625740251da759393d7daace65013d421c79fdd6c99a6490d989"; - }) - (fetchurl { - url = mirror://ubuntu/dists/utopic/universe/binary-i386/Packages.bz2; - sha256 = "e50553c033d9e478507405e63ce7d43c8060368ea851eca0c93b75b72fd85167"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1410x86_64 = { - name = "ubuntu-14.10-utopic-amd64"; - fullName = "Ubuntu 14.10 Utopic (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/utopic/main/binary-amd64/Packages.bz2; - sha256 = "9650775abec90a24c26dbb03f91a488180309144338f64f7044f7119d60d7182"; - }) - (fetchurl { - url = mirror://ubuntu/dists/utopic/universe/binary-amd64/Packages.bz2; - sha256 = "2acf0e39e64b4fd6d2b68b55c598fc167d7c3cabae233fc31a1e6b69eb6ecc63"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1504i386 = { - name = "ubuntu-15.04-vivid-i386"; - fullName = "Ubuntu 15.04 Vivid (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/vivid/main/binary-i386/Packages.bz2; - sha256 = "0bf587152fa3fc3524bf3a3caaf46ea43cc640a27b2b448577232f014a3ec1e4"; - }) - (fetchurl { - url = mirror://ubuntu/dists/vivid/universe/binary-i386/Packages.bz2; - sha256 = "3452cff96eb715ca36b73d4d0cdffbf06064cbc30b1097e334a2e493b94c7fac"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1504x86_64 = { - name = "ubuntu-15.04-vivid-amd64"; - fullName = "Ubuntu 15.04 Vivid (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/vivid/main/binary-amd64/Packages.bz2; - sha256 = "8f22c9bd389822702e65713e816250aa0d5829d6b3d75fd34f068de5f93de1d9"; - }) - (fetchurl { - url = mirror://ubuntu/dists/vivid/universe/binary-amd64/Packages.bz2; - sha256 = "feb88768e245a63ee04b0f3bcfc8899a1f03b2f831646dc2a59e4e58884b5cb9"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1510i386 = { - name = "ubuntu-15.10-wily-i386"; - fullName = "Ubuntu 15.10 Wily (i386)"; - packagesLists = - [ (fetchurl { - url = mirror://ubuntu/dists/wily/main/binary-i386/Packages.bz2; - sha256 = "ac9821095c63436fd4286539592295dd5de99bc82300f628e7a74111bb5dc370"; - }) - (fetchurl { - url = mirror://ubuntu/dists/wily/universe/binary-i386/Packages.bz2; - sha256 = "8951294f36c0755e945e8c37fdd046319f50553a8987ead1b68b21ffa53c5f7f"; - }) - ]; - urlPrefix = mirror://ubuntu; - packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; - }; - - ubuntu1510x86_64 = { - name = "ubuntu-15.10-wily-amd64"; - fullName = "Ubuntu 15.10 Wily (amd64)"; - packagesList = - [ (fetchurl { - url = mirror://ubuntu/dists/wily/main/binary-amd64/Packages.bz2; - sha256 = "2877de7674c8c6a410c3ac479e46fec24164a4de250f22b3ff062073e3985013"; - }) - (fetchurl { - url = mirror://ubuntu/dists/wily/universe/binary-amd64/Packages.bz2; - sha256 = "714be7a2fd33b8bb577901c9223039dcc12c130c9244122648ee21a625e2a66d"; + sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; }) ]; urlPrefix = mirror://ubuntu; @@ -1817,7 +926,7 @@ rec { ubuntu1604x86_64 = { name = "ubuntu-16.04-xenial-amd64"; fullName = "Ubuntu 16.04 Xenial (amd64)"; - packagesList = + packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz; sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; @@ -1831,153 +940,85 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1610i386 = { - name = "ubuntu-16.10-yakkety-i386"; - fullName = "Ubuntu 16.10 Yakkety (i386)"; + ubuntu1710i386 = { + name = "ubuntu-17.10-xenial-i386"; + fullName = "Ubuntu 17.10 Xenial (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/yakkety/main/binary-i386/Packages.xz; - sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba"; + url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; + sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; }) (fetchurl { - url = mirror://ubuntu/dists/yakkety/universe/binary-i386/Packages.xz; - sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa"; + url = mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz; + sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - ubuntu1610x86_64 = { - name = "ubuntu-16.10-yakkety-amd64"; - fullName = "Ubuntu 16.10 Yakkety (amd64)"; - packagesList = + ubuntu1710x86_64 = { + name = "ubuntu-17.10-artful-amd64"; + fullName = "Ubuntu 17.10 Artful (amd64)"; + packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz; - sha256 = "356c4cfab0d7f77b75c473cd78b22ee7288f63b24c9739049924dc081dd2e3d1"; + url = mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz; + sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; }) (fetchurl { - url = mirror://ubuntu/dists/yakkety/universe/binary-amd64/Packages.xz; - sha256 = "a72660f8feffd6978e3b9328c6259b5387ac0b4f33d1029e4a17091ceb5057e6"; + url = mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz; + sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; }) ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; - debian40i386 = { - name = "debian-4.0r9-etch-i386"; - fullName = "Debian 4.0r9 Etch (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2; - sha256 = "40eeeecc35e6895b6eb0bc601e38fe53fc985d1b1f3fea3766f34763d21f206f"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian40x86_64 = { - name = "debian-4.0r9-etch-amd64"; - fullName = "Debian 4.0r9 Etch (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/etch/main/binary-amd64/Packages.bz2; - sha256 = "cf1c4c7d72e0da45797b046011254d2bd83f5ecb7389c7f30d2561be3f5b2e49"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian50i386 = { - name = "debian-5.0.10-lenny-i386"; - fullName = "Debian 5.0.10 Lenny (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2; - sha256 = "fb390cf043a5b6bac50879ce1c0827882abdb560050313a6a326a03a4fc761d6"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian50x86_64 = { - name = "debian-5.0.10-lenny-amd64"; - fullName = "Debian 5.0.10 Lenny (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2; - sha256 = "1y4bb3n770fgwsrw8qiwsgf17k0ws2d6jmcfvqv07lj77dyj53wc"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - - debian60i386 = { - name = "debian-6.0.10-squeeze-i386"; - fullName = "Debian 6.0.10 Squeeze (i386)"; + debian8i386 = { + name = "debian-8.10-jessie-i386"; + fullName = "Debian 8.10 Jessie (i386)"; packagesList = fetchurl { - url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "c08899011a7a2b0df4da08f91eef3a80d112a247df988b1c966c9fb64c812392"; + url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; + sha256 = "1w1gm195dcrndy5486kcv0h9l3br9dqnqyyhmavp4vr5w2zk7amk"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - debian60x86_64 = { - name = "debian-6.0.10-squeeze-amd64"; - fullName = "Debian 6.0.10 Squeeze (amd64)"; + debian8x86_64 = { + name = "debian-8.10-jessie-amd64"; + fullName = "Debian 8.10 Jessie (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "3f2ebd5221b9a4bdf7224acf728a51a987c63d32df1bbc20a97f177d2f184045"; + url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; + sha256 = "045700qsrmd3lng2rw8nfs5ci7pf660lwl6alpzkyjikyp6pg7k8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - # Backward compatibility. - debian70i386 = debian7i386; - debian70x86_64 = debian7x86_64; - - debian7i386 = { - name = "debian-7.11-wheezy-i386"; - fullName = "Debian 7.11 Wheezy (i386)"; + debian9i386 = { + name = "debian-9.3-stretch-i386"; + fullName = "Debian 9.3 Stretch (i386)"; packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "57ea423dc1c0cc082cae580360f8e7192c9fd60e2ef775a4ce7f48784277462d"; + url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz; + sha256 = "1rpv0r92pkr9dmjvpffvgmq3an1s83npfmq870h67jqag3qpwj9l"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - debian7x86_64 = { - name = "debian-7.11-wheezy-amd64"; - fullName = "Debian 7.11 Wheezy (amd64)"; + debian9x86_64 = { + name = "debian-9.3-stretch-amd64"; + fullName = "Debian 9.3 Stretch (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "b400e459ce2f8af8621182c3a9ea843f0df3dc2d5662e6c6204f9406f5ff2d41"; + url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz; + sha256 = "1gnkvh7wc5yp0rw8kq8p8rlskvl0lc4cv3gdylw8qpqzy75xqlig"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; - debian8i386 = { - name = "debian-8.10-jessie-i386"; - fullName = "Debian 8.10 Jessie (i386)"; - packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "b3aa33bfe0256f72b7aad07b6c714b790d9a20d86c1a448a6f36b35652a82ff0"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; - debian8x86_64 = { - name = "debian-8.10-jessie-amd64"; - fullName = "Debian 8.10 Jessie (amd64)"; - packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "689e77cdf5334a3fffa5ca504e8131ee9ec88a7616f12c9ea5a3d5ac3100a710"; - }; - urlPrefix = mirror://debian; - packages = commonDebianPackages; - }; }; @@ -1997,7 +1038,7 @@ rec { "make" "patch" "perl" - "pkgconfig" + "pkgconf-pkg-config" "rpm" "rpm-build" "tar" @@ -2101,6 +1142,7 @@ rec { # Needed because it provides /etc/login.defs, whose absence causes # the "passwd" post-installs script to fail. "login" + "passwd" ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix index 34548b972442..34548b972442 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-4/default.nix diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix new file mode 100644 index 000000000000..6bb175f1ecac --- /dev/null +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: + +let + version = "5.0.6"; +in fetchzip rec { + name = "font-awesome-${version}"; + + url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype + ''; + + sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4"; + + meta = with stdenv.lib; { + description = "Font Awesome - OTF font"; + longDescription = '' + Font Awesome gives you scalable vector icons that can instantly be customized. + This package includes only the OTF 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/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 91e379de223a..84bf45a52bbe 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; - buildInputs = [ moka-icon-theme ]; + postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; meta = with stdenv.lib; { description = "Arc icon theme"; homepage = https://github.com/horst3180/arc-icon-theme; - license = with licenses; [ gpl3 ]; + license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 77d29d52507e..db4b5ea6387b 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, cmake, gtk3 }: stdenv.mkDerivation rec { + name = "elementary-icon-theme-${version}"; version = "4.3.1"; - package-name = "elementary-icon-theme"; - - name = "${package-name}-${version}"; - src = fetchurl { url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb"; }; - dontBuild = true; + nativeBuildInputs = [ cmake gtk3 ]; + + postPatch = "cat > volumeicon/CMakeLists.txt"; + postFixup = "gtk-update-icon-cache $out/share/icons/elementary"; - installPhase = '' - install -dm 755 $out/share/{icons,doc/$name} - cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/ - mv $out/share/icons/Elementary/{AUTHORS,CONTRIBUTORS,README.md} \ - $out/share/doc/$name/ - rm $out/share/icons/Elementary/{COPYING,pre-commit} - ''; meta = with stdenv.lib; { description = "Elementary icon theme"; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 9ff54d5d64d5..724f3a066cc8 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "elementary-xfce-icon-theme-${version}"; @@ -11,24 +11,21 @@ stdenv.mkDerivation rec { sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y"; }; - # fallback icon theme - propagatedBuildInputs = [ hicolor_icon_theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' elementary-xfce{,-dark,-darker,-darkest} $out/share/icons/ + mkdir -p $out/share/icons + mv elementary-xfce* $out/share/icons ''; - postInstall = '' - for icons in "$out"/share/icons/*; do - "${gtk3.out}/bin/gtk-update-icon-cache" "$icons" + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme done ''; meta = with stdenv.lib; { - description = "Elementary icons for Xfce and other Gtk+ desktops like Gnome3"; + description = "Elementary icons for Xfce and other GTK+ desktops like GNOME"; homepage = https://github.com/shimmerproject/elementary-xfce; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 37f46060ae31..fdad4f0f46da 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, autoreconfHook, elementary-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ elementary-icon-theme ]; + nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ]; postPatch = '' substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; + postFixup = "gtk-update-icon-cache $out/share/icons/Faba"; + meta = with stdenv.lib; { description = "A sexy and modern icon theme with Tango influences"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 3a871e86d9d1..bdb6f651e6a5 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "faba-mono-icons"; + name = "${pname}-${version}"; + pname = "faba-mono-icons"; version = "2016-04-30"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "2006c5281eb988c799068734f289a85443800cda"; sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; - buildInputs = [ moka-icon-theme ]; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; meta = with stdenv.lib; { description = "The full set of Faba monochrome panel icons"; homepage = https://snwh.org/moka; - license = with licenses; [ gpl3 ]; + license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index e5a3faf7742b..03c5be143ded 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.15"; + name = "hicolor-icon-theme-0.17"; src = fetchurl { url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w"; + sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = https://icon-theme.freedesktop.org/releases/; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index f4f81f8de8be..82aafca11f4f 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, gtk3, kdeFrameworks }: stdenv.mkDerivation rec { name = "maia-icon-theme-${version}"; @@ -11,21 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0f9l3k9abgg8islzddrxgbxaw6vbai5bvz5qi1v2fzir7ykx7bgj"; }; - dontBuild = true; - - installPhase = '' - install -dm 755 $out/share/icons - for f in "" "-dark"; do - rm icons$f/CMakeLists.txt - cp -dr --no-preserve='ownership' icons$f $out/share/icons/maia$f - done - ''; + nativeBuildInputs = [ + cmake + extra-cmake-modules + gtk3 + kdeFrameworks.plasma-framework + kdeFrameworks.kwindowsystem + ]; meta = with stdenv.lib; { description = "Icons based on Breeze and Super Flat Remix"; homepage = https://github.com/manjaro/artwork-maia; - license = licenses.free; - maintainers = [ maintainers.mounium ]; + license = licenses.free; # https://github.com/manjaro/artwork-maia/issues/27 + maintainers = with maintainers; [ mounium ]; platforms = platforms.all; }; } diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 5ac2a13be4d1..f3180db54dcf 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "moka-icon-theme"; + name = "${pname}-${version}"; + pname = "moka-icon-theme"; version = "5.3.6"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "v${version}"; sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ faba-icon-theme ]; + nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ]; postPatch = '' substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out ''; + postFixup = "gtk-update-icon-cache $out/share/icons/Moka"; + meta = with stdenv.lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = https://snwh.org/moka; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 08fd012bb41e..6b6b77ae5e8b 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,26 +1,28 @@ -{ stdenv, fetchFromGitHub, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "numix-icon-theme"; version = "17-12-25"; - package-name = "numix-icon-theme"; - - name = "${package-name}-${version}"; - src = fetchFromGitHub { owner = "numixproject"; - repo = package-name; + repo = pname; rev = version; sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; - buildInputs = [ hicolor_icon_theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ + mkdir -p $out/share/icons + mv Numix{,-Light} $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index f161d6fbbd67..f49009e76f3e 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3 }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "paper-icon-theme"; + name = "${pname}-${version}"; + pname = "paper-icon-theme"; version = "2017-11-20"; src = fetchFromGitHub { owner = "snwh"; - repo = package-name; + repo = pname; rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8"; sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ef817a2e3f47..ec3c671e2fd9 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gtk3 }: stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; @@ -7,20 +7,25 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; - rev = "${version}"; + rev = version; sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq"; }; - dontBuild = true; + nativeBuildInputs = [ gtk3 ]; installPhase = '' - install -dm 755 $out/share/icons - cp -dr Papirus{,-Dark,-Light} $out/share/icons/ - cp -dr ePapirus $out/share/icons/ + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done ''; meta = with stdenv.lib; { - description = "Papirus icon theme for Linux"; + description = "Papirus icon theme"; homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 4fec962f16d8..a91202a22123 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -3,12 +3,18 @@ let overridden = set // overrides; set = with overridden; { # Backward compatibility. - gtkdoc = self.gtk_doc; + gtkdoc = self.gtk-doc; startup_notification = libstartup_notification; startupnotification = libstartup_notification; - gnomedocutils = self.gnome_doc_utils; + gnomedocutils = self.gnome-doc-utils; gnomeicontheme = self.gnome_icon_theme; gnomepanel = self.gnome_panel; + gnome_common = gnome-common; + gnome_keyring = gnome-keyring; + gnome_desktop = gnome-desktop; + gnome_session = gnome-session; + gnome_settings_daemon = gnome-settings-daemon; + gnome_control_center = gnome-control-center; #### PLATFORM @@ -41,7 +47,7 @@ let overridden = set // overrides; set = with overridden; { libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { }; # for git-head builds - gnome_common = callPackage platform/gnome-common { }; + gnome-common = callPackage platform/gnome-common { }; gnome_mime_data = callPackage ./platform/gnome-mime-data { }; @@ -77,7 +83,7 @@ let overridden = set // overrides; set = with overridden; { #### DESKTOP - gnome_keyring = callPackage ./desktop/gnome-keyring { }; + gnome-keyring = callPackage ./desktop/gnome-keyring { }; libgweather = callPackage ./desktop/libgweather { }; @@ -97,15 +103,15 @@ let overridden = set // overrides; set = with overridden; { gnome_menus = callPackage ./desktop/gnome-menus { }; - gnome_desktop = callPackage ./desktop/gnome-desktop { }; + gnome-desktop = callPackage ./desktop/gnome-desktop { }; gnome_panel = callPackage ./desktop/gnome-panel { }; - gnome_session = callPackage ./desktop/gnome-session { }; + gnome-session = callPackage ./desktop/gnome-session { }; - gnome_settings_daemon = callPackage ./desktop/gnome-settings-daemon { }; + gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; - gnome_control_center = callPackage ./desktop/gnome-control-center { }; + gnome-control-center = callPackage ./desktop/gnome-control-center { }; gtksourceview = callPackage ./desktop/gtksourceview { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index c07dc9730e6d..7202be839082 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python -, shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 -, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python +, shared-mime-info, desktop-file-utils, libunique, libtool, bzip2 +, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd +, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 , libSM }: @@ -14,9 +14,9 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils - gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils + gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 + libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon libSM ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index 63df026836fa..b99f23555d38 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gtk -, intltool, GConf, gnome_doc_utils}: +, intltool, GConf, gnome-doc-utils}: stdenv.mkDerivation { name = "gnome-desktop-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python libxml2Python libxslt which libX11 gtk - intltool GConf gnome_doc_utils ]; + intltool GConf gnome-doc-utils ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix index 50f2cd081332..26f3f624a042 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, -gtk, intltool, GConf, libgnome_keyring }: +gtk, intltool, GConf, libgnome-keyring }: stdenv.mkDerivation { name = "gnome-keyring-2.30.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj"; }; - buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ]; + buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome-keyring ]; propagatedBuildInputs = [ glib libtasn1 ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix index 514389c6faf8..d85b5494da47 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau, libcanberra_gtk2 -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: +{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python +, glib, gtk, pango, atk, libXau, libcanberra-gtk2 +, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop +, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }: stdenv.mkDerivation { name = "gnome-panel-2.32.1"; @@ -12,10 +12,10 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk dbus_glib popt libxml2Python libxslt bzip2 python libXau intltool + [ gtk dbus-glib popt libxml2Python libxslt bzip2 python libXau intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf - gnome_menus gnome_desktop libwnck librsvg libgweather gnome_doc_utils - libtasn1 libtool libcanberra_gtk2 xorg.libICE xorg.libSM + gnome_menus gnome-desktop libwnck librsvg libgweather gnome-doc-utils + libtasn1 libtool libcanberra-gtk2 xorg.libICE xorg.libSM ]; nativeBuildInputs = [ pkgconfig intltool which ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix index 7678cb3a4b42..a5ae555ded83 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto +{ stdenv, fetchurl, pkgconfig, dbus-glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto , intltool, libglade, startup_notification, GConf, upower, libSM }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification + [ dbus-glib gtk libXau libXtst inputproto libglade startup_notification GConf upower libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 37f995396861..9712ce64841f 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +{ stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, gtk +, intltool, GConf, gnome-desktop, libglade, libgnomekbd, polkit, libpulseaudio , libSM }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = - [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit + [ dbus-glib libxklavier gtk GConf gnome-desktop libglade libgnomekbd polkit libpulseaudio libSM ]; diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index bd8b71d0daca..05da06846418 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib -, gnome_common, gtk, pango +, gnome-common, gtk, pango , libxml2Python, perl, intltool, gettext, gtk-mac-integration }: with stdenv.lib; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pango libxml2Python perl intltool gettext ] ++ optionals stdenv.isDarwin [ - autoreconfHook gnome_common gtk-mac-integration + autoreconfHook gnome-common gtk-mac-integration ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix index f0882e39a857..b846ef888c43 100644 --- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}: +{stdenv, fetchurl, pkgconfig, dbus-glib, libxklavier, glib, gtk, intltool, GConf, libglade}: stdenv.mkDerivation { name = "libgnomekbd-2.32.0"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ]; + buildInputs = [ dbus-glib libxklavier glib gtk intltool GConf libglade ]; } diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 22604f214d48..d4935c498f13 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.gnome-keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; prePatch = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c diff --git a/pkgs/desktops/gnome-2/desktop/metacity/default.nix b/pkgs/desktops/gnome-2/desktop/metacity/default.nix index 10c790bc09cc..95dd97568f46 100644 --- a/pkgs/desktops/gnome-2/desktop/metacity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/metacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, libcanberra_gtk2, intltool, GConf, startup_notification, zenity, gnome_doc_utils -, gsettings_desktop_schemas }: +, libcanberra-gtk2, intltool, GConf, startup_notification, zenity, gnome-doc-utils +, gsettings-desktop-schemas }: stdenv.mkDerivation { name = "metacity-2.30.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { }; buildInputs = - [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra_gtk2 - intltool GConf startup_notification zenity gnome_doc_utils - gsettings_desktop_schemas + [ pkgconfig glib gtk libXcomposite libXcursor libXdamage libcanberra-gtk2 + intltool GConf startup_notification zenity gnome-doc-utils + gsettings-desktop-schemas ]; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 3ab8838c97b6..55a5f9c0a234 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk -, gnome_doc_utils, intltool, libglade, libX11, which }: +, gnome-doc-utils, intltool, libglade, libX11, which }: stdenv.mkDerivation { name = "zenity-2.32.1"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { configureFlags = "--disable-scrollkeeper"; buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; } diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index afa27a93bad5..778a1cc920f1 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 , polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: assert withGtk -> (gtk2 != null); @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] + buildInputs = [ ORBit2 dbus_libs dbus-glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index b0b669148ff3..9bcc9ab6cabe 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2, GConf, dbus_glib }: +, intltool, libbonobo, ORBit2, GConf, dbus-glib }: stdenv.mkDerivation { name = "at-spi-1.32.0"; @@ -13,5 +13,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 GConf dbus_glib ]; + intltool libbonobo ORBit2 GConf dbus-glib ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index c00f0a9c37b2..54a2bd526a94 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; - propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which ]; # autogen.sh which is using gnome-common tends to require which patches = [(fetchurl { name = "gnome-common-patch"; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 06af8a63200a..4ca0e791a2a9 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus_glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib fam cdparanoia gnome_mime_data avahi acl ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 49b8cc88f9de..493f88290f3a 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool, -GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }: +GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; - propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool enchant isocodes ]; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index d93ef73ca986..ee0bf5f82a09 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt +{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 5a488e052c19..2dcb85235ee4 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra_gtk2 +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg }: @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra_gtk2 libtool ]; + buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra-gtk2 libtool ]; propagatedBuildInputs = [ glib libbonobo libogg ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 24cd851eef6a..838e51337453 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool -, gnome_vfs, libgnome_keyring, libglade }: +, gnome_vfs, libgnome-keyring, libglade }: stdenv.mkDerivation rec { name = "libgnomeui-${minVer}.5"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = - [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; + [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 545e89a85125..bf823426f603 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3Packages, at_spi2_core +, itstool, libxml2, python3Packages, at-spi2-core , dbus, intltool, libwnck3 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme + at-spi2-core dbus intltool libwnck3 gnome3.defaultIconTheme ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index ca266d73fd35..802002d266a1 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -1,7 +1,7 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, wrapGAppsHook, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist +, evolution-data-server, evolution, sqlite +, wrapGAppsHook, itstool, desktop-file-utils +, clutter-gtk, libuuid, webkitgtk, zeitgeist , gnome3, librsvg, gdk_pixbuf, libxml2 }: stdenv.mkDerivation rec { @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook + meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist - gnome3.gsettings_desktop_schemas + buildInputs = [ glib clutter-gtk libuuid webkitgtk gnome3.tracker + gnome3.gnome-online-accounts zeitgeist + gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; + evolution-data-server evolution sqlite ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index e94a89c7f27c..42e5cb4bc4d9 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,8 +1,8 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 +, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib -, libxslt, yelp_tools, gnome_common, gtk_doc -, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: +, libxslt, yelp-tools, gnome-common, gtk-doc +, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib libxslt docbook_xml_dtd_43 docbook_xsl - autoreconfHook gtk_doc yelp_tools gnome_common + autoreconfHook gtk-doc yelp-tools gnome-common ]; buildInputs = [ gtk3 glib gnome-video-effects gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst - libcanberra_gtk3 libgudev ]; + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop + gst_all_1.gst-plugins-bad clutter-gtk clutter-gst + libcanberra-gtk3 libgudev ]; outputs = [ "out" "man" "devdoc" ]; patches = [ - gtk_doc.respect_xml_catalog_files_var_patch + gtk-doc.respect_xml_catalog_files_var_patch ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 4996120d4935..ebbaccf9606a 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -1,8 +1,8 @@ { stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight , pkgconfig, gtk3, glib, libnotify, gtkspell3 -, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite +, 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 }: +, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let majVer = gnome3.version; @@ -11,17 +11,17 @@ in stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome3.evolution_data_server ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard + gnome3.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 - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit + gnome3.evolution-data-server libsecret libical gcr + webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 + libcanberra-gtk3 bogofilter gnome3.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.libgnome_keyring gnome3.glib_networking openldap + gnome3.gsettings-desktop-schemas + gnome3.libgnome-keyring gnome3.glib-networking openldap ]; nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 69056e28c260..f087b3129c48 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ gtk3 glib intltool itstool enchant isocodes gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ]; + gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 8b198b9c8797..6f79eeb7aedf 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 6126fed8e06f..8f9a33f01b4d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala -, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk +, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala +, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret , libcap_ng, numactl, xen, libapparmor }: @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc - libvirt spice_gtk spice_protocol libsoup libosinfo systemd + libvirt spice-gtk spice-protocol libsoup libosinfo systemd tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive - gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret + gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret libcap_ng numactl xen libapparmor ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { for prog in "$out/bin/"*; do wrapProgram "$prog" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" done ''; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index c13d7e976e5c..a464b823ba2b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook -, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup -, glib, gnome_online_accounts, gsettings_desktop_schemas }: +, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup +, glib, gnome-online-accounts, gsettings-desktop-schemas }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; buildInputs = [ - gtk evolution_data_server libsoup glib gnome_online_accounts - gsettings_desktop_schemas gnome3.defaultIconTheme + gtk evolution-data-server libsoup glib gnome-online-accounts + gsettings-desktop-schemas gnome3.defaultIconTheme ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index a354c4f6316e..c1efd7e24ccd 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ gtk3 gjs gdk_pixbuf gobjectIntrospection - librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 5441f1e5edc9..219a52b9843e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils +, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , vala, gtk3, glib, gsound , gnome3, gdk_pixbuf, geoclue2, libgweather }: @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils + vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils ]; buildInputs = [ - gtk3 glib gnome3.gsettings_desktop_schemas gdk_pixbuf gnome3.defaultIconTheme - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather gsound + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme + gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound ]; prePatch = "patchShebangs build-aux/"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a3f6084c9f39..f565b9b8aae1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -2,8 +2,8 @@ , pkgconfig, gtk3, glib, tracker, tracker-miners , itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: +, gobjectIntrospection, json-glib, inkscape, poppler_utils +, gmp, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-getting-started" ]; - nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk3 glib inkscape poppler_utils - gnome3.gsettings_desktop_schemas gmp + gnome3.gsettings-desktop-schemas gmp gdk_pixbuf gnome3.defaultIconTheme librsvg evince libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ]; + tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts + gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 91d5f7d00e49..416975a88a5d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme + systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index bb8375d595ef..1389c8f4994f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gobjectIntrospection wrapGAppsHook gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup + gnome3.geocode-glib libchamplain file libsoup gdk_pixbuf librsvg libgweather autoreconfHook - gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas gnome3.evolution-data-server + gnome3.gnome-online-accounts gnome3.defaultIconTheme webkitgtk ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index f5454c1c3869..58160f089735 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { python3Packages.pycairo python3Packages.dbus-python python3Packages.requests python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ]; + gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 0b19ba9f0f6d..c261aa1f1ef2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -1,8 +1,8 @@ { stdenv, intltool, fetchurl, exempi, libxml2 , pkgconfig, gtk3, glib, tracker, tracker-miners , makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib +, desktop-file-utils, gmp, libmediaart, wrapGAppsHook +, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib , dleyna-renderer }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart + gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart gdk_pixbuf gnome3.defaultIconTheme librsvg exempi gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils - wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; + gnome3.gnome-online-accounts gnome3.gnome-desktop + lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils + wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ]; enableParallelBuilding = true; 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 2fd0dfa5ac91..8e06f674c69c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -7,14 +7,14 @@ , meson , ninja , upower -, desktop_file_utils +, desktop-file-utils , wrapGAppsHook , gnome3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # needed by meson_post_install.sh glib.dev - desktop_file_utils + desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d6804e09a482..a82f075f5731 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas + libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas ]; # The .service file isn't wrapped with the correct environment diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index dc75193e771c..f2bd38709f14 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,17 +1,17 @@ { stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils +, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib -, gnome3, wrapGAppsHook, telepathy_logger, gspell }: +, gnome3, wrapGAppsHook, telepathy-logger, gspell }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 - desktop_file_utils gobjectIntrospection appstream-glib ]; - buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas - telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ]; + desktop-file-utils gobjectIntrospection appstream-glib ]; + buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; patches = [ (fetchpatch { diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 3bc69f67a4f8..14e59407d6a8 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -2,27 +2,27 @@ , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: +, libsecret, avahi, p11-kit, openssh }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg + gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala + libsecret avahi libsoup p11-kit vala openssh ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" ) ''; 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 62cc4da6ba14..780a315ca660 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: +, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index e463fe0e03f0..9b083ff5644b 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook +, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = with gnome3; - [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3 + [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 libXtst gtk2 ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index bf39965bf779..49780aeea607 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 9a836869ec6e..c09a31c82264 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace client/Makefile \ diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index f9156053819a..0263a152f7dc 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -1,40 +1,40 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib , file, librsvg, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server, yelp_xsl -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info +, dbus-glib, dbus_libs, telepathy-glib, telepathy-farstream +, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts +, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control +, telepathy-logger, libnotify, clutter, libsoup, gnutls +, evolution-data-server, yelp-xsl +, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info , bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee -, isocodes, enchant, libchamplain, geoclue2, geocode_glib, cheese, libgudev }: +, isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; propagatedUserEnvPkgs = [ - gnome_online_accounts shared_mime_info + gnome-online-accounts shared-mime-info ]; propagatedBuildInputs = [ - folks telepathy_logger evolution_data_server telepathy_mission_control + folks telepathy-logger evolution-data-server telepathy-mission-control ]; nativeBuildInputs = [ pkgconfig libtool intltool itstool file wrapGAppsHook - libxml2 libxslt yelp_xsl + libxml2 libxslt yelp-xsl ]; buildInputs = [ - gtk3 glib webkitgtk icu gnome_online_accounts - telepathy_glib clutter_gtk clutter-gst cogl + gtk3 glib webkitgtk icu gnome-online-accounts + telepathy-glib clutter-gtk clutter-gst cogl gst_all_1.gstreamer gst_all_1.gst-plugins-base gcr libsecret libpulseaudio gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + libnotify clutter libsoup gnutls libgee p11-kit + libcanberra-gtk3 telepathy-farstream farstream + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes # Display maps, location awareness, geocode support - libchamplain geoclue2 geocode_glib + libchamplain geoclue2 geocode-glib # Cheese webcam support, camera monitoring cheese libgudev ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index ae0abfd71502..b41be5c9d14c 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: +, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ libxml2 libjpeg gtk glib libpeas librsvg - gsettings_desktop_schemas shared_mime_info adwaita-icon-theme - gnome_desktop libexif dconf ]; + gsettings-desktop-schemas shared-mime-info adwaita-icon-theme + gnome-desktop libexif dconf ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/EyeOfGnome; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 6dafa160b1f8..aa8722f53f2e 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,8 +1,8 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, isocodes, desktop_file_utils, file -, gdk_pixbuf, gnome_common, gst_all_1, json_glib }: +, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit +, sqlite, gcr, isocodes, desktop-file-utils, file +, gdk_pixbuf, gnome-common, gst_all_1, json-glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { # Tests need an X display mesonFlags = [ "-Dunit_tests=false" ]; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ]; + nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify - sqlite isocodes p11_kit icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr - glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + sqlite isocodes p11-kit icu gnome3.yelp-tools + gdk_pixbuf gnome3.defaultIconTheme gnome-common 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 ]; + gst_all_1.gst-libav json-glib ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index fab46b35af66..de5b20a49919 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, intltool, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 +, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook -, librsvg, gobjectIntrospection, yelp_tools +, librsvg, gobjectIntrospection, yelp-tools , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps , autoreconfHook @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ - pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp_tools autoreconfHook + pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook ]; buildInputs = [ glib gtk3 pango atk gdk_pixbuf libxml2 - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas poppler ghostscriptX djvulibre libspectre libsecret librsvg gnome3.adwaita-icon-theme ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index f6ee457dc63f..bb45952f1d53 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,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, python3, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true -, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: +, p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true +, vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { cmake pkgconfig intltool python3 gperf makeWrapper ] ++ stdenv.lib.optional valaSupport vala; buildInputs = with gnome3; [ - glib libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata libaccounts-glib json_glib + glib libsoup libxml2 gtk gnome-online-accounts + gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6be27021023a..89f01341e9cd 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: +, vala, sqlite, libxml2, dbus-glib, libsoup, nss, dbus_libs +, telepathy-glib, evolution-data-server, libsecret, db }: # TODO: enable more folks backends @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + buildInputs = [ dbus-glib telepathy-glib evolution-data-server dbus_libs vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; + "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 99883c8a3f67..3e7ba45b03ae 100644 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 +{ stdenv, fetchurl, pkgconfig, dbus-glib, gnome3 ? null, glib, libxml2 , intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; + propagatedBuildInputs = [ glib dbus-glib ]; nativeBuildInputs = [ pkgconfig intltool ]; # ToDo: ldap reported as not found but afterwards reported as supported diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 2569b4e2c7ad..7ecf79391f0c 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib +, libgcrypt, libtasn1, dbus-glib, gtk, pango, gdk_pixbuf, atk , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { buildInputs = let gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome in [ - gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk + gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk ]; - propagatedBuildInputs = [ glib gtk p11_kit ]; + propagatedBuildInputs = [ glib gtk p11-kit ]; #doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 796e103fdb3c..a6c8375e9b52 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth +, gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth , librsvg, coreutils }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ]; buildInputs = [ glib accountsservice systemd gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam plymouth librsvg ]; + libcanberra-gtk3 pam plymouth librsvg ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 4d75bdc49963..341f1c4f095e 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; + [ intltool pkgconfig glib libsoup json-glib ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 3dbb4e32654f..12e91b8e431e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; + buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 12b8af206ea0..5382bce44a01 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ bash gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ]; + gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f9261e183ef1..8623e598dc20 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; })]; - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which + propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9078b9e051cd..d05ab4470c56 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -1,16 +1,16 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db +{ stdenv, intltool, fetchurl, evolution-data-server, db , pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib +, libchamplain, clutter-gtk, geocode-glib , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake, autoconf }: +, gnome3, librsvg, gdk_pixbuf, file, telepathy-glib, nspr, nss +, libsoup, vala, dbus-glib, automake, autoconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard evolution-data-server ]; # force build from vala preBuild = '' @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ]; - buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ]; + buildInputs = [ gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas libnotify + folks gnome3.gnome-desktop telepathy-glib libsecret dbus-glib + libxml2 libsoup gnome3.gnome-online-accounts nspr nss + gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib db ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" ) ''; 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 9d20eb750ab9..1c4d4858bf52 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,29 +1,29 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook -, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk +, libwacom, samba, shared-mime-info, tzdata, libtool +, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk , fontconfig, sound-theme-freedesktop, grilo }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns - shared_mime_info + shared-mime-info ]; buildInputs = with gnome3; [ - ibus gtk glib glib_networking upower gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libgtop - gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk + ibus gtk 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 - gdk_pixbuf defaultIconTheme librsvg clutter clutter_gtk + grilo libpwquality cracklib vino libcanberra-gtk3 libgudev + gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk networkmanager modemmanager gnome-bluetooth tracker ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share" + --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 99ff1b6f3a16..deabb41224f0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, xkeyboard_config, isocodes, itstool, wayland +, intltool, gnome-doc-utils, xkeyboard_config, isocodes, itstool, wayland , libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig which itstool intltool libxslt gnome_doc_utils gobjectIntrospection + pkgconfig which itstool intltool libxslt gnome-doc-utils gobjectIntrospection ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland gtk3 glib libseccomp ]; - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; patches = [ ./bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 6cfdd45c2f9c..0327ce9862bc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt +{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk, glib }: @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gnome3.defaultIconTheme ]; nativeBuildInputs = [ 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 ]; + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; + buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; 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 188ad99b73cd..c37f824a5613 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,18 +1,18 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk, glib, wrapGAppsHook, libnotify , itstool, gnome3, gdk_pixbuf, libxml2 -, libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }: +, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl wrapGAppsHook libxml2 ]; - buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3 + buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 gdk_pixbuf udisks2 gnome3.defaultIconTheme - gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ]; + gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file 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 dade56158fb1..6908a5161a06 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ]; + buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index d4f5835ed3a2..9c1282ecc4cd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook +, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit + dbus libgcrypt pam gtk3 libgnome-keyring + pango gcr gdk_pixbuf atk p11-kit ]; # In 3.20.1, tests do not support Python 3 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 c6fa6cb16584..b0edf4f978f1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common, gtk_doc -, telepathy_glib, intltool, dbus_libs, icu, glib_networking +, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc +, telepathy-glib, intltool, dbus_libs, icu, glib-networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - pkgconfig vala gnome_common intltool wrapGAppsHook - libxslt docbook_xsl_ns docbook_xsl gtk_doc + pkgconfig vala gnome-common intltool wrapGAppsHook + libxslt docbook_xsl_ns docbook_xsl gtk-doc ]; buildInputs = [ - glib gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib glib_networking icu libsoup + glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib 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 d8e878715602..2ef1ae2fa3e0 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,5 @@ { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }: +, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { 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 + gnome3.gnome-online-accounts gnome3.libmediaart + gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest dleyna-server ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 5986b07229f5..c4030f38d5d5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 +{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib , gnome3, librsvg, gdk_pixbuf }: @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; - buildInputs = [ bash gtk3 glib libcanberra_gtk3 - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ bash gtk3 glib libcanberra-gtk3 + gnome3.gsettings-desktop-schemas ]; patches = [ ./prevent-cache-updates.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 2cd92ce39ca1..c12b96f60905 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, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower +{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower , libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { configureFlags = "--enable-systemd"; buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd + [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt + gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme + gsettings-desktop-schemas upower intltool gconf makeWrapper systemd epoxy ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \ + --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" ''; meta = with stdenv.lib; { 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 6de97f3dea26..6741eb81ade6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit , geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager , docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }: @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ]; + [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager + libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio + libcanberra-gtk3 upower colord libgweather xkeyboard_config + polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ]; postPatch = '' substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 693560454b17..29b2bdd84068 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret -, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales -, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core +, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales +, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , gst_all_1 }: @@ -21,17 +21,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice + [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf (librsvg.override { enableIntrospection = true; }) - clutter networkmanager libstartup_notification telepathy_glib - libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server + clutter networkmanager libstartup_notification telepathy-glib + libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server libical nss gtk gstreamer gdm - libcanberra_gtk3 gnome_control_center geoclue2 + libcanberra-gtk3 gnome-control-center geoclue2 defaultIconTheme sqlite gnome3.gnome-bluetooth libgweather # not declared at build time, but typelib is needed at runtime gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon + at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobjectIntrospection (stdenv.lib.getLib dconf) ]; propagatedUserEnvPkgs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 37650ae5a142..dda6e78661ba 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt -, json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }: +, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 - valgrind-light docbook_xsl gtk_doc desktop_file_utils ]; + valgrind-light docbook_xsl gtk-doc desktop-file-utils ]; buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gtkspell3 json_glib libsecret ostree + gnome3.gsettings-desktop-schemas gnome3.gnome-desktop + gtkspell3 json-glib libsecret ostree polkit attr acl libyaml ]; propagatedBuildInputs = [ isocodes ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index d66efca66d9c..673140c3e1b6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; + gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" ) ''; 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 c32d9d95d88f..07eed05762d6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -7,17 +7,17 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ bash gtk3 glib intltool itstool libxml2 gtkmm3 libgtop wrapGAppsHook gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas systemd ]; + gnome3.gsettings-desktop-schemas systemd ]; preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index b28c3a4c45d8..4ce393ad4e45 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3 -, gnome_doc_utils, intltool, which, libuuid, vala -, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: +, gnome-doc-utils, intltool, which, libuuid, vala +, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools + buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools gnome3.dconf itstool gnome3.nautilus ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - vala desktop_file_utils wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2 + vala desktop-file-utils wrapGAppsHook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; # FIXME: enable for gnome3 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 0b83f6eb2267..5d551dff1c0a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, apacheHttpd, nautilus , pkgconfig, gtk3, glib, libxml2, gnused, systemd , bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: +, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib intltool itstool libxml2 libtool wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra_gtk3 systemd ]; + 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 eb600770e0ac..63dc6870ad40 100644 --- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, dleyna-server, itstool }: +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av +, gmime, json-glib, avahi, tracker, dleyna-server, itstool }: stdenv.mkDerivation rec { major = "0.3"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib + lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts + gnome3.totem-pl-parser gnome3.rest gmime json-glib avahi gnome3.libmediaart tracker dleyna-server intltool itstool ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 977dd7ffd6fb..836d178f09db 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: +, gnome3, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 45001e551273..88e6a0bd7853 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }: let checkInputs = [ xvfb_run dbus ]; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { # Required by gtksourceview-3.0.pc gtk3 # Used by gtk_source_language_manager_guess_language - shared_mime_info + shared-mime-info ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 731ff7e2688e..40b7a4c7d9f1 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools +, glib, desktop-file-utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools - gnome3.yelp_tools libxml2 desktop_file_utils gobjectIntrospection + gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; - buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix index ddf245f49e06..816ed6476e6b 100644 --- a/pkgs/desktops/gnome-3/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }: +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib +, gobjectIntrospection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: let majorVersion = "0.17"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl uhttpmock ]; + liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; - propagatedBuildInputs = [ json_glib ]; + propagatedBuildInputs = [ json-glib ]; meta = with stdenv.lib; { description = "GData API library"; diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 01b3c9bc0930..40f02886101d 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; + propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ]; nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; # Prevent building vapi into ${vala} derivation directory diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix index dab1a0fea8a0..8bd9e11d95f3 100644 --- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts }: stdenv.mkDerivation rec { name = "libzapojit-0.0.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; + buildInputs = [ glib intltool json-glib rest libsoup gtk gnome-online-accounts ]; meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index e1343d9977d7..92c2fee8e46c 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra_gtk3 +, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , pipewire, libgudev, libwacom, xwayland, autoreconfHook }: @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; buildInputs = with gnome3; [ - glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification - gnome3.geocode_glib libinput libgudev libwacom - libcanberra_gtk3 zenity xkeyboard_config libxkbfile + glib gobjectIntrospection gtk gsettings-desktop-schemas upower + gnome-desktop cairo pango cogl clutter zenity libstartup_notification + gnome3.geocode-glib libinput libgudev libwacom + libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 0a7cd139d2cc..ebabc269e814 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook -, gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook +, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif , exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ]; + nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; - buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux - tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux + tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ gnome-autoar ]; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { # Thumbnailers --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) ''; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 37b311256bd9..3e568f8639a2 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 , gdk_pixbuf, librsvg, gtk3, harfbuzz }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + clutter-gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper harfbuzz ]; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index c26b9b45dfdf..deb56e3c51cf 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter -, clutter_gtk, clutter-gst, python3Packages, shared_mime_info +, clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg +, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg , gdk_pixbuf, file, tracker, nautilus }: stdenv.mkDerivation rec { @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.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 dbus_glib - 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 gnome3.libpeas shared-mime-info dbus-glib + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index baff249a03a3..7213bbdfdb22 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -2,11 +2,11 @@ , pkgconfig, gtk3, glib , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt , gnome3, librsvg, gdk_pixbuf, libnotify -, evolution_data_server, gst_all_1, poppler +, evolution-data-server, gst_all_1, poppler , icu, taglib, libjpeg, libtiff, giflib, libcue , libvorbis, flac, exempi, networkmanager , libpng, libexif, libgsf, libuuid, bzip2 -, libsoup, json_glib, libseccomp +, libsoup, json-glib, libseccomp , libiptcdata }: stdenv.mkDerivation rec { @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; # TODO: add libgrss, libenca buildInputs = [ - bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser + bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu - json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup + json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup libtiff libuuid libvorbis libxml2 poppler taglib upower ]; diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 59455f320b53..2596709c0bac 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt -, gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ]; # TODO: add libstemmer buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib ]; - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas configureFlags = [ "--disable-unit-tests" ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index bd446623fc25..4eadcc05760b 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup -, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null , zlib ? null, libjpeg ? null , libXdamage ? null, libXfixes ? null, libXext ? null -, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , networkmanager ? null }: with lib; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ wrapGAppsHook pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] - ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ] + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ filter (p: p != null) [ libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index 251e27334b11..ef33cc34023c 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 +, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2 }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/desktops/gnome-3/core/vte/ng.nix index c40972e955fa..e6dc005fe58e 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/desktops/gnome-3/core/vte/ng.nix @@ -1,4 +1,4 @@ -{ gnome3, fetchFromGitHub, autoconf, automake, gtk_doc, gettext, libtool, gperf }: +{ gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: gnome3.vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -14,5 +14,5 @@ gnome3.vte.overrideAttrs (oldAttrs: rec { preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] - ++ [ gtk_doc autoconf automake gettext libtool gperf ]; + ++ [ gtk-doc autoconf automake gettext libtool gperf ]; }) diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index eaceadcc85c4..d849178ae09c 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ]; + buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 6b458598c299..16e314462858 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl librsvg gdk_pixbuf gnome3.defaultIconTheme groff - gnome3.gsettings_desktop_schemas wrapGAppsHook + gnome3.gsettings-desktop-schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 80f2dde534ec..e7d14188b0c4 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }: +, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 0650ddf04eae..9388c9198966 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -17,21 +17,21 @@ let maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ]; corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database + pkgs.desktop-file-utils pkgs.ibus + pkgs.shared-mime-info # for update-mime-database glib # for gsettings 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_standard defaultIconTheme gnome-shell-extensions - pkgs.hicolor_icon_theme + glib-networking gvfs dconf gnome-backgrounds gnome-control-center + gnome-menus gnome-settings-daemon gnome-shell + gnome-themes-standard defaultIconTheme gnome-shell-extensions + pkgs.hicolor-icon-theme ]; optionalPackages = with gnome3; [ baobab eog epiphany evince gucharmap nautilus totem vino yelp gnome-bluetooth gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-log gnome-system-monitor simple-scan - gnome_terminal gnome-user-docs evolution file-roller gedit + gnome-terminal gnome-user-docs evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool @@ -46,8 +46,8 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 - clutter clutter-gst clutter_gtk cogl gtkvnc; + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 + clutter clutter-gst clutter-gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -81,11 +81,11 @@ let evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - evolution_data_server = callPackage ./core/evolution-data-server { }; + evolution-data-server = callPackage ./core/evolution-data-server { }; gconf = callPackage ./core/gconf { }; - geocode_glib = callPackage ./core/geocode-glib { }; + geocode-glib = callPackage ./core/geocode-glib { }; gcr = callPackage ./core/gcr { }; # ToDo: tests fail @@ -93,8 +93,8 @@ let gjs = callPackage ./core/gjs { }; - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; + glib-networking = pkgs.glib-networking.override { + inherit gsettings-desktop-schemas; }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -103,13 +103,13 @@ let gnome-contacts = callPackage ./core/gnome-contacts { }; - gnome_control_center = callPackage ./core/gnome-control-center { }; + gnome-control-center = callPackage ./core/gnome-control-center { }; gnome-calculator = callPackage ./core/gnome-calculator { }; - gnome_common = callPackage ./core/gnome-common { }; + gnome-common = callPackage ./core/gnome-common { }; - gnome_desktop = callPackage ./core/gnome-desktop { }; + gnome-desktop = callPackage ./core/gnome-desktop { }; gnome-dictionary = callPackage ./core/gnome-dictionary { }; @@ -119,27 +119,27 @@ let gnome-menus = callPackage ./core/gnome-menus { }; - gnome_keyring = callPackage ./core/gnome-keyring { }; + gnome-keyring = callPackage ./core/gnome-keyring { }; - libgnome_keyring = callPackage ./core/libgnome-keyring { }; + libgnome-keyring = callPackage ./core/libgnome-keyring { }; libgnomekbd = callPackage ./core/libgnomekbd { }; folks = callPackage ./core/folks { }; - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; + gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; - gnome_session = callPackage ./core/gnome-session { }; + gnome-session = callPackage ./core/gnome-session { }; - gnome_shell = callPackage ./core/gnome-shell { }; + gnome-shell = callPackage ./core/gnome-shell { }; gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; gnome-screenshot = callPackage ./core/gnome-screenshot { }; - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; + gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; gnome-software = callPackage ./core/gnome-software { }; @@ -147,9 +147,9 @@ let gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - gnome_terminal = callPackage ./core/gnome-terminal { }; + gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + gnome-themes-standard = callPackage ./core/gnome-themes-standard { }; gnome-user-docs = callPackage ./core/gnome-user-docs { }; @@ -159,7 +159,7 @@ let grilo-plugins = callPackage ./core/grilo-plugins { }; - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; + gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; gsound = callPackage ./core/gsound { }; @@ -193,36 +193,36 @@ let nautilus = callPackage ./core/nautilus { }; - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { + networkmanager-openvpn = pkgs.networkmanager-openvpn.override { inherit gnome3; }; - networkmanager_pptp = pkgs.networkmanager_pptp.override { + networkmanager-pptp = pkgs.networkmanager-pptp.override { inherit gnome3; }; - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { + networkmanager-vpnc = pkgs.networkmanager-vpnc.override { inherit gnome3; }; - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { + networkmanager-openconnect = pkgs.networkmanager-openconnect.override { inherit gnome3; }; - networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { + networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override { inherit gnome3; }; - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { + networkmanager-l2tp = pkgs.networkmanager-l2tp.override { inherit gnome3; }; - networkmanager_iodine = pkgs.networkmanager_iodine.override { + networkmanager-iodine = pkgs.networkmanager-iodine.override { inherit gnome3; }; networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; + inherit gnome3 gsettings-desktop-schemas glib-networking; }; rest = callPackage ./core/rest { }; @@ -249,9 +249,9 @@ let yelp = callPackage ./core/yelp { }; - yelp_xsl = callPackage ./core/yelp-xsl { }; + yelp-xsl = callPackage ./core/yelp-xsl { }; - yelp_tools = callPackage ./core/yelp-tools { }; + yelp-tools = callPackage ./core/yelp-tools { }; zenity = callPackage ./core/zenity { }; @@ -401,6 +401,34 @@ let gnome-packagekit = callPackage ./misc/gnome-packagekit { }; +#### Legacy aliases + + 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 + 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 + gnome_keyring = gnome-keyring; # added 2018-02-25 + gnome_online_accounts = gnome-online-accounts; # added 2018-02-25 + gnome_session = gnome-session; # added 2018-02-25 + gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25 + gnome_shell = gnome-shell; # added 2018-02-25 + gnome_terminal = gnome-terminal; # added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 + libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 + libgnome_keyring = libgnome-keyring; # added 2018-02-25 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 + networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + yelp_xsl = yelp-xsl; # added 2018-02-25 + yelp_tools = yelp-tools; # added 2018-02-25 + }; in self; # pkgsFun diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 4347f72cc5f6..c81b160ae716 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl gnome3.libgda gnome3.gtksourceview - gnome3.gsettings_desktop_schemas + gnome3.gsettings-desktop-schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 08dbade67fbf..6ecac28f96a0 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool, gsettings_desktop_schemas }: +, webkitgtk, intltool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - gsettings_desktop_schemas + gsettings-desktop-schemas ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 11d891b67434..d22dbd49d393 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; - buildInputs = [ gnome3.gnome_shell python pygobject3 requests ]; + buildInputs = [ gnome3.gnome-shell python pygobject3 requests ]; preConfigure = '' substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 40e1473b59e2..a6f0a65832f7 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile_2_0, libcanberra_gtk3 }: +, wrapGAppsHook, gconf, librsvg, libxml2, desktop-file-utils +, guile_2_0, libcanberra-gtk3 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ]; + librsvg libxml2 desktop-file-utils guile_2_0 libcanberra-gtk3 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; 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 486fe5c486e0..a2623c5115b7 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 @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: +, intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 90fdccc11860..7489cf6111bb 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool +, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool , libxml2, libgee, libgames-support }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme + librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme libgee libgames-support ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index cd13e6ab9585..e46736351a1b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support , libgee}: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3 libxml2 gnome3.defaultIconTheme libgames-support libgee ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index a0f83d48c3da..2234d696d240 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: +, json-glib, qqwing, itstool, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; + json-glib qqwing itstool libxml2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Sudoku; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index d456abe6dc1f..3935afe3eb6b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: +, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + gtk3 wrapGAppsHook librsvg libcanberra-gtk3 intltool itstool libxml2 gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 3836548b3ab2..e7e1696dda44 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: +, intltool, itstool, libcanberra-gtk3, libxml2, dconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; + dconf libxml2 libcanberra-gtk3 wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 7bd3ca95de94..78663b99ae04 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: +, intltool, itstool, clutter, clutter-gtk, libxml2, dconf }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; + libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 514b2a035575..be3b5f6ee01a 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: +, librsvg, libcanberra-gtk3 +, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; + libcanberra-gtk3 itstool intltool clutter + libxml2 clutter-gtk wrapGAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index c6416960b7aa..1df746f4f28b 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: +, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; + dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index b33488e34fce..73d3b555ba9f 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; + libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server + sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ]; preFixup = '' wrapProgram "$out/bin/california" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index a912fb1c98b2..f8c296252617 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant -, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra_gtk3, libsecret, gmime +, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils +, libnotify, libcanberra-gtk3, libsecret, gmime , libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: +, gnome3, librsvg, gnome-doc-utils, webkitgtk }: let majorVersion = "0.12"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; - buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ]; + buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix index 364a52ee5cdf..779f21882e63 100644 --- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: +, gnome3, libsoup, json-glib }: stdenv.mkDerivation rec { name = "gfbgraph-0.2.3"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; + buildInputs = [ glib gnome3.gnome-online-accounts ]; + propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 4180cd3b8ea1..208f0e6a1c79 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib -, json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret +, json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , libsoup }: stdenv.mkDerivation rec { @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ shared-mime-info + gnome3.gnome-themes-standard ]; - buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas + buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index cce734b474e4..e2236913170e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit -, fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }: +, fontconfig, libcanberra-gtk3, systemd, libnotify, wrapGAppsHook, dbus-glib, dbus_libs, desktop-file-utils }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ]; + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ]; buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit - libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; + libcanberra-gtk3 libnotify dbus-glib dbus_libs ]; prePatch = "patchShebangs meson_post_install.sh"; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix index 4e8eaffde435..58d8f90cb86a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ]; buildInputs = [ - gtk3 glib gnome3.gsettings_desktop_schemas + gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme librsvg - libnotify gnome3.gnome_shell python3Packages.pygobject3 - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.mutter gnome3.gnome_desktop gobjectIntrospection + libnotify gnome3.gnome-shell python3Packages.pygobject3 + libsoup gnome3.gnome-settings-daemon gnome3.nautilus + gnome3.mutter gnome3.gnome-desktop gobjectIntrospection ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 3e1c897ffff9..aaedd6ef632d 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ]; buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme - gtk3 gnome3.gnome_control_center dbus + gtk3 gnome3.gnome-control-center dbus clutter pango appstream-glib systemd gobjectIntrospection ]; configureFlags = [ "--with-controlcenterdir=$(out)/share/gnome-control-center/keybindings" diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 3f65ab36b0bb..10e3c5618a98 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; + gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index edb34996867b..dd551a1caed6 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null +}: + +assert mysqlSupport -> mysql != null; +assert postgresSupport -> postgresql != null; stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -11,16 +17,18 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ - "--enable-gi-system-install=no" - ]; + configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] + ++ (optional (mysqlSupport) "--with-mysql=yes") + ++ (optional (postgresSupport) "--with-postgres=yes"); enableParallelBuilding = true; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool libxml2 gtk3 openssl ]; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ]; + buildInputs = with stdenv.lib; [ gtk3 openssl ] + ++ optional (mysqlSupport) mysql.connector-c + ++ optional (postgresSupport) postgresql; meta = with stdenv.lib; { description = "Database access library"; diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix index 3c9652de4990..c28ab402a124 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2 -, gtk_doc, gobjectIntrospection, libgit2, glib }: +, gtk-doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; nativeBuildInputs = [ - gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection + gnome3.gnome-common libtool pkgconfig vala gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 5634d2a48d54..82e56d3f96c4 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, + dbus-glib, libcanberra, gst_all_1, vala, gnome3, gtk3, libxml2, autoreconfHook, glib, gobjectIntrospection, libpeas }: @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra gst_all_1.gstreamer + 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.gsettings-desktop-schemas + gnome3.gnome-shell gtk3 gnome3.defaultIconTheme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index da33999087ed..0ada9af3b5e0 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop-file-utils, numlockx, xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, poppler_qt5, wrapGAppsHook }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { poppler_qt5 fluxbox xscreensaver - desktop_file_utils + desktop-file-utils numlockx ]; diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index e3cb02e8b8af..c40b9c4e9f94 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, qt5, xorg, lxqt, openbox, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libSM openbox - hicolor_icon_theme + hicolor-icon-theme ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c6607dad2902..05b9d966fc43 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor_icon_theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { poppler mate.caja mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 1aef8d3d184f..3383847f16c6 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib gupnp mate.caja mate.mate-desktop diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index a80f89feff29..070808504d14 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libexif exempi mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; patches = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 8e46102cf5a6..74d32ce1f216 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libxml2 gnome3.gtk mate.caja - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c3af73282e5c..23e167412919 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -17,18 +17,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib exempi lcms2 libexif libjpeg librsvg libxml2 - shared_mime_info + shared-mime-info gnome3.gtk gnome3.libpeas mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 9a926b78c3d7..e5a544ae33e5 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra_gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 libgtop gnome2.startup_notification gnome3.gtk diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index f56d594303c9..0be643c97189 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { wirelesstools mate.libmateweather mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; configureFlags = [ "--enable-suid=no" ]; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index e9b789bdc4e9..fdee351aeed5 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, - libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3, - desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, + libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, + desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool - desktop_file_utils + desktop-file-utils wrapGAppsHook ]; buildInputs = [ libxml2 - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 librsvg libappindicator-gtk3 gnome3.gtk gnome3.dconf - hicolor_icon_theme + hicolor-icon-theme mate.mate-desktop mate.libmatekbd mate.mate-menus diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 6e1f9778e313..2d868d2e0821 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mate, hicolor_icon_theme }: +{ stdenv, fetchurl, autoreconfHook, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mate.mate-icon-theme hicolor_icon_theme ]; + buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; meta = { description = "Faenza icon theme from MATE"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index a42116a63af5..93ad93b07b98 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor_icon_theme, gtk3, mate }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3, mate }: stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; - buildInputs = [ librsvg hicolor_icon_theme ]; + buildInputs = [ librsvg hicolor-icon-theme ]; postInstall = '' for theme in "$out"/share/icons/*; do diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 4ff636c3c734..512327c06208 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-indicator-applet-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { gtk3 libindicator-gtk3 mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index f4ee94b4bd37..514da3a11724 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra_gtk3, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-media-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk mate.libmatemixer mate.mate-desktop diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 53b441a293a6..59df2b7d59bd 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3, +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib - libcanberra_gtk3 + dbus-glib + libcanberra-gtk3 libnotify libwnck3 gnome3.gtk diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index b05a9a68af04..0adcb58758c3 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - dbus_glib + dbus-glib libwnck3 librsvg libxml2 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mate.libmateweather mate.mate-desktop mate.mate-menus - hicolor_icon_theme + hicolor-icon-theme ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index df38485fbc75..ddde6acf0e0e 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { glib itstool libxml2 - libcanberra_gtk3 + libcanberra-gtk3 gnome3.gtk - gnome3.libgnome_keyring + gnome3.libgnome-keyring libnotify - dbus_glib + dbus-glib upower mate.mate-panel ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index e1ae6b4ae1dc..3b5d303816ba 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib libXScrnSaver libnotify pam diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 130db2420ef1..dfd3766df297 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus-glib, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { libxslt libatasmart libnotify - dbus_glib + dbus-glib lm_sensors mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index d154b80263c6..97c80cdc2e4e 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus_glib, systemd, - libSM, libXtst, gtk3, hicolor_icon_theme, mate, +{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, + libSM, libXtst, gtk3, hicolor-icon-theme, mate, wrapGAppsHook }: @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib systemd libSM libXtst gtk3 mate.mate-desktop - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index dc1272115b8e..b97b5294d39b 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus_glib, libxklavier, libcanberra_gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook +{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib libxklavier - libcanberra_gtk3 + libcanberra-gtk3 libnotify nss polkit diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index f5393cad0b88..23123fd2db1a 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, mod_dnssd, apacheHttpd, hicolor_icon_theme, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-user-share-${version}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - dbus_glib + dbus-glib libnotify - libcanberra_gtk3 + libcanberra-gtk3 libxml2 mate.caja - hicolor_icon_theme + hicolor-icon-theme # Should mod_dnssd and apacheHttpd be runtime dependencies? # In gnome-user-share they are not. #mod_dnssd diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 946dc3efd253..f96eecb0a4e6 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-utils-${version}"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgtop - libcanberra_gtk3 + libcanberra-gtk3 libxml2 mate.mate-panel - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 13a34f90fcdd..22e790784d57 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = with gnome3; [ glib gtk3 granite libnotify gettext vte_290 libgee - gsettings_desktop_schemas defaultIconTheme + gsettings-desktop-schemas defaultIconTheme ]; meta = { description = "Elementary OS's terminal"; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 44e8a26eee15..4be84589080c 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,12 +1,12 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: mkDerivation { name = "bluedevil"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 5bb8b0f9ef80..6da0ad22d115 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl, - gconf, gsettings_desktop_schemas, + gconf, gsettings-desktop-schemas, debug ? false, }: @@ -105,7 +105,7 @@ let breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; - kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings_desktop_schemas; }; + kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; kdecoration = callPackage ./kdecoration.nix {}; kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; kgamma5 = callPackage ./kgamma5.nix {}; diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index f792f3b939f4..35d90a246bc6 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings_desktop_schemas + knewstuff, gsettings-desktop-schemas }: mkDerivation { @@ -10,12 +10,12 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings_desktop_schemas + knewstuff gsettings-desktop-schemas ]; patches = [ ./0001-follow-symlinks.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGLIB_SCHEMAS_DIR=${gsettings_desktop_schemas.out}/" + "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch index 79b5cfb437e2..75144d352223 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch @@ -16,7 +16,7 @@ index 568cb34..98a5992 100644 #include <KLocale> -const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml"; -+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml"; ++const QString MobileProviders::ProvidersFile = "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"; bool localeAwareCompare(const QString & one, const QString & two) { return one.localeAwareCompare(two) < 0; diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index cc1dcb7ee9f7..214dbd9cc042 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -4,7 +4,7 @@ kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, - mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt, + mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt, openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid }: @@ -15,13 +15,13 @@ mkDerivation { kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect + mobile-broadband-provider-info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; patches = [ (substituteAll { src = ./0001-mobile-broadband-provider-info-path.patch; - inherit mobile_broadband_provider_info; + inherit mobile-broadband-provider-info; }) (substituteAll { src = ./0002-openvpn-binary-path.patch; diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 0bfad2b5c8e4..b60b5298d6db 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kdoctools, gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem + libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem }: mkDerivation { @@ -10,6 +10,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem + libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 65912083a4cf..6becf3bf420b 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,5 +1,5 @@ { - mkDerivation, extra-cmake-modules, shared_mime_info, + mkDerivation, extra-cmake-modules, shared-mime-info, libpthreadstubs, libXcursor, libXdmcp, qtquickcontrols2, qtx11extras, karchive, ki18n, kio, knewstuff @@ -7,7 +7,7 @@ mkDerivation { name = "sddm-kcm"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs libXcursor libXdmcp qtquickcontrols2 qtx11extras diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 54b112927690..65e4463600a9 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared_mime_info, hicolor_icon_theme }: +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, libSM, shared-mime-info, hicolor-icon-theme }: let version = "2.11"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ]; + buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ]; patches = [ ./rox-filer-2.11-in-source-build.patch diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index a2b91aaaa79e..d66fa2049e65 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util -, gtk, gtksourceview, dbus, dbus_glib, makeWrapper +, gtk, gtksourceview, dbus, dbus-glib, makeWrapper , dconf }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool libxfce4util - gtk gtksourceview dbus dbus_glib makeWrapper + gtk gtksourceview dbus dbus-glib makeWrapper dconf ]; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index c26327f4d920..f376b743c824 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib +{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool bison flex ]; - buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix index 598c50380928..3b27456d78a3 100644 --- a/pkgs/desktops/xfce/applications/parole.nix +++ b/pkgs/desktops/xfce/applications/parole.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1 -, gtk, dbus_glib, libxfce4ui, libxfce4util, xfconf +, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf , taglib, libnotify , withGstPlugins ? true }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - gtk dbus_glib libxfce4ui libxfce4util xfconf + gtk dbus-glib libxfce4ui libxfce4util xfconf taglib libnotify ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]); diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index b38b97b90438..f849fbd20a73 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, libexif, gtk -, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf -, hicolor_icon_theme, makeWrapper +, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf +, hicolor-icon-theme, makeWrapper }: stdenv.mkDerivation rec { @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libexif gtk dbus_glib exo libxfce4util - libxfce4ui xfconf hicolor_icon_theme makeWrapper + [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util + libxfce4ui xfconf hicolor-icon-theme makeWrapper ]; postInstall = '' wrapProgram "$out/bin/ristretto" \ - --prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" ''; meta = { diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index ad1727da3b93..773a8274f341 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus_glib +{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib , exo, libxfce4util, libxfce4ui }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ]; + buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ]; meta = { homepage = http://www.xfce.org/projects/terminal; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index ffcdf4835779..4c855b8ddeb6 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, makeWrapper, glib_networking, exo, hicolor_icon_theme, wrapGAppsHook }: +, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme glib_networking + xfce4panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking ]; meta = { diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index a213b27a7619..6b5ee4b31328 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util -, hicolor_icon_theme }: +, hicolor-icon-theme }: stdenv.mkDerivation rec { p_name = "exo"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ]; + buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ]; meta = with stdenv.lib; { homepage = "http://www.xfce.org/projects/${p_name}"; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 58fc6c3fe4be..e8d5b4acd769 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf -, libglade, libstartup_notification, hicolor_icon_theme +, libglade, libstartup_notification, hicolor-icon-theme , withGtk3 ? false, gtk3 }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ] ++ optional withGtk3 gtk3; propagatedBuildInputs = [ xorg.libICE xorg.libSM ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 106cda6b9757..7fe76057c930 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk -, libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }: +, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }: let p_name = "libxfcegui4"; ver_maj = "4.10"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification hicolor_icon_theme + libstartup_notification hicolor-icon-theme ]; meta = { diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix index bfc55f87b5cd..bf44fc0adbba 100644 --- a/pkgs/desktops/xfce/core/thunar-build.nix +++ b/pkgs/desktops/xfce/core/thunar-build.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool -, gtk, dbus_glib, libstartup_notification, libnotify, libexif, pcre, udev +, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev , exo, libxfce4util, xfconf, xfce4panel, wrapGAppsHook }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ intltool - gtk dbus_glib libstartup_notification libnotify libexif pcre udev + gtk dbus-glib libstartup_notification libnotify libexif pcre udev exo libxfce4util xfconf xfce4panel ]; # TODO: optionality? diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 6e785c9438bb..3e1d2be2b531 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype , libgsf, poppler, bzip2 }: let p_name = "tumbler"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - intltool dbus_glib gdk_pixbuf curl freetype + intltool dbus-glib gdk_pixbuf curl freetype poppler libgsf bzip2 ]; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e9f6240cbdfe..26548f6daa42 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4mixer, hicolor_icon_theme -, withGtk3 ? false, gtk3, gettext, glib_networking +, makeWrapper, xfce4mixer, hicolor-icon-theme +, withGtk3 ? false, gtk3, gettext, glib-networking }: let inherit (stdenv.lib) optional; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme + garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme ] ++ xfce4mixer.gst_plugins ++ optional withGtk3 gtk3; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xfce4-panel" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index c72061e577e8..9425c4d8884b 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus_glib, upower, xfconf -, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme +{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf +, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor-icon-theme , withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }: let p_name = "xfce4-power-manager"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool glib dbus_glib upower xfconf libxfce4util - libnotify hicolor_icon_theme + [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util + libnotify hicolor-icon-theme ] ++ (if withGtk3 then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ] diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index edc810d38972..73939d535872 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit -, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg -, hicolor_icon_theme +, libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus-glib, xfconf, libglade, xorg +, hicolor-icon-theme }: let @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib + [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib xfconf xfce4panel libglade xorg.iceauth xorg.libSM - polkit hicolor_icon_theme + polkit hicolor-icon-theme ]; #TODO: upower-glib, gconf (assistive?), gnome keyring preBuild = '' diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index fbf03cc4a81d..9aa66a1343f6 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }: let p_name = "xfconf"; ver_maj = "4.12"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib libxfce4util ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus-glib ]; meta = with stdenv.lib; { homepage = http://docs.xfce.org/xfce/xfconf/start; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 165381451425..491185ff2c09 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify -, hicolor_icon_theme }: +, hicolor-icon-theme }: let p_name = "xfdesktop"; ver_maj = "4.12"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf - libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme + libglade xfce4panel thunar exo garcon libnotify hicolor-icon-theme ]; patches = [(fetchpatch { diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index d27f498842e3..968c845a0119 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk2 +, shared-mime-info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - mono makeWrapper nant shared_mime_info gtksourceview + mono makeWrapper nant shared-mime-info gtksourceview gtk2 ]; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index fd8930bc8547..8f9f6e19993d 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -11,11 +11,12 @@ let , name ? "" , developerProgram ? false , python ? python27 + , runPatches ? [] }: stdenv.mkDerivation rec { name = "cudatoolkit-${version}"; - inherit (args) version; + inherit version runPatches; dontPatchELF = true; dontStrip = true; @@ -48,35 +49,34 @@ let rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + unpackPhase = '' sh $src --keep --noexec + cd pkg/run_files sh cuda-linux*.run --keep --noexec sh cuda-samples*.run --keep --noexec - cd pkg - ''; - - buildPhase = '' - chmod -R u+w . - while IFS= read -r -d ''$'\0' i; do - if ! isELF "$i"; then continue; fi - echo "patching $i..." - if [[ ! $i =~ \.so ]]; then - patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i - fi - if [[ $i =~ libcudart ]]; then - rpath2= - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - fi - patchelf --set-rpath $rpath2 --force-rpath $i - done < <(find . -type f -print0) + mv pkg ../../$(basename $src) + cd ../.. + rm -rf pkg + + for patch in $runPatches; do + sh $patch --keep --noexec + mv pkg $(basename $patch) + done ''; installPhase = '' mkdir $out + cd $(basename $src) perl ./install-linux.pl --prefix="$out" + cd .. + for patch in $runPatches; do + cd $(basename $patch) + perl ./install_patch.pl --silent --accept-eula --installdir="$out" + cd .. + done rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -117,6 +117,23 @@ let echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; + preFixup = '' + while IFS= read -r -d ''$'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libcudart ]]; then + rpath2= + else + rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 + fi + patchelf --set-rpath $rpath2 --force-rpath $i + done < <(find $out $lib $doc -type f -print0) + ''; + passthru = { cc = gcc; majorVersion = @@ -163,16 +180,28 @@ in { }; cudatoolkit8 = common { - version = "8.0.61"; + version = "8.0.61.2"; url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run"; + sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; + }) + ]; gcc = gcc5; }; cudatoolkit9 = common { - version = "9.0.176"; - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; - sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; + version = "9.1.85.1"; + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; + sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; + runPatches = [ + (fetchurl { + url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; + sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; + }) + ]; gcc = gcc6; }; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 51dd24671bdd..8758ee59d384 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 54323458d9bd..5bd05b257ca5 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.0.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index c4780690f678..e4bf23c6e9e2 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.10.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4f00ef8fb751..988392e74b9e 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta.license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 7f636284c68d..86925c406cfc 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.4.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 481b8d90918c..982008563a06 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.6.3"; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 15f105946f51..47fc090c1ff1 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { targetPrefix = ""; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-7.8.4"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 011822994ed3..7d11ffb66c60 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.0.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f4aa2de3241e..1c3f260da1c1 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.2.2"; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index e7ec9be16b69..8f7cdc9568e4 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? true -, version ? "8.4.0.20180204" +, version ? "8.4.0.20180224" , # Whether to backport https://phabricator.haskell.org/D4388 for # deterministic profiling symbol names, at the cost of a slightly # non-standard GHC API @@ -77,8 +77,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; - rev = "111737cd218751f06ea58d3cf2c7c144265b5dfc"; - sha256 = "0ksp0k3sp928aq2cv6whgbfmjnr7l2j10diha13nncksp4byf0s9"; + rev = "a1e15c8f59092ef2d11be7966bd20688d8dc01e6"; + sha256 = "1pimf5ryl76r3vwnc2n0qzk4yh7zckp2r2g5rlz8nbddsws2v893"; }; enableParallelBuilding = true; @@ -190,7 +190,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.4.1"; }; meta = { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 82cef10ce3be..bc3ccbdcdf51 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { inherit llvmPackages; # Our Cabal compiler name - haskellCompilerName = "ghc"; + haskellCompilerName = "ghc-8.5"; }; meta = { diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 946a9bedbf51..bac36d61068d 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.10.6"; + name = "scala-2.10.7"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0rrdrndnxy8m76gppqh7yr68qfx0kxns5bwc69k4swz6va1zbbal"; + sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 469c8c8e3bc5..1145ebab5245 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.11.11"; + name = "scala-2.11.12"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "02whsszxabyhyrbcmgg3figaxknmfzy4f3wmgrqqwik89jk7q0qj"; + sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix deleted file mode 100644 index c98e2e75c171..000000000000 --- a/pkgs/development/compilers/scala/2.9.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl }: - -# at runtime, need jre or jdk - -stdenv.mkDerivation rec { - name = "scala-2.9.3"; - - src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "faaab229f78c945063e8fd31c045bc797c731194296d7a4f49863fd87fc4e7b9"; - }; - - installPhase = '' - mkdir -p $out - rm bin/*.bat - rm lib/scalacheck.jar - mv * $out - ''; - - meta = { - description = "A general purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = http://www.scala-lang.org/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.9"; - }; -} diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 6de85495bee3..a6d83fc770c7 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -196,6 +196,9 @@ go.stdenv.mkDerivation ( find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; + # Disable go cache, which is not reused in nix anyway + GOCACHE = "off"; + shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' 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 7fcab47686d2..6def68bd2a26 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -62,7 +62,13 @@ self: super: { ## Needs bump to a versioned attribute ## Issue: https://github.com/sol/doctest/issues/189 - doctest = dontCheck super.doctest_0_14_1; # test suite fails in Nix + doctest = overrideCabal super.doctest_0_14_1 (drv: { + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## + ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) + doCheck = false; + }); ## Needs bump to a versioned attribute ## • Could not deduce (Semigroup (IterT m a)) @@ -153,6 +159,21 @@ self: super: { ## Upstreamed ## Upstreamed, awaiting a Hackage release + deriving-compat = overrideCabal super.deriving-compat (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.5 && <2.13 + src = pkgs.fetchFromGitHub { + owner = "haskell-compat"; + repo = "deriving-compat"; + rev = "e592c6f8af53866dcf6f5700175a3b02bb4f77d3"; + sha256 = "0h4qadk7fmz5v3lbdsxfbf3ha81f73xn7v0s6wia16ika5yvfggs"; + }; + ## Setup: Encountered missing dependencies: + ## th-abstraction >=0.2.2 && <1 + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ th-abstraction ]); + }); + + ## Upstreamed, awaiting a Hackage release haskell-gi = overrideCabal super.haskell-gi (drv: { ## Setup: Encountered missing dependencies: ## haskell-gi-base ==0.20.* @@ -192,6 +213,22 @@ self: super: { }); ## Upstreamed, awaiting a Hackage release + http-api-data = overrideCabal super.http-api-data (drv: { + ## • No instance for (Semigroup Form) + ## arising from the 'deriving' clause of a data type declaration + ## Possible fix: + src = pkgs.fetchFromGitHub { + owner = "fizruk"; + repo = "http-api-data"; + rev = "83aac9540f4a304927c601c5db12f4dc2bf93816"; + sha256 = "14hy13szr09vsisxi25a4qfajqjwznvn222bqk55dcdlnrgf0zi9"; + }; + ## Setup: Encountered missing dependencies: + ## base >=4.7 && <4.11 + jailbreak = true; + }); + + ## Upstreamed, awaiting a Hackage release lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { ## Setup: Encountered missing dependencies: ## aeson >=0.9 && <0.12, @@ -246,6 +283,19 @@ self: super: { }); ## Upstreamed, awaiting a Hackage release + tar = overrideCabal super.tar (drv: { + ## • No instance for (Semigroup (Entries e)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (Entries e)’ + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "tar"; + rev = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8"; + sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny"; + }; + }); + + ## Upstreamed, awaiting a Hackage release th-desugar = overrideCabal super.th-desugar (drv: { ## • Could not deduce (MonadIO (DsM q)) ## arising from the 'deriving' clause of a data type declaration @@ -306,7 +356,7 @@ self: super: { doCheck = false; ## Setup: Encountered missing dependencies: ## data-or ==1.0.* - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ]; + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ data-or ]); }); ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 @@ -372,7 +422,7 @@ self: super: { ## monad-control -any, ## prim-uniq -any, ## reflection -any, - libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ]; + libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]); }); ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 @@ -414,6 +464,32 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-tls/pull/270 + tls = overrideCabal super.tls (drv: { + ## • No instance for (Semigroup Credentials) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid Credentials’ + src = pkgs.fetchFromGitHub { + owner = "ocheron"; + repo = "hs-tls"; + rev = "763656fbc6c2edabb43fc63d8717960f4b26e6e7"; + sha256 = "0v7f9b78w6prkbscdx5ggjixll9z1zfqzm5x0ap4wvynnflkspqb"; + }; + prePatch = "cd core; "; + }); + + ## Unmerged. PR: https://github.com/Soostone/uri-bytestring/pull/0 + uri-bytestring = overrideCabal super.uri-bytestring (drv: { + ## Setup: Encountered missing dependencies: + ## template-haskell >=2.9 && <2.13 + src = pkgs.fetchFromGitHub { + owner = "koenigmaximilian"; + repo = "uri-bytestring"; + rev = "105d5855bbf9c78d1e48394677b42a058e242fc9"; + sha256 = "144hr12k0d61zpgxv62vwlzy6bfs01fqh7qr4qsbv457sznmbb9d"; + }; + }); + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { ## Ambiguous occurrence ‘<>’ @@ -427,6 +503,34 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-certificate/pull/89 + x509 = overrideCabal super.x509 (drv: { + ## • No instance for (Semigroup DistinguishedName) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid DistinguishedName’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "hs-certificate"; + rev = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9"; + sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf"; + }; + prePatch = "cd x509; "; + }); + + ## Unmerged. PR: https://github.com/vincenthz/hs-certificate/pull/89 + x509-store = overrideCabal super.x509-store (drv: { + ## • No instance for (Semigroup CertificateStore) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid CertificateStore’ + src = pkgs.fetchFromGitHub { + owner = "bgamari"; + repo = "hs-certificate"; + rev = "2c5f54ba69c8a0531d10f9b37542bf958ede54c9"; + sha256 = "1fakr9gqz8k62rnjdsslfavbqrhn92jq9mahyc91f9zhisxp5kdf"; + }; + prePatch = "cd x509-store; "; + }); + ## Non-code, configuration-only change @@ -502,6 +606,12 @@ self: super: { jailbreak = true; }); + hnix = overrideCabal super.hnix (drv: { + ## Setup: Encountered missing dependencies: + ## deriving-compat ==0.3.* + jailbreak = true; + }); + integer-logarithms = overrideCabal super.integer-logarithms (drv: { ## Setup: Encountered missing dependencies: ## base >=4.3 && <4.11 @@ -588,12 +698,19 @@ self: super: { jailbreak = true; }); + ## Issue: https://github.com/ChrisPenner/rasa/issues/54 text-lens = overrideCabal super.text-lens (drv: { + ## Failures: + ## test/Spec.hs:136: + ## 1) TextLens.range gets "" if invalid range + ## uncaught exception: ErrorCall (Data.Text.Array.new: size overflow + ## CallStack (from HasCallStack): + ## error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array) + ## Randomized with seed 2114194349 + ## Finished in 0.0017 seconds + doCheck = false; ## Setup: Encountered missing dependencies: - ## base >=4.9.0.0 && <4.10, - ## extra >=1.4.10 && <1.5, - ## hspec >=2.2.4 && <2.3, - ## lens ==4.14.* + ## extra >=1.4.10 && <1.5, lens ==4.14.* jailbreak = true; }); @@ -625,4 +742,5 @@ self: super: { ## base >=4.8 && <4.11 jailbreak = true; }); + } diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edec2724d84d..d55c230dcc85 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -492,11 +492,8 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); - # Haskell OpenCV bindings need contrib code enabled in the C++ library. - opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; - # Without this override, the builds lacks pkg-config. - opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3; # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8303162b93c7..99524f4e7e60 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -84276,21 +84276,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome_keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1"; sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome_keyring ]; - libraryPkgconfigDepends = [ gnome_keyring ]; + librarySystemDepends = [ gnome-keyring ]; + libraryPkgconfigDepends = [ gnome-keyring ]; libraryToolDepends = [ c2hs ]; homepage = "https://john-millikin.com/software/haskell-gnome-keyring/"; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_keyring;}; + }) {inherit (pkgs.gnome2) gnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 16734c184eb8..14b9a78af46e 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -3,11 +3,11 @@ sbcl }: let hashes = { - "7.4" = "04jb789nks9llwysxz1zw9pq1dh0j39b5fcmivcc4bq9v9cga2l1"; + "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "7.4"; + version = "8.0"; src = fetchFromGitHub { owner = "acl2-devel"; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 2608388e1526..01348c753484 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.31.2"; + version = "2.32.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1cl1yg36ad4wq0vks4xg0hv7iyvq6yzsd4y1jng5qdf8qybq02qc"; + sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl"; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 14a4bac47f62..c1c92e6efdf2 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -133,7 +133,9 @@ let sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; }; - nativeBuildInputs = [ buildPackages.stdenv.cc ]; + # Hacky! But not sure how else we can access a native-targeted gcc6 + # https://github.com/arsv/perl-cross/issues/60 + nativeBuildInputs = [ buildPackages.buildPackages.gcc6 ]; postUnpack = '' unpackFile ${perl-cross-src} diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 42988e334b07..230a7e64dff3 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.4.3"; + version = "6.4.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; + sha256 = "0xvdwk2505s615fgsy6g33ncxx70vszqspx0bg6lm8hfd3hb4qyj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index a185f19a9a16..bcf819702da9 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "00r6d8xk2sq5hdl5lp14nhyh1b2d68fxpzbm69fk6iq2f2gv0iqv"; + sha256 = "1p5zd9kdwnrwg604bq79ianc5bw6mx6i5d7yc4r11xrbphlc9m1g"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index dc5de2b382a1..1ccfa85591f4 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib -, gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant +, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant , sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42 -, libuuid, json_glib, meson, gperf, ninja +, libuuid, json-glib, meson, gperf, ninja }: stdenv.mkDerivation rec { name = "appstream-glib-0.7.6"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { }; 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 ]; buildInputs = [ glib gettext sqlite libsoup - gcab attr acl libuuid json_glib + gcab attr acl libuuid json-glib libarchive gobjectIntrospection gperf ]; propagatedBuildInputs = [ gtk3 ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 52c3a5f8c076..86f35d7f578e 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi -, intltool, dbus_glib, at_spi2_core, libSM }: +, intltool, dbus-glib, at-spi2-core, libSM }: stdenv.mkDerivation rec { versionMajor = "2.26"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - dbus_glib at_spi2_core libSM ]; + dbus-glib at-spi2-core libSM ]; meta = with stdenv.lib; { platforms = platforms.unix; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 1743faafa687..b717101b3e13 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus_glib +{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; buildInputs = [ - python popt dbus_glib + python popt dbus-glib libX11 xextproto libSM libICE libXtst libXi ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f7788eb93cb3..be4cf809f0c5 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.42"; + name = "babl-0.1.44"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "1wc7fyj9bfqfiwf1w33g3vv3wcl18pd9cxr9fc0iy391szrsynb8"; + sha256 = "0zfy1jrwdp4ja2f1rqa2m46vx6nilm73f72d4d1c8d65vshgsqzl"; }; doCheck = true; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 0f899e4324c1..9ec27d3e9ebc 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -3,11 +3,11 @@ let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in stdenv.mkDerivation rec { - name = "boolstuff-0.1.15"; + name = "boolstuff-0.1.16"; src = fetchurl { url = "${baseurl}/${name}.tar.gz"; - sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln"; + sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 3292c8e353fe..f30485f60cf9 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, +, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, gobjectIntrospection, gtk3 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection libxcb + atk json-glib gobjectIntrospection libxcb ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 301b245a9f54..9933d1034af8 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "4.2.1"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk"; + sha256 = "1yjs25ra5s8zs0rhk50w3f1rrrl80hhq784lwdhh1m3risk740sa"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index b9b8d8fbd750..176b05126b2b 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup, makeWrapper }: +{ stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }: stdenv.mkDerivation rec { name = "dleyna-renderer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-renderer-service" \ diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 8668cff644ed..d36e665bd85d 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp_av, gupnp_dlna, libsoup }: +{ stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }: stdenv.mkDerivation rec { name = "dleyna-server"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp_av gupnp_dlna libsoup ]; + buildInputs = [ dleyna-core dleyna-connector-dbus gssdp gupnp gupnp-av gupnp-dlna libsoup ]; preFixup = '' wrapProgram "$out/libexec/dleyna-server-service" \ diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 47c165c1bad1..c656220f7609 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b"; + sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 651878182dc1..eb197d117202 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0kiff19gk0w7ij0kx5ydqpsmdq499ylxxxq79lrgss218jy49aqq"; + sha256 = "0pzibd3vdqmqsqsnfir6q66p6f3cmr9hrrixzpfhf7k62vv9y1ha"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index b486a327466d..96f4af3226b4 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { - name = "exempi-2.4.2"; + name = "exempi-2.4.4"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"; + sha256 = "1c1xxiw9lazdaz4zvrnvcy9pif9l1wib7zy91m48i7a4bnf9mmd2"; }; configureFlags = [ diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 034738813395..ebb581bdbccd 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base -, gst-python, gupnp_igd +, gst-python, gupnp-igd , gst-plugins-good, gst-plugins-bad, gst-libav }: @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; - buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp-igd libnice ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index add520558ba9..fb74c4ff4d24 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "flatbuffers-${version}"; - version = "1.4.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "0jsqk49h521d5h4c9gk39a8968g6rcd6520a8knbfc7ssc4028y0"; + sha256 = "1qq8qbv8wkiiizj8s984f17bsbjsrhbs9q1nw1yjgrw0grcxlsi9"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index dd16ebd5c886..6745bc1ecf5f 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gbenchmark-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48"; + sha256 = "1qx2dp7y0haj6wfbbfw8hx8sxb8ww0igdfrmmaaxfl0vhckylrxh"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 38c1b6197a5f..9c4296b23864 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -5,7 +5,7 @@ let ver_maj = "2.36"; ver_min = "7"; # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, - # which apparently requires access to shared_mime_info files during runtime. + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 2bb773a17b8f..03f6054791e4 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw +, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw , libwebp, gnome3 }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libraw libwebp gnome3.gexiv2 ]; - propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc + propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 483ee39c2da1..66aa3b4a2188 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook +{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip +, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook }: with stdenv.lib; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { ]; buildInputs = libintlOrEmpty ++ - [ glib json_glib libsoup geoip - dbus dbus_glib avahi + [ glib json-glib libsoup geoip + dbus dbus-glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ]; preConfigure = '' substituteInPlace configure --replace "-Werror" "" diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index ff65ca97eb74..bf0af502d017 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, - libxslt, glib_networking }: +{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2, + libxslt, glib-networking }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; + buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ]; - propagatedBuildInputs = [dbus glib dbus_glib]; + propagatedBuildInputs = [dbus glib dbus-glib]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 363d0ec7484a..37de039544bc 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy -, gsettings_desktop_schemas }: +, gsettings-desktop-schemas }: let ver_maj = "2.54"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ]; + propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f68bd1380052..5d60cf5e633a 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -4,7 +4,7 @@ , utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) -, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false +, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false }: with stdenv.lib; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre ] ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount - ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; + ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" - export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share" export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 6691928c021e..a46abe3b4f7c 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=\${out}" - "CC=gcc" - "AS=as" - "LD=ld" - "AR=ar" - "RANLIB=ranlib" - "OBJCOPY=objcopy" - ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"; + "CC=${stdenv.cc.targetPrefix}gcc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" + "AR=${stdenv.cc.targetPrefix}ar" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm" + ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64"; meta = with stdenv.lib; { description = "GNU EFI development toolchain"; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index e7e0672490d0..472ec83fb02c 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv , tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake , yacc, texinfo @@ -52,7 +52,7 @@ stdenv.mkDerivation { # systemkey-args.h. enableParallelBuilding = false; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp + buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp autogen gperftools gperf gettext automake yacc texinfo ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index d2947cd7c6b5..8769584a9f21 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv +, guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv , tpmSupport ? false, trousers, which, nettools, libunistring , unbound, dns-root-data, gettext @@ -40,7 +40,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring unbound ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional stdenv.isDarwin gettext ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix new file mode 100644 index 000000000000..026f58079f6d --- /dev/null +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobjectIntrospection, python2, gtk3, cairo, glib }: + +let + version = "2.0.4"; +in stdenv.mkDerivation rec { + name = "goocanvas-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/goocanvas/2.0/${name}.tar.xz"; + sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67"; + }; + + nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ]; + buildInputs = [ gtk3 cairo glib ]; + + configureFlags = [ + "--disable-python" + ]; + + meta = with stdenv.lib; { + description = "Canvas widget for GTK+ based on the the Cairo 2D library"; + homepage = https://wiki.gnome.org/Projects/GooCanvas; + license = licenses.lgpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 47eeb3d32843..1cb5e4f968ef 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobjectIntrospection, json_glib +, python, gobjectIntrospection, json-glib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python json_glib + python json-glib ]; propagatedBuildInputs = [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index e9c93660bf79..0f95cf7f3c66 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 -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xorg, epoxy, json_glib, libxkbcommon, gmp +, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection +, xorg, epoxy, json-glib, libxkbcommon, gmp , waylandSupport ? stdenv.isLinux, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ libxkbcommon epoxy json_glib ]; + buildInputs = [ libxkbcommon epoxy json-glib ]; 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 libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index f9ce0aa4b81e..0171a4b6833b 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gtk-mac-integration-2.0.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ]; + nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; buildInputs = [ glib ]; propagatedBuildInputs = [ gtk ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 15e7e736e0c6..22fc6cc19760 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - libsoup libgnome_keyring gconf gcr + libsoup libgnome-keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix index e5b80f4b2700..f7763ba49da1 100644 --- a/pkgs/development/libraries/icu/58.nix +++ b/pkgs/development/libraries/icu/58.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +fetchurl: let keywordFix = fetchurl { url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; @@ -11,4 +11,4 @@ import ./base.nix { sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; patches = [ keywordFix ]; patchFlags = "-p4"; -} args +} diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 2c8392c8bac8..87551ee6ee03 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,66 +1,95 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames + # Cross-compiled icu4c requires a build-root of a native compile +, buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform +}: let pname = "icu4c"; -in -stdenv.mkDerivation { - name = pname + "-" + version; - src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - inherit sha256; - }; + baseAttrs = { + src = fetchurl { + url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; + inherit sha256; + }; + + postUnpack = '' + sourceRoot=''${sourceRoot}/source + echo Source root reset to ''${sourceRoot} + ''; + + # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'" + else null; # won't find locale_t on darwin + + inherit patchFlags patches; - outputs = [ "out" "dev" ]; - outputBin = "dev"; + preConfigure = '' + sed -i -e "s|/bin/sh|${stdenv.shell}|" configure - # FIXME: This fixes dylib references in the dylibs themselves, but - # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + # $(includedir) is different from $(prefix)/include due to multiple outputs + sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in + '' + stdenv.lib.optionalString stdenv.isArm '' + # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch + sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux + ''; - postUnpack = '' - sourceRoot=''${sourceRoot}/source - echo Source root reset to ''${sourceRoot} - ''; + configureFlags = "--disable-debug" + + stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath" + + stdenv.lib.optionalString (buildPlatform != hostPlatform) " --with-cross-build=${nativeBuildRoot}"; - # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") - then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'" - else null; # won't find locale_t on darwin + enableParallelBuilding = true; - inherit patchFlags patches; + meta = with stdenv.lib; { + description = "Unicode and globalization support library"; + homepage = http://site.icu-project.org/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + }; + }; + + realAttrs = baseAttrs // { + name = pname + "-" + version; - preConfigure = '' - sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + outputs = [ "out" "dev" ]; + outputBin = "dev"; - # $(includedir) is different from $(prefix)/include due to multiple outputs - sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in - '' + stdenv.lib.optionalString stdenv.isArm '' - # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch - sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux - ''; + # FIXME: This fixes dylib references in the dylibs themselves, but + # not in the programs in $out/bin. + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; + # remove dependency on bootstrap-tools in early stdenv build + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + '' + '' + substituteInPlace "$dev/bin/icu-config" \ + --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" + ''; - # remove dependency on bootstrap-tools in early stdenv build - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc - '' + '' - substituteInPlace "$dev/bin/icu-config" \ - --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc" - ''; + postFixup = ''moveToOutput lib/icu "$dev" ''; + }; - postFixup = ''moveToOutput lib/icu "$dev" ''; + buildRootOnlyAttrs = baseAttrs // { + name = pname + "-build-root-" + version; - enableParallelBuilding = true; + preConfigure = baseAttrs.preConfigure + '' + mkdir build + cd build + configureScript=../configure + ''; - meta = with stdenv.lib; { - description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.all; + postBuild = '' + cd .. + mv build $out + echo "Doing build-root only, exiting now" >&2 + exit 0 + ''; }; -} + + attrs = if buildRootOnly + then buildRootOnlyAttrs + else realAttrs; +in +stdenv.mkDerivation attrs diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index b4fea7c1fa4a..36b637c62bb2 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk2 libindicator-gtk2 libdbusmenu-gtk2 libappindicator-gtk2 ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 03afd6f1e878..3d7c20691ab5 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, json_glib +, glib, dbus-glib, json-glib , gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ - glib dbus_glib json_glib + glib dbus-glib json-glib gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 6658e4dca100..cd5f2163dd95 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, writeScript, extra-cmake-modules, - qtbase, qttools, shared_mime_info + qtbase, qttools, shared-mime-info }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttools shared_mime_info ]; + buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 3ac4f4dc2688..356e6537a4fd 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, copyPathsToStore, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, - qtbase, shared_mime_info, + qtbase, shared-mime-info, }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { kcrash kdbusaddons ki18n kwindowsystem qtbase ]; propagatedBuildInputs = [ kconfig kcoreaddons ]; - propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5 + propagatedUserEnvPkgs = [ shared-mime-info ]; # for kbuildsycoca5 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 5ce1b8ec13cc..5110908e0f27 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk2, python2Packages, lua, libX11, libXext, libXrender, gobjectIntrospection }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc gnome3.gtk3 + autoconf automake libtool gnome3.gnome-common gtk-doc gnome3.gtk3 python pygobject3 pygtk lua libX11 libXext libXrender gobjectIntrospection gtk2 ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index f4158f7edbb4..cf4b85043bb2 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 -, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection +, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool gnome3.gnome_common gtk_doc + autoconf automake libtool gnome3.gnome-common gtk-doc libX11 libXext libXrender gobjectIntrospection gtk3 ]; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 09001b6a6f08..acd0d35a5f08 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk_doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: +{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ autoconf automake glib gobjectIntrospection gtk_doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; + buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ]; configurePhase = '' ./configure --with-pkg-config=$PKG_CONFIG_PATH \ diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 70d0e9faf845..4bb806b91d8a 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoconf, automake, glib -, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: +, gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }: let version = "1.23"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib libxml2 libxslt sqlite ]; - nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ]; postPatch = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 7ebd14b51f52..6c87588fd3d7 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, gtkVersion +, glib, dbus-glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null , python2Packages, gobjectIntrospection, vala @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { else [ gtk3 libdbusmenu-gtk3 ]; buildInputs = [ - glib dbus_glib + glib dbus-glib python pygobject2 pygtk gobjectIntrospection vala ] ++ (if gtkVersion == "2" then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index 81e32ab2c931..b81eba5252f8 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib }: stdenv.mkDerivation rec { name = "libaudclient-3.5-rc2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus_glib ]; + buildInputs = [ glib dbus-glib ]; meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f49c449f9ea3..76977b745197 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libburn-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "0wbh49s3az3sfpai09z1zdgynq7wnwrk31v5589033274nmzldlx"; + sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index f7596b9c702b..6817d1a888cc 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: stdenv.mkDerivation rec { - name = "libcdio-0.93"; + name = "libcdio-2.0.0"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.bz2"; - sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; + sha256 = "0jr8ppdm80c533nzmrpz3iffnpc6nhvsria1di9f4jg1l19a03fd"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libcddb ncurses help2man ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - # Disabled because one test (check_paranoia.sh) fails. - #doCheck = true; + # Disabled due to several spurious test failures. + # doCheck = true; meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 514a1fa85343..9f60e724ac42 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite -, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: +, clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }: stdenv.mkDerivation rec { major = "0.12"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ]; + propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index c7a6fcc58748..220cc5a2eeb4 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool -, glib, dbus_glib, json_glib -, gobjectIntrospection, vala_0_38, gnome_doc_utils +, glib, dbus-glib, json-glib +, gobjectIntrospection, vala_0_38, gnome-doc-utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib dbus_glib json_glib - gobjectIntrospection vala_0_38 gnome_doc_utils + glib dbus-glib json-glib + gobjectIntrospection vala_0_38 gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 1339be451c29..50cf8526c362 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false -, buildPlatform, hostPlatform +, buildPlatform, hostPlatform, autoreconfHook }: stdenv.mkDerivation rec { @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580"; sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2"; }) + ++ stdenv.lib.optional hostPlatform.isRiscV (fetchpatch { + name = "riscv-support.patch"; + url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch; + sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y"; + }) ++ stdenv.lib.optionals stdenv.isMips [ (fetchpatch { name = "0001-mips-Use-compiler-internal-define-for-linux.patch"; @@ -37,6 +42,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck dejagnu; + nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook; + configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 45564d64861d..a02aefb0a742 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap +, buildPackages +}: assert enableCapabilities -> stdenv.isLinux; @@ -19,10 +21,19 @@ stdenv.mkDerivation rec { # The build enables -O2 by default for everything else. hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + depsBuildBuild = stdenv.lib.optional stdenv.isCross buildPackages.stdenv.cc; + buildInputs = [ libgpgerror ] ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optional enableCapabilities libcap; + preConfigure = if stdenv.isCross then '' + # This is intentional: gpg-error-config is a shell script that will work during the build + mkdir -p "$NIX_BUILD_TOP"/bin + ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin" + export PATH="$NIX_BUILD_TOP/bin:$PATH" + '' else null; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 7bd551e70d56..8961afcd6207 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, - autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo + autoreconfHook, intltool, gtk-doc, docbook_xsl, xauth, sudo }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook intltool gtk_doc docbook_xsl wrapGAppsHook + pkgconfig autoreconfHook intltool gtk-doc docbook_xsl wrapGAppsHook ]; buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser + gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index e6cb62330c4e..5c5824a9930c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,6 +1,21 @@ -{ stdenv, buildPackages, fetchurl, gettext }: +{ stdenv, buildPackages, fetchurl, gettext +, hostPlatform, genPosixLockObjOnly ? false +}: let + genPosixLockObjOnlyAttrs = stdenv.lib.optionalAttrs genPosixLockObjOnly { + buildPhase = '' + cd src + make gen-posix-lock-obj + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 gen-posix-lock-obj $out/bin + ''; -stdenv.mkDerivation rec { + outputs = [ "out" ]; + outputBin = "out"; + }; +in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; version = "1.27"; @@ -9,6 +24,8 @@ stdenv.mkDerivation rec { sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; }; + patches = if hostPlatform.isRiscV then ./riscv.patch else null; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' @@ -49,4 +66,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.fuuzetsu maintainers.vrthra ]; }; -} +} // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch new file mode 100644 index 000000000000..afc3b9993a43 --- /dev/null +++ b/pkgs/development/libraries/libgpg-error/riscv.patch @@ -0,0 +1,54 @@ +commit b3e9ec5626d474c58e683a41d09576297d4acd3d +Author: Shea Levy <shea@shealevy.com> +Date: Sat Feb 24 21:12:44 2018 -0500 + + syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. + + * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. + * src/Makefile.am (lock_obj_pub): Add it. + + Signed-off-by: Shea Levy <shea@shealevy.com> + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4446612..5a8cc43 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -65,6 +65,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ ++ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ + syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ +diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +new file mode 100644 +index 0000000..8aab9d6 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h +@@ -0,0 +1,25 @@ ++## lock-obj-pub.riscv64-unknown-linux-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[40]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix index eaf2eb170956..e29b3ed89dea 100644 --- a/pkgs/development/libraries/libgsystem/default.nix +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , glib, attr, systemd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - autoreconfHook pkgconfig gtk_doc gobjectIntrospection + autoreconfHook pkgconfig gtk-doc gobjectIntrospection ]; propagatedBuildInputs = [ glib attr systemd ]; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c3405148242c..f5bdb2069d99 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, meson, ninja, valadoc -, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }: +, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { major = "0.6"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ]; - buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ]; + buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ]; mesonFlags = "-Denable_valadoc=true"; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 9c7e48f8f6a8..445a505b68c8 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -2,9 +2,9 @@ { stdenv, fetchurl, lib, file , pkgconfig, autoconf -, glib, dbus_glib, libdbusmenu-glib +, glib, dbus-glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, pythonPackages, gobjectIntrospection, vala, gnome_doc_utils +, pythonPackages, gobjectIntrospection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -24,10 +24,10 @@ in stdenv.mkDerivation rec { sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; }; - nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome_doc_utils ]; + nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ]; buildInputs = [ - glib dbus_glib libdbusmenu-glib + glib dbus-glib libdbusmenu-glib python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index a0205fb234ca..d0217a908b9f 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.6"; + version = "1.4.8"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "02m5g6lbmmkh2xc5xzq5zaf3ma6v31gls66aj886b3cq9qw0paql"; + sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"; }; buildInputs = [ attr zlib ]; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 8951017a4b5c..2da8e5ebf738 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libmd"; - version = "0.0.0"; + version = "1.0.0"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "121s73pgbqsnmy6xblbrkj9y44c5zzzpf2hcmh6zvcvg4dk26gzx"; + sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 897a769b014d..42bcf5b64740 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libtool, pkgconfig, automake, autoconf, intltool -, glib, gobjectIntrospection, gtk2, gtk_doc -, clutter, clutter_gtk +, glib, gobjectIntrospection, gtk2, gtk-doc +, clutter, clutter-gtk }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { automake autoconf libtool intltool gobjectIntrospection glib - gtk2 gtk_doc clutter clutter_gtk + gtk2 gtk-doc clutter clutter-gtk ]; # patch to resolve GL errors diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 7e9ae1608d2b..c7967c3fb6fc 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }: +{ stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { name = "libnice-0.1.14"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; - propagatedBuildInputs = [ glib gupnp_igd ]; + propagatedBuildInputs = [ glib gupnp-igd ]; meta = { homepage = https://nice.freedesktop.org/wiki/; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a0924e791e3b..0175e21bbc72 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl + pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl ] ++ stdenv.lib.optionals doCheck checkInputs; checkInputs = [ check curl perl ]; buildInputs = [ glib libsoup libxml2 libxslt ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index b1100d00f3e0..f5c92e11c357 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu , libxslt, pkgconfig, python2 }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ icu libxslt ]; - nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python2 ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ]; postPatch = '' substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 89b71c1855da..cdc2a6570022 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "036f284bssvavyz6pgpcdafvxa59h2wdrh8xl7nmxxnw9v7n2n7l"; + sha256 = "0bam1xvw4n5sm3g4kmggz2aha34xaw64kw15wl2lbkd2yzdjdm4l"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 75438e00570e..a116e2c0babd 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc +{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc , libgcrypt, gobjectIntrospection, vala_0_38 }: let version = "0.18.5"; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 5e36d0688694..521391b1bef8 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, libtool, gettext, pkgconfig, - vala, gnome_common, gobjectIntrospection, - libgee, json_glib, skk-dicts }: + vala, gnome-common, gobjectIntrospection, + libgee, json-glib, skk-dicts }: stdenv.mkDerivation rec { name = "libskk-${version}"; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ skk-dicts ]; - nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ]; - propagatedBuildInputs = [ libgee json_glib ]; + nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json-glib ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index e8d48bf668b3..b67e41a0dc6e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection , valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: @@ -37,10 +37,10 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; - passthru.propagatedUserEnvPackages = [ glib_networking.out ]; + ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ]; + passthru.propagatedUserEnvPackages = [ glib-networking.out ]; - # glib_networking is a runtime dependency, not a compile-time dependency + # glib-networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check" + " --enable-vala=${if valaSupport then "yes" else "no"}" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b0066fa75f22..1a4f16046fc1 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, dbus, dbus_glib, gtk3, gobjectIntrospection +, dbus, dbus-glib, gtk3, gobjectIntrospection , gtkdoc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; + buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 1bef76836542..2bb53dd2b97f 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ++ [ ./gcc7-bug.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus_glib ]; + buildInputs = [ glib gtk2 dbus-glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 356e1e336ac2..ff3ac3b03635 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 -, caffe, glog, boost, google-gflags, protobuf +, glog, boost, google-gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -12,12 +12,12 @@ , enableJPEG2K ? true, jasper , enableEigen ? true, eigen , enableOpenblas ? true, openblas +, enableContrib ? true , enableCuda ? (config.cudaSupport or false), cudatoolkit , enableUnfree ? false , enableIpp ? false -, enableContrib ? false , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 @@ -188,7 +188,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre hdf5 glog boost google-gflags protobuf ] - ++ lib.optional (!stdenv.isDarwin) caffe ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -222,11 +221,16 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + # Configure can't find the library without this. + OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; + cmakeFlags = [ "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" + "-DBUILD_TESTS=OFF" + "-DBUILD_PERF_TESTS=OFF" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -238,15 +242,15 @@ stdenv.mkDerivation rec { (opencvFlag "CUBLAS" enableCuda) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc" - ] - ++ lib.optionals stdenv.isDarwin [ - "-DWITH_OPENCL=OFF" - "-DWITH_LAPACK=OFF" - - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" - ]; + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" + ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_OPENCL=OFF" + "-DWITH_LAPACK=OFF" + + # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 91899ad8da43..a78a584a4a52 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { "-DNO_EXAMPLES=1" "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" - ] ++ lib.optional cudaSupport "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"; + ] ++ lib.optionals cudaSupport [ + "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30" + "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 63c882076b9d..febba5d5703f 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobjectIntrospection ] ++ (with gnome3; [ - gnome_common gtk libsoup + gnome-common gtk libsoup ]); meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 6bf9bcb954c1..ef865529805f 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl -, docbook_xml_dtd_412, gtk_doc +, docbook_xml_dtd_412, gtk-doc , useSystemd ? stdenv.isLinux, systemd }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk_doc pkgconfig autoreconfHook intltool gobjectIntrospection ] + [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = [ glib expat pam spidermonkey_17 gobjectIntrospection ] diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh index 849e76d616df..4770644ae4e9 100644 --- a/pkgs/development/libraries/qt-5/5.10/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.10/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch index b79ce9fc3568..286dea2178b1 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -261,14 +261,13 @@ index 55c74aad66..0bbc8718eb 100644 set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index e645ba5803..a0e5c68b7e 100644 +index 50a1ec6764..d6368b769e 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -24,166 +24,3 @@ qt { - } +@@ -25,188 +25,3 @@ qt { } } -- + -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. -!no_default_rpath { @@ -291,6 +290,29 @@ index e645ba5803..a0e5c68b7e 100644 -} - -macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- !isEmpty(VERSION) { +- l = $$split(VERSION, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- } +- - !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { - debug_information_format.name = DEBUG_INFORMATION_FORMAT - debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT @@ -432,10 +454,10 @@ index e645ba5803..a0e5c68b7e 100644 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..3b01424e67 100644 +index f1a4ca77b2..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,2 @@ +@@ -1,67 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - @@ -492,6 +514,17 @@ index 44636f2288..3b01424e67 100644 -# feature, which allows Xcode to choose the Qt libraries to link to -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf @@ -676,10 +709,10 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..eb4840a0aa 100644 +index c9ce926b1a..f00868a031 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -82,7 +82,7 @@ sourcefiles += \ +@@ -88,7 +88,7 @@ sourcefiles += \ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -765,7 +798,7 @@ index 90d84cc535..387481bfc6 100644 INSTALLS += privpritarget } diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 62e1b69fde..abd63123f9 100644 +index 14fc5f9a94..2a0f2cd27f 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { @@ -851,10 +884,10 @@ index 706304cf34..546420f6ad 100644 set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 609e52d9d2..f0f29ce61f 100644 +index 3814894630..3c6468277c 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2580,6 +2580,15 @@ QStringList QCoreApplication::libraryPaths() +@@ -2601,6 +2601,15 @@ QStringList QCoreApplication::libraryPaths() QStringList *app_libpaths = new QStringList; coreappdata()->app_libpaths.reset(app_libpaths); @@ -871,7 +904,7 @@ index 609e52d9d2..f0f29ce61f 100644 if (!libPathEnv.isEmpty()) { QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index bcc1285472..a77eb472a3 100644 +index 6a5df6272a..a6136ca4cd 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; @@ -969,10 +1002,10 @@ index 07869efd7d..fb4183bada 100644 set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 1da00813ce..0bf877afcb 100644 +index ce1ec6442a..4f75655abe 100644 --- a/src/network/kernel/qdnslookup_unix.cpp +++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() +@@ -95,7 +95,7 @@ static bool resolveLibraryInternal() if (!lib.load()) #endif { @@ -1013,10 +1046,10 @@ index b5a0a5bbeb..6c20305f4d 100644 QString TableGenerator::findComposeFile() diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index 3bc8590d36..2a78fde518 100644 +index a59dc15b0e..a13ee89b5a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) +@@ -584,7 +584,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix index 5369169aa67f..025c7aa44e13 100644 --- a/pkgs/development/libraries/qt-5/5.10/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.10/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qt3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "1arlplfpqdk0qki7bs1pp16y9cwa0awn071p551jg4y74xr7wi8j"; - name = "qt3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0fvb346xhiyc0csxcvs5ifwkzs9wnza54vvsw6dvyax76qjv87q4"; + name = "qt3d-everywhere-src-5.10.1.tar.xz"; }; }; qtactiveqt = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtactiveqt-everywhere-src-5.10.0.tar.xz"; - sha256 = "0x6nbi5hlbr1pncbd8zzkwmqi04gcy64q3bjy5w45rg6zws41mzr"; - name = "qtactiveqt-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtactiveqt-everywhere-src-5.10.1.tar.xz"; + sha256 = "1r4i72i1pl9xnmcx8rr8g48fmym8mxs28pkg1nl302xi6izan8ch"; + name = "qtactiveqt-everywhere-src-5.10.1.tar.xz"; }; }; qtandroidextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtandroidextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "1ifb49px86abaf4znmlis9wyyxq132nlgj3fyqppbx1sranikygk"; - name = "qtandroidextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtandroidextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "03jmf7gw4abn5gj92b1ns0k75bbi4wycbc4bbb7c9mngzkv3nzkn"; + name = "qtandroidextras-everywhere-src-5.10.1.tar.xz"; }; }; qtbase = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz"; - sha256 = "0qpp56cbw1sfz5ayhj2mskb07cl6jd1ijayg29y624qa6b6phmgx"; - name = "qtbase-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz"; + sha256 = "0sd9cn3ywkjfswddcxhbfplkwk8snqld752q5laaapdakhc0wrnq"; + name = "qtbase-everywhere-src-5.10.1.tar.xz"; }; }; qtcanvas3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcanvas3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "11r98mdxy833kcnywlsjrfaqhax7m3b6yhb56072qvr30rpn52fj"; - name = "qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "1h5hpjwdyp824r2ajmaqjcshra06yfzz7dp991h4kf54da79m0ny"; + name = "qtcanvas3d-everywhere-src-5.10.1.tar.xz"; }; }; qtcharts = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcharts-everywhere-src-5.10.0.tar.xz"; - sha256 = "1vri3f7wyg84w6j84452g8h2p7sk7k01r0xszpn4klv7hi52rkhj"; - name = "qtcharts-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j8y683ainri9ma44ky6q87pjs1d794znb2wfsrbplixyxxmf3ag"; + name = "qtcharts-everywhere-src-5.10.1.tar.xz"; }; }; qtconnectivity = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtconnectivity-everywhere-src-5.10.0.tar.xz"; - sha256 = "19k9n6gzrbg0sbgyhhcl5gv0d4b2gjwmz5966gn6b424fblf4grf"; - name = "qtconnectivity-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz"; + sha256 = "1j9ydlkwz3039yslaizz923h0qbszm4z2sqspk28wr8rd3f22a35"; + name = "qtconnectivity-everywhere-src-5.10.1.tar.xz"; }; }; qtdatavis3d = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdatavis3d-everywhere-src-5.10.0.tar.xz"; - sha256 = "06363x449k7wkqrd7c0y6b5vqlpwssnkl0g5s1bhp8lkl3bw81lj"; - name = "qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdatavis3d-everywhere-src-5.10.1.tar.xz"; + sha256 = "0ny8j689jm2fghklzw894yc5hjqa23yf395yv17yvwi72kpiz0b3"; + name = "qtdatavis3d-everywhere-src-5.10.1.tar.xz"; }; }; qtdeclarative = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz"; - sha256 = "07kicxzbwiqwkg1x2k6447rwzvzn31cv1yyggc1m8r84lny4vjsw"; - name = "qtdeclarative-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwmg1qan886czzkzi4px36mqxlqiw0acrsa9kqcddg5pi8yvy9s"; + name = "qtdeclarative-everywhere-src-5.10.1.tar.xz"; }; }; qtdoc = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdoc-everywhere-src-5.10.0.tar.xz"; - sha256 = "01z4ikqrnnx9mzf5pvk4i2lqks4xai32fs9qqbqnsp0qrrcb1jfn"; - name = "qtdoc-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdoc-everywhere-src-5.10.1.tar.xz"; + sha256 = "1gl62acr346jrcfxla8vxlczf706a3md52zc0zaqbjw9rf2bgnqq"; + name = "qtdoc-everywhere-src-5.10.1.tar.xz"; }; }; qtgamepad = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgamepad-everywhere-src-5.10.0.tar.xz"; - sha256 = "1rl77rsfgs69cdv75nfjp9w66mndwi211wix5cwl46d7i3wm0xak"; - name = "qtgamepad-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgamepad-everywhere-src-5.10.1.tar.xz"; + sha256 = "1xs6adpnv5ymdmb7kcbvcc0vx2lp6wqz53pzr9amyzbgyl0jiiw5"; + name = "qtgamepad-everywhere-src-5.10.1.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; - sha256 = "0c2y0ixxncn5xslpxciigq1gfaxd3n7wkcf14k4iy5i15w8nkfcp"; - name = "qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; + sha256 = "0zw4n6s42w70r45gjg66ad0s9dpxil6wmwwrivshnqvrnlqhcfrz"; + name = "qtgraphicaleffects-everywhere-src-5.10.1.tar.xz"; }; }; qtimageformats = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtimageformats-everywhere-src-5.10.0.tar.xz"; - sha256 = "1z7lnw85apzf6ph3dgnbb6py17qzpgww92kz31n6vbv5z62bigwi"; - name = "qtimageformats-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz"; + sha256 = "10x248s4a6ij18awkdskk3g7zfw6gwyj63l2jr803blyfyibl118"; + name = "qtimageformats-everywhere-src-5.10.1.tar.xz"; }; }; qtlocation = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz"; - sha256 = "1iw5m9v5p6l6mivjvj7g1macpqf2n21mg4wg0hza36dwrz3wwkfq"; - name = "qtlocation-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jbjzl6gwxy4n43x6m55b86vkdpjvwyvw7xsxg4a40f72xaw0p2y"; + name = "qtlocation-everywhere-src-5.10.1.tar.xz"; }; }; qtmacextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmacextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "08n8na36j9c15hvicqfs7h915m2av5xd5v0azf7660z0q9lk9zb3"; - name = "qtmacextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmacextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1jkzizsa8nr1dp5n9p81s6ylnqfh0vqwz8l72632fg68x229jfn7"; + name = "qtmacextras-everywhere-src-5.10.1.tar.xz"; }; }; qtmultimedia = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz"; - sha256 = "0vw0i5jgn4q63g5ijwwrb6835qdaxcw7sfcjffbqfbdwqgyk70q0"; - name = "qtmultimedia-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz"; + sha256 = "0j9nq8s2kzfc7zqs253pixqwd5xjv2cbqyik5lgvi9p5bq0riym1"; + name = "qtmultimedia-everywhere-src-5.10.1.tar.xz"; }; }; qtnetworkauth = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtnetworkauth-everywhere-src-5.10.0.tar.xz"; - sha256 = "1lnqi1qpy9j5pi2lcmdihf81lspxv6hgdg5jmbqqdqxwzblgpnpc"; - name = "qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtnetworkauth-everywhere-src-5.10.1.tar.xz"; + sha256 = "1p6wnma2nygqbjhrbiijjgkc8jq6lkdmq6xaxcgdh8ynkcqiq8wp"; + name = "qtnetworkauth-everywhere-src-5.10.1.tar.xz"; }; }; qtpurchasing = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtpurchasing-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mkxslc8qc6sclpngllby3bb86qq5csrsz0xrc14nwmbkhwksxwc"; - name = "qtpurchasing-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtpurchasing-everywhere-src-5.10.1.tar.xz"; + sha256 = "090gmxy5bp44rirl5yrb1ryn97z37ri4fmmclh9z7c4dvnmr2d3j"; + name = "qtpurchasing-everywhere-src-5.10.1.tar.xz"; }; }; qtquickcontrols = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols-everywhere-src-5.10.0.tar.xz"; - sha256 = "0ab19raip9828br21qqaglr4y0kqmxix882r13sfxlnm4ivyycx1"; - name = "qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz"; + sha256 = "1dw22sk2x5bk2mix06w8dv1b05dyq0gx088aqvdz18y67ncs2cfj"; + name = "qtquickcontrols-everywhere-src-5.10.1.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; - sha256 = "18d1b5aivaqgs1px61glkyclkky60xd7yzy1vwa1f89sg8j711w1"; - name = "qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; + sha256 = "0jk01vgzc78w45q8kys1hwri3jx0hzx5vxivzmv8nh8yj0dlmijx"; + name = "qtquickcontrols2-everywhere-src-5.10.1.tar.xz"; }; }; qtremoteobjects = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtremoteobjects-everywhere-src-5.10.0.tar.xz"; - sha256 = "01bf1ykqxb4d8wz58vxy15yj4jsaqhi258k05dhy7ygdvfgscdnz"; - name = "qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtremoteobjects-everywhere-src-5.10.1.tar.xz"; + sha256 = "052fa27rv4b9h6qbldrq013zxb69ysgmqnxbyv9c48s2ra50pnp9"; + name = "qtremoteobjects-everywhere-src-5.10.1.tar.xz"; }; }; qtscript = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscript-everywhere-src-5.10.0.tar.xz"; - sha256 = "1z6a14x9yj0p2znc0vny8y4zkdvm5fp42rnisnf9rynakkqg5wkc"; - name = "qtscript-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bakr5xcxc6j6l78fyazh7sgcz2hwf2g8k60jb9307qzrgvqlqg0"; + name = "qtscript-everywhere-src-5.10.1.tar.xz"; }; }; qtscxml = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscxml-everywhere-src-5.10.0.tar.xz"; - sha256 = "142qysd5s706r62gap62s89xm7334i1ys29dqsp09av9n7b1kfsb"; - name = "qtscxml-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz"; + sha256 = "00v1n86pyw9cm320qa2fpazvkfi6czd027x60k2g2sprwh0x4hhb"; + name = "qtscxml-everywhere-src-5.10.1.tar.xz"; }; }; qtsensors = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsensors-everywhere-src-5.10.0.tar.xz"; - sha256 = "0w9rzqc0hva4521i5j298lrsvys3jqddmqd80cxj9nsvnapwb66d"; - name = "qtsensors-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz"; + sha256 = "15jw2r6snhwi26b4ajp7m89l89kaf1j0kgqds4wjpksk1rngf3dv"; + name = "qtsensors-everywhere-src-5.10.1.tar.xz"; }; }; qtserialbus = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialbus-everywhere-src-5.10.0.tar.xz"; - sha256 = "06rr0191zy5yxqzxiv0c6dvshncjg8kdc33lszk41pajv624fn9z"; - name = "qtserialbus-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mr2j86mk1fm9z5iba3kav651231j9jv0805q8716h7ia1ws2l06"; + name = "qtserialbus-everywhere-src-5.10.1.tar.xz"; }; }; qtserialport = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialport-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mqlhdp20jl6agv58mszznsikmi1dflhalkpfbgpiafjzzczx075"; - name = "qtserialport-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz"; + sha256 = "17ja368ggl9aak64r8sqzx34j2i8zv7z60bkhncynrgipc9wpr08"; + name = "qtserialport-everywhere-src-5.10.1.tar.xz"; }; }; qtspeech = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtspeech-everywhere-src-5.10.0.tar.xz"; - sha256 = "1hashidb33f1215f0azjby1lh8iw7v2bvxp08mqvdk02jld9w5br"; - name = "qtspeech-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtspeech-everywhere-src-5.10.1.tar.xz"; + sha256 = "07clcy3bslq4fk7xb6cqlfsz5frhmy41hzpajdqjwj9h6dvmqxw5"; + name = "qtspeech-everywhere-src-5.10.1.tar.xz"; }; }; qtsvg = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsvg-everywhere-src-5.10.0.tar.xz"; - sha256 = "1c77wnpzjz4wwic5if876y5v1n44v2g2nhjmcs25cc8awz5afaja"; - name = "qtsvg-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz"; + sha256 = "0nkz3kxclk7s95fnh8xgljahk131mwb8pjllgp7n70ycmc20rq00"; + name = "qtsvg-everywhere-src-5.10.1.tar.xz"; }; }; qttools = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttools-everywhere-src-5.10.0.tar.xz"; - sha256 = "0cpybii2yznk6gwaa2cz83rk3cpzzm6l4wvn4n2xwdbrgdsdrx8z"; - name = "qttools-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz"; + sha256 = "0lwa0i6zspcrii0ak1dyxacif1fkv2vhmdp3dmp7af71bwg49spi"; + name = "qttools-everywhere-src-5.10.1.tar.xz"; }; }; qttranslations = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttranslations-everywhere-src-5.10.0.tar.xz"; - sha256 = "1gmrisf08nsrni7fyjlz5ggfgfzzkjpq3g7l2hc6vq5g04vbskgc"; - name = "qttranslations-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz"; + sha256 = "1za34rvn3bhzi4mxqm9lghdhaqcxpsi6xa61dfbhpc047l788v8z"; + name = "qttranslations-everywhere-src-5.10.1.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; - sha256 = "0mqb9sgvq7djd2lz4q4p6p9f0c23cfhk447zx4axvv1mldjxsb9c"; - name = "qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; + sha256 = "0bnmhy0kibvyra0i15qzwc9195s8wpfhg5gk0d6rfwd5d07gj6a3"; + name = "qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz"; }; }; qtwayland = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwayland-everywhere-src-5.10.0.tar.xz"; - sha256 = "14sb0227rzqzf5z8dz8b9nzkk5rwq6hrfxifz603iy4mdijzjmsn"; - name = "qtwayland-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz"; + sha256 = "0mk3p8pkfia3z7v7phk0qdyzd1zkfpk92c995g851p5wbqx699zm"; + name = "qtwayland-everywhere-src-5.10.1.tar.xz"; }; }; qtwebchannel = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebchannel-everywhere-src-5.10.0.tar.xz"; - sha256 = "18rml5xyb9chz8wrfamsgx4z32kkjbk1rc47ynvhn49mcbf2897j"; - name = "qtwebchannel-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz"; + sha256 = "0r1p1ar4xh7g7lzi564hgw1ng5xkim4mkpgq29ymjlmhxjgl8b62"; + name = "qtwebchannel-everywhere-src-5.10.1.tar.xz"; }; }; qtwebengine = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebengine-everywhere-src-5.10.0.tar.xz"; - sha256 = "1yb7jpydxg0dwdrx0iv7i5dq4wb9ld1iff8zpjdj8yl4xy4mkgx8"; - name = "qtwebengine-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz"; + sha256 = "1ph1pinxn0dp44zall9gihbgziira4zpynixacm4ldd85f6lyr0j"; + name = "qtwebengine-everywhere-src-5.10.1.tar.xz"; }; }; qtwebglplugin = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebglplugin-everywhere-src-5.10.0.tar.xz"; - sha256 = "0hgwb5lll3275knnj3ms04y1n0i6gph9kac2246ixmcq8sc7a2k7"; - name = "qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebglplugin-everywhere-src-5.10.1.tar.xz"; + sha256 = "1hdzymwai5f6agkn4hz32aq5fjv2lqdac285fwrlk5gsff0j0yal"; + name = "qtwebglplugin-everywhere-src-5.10.1.tar.xz"; }; }; qtwebsockets = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebsockets-everywhere-src-5.10.0.tar.xz"; - sha256 = "00wlyhw7h2axyhinksfm912jfa3n73szxdccz5dlir8742i0zaqp"; - name = "qtwebsockets-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz"; + sha256 = "1sjkml5kqigvyxrkv5b7x1cy69d69dzma40yfg72vr7zal4pkkvf"; + name = "qtwebsockets-everywhere-src-5.10.1.tar.xz"; }; }; qtwebview = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebview-everywhere-src-5.10.0.tar.xz"; - sha256 = "1955fkc7a22d7a0y2n7kz7r1md56v2s5qvyb3h68szs60zjnk3xa"; - name = "qtwebview-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebview-everywhere-src-5.10.1.tar.xz"; + sha256 = "110mwc423cq1bwdz0vv78cjprzy03xawxnxhfcs4138gssfj0n0b"; + name = "qtwebview-everywhere-src-5.10.1.tar.xz"; }; }; qtwinextras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwinextras-everywhere-src-5.10.0.tar.xz"; - sha256 = "1mx5qihmh3awqcr9k3z2chxz8273bi5ha90v7f4fqr2vk3g6w4yd"; - name = "qtwinextras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz"; + sha256 = "05w9n8kry1mg3i14i4m98gm5hf20mlwxbagbk9xk11xykbm1wh0j"; + name = "qtwinextras-everywhere-src-5.10.1.tar.xz"; }; }; qtx11extras = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtx11extras-everywhere-src-5.10.0.tar.xz"; - sha256 = "11jp0a40jqwcdq7isyip4f4mq2d58c9fx1kvg9g71m92n52ffyfb"; - name = "qtx11extras-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz"; + sha256 = "1d4pvisxbcyb7ljl1lh2zg72kw44h9kk14l0xmvajb8bslgkg2n3"; + name = "qtx11extras-everywhere-src-5.10.1.tar.xz"; }; }; qtxmlpatterns = { - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; - sha256 = "1hq3sbimbhaiw570d2cd84jhki0n2jw2x2s7iq92m53y4akbr2mh"; - name = "qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; + sha256 = "1zp9smsfdqyfiarxs7r8kfr7yq68cdn7biddwl36cybax6fgbpiw"; + name = "qtxmlpatterns-everywhere-src-5.10.1.tar.xz"; }; }; qtwebkit = { diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d6e55e7bf73c..f5715157531e 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -40,6 +40,6 @@ in version = "7.0.5"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1a3e076447d5b9860c73d9bebe7087ffcb7b0c8814fd1e506096435a2ad9ab0e"; + sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y"; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 567ee7853f88..f694f72f22b6 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.8"; + version = "3.12.9"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1"; + sha256 = "1fqdjgxh6l1xjvw1ffma7lg92xqg0l8sj02y0zqvbfnx8i47qs9a"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c4deccff5b7e..1d692f6316ff 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,41 +1,24 @@ -{ stdenv, fetchFromGitHub -, gcc5, eject, cudatoolkit -}: +{ callPackage, cudatoolkit8, cudatoolkit9 }: -stdenv.mkDerivation rec { - name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; - version = "1.3.4-1"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nccl"; - rev = "v${version}"; - sha256 = "0fvnrfn572lc6i2a3xyhbifm53ivcrr46z6cqr3b0bwb1iq79m7q"; +let + generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + inherit (args) cudatoolkit; }; - nativeBuildInputs = [ - gcc5 - eject - ]; - - propagatedBuildInputs = [ - cudatoolkit - ]; +in - makeFlags = [ - "PREFIX=$(out)" - "CUDA_HOME=${cudatoolkit}" - "CUDA_LIB=${cudatoolkit.lib}/lib" - ]; +{ + nccl_cudatoolkit8 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit8; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; + }; - meta = with stdenv.lib; { - description = '' - NVIDIA Collective Communications Library. - Multi-GPU and multi-node collective communication primitives. - ''; - homepage = https://developer.nvidia.com/nccl; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ hyphon81 ]; + nccl_cudatoolkit9 = generic rec { + version = "2.1.4"; + cudatoolkit = cudatoolkit9; + srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; + sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; }; } diff --git a/pkgs/development/libraries/science/math/nccl/generic.nix b/pkgs/development/libraries/science/math/nccl/generic.nix new file mode 100644 index 000000000000..aa04d75b078b --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/generic.nix @@ -0,0 +1,57 @@ +{ version +, srcName +, sha256 +}: + +{ stdenv +, lib +, requireFile +, cudatoolkit +}: + +stdenv.mkDerivation rec { + name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; + + inherit version; + + src = requireFile rec { + name = srcName; + inherit sha256; + message = '' + This nix expression requires that ${name} is already part of the store. + Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library + at https://developer.nvidia.com/nccl, and run the following command in the download directory: + nix-prefetch-url file://${name} + ''; + }; + + unpackCmd = "tar xJf $src"; + + installPhase = '' + function fixRunPath { + p=$(patchelf --print-rpath $1) + patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 + } + fixRunPath lib/libnccl.so + + mkdir -p $out + cp -a include $out/include + cp -a lib $out/lib + ''; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + passthru = { + inherit cudatoolkit; + }; + + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 080dbc4510dd..01b766351c27 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, spice_protocol, gettext, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , gtk3, epoxy }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection + spice-protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy ]; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index c8e98d3d28ed..1ab76340cc7c 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama -, libjpeg, zlib, spice_protocol, python, pyparsing, glib, cyrus_sasl +, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl , lz4 }: with stdenv.lib; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libXrandr libXfixes libXrender libXext libXinerama python pyparsing glib cyrus_sasl lz4 ]; - nativeBuildInputs = [ pkgconfig spice_protocol ]; + nativeBuildInputs = [ pkgconfig spice-protocol ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index aed08435a149..41308a7ef4ec 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, farstream, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { name = "${pname}-0.6.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; - propagatedBuildInputs = [ dbus_glib telepathy_glib farstream ]; + propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index fffe677f6a71..df5c76abd7cd 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt +{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt , gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings"; LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; + propagatedBuildInputs = [dbus-glib glib gobjectIntrospection]; nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; buildInputs = [ glibcLocales python2 ]; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 18888df5c52b..90dd47c11e2f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, fetchpatch }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon +, telepathy-farstream, telepathy-glib, fetchpatch }: let inherit (python2Packages) python dbus-python; @@ -12,8 +12,8 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig python ]; - propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ]; - buildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; + buildInputs = [ dbus-glib ]; checkInputs = [ dbus_daemon dbus-python ]; patches = [ diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 26c040721bdf..377ceba59e70 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk_doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: +{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { version="0.5.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf gtk_doc automake libtool glib libsoup gobjectIntrospection ]; + buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 09016bd9c2c7..a0936310c42f 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk_doc +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ automake autoconf libtool gtk_doc pkgconfig vala ]; + nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 1dbbcf798c9f..e2a2af615b88 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "Vc-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9"; + sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index e93f071aefac..48ad33424f60 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libcdio, libxml2, popt }: +{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }: -stdenv.mkDerivation { - name = "vcdimager-0.7.24"; +stdenv.mkDerivation rec { + name = "vcdimager-2.0.1"; src = fetchurl { - url = mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz; - sha256 = "1526jxynslg07i50v3c3afhc8swbd4si8y6s8m3h1wrz6mkplp87"; + url = "mirror://gnu/vcdimager/${name}.tar.gz"; + sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; nativeBuildInputs = [ pkgconfig ]; @@ -14,9 +14,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libcdio ]; - meta = { + meta = with lib; { homepage = http://www.gnu.org/software/vcdimager/; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; - platforms = stdenv.lib.platforms.gnu; # random choice + platforms = platforms.gnu; # random choice + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index d3e3163a8afe..a79ef3439166 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls -, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit +, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null @@ -88,8 +88,8 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty ++ [ libwebp enchant libnotify gnutls pcre nettle libidn - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) diff --git a/pkgs/development/libraries/zeitgeist/dbus_glib.patch b/pkgs/development/libraries/zeitgeist/dbus_glib.patch deleted file mode 100644 index 872ea0db31b8..000000000000 --- a/pkgs/development/libraries/zeitgeist/dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac 2014-01-27 22:45:42.000000000 +0100 -+++ configure.ac.new 2014-05-02 17:25:45.813491239 +0200 -@@ -151,6 +151,7 @@ - gio-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED -+ dbus-glib-1 - json-glib-1.0 >= $JSON_GLIB_REQUIRED" - - AC_ARG_ENABLE([datahub], diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 3c50de6cc6b7..33cf5dd4af84 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 -, intltool, libtool, dbus_libs, telepathy_glib -, gtk3, json_glib, librdf_raptor2, dbus_glib +{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38 +, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib +, gtk3, json-glib, librdf_raptor2, dbus-glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.1"; name = "zeitgeist-${version}"; src = fetchgit { url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; rev = "v${version}"; - sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; + sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44"; }; - configureScript = "./autogen.sh"; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; - buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib - gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ]; + buildInputs = [ + glib sqlite dbus_libs telepathy-glib dbus-glib + gtk3 json-glib librdf_raptor2 python2Packages.rdflib + ]; prePatch = "patchShebangs ."; - patches = [ ./dbus_glib.patch ]; - - patchFlags = [ "-p0" ]; - enableParallelBuilding = true; - postFixup = '' - '' + stdenv.lib.optionalString pythonSupport '' + postFixup = stdenv.lib.optionalString pythonSupport '' moveToOutput lib/${python2Packages.python.libPrefix} "$py" ''; diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 522d2c252684..65fb6e615f5f 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -13,7 +13,7 @@ shift export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_FINAL_PARAMETERS test -n "$NIX_LISP_LD_LIBRARY_PATH" && - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$NIX_LISP_LD_LIBRARY_PATH" declare -a NIX_LISP_FINAL_PARAMETERS; diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index b13ddf8357f4..390e0e061128 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -33,7 +33,7 @@ let test -n "$LD_LIBRARY_PATH" && echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':')'" >> "$path_config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':' | sed -e 's/:$//')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! /bin/sh" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$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" ''; moveAsdFiles = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix new file mode 100644 index 000000000000..6dbff1d6e56c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -0,0 +1,49 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode-xhtml''; + version = ''buildnode-20170403-git''; + + description = ''Tool for building up an xml dom of an excel spreadsheet nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode-xhtml"; + + asdFilesToKeep = ["buildnode-xhtml.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode-xhtml DESCRIPTION + Tool for building up an xml dom of an excel spreadsheet nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode-xhtml FILENAME + buildnode-xhtml DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop + closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test + cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger + trivial-features trivial-gray-streams) + VERSION buildnode-20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix new file mode 100644 index 000000000000..ecc1634bfce0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -0,0 +1,50 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''buildnode''; + version = ''20170403-git''; + + parasites = [ "buildnode-test" ]; + + description = ''Tool for building up an xml dom nicely.''; + + deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz''; + sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6''; + }; + + packageName = "buildnode"; + + asdFilesToKeep = ["buildnode.asd"]; + overrides = x: x; +} +/* (SYSTEM buildnode DESCRIPTION Tool for building up an xml dom nicely. SHA256 + 1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6 URL + http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz + MD5 b917f0d6c20489febbef0d5b954c350d NAME buildnode FILENAME buildnode DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams) + VERSION 20170403-git SIBLINGS + (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml + buildnode-xul) + PARASITES (buildnode-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix new file mode 100644 index 000000000000..d1ce782e7f84 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-html5-parser''; + version = ''20171019-git''; + + description = ''A HTML5 parser for Common Lisp''; + + deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz''; + sha256 = ''0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98''; + }; + + packageName = "cl-html5-parser"; + + asdFilesToKeep = ["cl-html5-parser.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-html5-parser DESCRIPTION A HTML5 parser for Common Lisp SHA256 + 0ww4r8x27k060krnwq2nb9w93wl9cxqjqil4j1n0fgpbyp2mqn98 URL + http://beta.quicklisp.org/archive/cl-html5-parser/2017-10-19/cl-html5-parser-20171019-git.tgz + MD5 c4a18ac20668c9aef723954fb901c16b NAME cl-html5-parser FILENAME + cl-html5-parser DEPS + ((NAME cl-ppcre FILENAME cl-ppcre) + (NAME flexi-streams FILENAME flexi-streams) + (NAME string-case FILENAME string-case) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (cl-ppcre flexi-streams string-case trivial-gray-streams) + VERSION 20171019-git SIBLINGS (cl-html5-parser-cxml cl-html5-parser-tests) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 572e3eb4cb38..3ca67723925e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -5,7 +5,7 @@ rec { description = ''Common Lisp smtp client.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl+ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-smtp/2018-01-31/cl-smtp-20180131-git.tgz''; @@ -23,7 +23,7 @@ rec { MD5 0ce08f067f145ab4c7528f806f0b51ff NAME cl-smtp FILENAME cl-smtp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl+ssl) + (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 0243709f3fe1..99aa768c8dfc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,6 +1,6 @@ args @ { fetchurl, ... }: rec { - baseName = ''cl+ssl''; + baseName = ''cl_plus_ssl''; version = ''cl+ssl-20171227-git''; parasites = [ "openssl-1.1.0" ]; @@ -22,7 +22,7 @@ rec { /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz - MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl+ssl DEPS + MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix new file mode 100644 index 000000000000..7375b8dd7094 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''collectors''; + version = ''20161204-git''; + + parasites = [ "collectors-test" ]; + + description = ''A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies''; + + deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz''; + sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf''; + }; + + packageName = "collectors"; + + asdFilesToKeep = ["collectors.asd"]; + overrides = x: x; +} +/* (SYSTEM collectors DESCRIPTION + A library providing various collector type macros + pulled from arnesi into its own library and stripped of dependencies + SHA256 0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf URL + http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz + MD5 59c8c885a8e512d4f09e73d3e0c97b1f NAME collectors FILENAME collectors + DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES (alexandria closer-mop iterate lisp-unit2 symbol-munger) + VERSION 20161204-git SIBLINGS NIL PARASITES (collectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix new file mode 100644 index 000000000000..2ad018e5549c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -0,0 +1,52 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-selectors''; + version = ''20160628-git''; + + parasites = [ "css-selectors-test" ]; + + description = ''An implementation of css selectors''; + + deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz''; + sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b''; + }; + + packageName = "css-selectors"; + + asdFilesToKeep = ["css-selectors.asd"]; + overrides = x: x; +} +/* (SYSTEM css-selectors DESCRIPTION An implementation of css selectors SHA256 + 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL + http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz + MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors FILENAME + css-selectors DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME buildnode FILENAME buildnode) + (NAME buildnode-xhtml FILENAME buildnode-xhtml) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) + (NAME closure-html FILENAME closure-html) + (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) + (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) + (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode + closer-mop closure-common closure-html collectors cxml cxml-dom + cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri + split-sequence swank symbol-munger trivial-features trivial-gray-streams + yacc) + VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp) + PARASITES (css-selectors-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index d6885fc58d8c..f03a95d27b1f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -5,7 +5,7 @@ rec { description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz''; @@ -25,7 +25,7 @@ rec { (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 44ce34a2cb33..95162ffc99a3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -5,7 +5,7 @@ rec { description = ''Full-featured http/https client based on usocket''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/drakma/2017-08-30/drakma-v2.0.4.tgz''; @@ -24,7 +24,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 6a103b5ac1c5..611ef77256fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -10,7 +10,7 @@ rec { simple framework for user-defined handlers and can be extended through subclassing.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; @@ -34,7 +34,7 @@ rec { ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga) - (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp) (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index da9fe306276f..a913cdbe521c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -5,7 +5,7 @@ rec { description = ''Load data into PostgreSQL''; - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl+ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; + deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; @@ -28,7 +28,7 @@ rec { (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) + (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-containers FILENAME cl-containers) (NAME cl-csv FILENAME cl-csv) (NAME cl-fad FILENAME cl-fad) (NAME cl-interpol FILENAME cl-interpol) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index 356c7ff68642..de24a5984960 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -5,7 +5,7 @@ rec { description = ''MySQL Native Driver''; - deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl+ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; + deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl_plus_ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; @@ -26,7 +26,8 @@ rec { (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME cl+ssl FILENAME cl+ssl) (NAME flexi-streams FILENAME flexi-streams) + (NAME cl+ssl FILENAME cl_plus_ssl) + (NAME flexi-streams FILENAME flexi-streams) (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) (NAME split-sequence FILENAME split-sequence) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix new file mode 100644 index 000000000000..7f5cc1e048de --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''string-case''; + version = ''20151218-git''; + + description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz''; + sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw''; + }; + + packageName = "string-case"; + + asdFilesToKeep = ["string-case.asd"]; + overrides = x: x; +} +/* (SYSTEM string-case DESCRIPTION + string-case is a macro that generates specialised decision trees to dispatch on string equality + SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL + http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz + MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case + DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 9a7fb3e5d1b8..0c12f169cf7b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -46,7 +46,7 @@ in cxml = skipBuildPhase; wookie = addNativeLibs (with pkgs; [libuv openssl]); lev = addNativeLibs [pkgs.libev]; - "cl+ssl" = addNativeLibs [pkgs.openssl]; + cl_plus_ssl = addNativeLibs [pkgs.openssl]; cl-colors = skipBuildPhase; cl-libuv = addNativeLibs [pkgs.libuv]; cl-async-ssl = addNativeLibs [pkgs.openssl]; @@ -154,4 +154,8 @@ $out/lib/common-lisp/query-fs" ]; asdFilesToKeep = x.asdFilesToKeep ++ ["simple-date.asd"]; }; + buildnode = x: { + deps = pkgs.lib.filter (x: x.name != quicklisp-to-nix-packages.buildnode-xhtml.name) x.deps; + parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; + }; } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index ebf09c43a0e0..61d1d05139ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -21,11 +21,13 @@ cl-base64 cl-cli cl-colors cl-cookie +cl-csv cl-dbi cl-emb cl-fuse cl-fuse-meta-fs cl-html-parse +cl-html5-parser cl-json cl-l10n cl-libuv @@ -57,6 +59,7 @@ clx clx-truetype command-line-arguments css-lite +css-selectors cxml dbd-mysql dbd-postgres diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index e931c12f1e72..e9157422202d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,34 +6,9 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "symbol-munger" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."symbol-munger" or (x: {})) - (import ./quicklisp-to-nix-output/symbol-munger.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iterate" = quicklisp-to-nix-packages."iterate"; - })); - - "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; - "lisp-unit2" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lisp-unit2" or (x: {})) - (import ./quicklisp-to-nix-output/lisp-unit2.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; - })); - - "moptilities" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."moptilities" or (x: {})) @@ -54,14 +29,6 @@ let quicklisp-to-nix-packages = rec { })); - "yacc" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."yacc" or (x: {})) - (import ./quicklisp-to-nix-output/yacc.nix { - inherit fetchurl; - })); - - "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; @@ -135,7 +102,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "ironclad" = quicklisp-to-nix-packages."ironclad"; "list-of" = quicklisp-to-nix-packages."list-of"; @@ -280,32 +247,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-interpol" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-interpol" or (x: {})) - (import ./quicklisp-to-nix-output/cl-interpol.nix { - inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - })); - - - "cl-csv" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-csv" or (x: {})) - (import ./quicklisp-to-nix-output/cl-csv.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; - })); - - "cl-containers" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-containers" or (x: {})) @@ -425,14 +366,6 @@ let quicklisp-to-nix-packages = rec { })); - "swank" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."swank" or (x: {})) - (import ./quicklisp-to-nix-output/swank.nix { - inherit fetchurl; - })); - - "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -524,6 +457,108 @@ let quicklisp-to-nix-packages = rec { })); + "yacc" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."yacc" or (x: {})) + (import ./quicklisp-to-nix-output/yacc.nix { + inherit fetchurl; + })); + + + "symbol-munger" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."symbol-munger" or (x: {})) + (import ./quicklisp-to-nix-output/symbol-munger.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "swank" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swank" or (x: {})) + (import ./quicklisp-to-nix-output/swank.nix { + inherit fetchurl; + })); + + + "collectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."collectors" or (x: {})) + (import ./quicklisp-to-nix-output/collectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "buildnode-xhtml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode-xhtml" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode-xhtml.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "buildnode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."buildnode" or (x: {})) + (import ./quicklisp-to-nix-output/buildnode.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "zpb-ttf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."zpb-ttf" or (x: {})) @@ -689,6 +724,14 @@ let quicklisp-to-nix-packages = rec { })); + "string-case" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."string-case" or (x: {})) + (import ./quicklisp-to-nix-output/string-case.nix { + inherit fetchurl; + })); + + "pcall-queue" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pcall-queue" or (x: {})) @@ -716,6 +759,32 @@ let quicklisp-to-nix-packages = rec { })); + "lisp-unit2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-unit2" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit2.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "cl-interpol" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-interpol" or (x: {})) + (import ./quicklisp-to-nix-output/cl-interpol.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -1236,7 +1305,7 @@ let quicklisp-to-nix-packages = rec { "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-containers" = quicklisp-to-nix-packages."cl-containers"; "cl-csv" = quicklisp-to-nix-packages."cl-csv"; @@ -1490,7 +1559,7 @@ let quicklisp-to-nix-packages = rec { "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; @@ -1660,7 +1729,7 @@ let quicklisp-to-nix-packages = rec { "cffi" = quicklisp-to-nix-packages."cffi"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; @@ -1694,7 +1763,7 @@ let quicklisp-to-nix-packages = rec { "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; "chipz" = quicklisp-to-nix-packages."chipz"; "chunga" = quicklisp-to-nix-packages."chunga"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; @@ -1801,6 +1870,40 @@ let quicklisp-to-nix-packages = rec { })); + "css-selectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-selectors" or (x: {})) + (import ./quicklisp-to-nix-output/css-selectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "buildnode" = quicklisp-to-nix-packages."buildnode"; + "buildnode-xhtml" = quicklisp-to-nix-packages."buildnode-xhtml"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "closure-html" = quicklisp-to-nix-packages."closure-html"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "css-lite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."css-lite" or (x: {})) @@ -1941,10 +2044,10 @@ let quicklisp-to-nix-packages = rec { })); - "cl+ssl" = buildLispPackage + "cl_plus_ssl" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl+ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl+ssl.nix { + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; @@ -2021,7 +2124,7 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -2171,6 +2274,18 @@ let quicklisp-to-nix-packages = rec { })); + "cl-html5-parser" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html5-parser" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html5-parser.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "string-case" = quicklisp-to-nix-packages."string-case"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "cl-html-parse" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html-parse" or (x: {})) @@ -2245,6 +2360,21 @@ let quicklisp-to-nix-packages = rec { })); + "cl-csv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-csv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-csv.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + })); + + "cl-cookie" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-cookie" or (x: {})) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 63d6f3305194..3824a04826f1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -55,6 +55,7 @@ (#\\ "_backslash_") (#\_ "__") (#\. "_dot_") + (#\+ "_plus_") (t x))))) (defvar *system-info-bin* diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 7152d0b9e360..091ae06ab910 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,4 +1,4 @@ -lua: +{ lua, writeText }: { buildInputs ? [], disabled ? false, ... } @ attrs: @@ -19,5 +19,36 @@ else { name = "lua${lua.luaversion}-" + attrs.name; buildInputs = buildInputs ++ [ lua ]; + + setupHook = writeText "setup-hook.sh" '' + # check for lua/clua modules and don't add duplicates + + addLuaLibPath() { + local package_path="$1/share/lua/${lua.luaversion}" + if [[ ! -d $package_path ]]; then return; fi + if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi + + if [[ -z $LUA_PATH ]]; then + export LUA_PATH="$package_path/?.lua" + else + export LUA_PATH="$LUA_PATH;$package_path/?.lua" + fi + } + + addLuaLibCPath() { + local package_cpath="$1/lib/lua/${lua.luaversion}" + if [[ ! -d $package_cpath ]]; then return; fi + if [[ $LUA_CPATH = *"$package_cpath"* ]]; then return; fi + + if [[ -z $LUA_CPATH ]]; then + export LUA_CPATH="$package_cpath/?.so" + else + export LUA_CPATH="$LUA_CPATH;$package_cpath/?.so" + fi + } + + addEnvHooks "$hostOffset" addLuaLibPath + addEnvHooks "$hostOffset" addLuaLibCPath + ''; } ) diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix new file mode 100644 index 000000000000..9cee1c9e5dee --- /dev/null +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, bzip2, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "imgpatchtools-${version}"; + version = "0.3"; + + src = fetchzip { + url = "https://github.com/erfanoabdi/imgpatchtools/archive/${version}.tar.gz"; + sha256 = "1cwp1hfhip252dz0mbkhrsrkws6m15k359n4amw2vfnglnls8czd"; + }; + + buildInputs = [ bzip2 openssl zlib ]; + + installPhase = "install -Dt $out/bin bin/*"; + + meta = with stdenv.lib; { + description = "Tools to manipulate Android OTA archives"; + longDescription = '' + This package is useful for Android development. In particular, it can be + used to extract ext4 /system image from Android distribution ZIP archives + such as those distributed by LineageOS and Replicant, via BlockImageUpdate + utility. It also includes other, related, but arguably more advanced tools + for OTA manipulation. + ''; + homepage = https://github.com/erfanoabdi/imgpatchtools; + license = licenses.gpl3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index c8f122098da8..a0724c9ada59 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus dbus_glib ] + buildInputs = [ dbus dbus-glib ] ++ lib.optionals doCheck [ dbus_tools pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix new file mode 100644 index 000000000000..6b1d2af357a4 --- /dev/null +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, enum34 }: + +buildPythonPackage rec { + pname = "enum-compat"; + version = "0.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; + }; + + propagatedBuildInputs = [ enum34 ]; + + meta = with lib; { + homepage = https://github.com/jstasiak/enum-compat; + description = "enum/enum34 compatibility package"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix new file mode 100644 index 000000000000..53307333048e --- /dev/null +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }: + +buildPythonPackage rec { + name = "Flask-Assets-${version}"; + version = "0.12"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; + sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; + }; + + propagatedBuildInputs = [ flask webassets flask_script nose ]; + + meta = with lib; { + homepage = http://github.com/miracle2k/flask-assets; + description = "Asset management for Flask, to compress and merge CSS and Javascript files"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 3c7731c30a8b..e2585262e58e 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,19 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast -, flask, nose, mock, blinker}: +, flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { pname = "Flask-Login"; name = "${pname}-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "maxcountryman"; repo = "flask-login"; rev = version; - sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh"; + sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9"; }; - buildInputs = [ nose mock ]; + checkInputs = [ nose mock semantic-version ]; propagatedBuildInputs = [ flask blinker ]; checkPhase = "nosetests -d"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix new file mode 100644 index 000000000000..1f41f7987631 --- /dev/null +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }: + +buildPythonPackage rec { + name = "Flask-Principal-${version}"; + version = "0.4.0"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; + sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; + }; + + propagatedBuildInputs = [ flask blinker ]; + + checkInputs = [ nose ]; + + meta = with lib; { + homepage = http://packages.python.org/Flask-Principal/; + description = "Identity management for flask"; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix new file mode 100644 index 000000000000..ace3cee2d22e --- /dev/null +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchurl, flask, pytest }: + +buildPythonPackage rec { + name = "Flask-Script-${version}"; + version = "2.0.6"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Script/${name}.tar.gz"; + sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; + }; + + propagatedBuildInputs = [ flask ]; + checkInputs = [ pytest ]; + + meta = with lib; { + homepage = http://github.com/smurfix/flask-script; + description = "Scripting support for Flask"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix new file mode 100644 index 000000000000..c11bcaa5baa5 --- /dev/null +++ b/pkgs/development/python-modules/grip/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +# Python bits: +, buildPythonPackage +, pytest +, responses +, docopt +, flask +, markdown +, path-and-address +, pygments +, requests +, tabulate +}: + +buildPythonPackage rec { + pname = "grip"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "joeyespo"; + repo = "grip"; + rev = "v${version}"; + sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; + }; + + patches = [ + # Render "front matter", used in our RFC template and elsewhere + (fetchpatch { + url = https://github.com/joeyespo/grip/pull/249.patch; + sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; + }) + ]; + + checkInputs = [ pytest responses ]; + + propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -xm "not assumption" + ''; + + meta = with stdenv.lib; { + description = "Preview GitHub Markdown files like Readme locally before committing them"; + homepage = https://github.com/joeyespo/grip; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 3295786bd08c..e0294c2afca4 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = "https://github.com/hmmlearn/hmmlearn"; + homepage = https://github.com/hmmlearn/hmmlearn; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix new file mode 100644 index 000000000000..02348c68e07a --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, jupyterhub +, ldap3 +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jupyterhub-ldapauthenticator"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz"; + }; + + # No tests implemented + doCheck = false; + + propagatedBuildInputs = [ jupyterhub ldap3 ]; + + meta = with lib; { + description = "Simple LDAP Authenticator Plugin for JupyterHub"; + homepage = https://github.com/jupyterhub/ldapauthenticator; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 789beaa2384c..d9cc5fb0d9e5 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "libarcus"; name = "${pname}-${version}"; - version = "3.0.3"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw"; + sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk"; }; propagatedBuildInputs = [ sip protobuf ]; diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 67353a32ada6..c0c2b205f58b 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "libgpuarray"; - version = "0.6.9"; + version = "0.7.5"; name = pname + "-" + version; src = fetchFromGitHub { owner = "Theano"; repo = "libgpuarray"; rev = "v${version}"; - sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0"; + sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v"; }; # requires a GPU @@ -40,7 +40,6 @@ buildPythonPackage rec { make -j$NIX_BUILD_CORES make install - ls $out/lib export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" cd .. diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 410a633c46b0..bfe5d2f202df 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; - homepage = "https://github.com/dranjan/python-plyfile"; + homepage = https://github.com/dranjan/python-plyfile; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix new file mode 100644 index 000000000000..3931078c12ed --- /dev/null +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, numpy +, six +, nose +, fetchPypi +}: + +buildPythonPackage rec { + pname = "py_stringmatching"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4"; + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ numpy six ]; + + meta = with lib; { + description = "A Python string matching library including string tokenizers and string similarity measures"; + homepage = https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching; + license = licenses.bsd3; + maintainers = with maintainers; [ ixxie ]; + }; +} diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d96a4c8cea32..6192f94445f3 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: +{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }: stdenv.mkDerivation rec { pname = "pyatspi"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { broken = true; buildInputs = [ - at_spi2_core + at-spi2-core pkgconfig pythonPackages.python pythonPackages.pygobject3 diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 46d3272807eb..0b41b6ef0b10 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "1.0.3"; + version = "2.0.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; - sha256 = "714a9e03e6a258081e3b6296ed15592e015facbe38bbe60819cca6f04c599f25"; + sha256 = "1cp1ssfb8zk4sz74nsnf72b7dd5fzkwc4qdgc7rq8nfr4v611w6c"; }; propagatedBuildInputs = [ requests six zeroconf protobuf ]; meta = with lib; { description = "Library for Python 2 and 3 to communicate with the Google Chromecast"; - homepage = "https://github.com/balloob/pychromecast"; + homepage = https://github.com/balloob/pychromecast; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pykde4/kdelibs.nix b/pkgs/development/python-modules/pykde4/kdelibs.nix index dbf36d0eac8b..c5e148d1500a 100644 --- a/pkgs/development/python-modules/pykde4/kdelibs.nix +++ b/pkgs/development/python-modules/pykde4/kdelibs.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, - automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared_mime_info, + automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info, attica, docbook_xml_dtd_42, docbook_xsl, giflib, libdbusmenu_qt, libjpeg, phonon, qt4 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - automoc4 cmake_2_8 libxslt perl pkgconfig shared_mime_info + automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info ]; buildInputs = [ attica giflib libdbusmenu_qt libjpeg diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix new file mode 100644 index 000000000000..db8584c4f9e5 --- /dev/null +++ b/pkgs/development/python-modules/pylru/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "pylru-${version}"; + version = "1.0.9"; + + src = fetchurl { + url = "mirror://pypi/p/pylru/${name}.tar.gz"; + sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; + }; + + meta = with lib; { + homepage = https://github.com/jlhutch/pylru; + description = "A least recently used (LRU) cache implementation"; + license = licenses.gpl2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix new file mode 100644 index 000000000000..6903b6c7a0c0 --- /dev/null +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, pydns }: + +buildPythonPackage rec { + name = "pyspf-${version}"; + version = "2.0.12"; + + src = fetchurl { + url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; + sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; + }; + + propagatedBuildInputs = [ pydns ]; + + meta = with lib; { + homepage = http://bmsi.com/python/milter.html; + description = "Python API for Sendmail Milters (SPF)"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix new file mode 100644 index 000000000000..d90b7fa740dc --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "python-axolotl-curve25519-${version}"; + version = "0.1"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; + sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; + }; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl-curve25519; + description = "Curve25519 with ed25519 signatures"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix new file mode 100644 index 000000000000..71c456875bcf --- /dev/null +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }: + +buildPythonPackage rec { + name = "python-axolotl-${version}"; + version = "0.1.39"; + + src = fetchurl { + url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; + sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; + }; + + propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ]; + # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) + doCheck = false; + + meta = with lib; { + homepage = https://github.com/tgalal/python-axolotl; + description = "Python port of libaxolotl-android"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 65de08382239..44650618f5f5 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -15,9 +15,9 @@ buildPythonPackage rec { meta = { description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; + homepage = https://bitbucket.org/mrabarnett/mrab-regex; license = lib.licenses.psfl; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix new file mode 100644 index 000000000000..340c8d002b72 --- /dev/null +++ b/pkgs/development/python-modules/sarge/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "sarge-${version}"; + version = "0.1.4"; + + src = fetchurl { + url = "mirror://pypi/s/sarge/${name}.tar.gz"; + sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; + }; + + meta = with lib; { + homepage = http://sarge.readthedocs.org/; + description = "A wrapper for subprocess which provides command pipeline functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix new file mode 100644 index 000000000000..521f68db1cc6 --- /dev/null +++ b/pkgs/development/python-modules/scandir/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.7"; + + src = fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj"; + }; + + meta = with lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = https://github.com/benhoyt/scandir; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix new file mode 100644 index 000000000000..eff799e0d014 --- /dev/null +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchurl, tornado }: + +buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + }; + + propagatedBuildInputs = [ tornado ]; + + meta = with lib; { + homepage = http://github.com/mrjoes/sockjs-tornado/; + description = "SockJS python server implementation on top of Tornado framework"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 189fa7c932da..8ee4ce76069f 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numpy-based NIST SPH audio-file reader"; - homepage = "https://github.com/mcfletch/sphfile"; + homepage = https://github.com/mcfletch/sphfile; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 24eecf82311a..774799f3b4d8 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - version = "3.1.0"; + version = "3.2.1"; pname = "uranium"; name = "${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk"; + sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz"; }; buildInputs = [ python gettext ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = "https://github.com/Ultimaker/Uranium"; + homepage = https://github.com/Ultimaker/Uranium; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix new file mode 100644 index 000000000000..e18e9f87acd3 --- /dev/null +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }: + +buildPythonPackage rec { + name = "virtkey-${version}"; + majorVersion = "0.63"; + version = "${majorVersion}.0"; + + src = fetchurl { + url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; + sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ]; + + meta = with lib; { + description = "Extension to emulate keypresses and to get the layout information from the X server"; + homepage = https://launchpad.net/virtkey; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix new file mode 100644 index 000000000000..a5a7957e8ec1 --- /dev/null +++ b/pkgs/development/python-modules/webassets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }: + +buildPythonPackage rec { + name = "webassets-${version}"; + version = "0.12.1"; + + src = fetchurl { + url = "mirror://pypi/w/webassets/${name}.tar.gz"; + sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; + }; + + propagatedBuildInputs = [ pyyaml ]; + checkInputs = [ nose jinja2 mock pytest ]; + + # Needs Babel CLI tool + doCheck = false; + checkPhase = "py.test"; + + meta = with lib; { + description = "Media asset management for Python, with glue code for various web frameworks"; + homepage = http://github.com/miracle2k/webassets/; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index 99958a416c39..a9793e048839 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchurl, - extra-cmake-modules, shared_mime_info, + extra-cmake-modules, shared-mime-info, qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n, kdiagram, kgraphviewer }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 4ea85eca2138..01a112bcecce 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1mz2aiwb3ha8dnx9fzbykz1y5ax01l2x6xml956fs1vm555v534x"; + sha256 = "0fy04mnnrbdm7kfnjh6sv1q3g6wqzvwyf1p43f36rw3qalap544a"; }; patchPhase = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 5fdbd7766cf8..c778b67a95f5 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { rev = "v${version}"; owner = "projectatomic"; repo = "buildah"; - sha256 = "0rq3dw6p9rcqc99jk93j0qwg1p8fh4pwqvzylcqlcyqhv46426zf"; + sha256 = "0xyq7rv0lj6bxwh2rnf44w9gjcqbdkfcdff88023b9vlsc8h4k0m"; }; goPackagePath = "github.com/projectatomic/buildah"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 18ca5d4d8972..2d534435b5f9 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.89.3"; + version = "2.89.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0flqd3r1nip9wc8sy0kiqjivgx0zkpzlkbz6n3gb1plc73lpdwbr"; + sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x"; }; buildCommand = '' diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b88b8e3c82a9..a176c5cb7645 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome_doc_utils dblatex gettext which itstool + gnome-doc-utils dblatex gettext which itstool ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 2adc61ce6456..d4a8d483e2e5 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.3"; + name = "babeltrace-1.5.4"; src = fetchurl { url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; - sha256 = "0z0k4qvz4ypxs4dmgrzv9da7ylf6jr94ra6nylqpfrdspvjzwj92"; + sha256 = "1h8zi7afilbfx4jvdlhhgysj6x01w3799mdk4mdcgax04fch6hwn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 28b108c743f0..928f12602909 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name = "doclifter-2.15"; + name = "doclifter-2.17"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz; - sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0"; + url = http://www.catb.org/~esr/doclifter/doclifter-2.17.tar.gz; + sha256 = "1m8yfjbl8wzcml9q4k7m1crwid0a14r07fqf33bmmgx1zpjk8kmv"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 27dadd08e560..9f0ea147b585 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus dbus_glib ]; + buildInputs = [ glib dbus dbus-glib ]; meta = { homepage = https://hal.freedesktop.org/releases/; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 50f451ebae23..02b4d1557678 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor-icon-theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; meta = { homepage = https://code.google.com/archive/p/gtkdialog/; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 34b31cdf7ec8..317550059b45 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.0.5"; + version = "4.1.2"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "1l7ybqmsxpsijm7iqiqjpa7lhjafxml743q4crxn8wnwrbjzbi86"; + sha256 = "1n18i8ni154ym3d32zlbxcw0zz62h66iifr0h1yvvv2kp13p5zix"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 430da66c21c5..39d98f4f8b56 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.20.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; + sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh"; }; patches = [ ./crawl_purify.patch ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" + makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ lib.optional tileMode "TILES=y"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 71938874057a..ca64045b185b 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -5,12 +5,12 @@ let dfVersion = "0.44.05"; - version = "${dfVersion}-alpha1"; + version = "${dfVersion}-r2"; rev = "refs/tags/${version}"; sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52"; # revision of library/xml submodule - xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e"; + xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 20f7502f27dd..8cdfc426d830 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.2.0"; + version = "39.2.1"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy"; + sha256 = "1dgcn1a4sz649kj94ldqy4ms7zhwpaj3q4r86b0yfh6dda8jzlgp"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 0b0561afd24d..d3fb8c7bc58e 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, - libxkbcommon, epoxy, at_spi2_core, dbus, libxml2, + libxkbcommon, epoxy, at-spi2-core, dbus, libxml2, enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp - pkgconfig gtest gmock readline epoxy at_spi2_core dbus libxml2 + pkgconfig gtest gmock readline epoxy at-spi2-core dbus libxml2 ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 53c2cc5d073a..f64bbe4c1255 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -6,12 +6,12 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; - rev = "35f1a459a4ab6da9d70427e6539bdf4faae4cc91"; - sha256 = "1s3a9dpbcc6v8d05pqin4xfv36i2031xpdja1vl8x11cw05fln91"; + rev = "2b4c8e37268e595b82da4b9aadd5507852569b87"; + sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); in stdenv.mkDerivation rec { - version = "0.42.0"; + version = "0.43.0"; name = "openmw-${version}"; src = fetchFromGitHub { diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index d94a1f9a8d4d..bae26dfbad8c 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, mesa, openalSoft -, curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype +{ stdenv, fetchFromGitHub, which, pkgconfig, SDL2, mesa, openalSoft +, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype }: stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2017-07-25"; + version = "2018-02-23"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "356ae10ef65d4401958d50f03288dcb22d957c96"; - sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j"; + rev = "0d6edd227a13f1447938da1d1b020303c2545eb2"; + sha256 = "1nsagyzrai8cxhabcv2my8bbwmwckvri288j6x4qi5bmp78xl4hx"; }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; + buildInputs = [ + SDL2 mesa openalSoft curl speex opusfile libogg libvorbis libopus libjpeg + freetype mumble + ]; enableParallelBuilding = true; @@ -28,11 +31,11 @@ stdenv.mkDerivation rec { mkdir -p $out/baseq3 ''; - meta = { + meta = with stdenv.lib; { homepage = https://ioquake3.org/; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.eelco lib.maintainers.abbradar ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eelco abbradar ]; }; } diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index c5e5e525f365..c5633bedf39f 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -38,7 +38,7 @@ let libcap SDL2 libusb1 - dbus_glib + dbus-glib libav atk # Only libraries are needed from those two diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index ffbcd595cc35..c70feca0860f 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "the-powder-toy-${version}"; - version = "92.0.331"; + version = "92.5"; src = fetchFromGitHub { owner = "simtr"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax"; + sha256 = "1n15kgl4qnz55b32ddgmhrv64cl3awbds8arycn7mkf7akwdg1g6"; }; patches = [ ./fix-env.patch ]; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index f07fd88fbaf3..1e529fb15817 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,43 +1,86 @@ -{stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, premake4, unzip +, openal, libpng, libvorbis, mesa_glu, SDL2, SDL2_image, SDL2_ttf }: + +let + pname = "tome4"; + + desktop = makeDesktopItem { + desktopName = pname; + name = pname; + exec = "@out@/bin/${pname}"; + icon = "${pname}"; + terminal = "False"; + comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal."; + type = "Application"; + categories = "Game;RolePlaying;"; + genericName = pname; + }; + +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.5.5"; -stdenv.mkDerivation rec { - version = "1.4.9"; - name = "tome4-${version}"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; + sha256 = "0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03"; }; - nativeBuildInputs = [ premake4 ]; + + nativeBuildInputs = [ premake4 makeWrapper unzip ]; + + # tome4 vendors quite a few libraries so someone might want to look into avoiding that... buildInputs = [ mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; + + enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ]; - preConfigure = '' + + postPatch = '' substituteInPlace premake4.lua \ --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \ --replace "/usr/include/GL" "/run/opengl-driver/include" + ''; + + preConfigure = '' premake4 gmake ''; + makeFlags = [ "config=release" ]; + + # The wrapper needs to cd into the correct directory as tome4's detection of + # the game asset root directory is faulty. + installPhase = '' - install -Dm755 t-engine $out/opt/tome4/t-engine - cat > tome4 <<EOF -#!/bin/sh -cd $out/opt/tome4 -./t-engine & -EOF - install -Dm755 tome4 $out/bin/tome4 - cp -r bootstrap $out/opt/tome4 - cp -r game $out/opt/tome4 + runHook preInstall + + dir=$out/share/${pname} + + install -Dm755 t-engine $dir/t-engine + cp -r bootstrap game $dir + makeWrapper $dir/t-engine $out/bin/${pname} \ + --run "cd $dir" + + install -Dm755 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --subst-var out + + unzip -oj -qq game/engines/te4-${version}.teae data/gfx/te4-icon.png + install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/${pname}.png + + install -Dm644 -t $out/share/doc/${pname} CONTRIBUTING COPYING COPYING-MEDIA CREDITS + + runHook postInstall ''; + meta = with stdenv.lib; { - homepage = https://te4.org/; description = "Tales of Maj'eyal (rogue-like game)"; - maintainers = [ maintainers.chattered ]; + homepage = https://te4.org/; license = licenses.gpl3; + maintainers = with maintainers; [ chattered peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix index 95d49dd63759..9fd2dc97d980 100644 --- a/pkgs/games/wesnoth/dev.nix +++ b/pkgs/games/wesnoth/dev.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre +, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl , enableTools ? false }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.13.8"; + version = "1.13.11"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr"; + sha256 = "168732lmdnskca9hrkmaz4mi0bssc5ppklln10s306cbsl93bd39"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre ]; + libvorbis fribidi dbus libpng pcre openssl ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 8262eea48b43..3cc7869eb0a7 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, scons, libX11, pkgconfig -, libusb1, boost, glib, dbus_glib }: +, libusb1, boost, glib, dbus-glib }: let version = "0.8.8"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons libX11 libusb1 boost glib dbus_glib]; + buildInputs = [ scons libX11 libusb1 boost glib dbus-glib]; meta = with stdenv.lib; { homepage = https://pingus.seul.org/~grumbel/xboxdrv/; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 2eebe089de32..db1de37da962 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }: stdenv.mkDerivation rec { - name = "citra-2018-01-24"; + name = "citra-2018-02-23"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "33b0b5163fdb08bc8aa1d7eb83e0931a14ed3046"; - sha256 = "07z32d8lj84yy3l5iqpk37mnmvzjmppqhyqr64kbx14dh5hb6cbj"; + rev = "e51a642a13b9c2eda43d875fe318f627e11d480f"; + sha256 = "0cw9cqbljc87rjyr2alfryp04mxpvd5mdlyrmnp9yis3xr8g9sa1"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 3e7b033b5788..a919d21626b6 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -3,7 +3,7 @@ , libXmu , lua , agg, alsaLib, soundtouch, openal -, desktop_file_utils +, desktop-file-utils , gtk2, gtkglext, libglade, pangox_compat , mesa_glu, libpcap, SDL, zziplib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch - openal desktop_file_utils gtk2 gtkglext libglade pangox_compat + openal desktop-file-utils gtk2 gtkglext libglade pangox_compat mesa_glu libpcap SDL zziplib ]; configureFlags = [ diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index ce8f8e030e30..70cf32d54cc2 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}: stdenv.mkDerivation { - name = "fceux-2.2.2"; + name = "fceux-2.2.3"; src = fetchurl { - url = mirror://sourceforge/fceultra/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz; - sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0"; + url = mirror://sourceforge/fceultra/Source%20Code/2.2.3%20src/fceux-2.2.3.src.tar.gz; + sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index ef4485ef33fa..fb00696b0670 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu -, makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas +, makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix new file mode 100644 index 000000000000..140149bde495 --- /dev/null +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchgit, cmake, pkgconfig +, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev +, pulseaudioSupport ? true, libpulseaudio +, waylandSupport ? true, wayland +, alsaSupport ? true, alsaLib +}: + +stdenv.mkDerivation rec { + name = "rpcs3-${version}"; + version = "2018-02-23"; + + src = fetchgit { + url = "https://github.com/RPCS3/rpcs3"; + rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb"; + sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x"; + }; + + cmakeFlags = [ + "-DUSE_SYSTEM_LIBPNG=ON" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_NATIVE_INSTRUCTIONS=OFF" + ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qtbase openal glew llvm_4 vulkan-loader libpng ffmpeg libevdev + ] ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional alsaSupport alsaLib + ++ lib.optional waylandSupport wayland; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "PS3 emulator/debugger"; + homepage = "https://rpcs3.net/"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index a0dac519a0b8..c2486b7ebe4b 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -8,7 +8,7 @@ , libXScrnSaver , libXxf86misc , gtk3 -, dbus_glib +, dbus-glib , systemd , wrapGAppsHook }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which xfce.xfce4_dev_tools glib systemd - libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ]; + libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 9d63e9c3aafc..7eee7ca3121a 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inkscape libxml2 glib.dev - gnome3.gnome_shell + gnome3.gnome-shell ]; buildInputs = [ diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix index f8437f6d681d..58001183bd9e 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnome3.glib libxml2 ]; - buildInputs = [ gnome3.gnome_themes_standard gdk_pixbuf librsvg ]; + buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7cf6e6b596ed..b98dcf7fe2a8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -492,11 +492,11 @@ rec { }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2017-04-30"; + name = "vim-nix-2018-02-25"; src = fetchgit { url = "https://github.com/LnL7/vim-nix"; - rev = "867488a04c2ddc47f0f235f37599a06472fea299"; - sha256 = "1mwc06z9q45cigyxd0r9qnfs4ph6lbcwx50rf5lmpavakcn3vqir"; + rev = "36c5feb514930e8fb8e2f4567d6b0d9e806fc2eb"; + sha256 = "1v0vm0h5j6zzwhm5gw3xcmckswma3a5kxyli34i8hy14yli0ff3d"; }; dependencies = []; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index ff32ca01a97f..88e8a9665586 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20171113"; + version = "20180112"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "11gcnk6wjc2sw05hwi4xphvx9ksmkpvsdziaczymqxkaads3f1dy"; + sha256 = "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/os-specific/linux/blktrace/default.nix index 886aa503abbb..4ae449c19aa8 100644 --- a/pkgs/os-specific/linux/blktrace/default.nix +++ b/pkgs/os-specific/linux/blktrace/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libaio }: stdenv.mkDerivation { - name = "blktrace-1.1.0"; + name = "blktrace-1.2.0"; # Official source # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { - url = "http://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2"; - sha256 = "15cj9aki7z5i5y6bnchqry6yp40r4lmgmam6ar5gslnx0smgm8jl"; + url = "http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.bz2"; + sha256 = "0i9z7ayh9qx4wi0ihyz15bhr1c9aknjl8v5i8c9mx3rhyy41i5i6"; }; buildInputs = [ libaio ]; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 6ef5476f8e83..d77539fb89ed 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cachefilesd-${version}"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { url = "https://people.redhat.com/dhowells/fscache/${name}.tar.bz2"; - sha256 = "1jkb3qd8rcmli3g2qgcpp1f9kklil4qgy86w7pg2cpv10ikyr5y8"; + sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd"; }; installFlags = [ diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 76f9d8c128c3..534e57354474 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dmtcp-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "dmtcp"; repo = "dmtcp"; rev = version; - sha256 = "1z6cc7avs2sj8csf7rapf7nbw0giva6xpj0cshv7p9s643y8yxmi"; + sha256 = "1sq38in4wk855yhfnzbs9xpnps97fhja93w08xjmx7szzm33g5a8"; }; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index aad4f5f61df9..646c18860c5d 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, gtk_doc, pkgconfig, gobjectIntrospection, intltool -, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib_networking +{ stdenv, fetchurl, fetchpatch, gtk-doc, pkgconfig, gobjectIntrospection, intltool +, libgudev, polkit, appstream-glib, gusb, sqlite, libarchive, glib-networking , libsoup, help2man, gpgme, libxslt, elfutils, libsmbios, efivar, glibcLocales , fwupdate, libyaml, valgrind, meson, libuuid, colord, docbook_xml_dtd_43, docbook_xsl -, ninja, gcab, gnutls, python3, wrapGAppsHook, json_glib -, shared_mime_info, umockdev +, ninja, gcab, gnutls, python3, wrapGAppsHook, json-glib +, shared-mime-info, umockdev }: let # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc @@ -20,12 +20,12 @@ in stdenv.mkDerivation { outputs = [ "out" "devdoc" "man" "installedTests" ]; nativeBuildInputs = [ - meson ninja gtk_doc pkgconfig gobjectIntrospection intltool glibcLocales shared_mime_info + meson ninja gtk-doc pkgconfig gobjectIntrospection intltool glibcLocales shared-mime-info valgrind gcab docbook_xml_dtd_43 docbook_xsl help2man libxslt python wrapGAppsHook ]; buildInputs = [ polkit appstream-glib gusb sqlite libarchive libsoup elfutils libsmbios fwupdate libyaml - libgudev colord gpgme libuuid gnutls glib_networking efivar json_glib umockdev + libgudev colord gpgme libuuid gnutls glib-networking efivar json-glib umockdev ]; LC_ALL = "en_US.UTF-8"; # For po/make-images @@ -50,7 +50,7 @@ in stdenv.mkDerivation { doCheck = true; preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; mesonFlags = [ diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index cdcae22a18e9..f4c9c409ce2c 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake -, glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }: +, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }: stdenv.mkDerivation rec { name = "iio-sensor-proxy-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gtk_doc + gtk-doc libgudev systemd ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 3796ed7b037c..4c8ce4d4c371 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.21"; + version = "4.14.22"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vda6l61755wjbqjz3xbdkhgzzvd8lhnlliga3chfprxq348kpqr"; + sha256 = "1gkzc4cpdkcc43aivi3hd0vi7aw511wlxqb20ksw4wa9hn0zmqjc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index b2a55ba4b1ff..7abd2655c353 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.5"; + version = "4.15.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08l0m6pj690v6a0jjd7369zqkwnmgnm7k74g7s8sfwfxq0dsi2wj"; + sha256 = "144gd7f7qpzcwj0yyj75cdfj6b1a9vk8s6qc3pg61j10div2gvf8"; }; } // (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 6f6a39fcff27..92e887eb0914 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.117"; + version = "4.4.118"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s2d5vaa8wzfsamf9wkafk6nv46q7809j7x6a394sy39jq7lj3qj"; + sha256 = "14drszkabwin9fibs9gx67pf5l537ayyjappk70ynbrjxkxdq54q"; }; } // (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 473fa052bbd4..edbf4ad4d8f6 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.83"; + version = "4.9.84"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1csh557b9b0zsldlk1lalmy5wgn5rhk857fryn3v4nh8kj3y4mw9"; + sha256 = "1dqvmxy152zymfpvrpxrd85hs1481b814p84a5dbgs1cfs4nrf3c"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index e17e9045d6cd..cd7e86b3babb 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.5"; + version = "4.15.6"; revision = "a"; - sha256 = "082b5mwkklf111516qld980dqh4q7g1afb2y7mhc2in5pgkgqrws"; + sha256 = "11mj7bjmzbjwalvxq2wba33d1nymvjhr6j6bpgwwhhq6aqfg7zmh"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index c1049d78f42a..63d159e18842 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinux +{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux , mediaDir ? "/media/" , lockDir ? "/var/lock/pmount" , whiteList ? "/etc/pmount.allow" diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 1cdf9044b8ff..3698b2b281f9 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -3,7 +3,7 @@ , fetchurl , pciutils , confuse -, dbus, dbus_glib +, dbus, dbus-glib , alsaLib , audiofile , pkgconfig @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { dbus alsaLib audiofile - dbus_glib + dbus-glib pkgconfig gtk2 gettext diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 12b361e953ea..b120062295ad 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip -, gawk, utillinux, xorg, glib, dbus_glib, zlib +, gawk, utillinux, xorg, glib, dbus-glib, zlib , kernel ? null, libsOnly ? false , undmg, fetchurl }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { libPath = with xorg; stdenv.lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); + ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); installPhase = '' diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix new file mode 100644 index 000000000000..99b42fc74007 --- /dev/null +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: + +stdenv.mkDerivation rec { + name = "rtl8814au-${kernel.version}-${version}"; + version = "4.3.21"; + + src = fetchFromGitHub { + owner = "zebulon2"; + repo = "rtl8814au"; + rev = "a58c56a5a6cb99ffb872f07cb67b68197911854f"; + sha256 = "1ffm67da183nz009gm5v9w1bab081hrm113kk8knl9s5qbqnn13q"; + }; + + buildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" ]; + + NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "Realtek 8814AU USB WiFi driver"; + homepage = https://github.com/zebulon2/rtl8814au; + license = licenses.gpl2; + maintainers = [ maintainers.lassulus ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 8875d7ec4b3e..ca15571d1ede 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2 -, docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison +, docbook_xml_dtd_412, docbook_xsl, gnome-doc-utils, flex, bison , pam ? null, glibcCross ? null , buildPlatform, hostPlatform }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 - docbook_xml_dtd_412 docbook_xsl gnome_doc_utils flex bison + docbook_xml_dtd_412 docbook_xsl gnome-doc-utils flex bison ]; patches = diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9085b1703c0a..383e3c340e64 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -8,6 +8,7 @@ , ninja, meson, python3Packages, glibcLocales , patchelf , getent +, hostPlatform }: assert stdenv.isLinux; @@ -71,10 +72,10 @@ in "-Dsystem-gid-max=499" # "-Dtime-epoch=1" - (if stdenv.isArm then "-Dgnu-efi=false" else "-Dgnu-efi=true") - "-Defi-libdir=${gnu-efi}/lib" - "-Defi-includedir=${gnu-efi}/include/efi" - "-Defi-ldsdir=${gnu-efi}/lib" + (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" "-Dsysvinit-path=" "-Dsysvrcnd-path=" diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 8b3ebd46c325..131ec630f274 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus_glib, glib, confuse }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, udisks, dbus-glib, glib, confuse }: stdenv.mkDerivation { name = "udisks-glue-1.3.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ automake autoconf udisks dbus_glib glib confuse ]; + buildInputs = [ automake autoconf udisks dbus-glib glib confuse ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 98cb616e2d5c..aeb9deac89d2 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus_glib +{ stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib , polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm , libxslt, docbook_xsl, utillinux, libgudev }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ sg3_utils udev glib dbus dbus_glib polkit parted libgudev + [ sg3_utils udev glib dbus dbus-glib polkit parted libgudev lvm2 libatasmart intltool libuuid libxslt docbook_xsl ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index a265395f96e5..725b1cd25643 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gnused , expat, acl, systemd, glib, libatasmart, polkit , libxslt, docbook_xsl, utillinux, mdadm, libgudev +, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify"; }; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "dev" ]; patches = [ ./force-path.patch ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { --replace " sed " " ${gnused}/bin/sed " ''; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; buildInputs = [ libxslt docbook_xsl libgudev expat acl systemd glib libatasmart polkit ]; @@ -38,6 +39,11 @@ stdenv.mkDerivation rec { "--with-udevdir=$(out)/lib/udev" ]; + makeFlags = [ + "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0" + "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + ]; + meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index c46ed2d0c015..713ef974f9fb 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus_glib +{ stdenv, fetchurl, pkgconfig, glib, dbus-glib , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1 , useSystemd ? true, systemd, gobjectIntrospection }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ dbus_glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ] + [ dbus-glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index b88d96e02a44..8ed4735dd278 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, libxslt, pandoc, pkgconfig, - dbus_glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, + dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg, libgcrypt ? null, libsodium ? null }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus_glib + dbus-glib libcap_ng libqb libseccomp diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index c24780095dbe..ad8aeadeff06 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.10"; + version = "0.10.11"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1x7f1yz5vnsy9n50ak0vjrm4w8fqc1qvhv8fmqnsc8cgbp7f3p8w"; + sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6"; }; buildFlagsArray = '' diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index dc2f0f6fd709..145052ff8c3a 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "corosync-2.4.2"; + name = "corosync-2.4.3"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; - sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj"; + sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8df584435a2f..f83ef4cef388 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -4,13 +4,13 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "coturn-${version}"; - version = "4.5.0.6"; + version = "4.5.0.7"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = "${version}"; - sha256 = "084c3zgwmmz4s6211i5jbkzsn13703lsg7vhc2cpacazq4sgsrhb"; + sha256 = "1781fx8lqgc54j973xzgq9d7k3g2j03va82jb4217gd3a93pa65l"; }; buildInputs = [ openssl libevent ]; diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 044d4fa50ab2..ee139ea2652c 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { name = "dante-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://www.inet.no/dante/files/${name}.tar.gz"; - sha256 = "0lsg3hk8zd2h9f08s13bn4l4pvyyzkj4gr4ppwa7vj7gdyyk5lmn"; + sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms"; }; configureFlags = [ diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index c530929f79e4..8958daa1a70a 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.4"; + name = "dico-2.5"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "13m7vahfbdj7hb38bjgd4cmfswavvxrcpppj9n4m4rar3wyzg52g"; + sha256 = "0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index dcda4e8c0bb4..a233b6ba4cf8 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "diod-${version}"; - version = "1.0.23"; + version = "1.0.24"; src = fetchurl { url = "https://github.com/chaos/diod/releases/download/${version}/${name}.tar.gz"; - sha256 = "002vxc9fwdwshda4jydxagr63xd6nnhbc6fh73974gi2pvp6gid3"; + sha256 = "17wckwfsqj61yixz53nwkc35z66arb1x3napahpi64m7q68jn7gl"; }; buildInputs = [ munge lua libcap perl ncurses ]; diff --git a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch index b7e7bfc73bf9..8276c28c3f4b 100644 --- a/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch +++ b/pkgs/servers/dns/bind/darwin-openssl-linking-fix.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 6779cc3..4275520 100755 +index b9ad66b..a2a7382 100755 --- a/configure +++ b/configure -@@ -15707,21 +15707,6 @@ $as_echo "not found" >&6; } +@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; } *-hp-hpux*) DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" ;; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ea4d4f387d8f..c0176db15769 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.2-P1"; in +let version = "9.12.0"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"; + sha256 = "10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 91cae62b1715..5a934056d13d 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,40 +1,41 @@ diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index f354cfb..2aa0cc5 100644 +index 388dc97..3c6135c 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h -@@ -71,7 +71,9 @@ EXTERN const char * ns_g_version INIT(VERSION); - EXTERN const char * ns_g_product INIT(PRODUCT); - EXTERN const char * ns_g_description INIT(DESCRIPTION); - EXTERN const char * ns_g_srcid INIT(SRCID); +@@ -65,7 +65,9 @@ EXTERN const char * named_g_version INIT(VERSION); + EXTERN const char * named_g_product INIT(PRODUCT); + EXTERN const char * named_g_description INIT(DESCRIPTION); + EXTERN const char * named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char * ns_g_configargs INIT(CONFIGARGS); + EXTERN const char * named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char * ns_g_builder INIT(BUILDER); - EXTERN in_port_t ns_g_port INIT(0); - EXTERN isc_dscp_t ns_g_dscp INIT(-1); + EXTERN const char * named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/bin/named/main.c b/bin/named/main.c -index 556db54..edab41d 100644 +index 4fb0566..60d56cd 100644 --- a/bin/named/main.c +++ b/bin/named/main.c -@@ -636,8 +636,10 @@ parse_command_line(int argc, char *argv[]) { - (*ns_g_description != '\0') ? " " : "", - ns_g_description, ns_g_srcid); - printf("running on %s\n", ns_os_uname()); -+#if 0 +@@ -672,8 +672,10 @@ parse_command_line(int argc, char *argv[]) { + (*named_g_description != '\0') ? " " : "", + named_g_description, named_g_srcid); + printf("running on %s\n", named_os_uname()); ++ #if 0 printf("built by %s with %s\n", - ns_g_builder, ns_g_configargs); -+#endif + named_g_builder, named_g_configargs); ++ #endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else -@@ -998,8 +1000,10 @@ setup(void) { - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "running on %s", ns_os_uname()); +@@ -1075,9 +1077,11 @@ setup(void) { + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "running on %s", named_os_uname()); +#if 0 - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, "built with %s", ns_g_configargs); + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, + "built with %s", named_g_configargs); +#endif - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN, - ISC_LOG_NOTICE, + isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 05d53d444627..12c475bfc280 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.60.0"; + version = "3.2.70.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0yrbwq5dzzq5047vdpar4vkwzcgd9dj2v9basaw413hzncf2q8gj"; + sha256 = "051mbzh1igcbda43n14aijbvhhh98rqw8i13f06xqsm67afrjjcv"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 7670c89f0c6a..b01e94187898 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus_glib +{ fetchurl, stdenv, scons, pkgconfig, dbus, dbus-glib , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python2Packages.python dbus dbus_glib ncurses libX11 libXt libXpm libXaw libXext + python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext libxslt libusb1 ]; diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix new file mode 100644 index 000000000000..d5e410a86c1f --- /dev/null +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchurl, pyspf }: + +buildPythonApplication rec { + name = "pypolicyd-spf-${version}"; + majorVersion = "2.0"; + version = "${majorVersion}.2"; + + src = fetchurl { + url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "1nm8y1jjgx6mxrbcxrbdnmkf8vglwp0wiw6jipzh641wb24gi76z"; + }; + + propagatedBuildInputs = [ pyspf ]; + + preBuild = '' + substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" + ''; + + meta = with lib; { + homepage = https://launchpad.net/pypolicyd-spf/; + description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 2f102b58f141..6a65e8d03201 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "11.0"; + version = "11.1"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "0sf92knqkvqmfhrbz4vlsagzqlps72wycpmln5dygicg07a0a8q7"; + sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; }; patches = [ ./caps-fix.patch ] diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 046eb6cfca98..7125f9ef8e96 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation rec { - name = "mysql-connector-java-5.1.39"; + name = "mysql-connector-java-5.1.45"; builder = ./builder.sh; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; - sha256 = "0d0g51hfx7a2r6nbni8yramg4vpqk0sql0aaib6q576a0nnrq78r"; + sha256 = "1x3dygygj15p7zk825mqr0g80wlm3rfsqgbqnb11l133rk4s1ylw"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 4614a9768b05..b420c673850b 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { name = "uwsgi-${version}"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { url = "http://projects.unbit.it/downloads/${name}.tar.gz"; - sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp"; + sha256 = "1x61vipgzhzb6flbbgl0hq96j9d330gh0kmwv8pwh6n57j7z84d9"; }; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/matomo/bootstrap.php index a8163f33e5c0..a8163f33e5c0 100644 --- a/pkgs/servers/web-apps/piwik/bootstrap.php +++ b/pkgs/servers/web-apps/matomo/bootstrap.php diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix new file mode 100644 index 000000000000..c99b20a46bd5 --- /dev/null +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeWrapper, php }: + +stdenv.mkDerivation rec { + name = "matomo-${version}"; + version = "3.3.0"; + + src = fetchurl { + # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again + # url = "https://builds.matomo.org/${name}.tar.gz"; + url = "https://builds.matomo.org/piwik-${version}.tar.gz"; + sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # make-localhost-default-database-server.patch: + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + patches = [ ./make-localhost-default-database-host.patch ]; + + # this bootstrap.php adds support for getting PIWIK_USER_PATH + # from an environment variable. Point it to a mutable location + # to be able to use matomo read-only from the nix store + postPatch = '' + cp ${./bootstrap.php} bootstrap.php + ''; + + # TODO: future versions might rename the PIWIK_… variables to MATOMO_… + # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. + # See https://forum.matomo.org/t/bootstrap-php/5926/10 and + # https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843 + installPhase = '' + runHook preInstall + + # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed + mkdir -p $out/share + cp -ra * $out/share/ + # tmp/ is created by matomo in PIWIK_USER_PATH + rmdir $out/share/tmp + # config/ needs to be copied to PIWIK_USER_PATH anyway + mv $out/share/config $out/ + + makeWrapper ${php}/bin/php $out/bin/matomo-console \ + --add-flags "$out/share/console" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A real-time web analytics application"; + license = licenses.gpl3Plus; + homepage = https://matomo.org/; + platforms = platforms.all; + maintainers = [ maintainers.florianjacob ]; + }; +} diff --git a/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch new file mode 100644 index 000000000000..48808ac2ccca --- /dev/null +++ b/pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php +index 9364f49870..2625cbb91b 100644 +--- a/plugins/Installation/FormDatabaseSetup.php ++++ b/plugins/Installation/FormDatabaseSetup.php +@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2 + + // default values + $this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( +- 'host' => '127.0.0.1', ++ 'host' => 'localhost', + 'type' => $defaultDatabaseType, + 'tables_prefix' => 'matomo_', + ))); diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix deleted file mode 100644 index 697240e81c75..000000000000 --- a/pkgs/servers/web-apps/piwik/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, php }: - -stdenv.mkDerivation rec { - name = "piwik-${version}"; - version = "3.2.1"; - - src = fetchurl { - url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "1yisgywz7dm6kygh9mc207xnqpvdxbw4pa2l9gjh495a6979x3chi7z5rf410z4dmrg0kbj8wqm8mmmslfn276xvw37l2d4h73ij1h2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - # regarding the 127.0.0.1 substitute: - # This replaces the default value of the database server field. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - postPatch = '' - substituteInPlace plugins/Installation/FormDatabaseSetup.php \ - --replace "=> '127.0.0.1'," "=> 'localhost'," - cp ${./bootstrap.php} bootstrap.php - ''; - - # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. - # See https://forum.piwik.org/t/bootstrap-php/5926/10 and - # https://github.com/piwik/piwik/issues/11654#issuecomment-297730843 - installPhase = '' - runHook preInstall - - # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed - mkdir -p $out/share - cp -ra * $out/share/ - # tmp/ is created by piwik in PIWIK_USER_PATH - rmdir $out/share/tmp - # config/ needs to be copied to PIWIK_USER_PATH anyway - mv $out/share/config $out/ - - makeWrapper ${php}/bin/php $out/bin/piwik-console \ - --add-flags "$out/share/console" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "A real-time web analytics application"; - license = licenses.gpl3Plus; - homepage = https://piwik.org/; - platforms = platforms.all; - maintainers = [ maintainers.florianjacob ]; - }; -} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cc2cade8ba13..d22565ae8db9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,6 +1,6 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol +, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 1f3557dff66e..acf234a1683e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -230,7 +230,7 @@ print OUT ""; print OUT <<EOF; # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice_protocol +, libxslt, expat, libpng, zlib, perl, mesa_drivers, spice-protocol , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c6466598195e..18189ba2e68d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -390,7 +390,7 @@ in }; xf86videoqxl = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ args.spice_protocol ]; + buildInputs = attrs.buildInputs ++ [ args.spice-protocol ]; }; xf86videosiliconmotion = attrs: attrs // { diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 3cde8307cb02..cd27f69e5f4b 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,5 +1,5 @@ { stdenv, writeScriptBin, lib, fetchurl, git, cacert -, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps +, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd , withMysql ? false , withPgsql ? false , withSqlite ? false, sqlite @@ -23,17 +23,17 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "17.07"; + version = "18.01"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km"; + sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6"; }; nativeBuildInputs = [ fakegit ]; - buildInputs = [ erlang openssl expat libyaml ] + buildInputs = [ erlang openssl expat libyaml gd ] ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7"; + outputHash = "1v3h0c7kfifb6wsfxyv5j1wc7rlxbb7r0pgd4s340wiyxnllzzhk"; }; configureFlags = @@ -107,12 +107,12 @@ in stdenv.mkDerivation rec { $out/sbin/ejabberdctl ''; - meta = { + meta = with stdenv.lib; { description = "Open-source XMPP application server written in Erlang"; - license = lib.licenses.gpl2; + license = licenses.gpl2; homepage = http://www.ejabberd.im; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.sander lib.maintainers.abbradar ]; + platforms = platforms.linux; + maintainers = with maintainers; [ sander abbradar ]; broken = withElixir; }; } diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/antigen/default.nix index fc3759803f62..cf22207ef09c 100644 --- a/pkgs/shells/antigen/default.nix +++ b/pkgs/shells/antigen/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.2.2"; + version = "2.2.3"; name = "antigen-${version}"; src = fetchurl { url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh"; - sha256 = "0635dvnsqh7dpqdwx5qq3kx7m1cx2038zln6y9ycnbi3i0ilgj9z"; + sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; phases = "installPhase"; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index d5885193b9bc..42288e6245e4 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -135,6 +135,8 @@ let inherit overrides; inherit cc; + + isCross = targetPlatform != buildPlatform; } # Propagate any extra attributes. For instance, we use this to diff --git a/pkgs/test/openftd/default.nix b/pkgs/test/openftd/default.nix index 13b6b01f3259..a5b817de40e9 100644 --- a/pkgs/test/openftd/default.nix +++ b/pkgs/test/openftd/default.nix @@ -28,7 +28,7 @@ Heb je geen mozilla, maar heb je wel de firebird/firefox variant geinstalleerd s { stdenv, fetchurl , zlib, libxml2, libxslt, firefox, openssl, curl , glib, gtk, libgnomeui, libgtkhtml -, pkgconfig, dbus_glib, realCurl, pcre, libsexy, gtkspell, libnotify +, pkgconfig, dbus-glib, realCurl, pcre, libsexy, gtkspell, libnotify }: stdenv.mkDerivation { @@ -42,7 +42,7 @@ stdenv.mkDerivation { buildInputs = [ zlib libxml2 libxslt firefox openssl curl - glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml + glib gtk pkgconfig dbus-glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml ]; configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include"; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 71df4a1b5a55..394f3fe5b980 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp -, hicolor_icon_theme, librsvg, wrapGAppsHook, gobjectIntrospection +, hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; - sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; + sha256 = "1jl83z56c01ypvv98mxn74kpbv58yrccggp1rbmnw1dnvjxvjbic"; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { pythonPackages.wrapPython wrapGAppsHook ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] + buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 53a193749d3c..ffc7ee192c90 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex, dbus_libs }: +{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus_libs }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus_glib bluez openobex dbus_libs ]; + buildInputs = [ libusb glib dbus-glib bluez openobex dbus_libs ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d62f2c25623f..8223ba2be4bb 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify -, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs -, vcdimager, wrapGAppsHook, hicolor_icon_theme }: +, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs +, vcdimager, wrapGAppsHook, hicolor-icon-theme }: # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590 @@ -20,8 +20,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; - buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs - hicolor_icon_theme + buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs + hicolor-icon-theme 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 ]; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 31ce1a986fb0..db1e1dbfd857 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "advancecomp-${version}"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - sha256 = "1lvrcxcxbxac47j0ml11nikx38zan7bbr3dfjssm52r5v4cmh8j9"; + sha256 = "1pd6czamamrd0ppk5a3a65hcgdlqwja98aandhqiajhnibwldv8x"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 4d7ee75c0060..c558c9e8a320 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.12.6"; + version = "1.13.9"; name = "bindfs-${version}"; src = fetchurl { url = "http://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "0s90n1n4rvpcg51ixr5wx8ixml1xnc7w28xlbnms34v19pzghm59"; + sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 793a540d9bf3..09f004f28440 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "15izak6jg6pqr6ha9447cdrdj9k6kfiarvwlrj53cpvrsv02l437"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt zstd + nativeBuildInputs = [ + pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; + buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd ]; + # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally patchPhase = "sed -i s/-O1/-O2/ configure"; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index e415f57e707e..03da84f7c733 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { - sha256 = "0isx7n4r8znk02464s0wvlzk6ry5mlnq3kgnd0rapnhjwdvwqr5y"; + sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 8c53882ff1b2..a4d49edcb447 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "cfdg-${version}"; - version = "3.0.2"; + version = "3.0.9"; src = fetchurl { - sha256 = "1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; + sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl"; url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz"; }; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 7261326633a1..dc703cf02f75 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at_spi2_core, dbus, libdbusmenu-glib +, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake autoreconfHook gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon epoxy at_spi2_core + libXdmcp libxkbcommon epoxy at-spi2-core dbus libdbusmenu-glib ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index e9e2e29f7fad..2bd4bf1c878c 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor_icon_theme }: +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, librime, brise, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "fcitx-rime-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0bd8snfa6jr8dhnm0s0z021iryh5pbaf7p15rhkgbigw2pssczpr"; }; - buildInputs = [ cmake pkgconfig fcitx librime brise hicolor_icon_theme ]; + buildInputs = [ cmake pkgconfig fcitx librime brise hicolor-icon-theme ]; # cmake cannont automatically find our nonstandard brise install location cmakeFlags = [ "-DRIME_DATA_DIR=${brise}/share/rime-data" ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index f71a21b914f3..59ddab7294f5 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 -, gtk3, gtk_doc, isocodes, python3, json_glib, libnotify ? null, enablePythonLibrary ? true +, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { 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 - cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make . + cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog"; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gconf - gtk_doc + gtk-doc intltool makeWrapper pkgconfig @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 isocodes - json_glib + json-glib libnotify ] ++ optionals withWayland [ libxkbcommon diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index d41ba1e791f9..2b93274b79a2 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, makeWrapper, lndir -, dconf, hicolor_icon_theme, ibus, librsvg, plugins +, dconf, hicolor-icon-theme, ibus, librsvg, plugins }: let @@ -7,7 +7,7 @@ let env = { buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; - propagatedUserEnvPackages = [ hicolor_icon_theme ]; + propagatedUserEnvPackages = [ hicolor-icon-theme ]; paths = [ ibus ] ++ plugins; inherit (ibus) meta; }; @@ -37,7 +37,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" done for prog in ibus-daemon; do @@ -56,7 +56,7 @@ let --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --add-flags "--cache=refresh" done ''; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 6214bc216f8b..168a3f887728 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -2,14 +2,14 @@ let - version = "1.1.1"; + version = "1.2.0"; rev = "v${version}"; aptlySrc = fetchFromGitHub { inherit rev; owner = "smira"; repo = "aptly"; - sha256 = "197a7nh8li20slqxgn8s8xm13x5b8ansmabk8rx32sngb73hp4av"; + sha256 = "1acnkmgarz9rp0skkh7zzwkhisjlmbl74jqjmqd3mn42y528c34b"; }; aptlyCompletionSrc = fetchFromGitHub { diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 4d6e90a347e7..0808704ecb78 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -4,7 +4,7 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { name = "asciinema-${version}"; - version = "1.4.0"; + version = "2.0.0"; buildInputs = with pythonPackages; [ nose ]; propagatedBuildInputs = with pythonPackages; [ requests ]; @@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec { owner = "asciinema"; repo = "asciinema"; rev = "v${version}"; - sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2"; + sha256 = "1f92hv9w58jf1f7igspjxvrxqn3n21kgya2zb56spqyydr4jzwdk"; }; patchPhase = '' diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ba38a55dda02..4d3376108b7e 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, python, bash }: let - version = "22.5.0"; + version = "22.5.1"; in stdenv.mkDerivation rec { name = "autojump-${version}"; @@ -9,7 +9,7 @@ in src = fetchurl { url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "00ai0j37ka3557a8m7ig44dby7v01pckwi8gl479vz5b5pw1z8cd"; + sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn"; }; buildInputs = [ python bash ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 02caf6e33f99..75c7b258a449 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "autorevision-${version}"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; - sha256 = "1xlp7wn2vv17rp848ai272sifi6fmwdr6dg4im53hrf32j3gzlhy"; + sha256 = "07ssirjy2mgbqxr792n3rqa408hm7qnhwfjzd73rqfwvjcahy1q8"; }; buildInputs = [ diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 899fb5f643ab..a8b6d5f3c252 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "bandwidth-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd"; + sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; buildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 8dbcd08fba6e..6635f2931955 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -4,11 +4,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.5"; + name = "brltty-5.6"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; + sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 4598655092f3..15d8647ff823 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.15.0"; + version = "2.15.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "09mys14acjbrkvjy9zl2k521k3xcs6b0brg8zlhh8qadhbirfkp3"; + sha256 = "07kzfkv5ssys788j0f1bp73gd7b53vwv2jsxkd85zwb3kby1145v"; }; postConfigure = '' diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index e1024d70bce9..9449b7759a8c 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diskscan-${version}"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; rev = "${version}"; - sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; }; buildInputs = [ ncurses zlib ]; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 0d1c81c00a65..ed210783db19 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, tcl, makeWrapper }: stdenv.mkDerivation rec { - version = "5.45"; + version = "5.45.4"; name = "expect-${version}"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; + sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; }; buildInputs = [ tcl ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 71cfedcaec72..99c54b6d3964 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor-icon-theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor-icon-theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 40d122242ffc..9719ea6fe554 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-12-24"; + version = "0.4.6a-2018-02-20"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; - sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; + rev = "74f6c862c73a4d21e61832174f4ab2f1d7f8b12a"; + sha256 = "0p85y5adnlcs4cdi9dg6f5fzzc1y12bmfhx13qs0576izx2rma3q"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 6289c35f35a7..2116815ed0c3 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }: + libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: stdenv.mkDerivation { name = "mdbtools-git-2014-07-25"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib readline bison flex autoreconfHook which txt2man - gnome_doc_utils scrollkeeper libiconv + gnome-doc-utils scrollkeeper libiconv ]; preAutoreconf = '' diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 81d6d29b2bf2..52f685b22ca6 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: +{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; - buildInputs = [ file desktop_file_utils ]; + buildInputs = [ file desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.pyxdg ]; preConfigure = '' substituteInPlace Mimeo.py \ --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ - "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop-file-utils}/bin/update-desktop-database'" \ --replace "EXE_FILE = 'file'" \ "EXE_FILE = '${file}/bin/file'" ''; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a8332ad494da..3b220153f173 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse , libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: @@ -30,7 +30,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig gtk_doc gobjectIntrospection which yacc + autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index cb55226109b4..37073daa699d 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor_icon_theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkgconfig , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ff86f5cbdf6..640e641dd477 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, - gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }: + gettext, glib, json-glib, libelf, pkgconfig, scons, sphinx, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = "scons config"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext glib json_glib libelf scons sphinx utillinux ]; + buildInputs = [ gettext glib json-glib libelf scons sphinx utillinux ]; buildPhase = "scons"; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index d6cad51ce753..8c2845dc8ebd 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils, + libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: let @@ -31,7 +31,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this acl diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix new file mode 100644 index 000000000000..a310135727db --- /dev/null +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: + +buildPythonApplication rec { + name = "scfbuild-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "scfbuild"; + rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; + sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -r scfbuild $out/${python.sitePackages} + cp -r bin $out + ''; + + meta = with lib; { + description = "SVGinOT color font builder"; + homepage = https://github.com/eosrei/scfbuild; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 11d61cfe30f3..90a17bdff704 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl -, libxml2, desktop_file_utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify -, gobjectIntrospection, libgnome_keyring3 +, libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify +, gobjectIntrospection, libgnome-keyring3 , cups-filters , pythonPackages , withGUI ? true @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils + libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils pythonPackages.python pythonPackages.wrapPython libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome_keyring3 + libgnome-keyring3 ]; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 8dfd73ef20cb..31b8d673a988 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor_icon_theme +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, hicolor-icon-theme , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # for gcc5: c11 inline semantics breaks the build NIX_CFLAGS_COMPILE = "-fgnu89-inline"; - buildInputs = [ gtk2 hicolor_icon_theme ]; + buildInputs = [ gtk2 hicolor-icon-theme ]; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index e3a147b20b17..7af7a8f551d1 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "assh-${version}"; - version = "2.6.0"; + version = "2.7.0"; goPackagePath = "github.com/moul/advanced-ssh-config"; subPackages = [ "cmd/assh" ]; @@ -18,7 +18,7 @@ buildGoPackage rec { repo = "advanced-ssh-config"; owner = "moul"; rev = "v${version}"; - sha256 = "1vv98dz5822k51xklnmky0lwfjw8nc6ryvn8lmv9n63ppwh9s2s6"; + sha256 = "0jfpcr8990lb7kacadbishdkz5l8spw24ksdlb79x34sdbbp3fm6"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index cfcd051f2816..128ebc155b56 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ writeText, stdenv, fetchurl, ncurses }: let version = "0.6.1"; @@ -13,6 +13,32 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; + # gcc7 has some issues with inline functions + patches = [ + (writeText "gcc7.patch" + '' + --- a/src/bwm-ng.c + +++ b/src/bwm-ng.c + @@ -27,5 +27,5 @@ + /* handle interrupt signal */ + void sigint(int sig) FUNCATTR_NORETURN; + -inline void init(void); + +static inline void init(void); + + /* clear stuff and exit */ + --- a/src/options.c + +++ b/src/options.c + @@ -35,5 +35,5 @@ + inline int str2output_type(char *optarg); + #endif + -inline int str2out_method(char *optarg); + +static inline int str2out_method(char *optarg); + inline int str2in_method(char *optarg); + + '') + ]; + + # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=gnu89" else null; diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 1282c72452f4..cb12300d51ea 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dnscrypt-wrapper-${version}"; - version = "0.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Cofyc"; repo = "dnscrypt-wrapper"; rev = "v${version}"; - sha256 = "0wnkgn0ajx1qmfyb264jvpqxlbravdcq4m485iaa3wjp82g8xlca"; + sha256 = "121y93sb06qc50fj7vv47r6dpzv77hh7ywl7sgrfp8i4jf4kaspa"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index fcbf5a4e1b2a..e008c9183c98 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, gnome2, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}: stdenv.mkDerivation rec { name = "gupnp-tools-${version}"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp_av + buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av gnome2.gnome_icon_theme makeWrapper]; postInstall = '' for program in gupnp-av-cp gupnp-universal-cp; do wrapProgram "$out/bin/$program" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" + --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" done ''; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index a59aee83b939..f6a750112870 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking +{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib-networking , asciidoc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ]; - buildInputs = [ glib glib_networking fuse curl ]; + buildInputs = [ glib glib-networking fuse curl ]; meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 131021704a22..c969119e1d76 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,60 +1,47 @@ -{ stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: - -let - # When overrides are not needed, then only remove the contents of this set. - packageOverrides = self: super: { - ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec { - version = "2.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac"; - }; - }); - pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { - version = "0.3.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965"; - }; - }); - }; +{ stdenv, fetchFromGitHub, python3Packages, glibcLocales }: - pythonPackages = (python3.override {inherit packageOverrides; }).pkgs; -in with pythonPackages; +with python3Packages; buildPythonPackage rec { - baseName = "mitmproxy"; - name = "${baseName}-unstable-2017-10-31"; + pname = "mitmproxy"; + version = "3.0.2"; src = fetchFromGitHub { - owner = baseName; - repo = baseName; - rev = "80a8eaa708ea31dd9c5e7e1ab6b02c69079039c0"; + owner = pname; + repo = pname; + rev = "v${version}"; sha256 = "0rvwm11yryzlp3c1i42rk2iv1m38yn6r83k41jb51hwg6wzbwzvw"; }; + postPatch = '' + # remove dependency constraints + sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py + ''; + checkPhase = '' export HOME=$(mktemp -d) + export LC_CTYPE=en_US.UTF-8 # test_echo resolves hostnames - LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' + pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; propagatedBuildInputs = [ blinker click certifi cryptography - h2 hyperframe - kaitaistruct passlib pyasn1 pyopenssl - pyparsing pyperclip requests ruamel_yaml tornado - urwid brotlipy sortedcontainers ldap3 + h2 hyperframe kaitaistruct passlib + pyasn1 pyopenssl pyparsing pyperclip + requests ruamel_yaml tornado urwid + brotlipy sortedcontainers ldap3 ]; buildInputs = [ - beautifulsoup4 flask pytest pytestrunner glibcLocales + beautifulsoup4 flask pytest + pytestrunner glibcLocales ]; meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = https://mitmproxy.org/; - license = licenses.mit; + homepage = https://mitmproxy.org/; + license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; } diff --git a/pkgs/tools/networking/mitmproxy/tornado-4.6.patch b/pkgs/tools/networking/mitmproxy/tornado-4.6.patch deleted file mode 100644 index 879b8a4c3794..000000000000 --- a/pkgs/tools/networking/mitmproxy/tornado-4.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mitmproxy-v2.0.2-src.org/setup.py 2017-08-28 07:31:51.727424688 +0100 -+++ mitmproxy-v2.0.2-src/setup.py 2017-08-28 07:35:55.608919302 +0100 -@@ -78,7 +78,7 @@ - "pyperclip>=1.5.22, <1.6", - "requests>=2.9.1, <3", - "ruamel.yaml>=0.13.2, <0.14", -- "tornado>=4.3, <4.5", -+ "tornado>=4.3, <4.6", - "urwid>=1.3.1, <1.4", - "watchdog>=0.8.3, <0.9", - "brotlipy>=0.5.1, <0.7", diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 36c56ac98477..f4631d39b010 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig +{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, intltool, pkgconfig , libmbim, libqmi, systemd }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi systemd ]; + buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; configureFlags = [ "--with-polkit" diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index f2c0bb13afe8..20bab09c2a76 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager -, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas +, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: stdenv.mkDerivation rec { @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ - gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas - polkit isocodes udev libgudev gnome3.libgnome_keyring - modemmanager jansson glib_networking + gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas + polkit isocodes udev libgudev gnome3.libgnome-keyring + modemmanager jansson glib-networking libindicator-gtk3 libappindicator-gtk3 ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ]; makeFlags = [ - ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; preInstall = '' diff --git a/pkgs/tools/networking/network-manager/0.9.8/default.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 0c791631daa4..c5613341aab1 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib +{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib , udev, libnl, libuuid, gnutls, dhcp , libgcrypt, perl, libgudev, avahi, ppp, kmod }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ udev libnl libuuid gnutls libgcrypt libgudev ]; - propagatedBuildInputs = [ dbus_glib ]; + propagatedBuildInputs = [ dbus-glib ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index b6201e308d9a..c04716019175 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib +{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; - propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; + propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ]; nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ]; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix index 864af033a399..5f1e0790b0b6 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf gnome3.networkmanagerapplet ]; nativeBuildInputs = [ automake autoconf intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix index 0cfc8bbba7db..9e6ba581a946 100644 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ b/pkgs/tools/networking/network-manager/iodine.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ iodine networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index b40afa605e3b..e5626dee1d4d 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ networkmanager ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring networkmanagerapplet ]; nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index e1a5f954986f..5a215529d831 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openconnect networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ]; + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.gconf ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 47dca561d6cb..49411f778456 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ openvpn networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 6cc8107f2c89..08f591b117e3 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ networkmanager pptp ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 365aec88a7d6..4fc9c904f5f9 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps -, gnome3, libgnome_keyring, libsecret }: +, gnome3, libgnome-keyring, libsecret }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ networkmanager strongswanNM libsecret ] - ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]); + ++ (with gnome3; [ gtk libgnome-keyring networkmanagerapplet ]); nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 44233b351290..8d69415313d9 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ vpnc networkmanager libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring + ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 2a72a530cab9..37f542319dad 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/share/man/man1" ''; + NIX_CFLAGS_COMPILE=" -Wno-error "; + meta = with stdenv.lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index 80bac726457b..02d3f2c29488 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11_kit, +{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11-kit, libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash, python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh, useSystemd ? true, systemd, swig @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370"; }; - propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ]; + propagatedBuildInputs = [ python softhsm openldap p11-kit.dev p11-kit.out gnupg ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ unbound unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ] diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index e50f208e95fe..f34b01fb484a 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xl2tpd-${version}"; - version = "1.3.10"; + version = "1.3.10.1"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "1z8a33hz82nla1342lfxdihssbhw9lzkgavdhl275im5byj8qgkg"; + sha256 = "0rz31bcjl7na89abn9bj5p3dbgqd6q6xsympzki15axxhyy57qan"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 152dc7dcc040..f75bf6bf1625 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixWebService-0.7"; + name = "DisnixWebService-0.8"; src = fetchurl { - url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz; - sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g"; + url = https://github.com/svanderburg/DisnixWebService/files/1756703/DisnixWebService-0.8.tar.gz; + sha256 = "05hmyz17rmqlph0i321kmhabnpw84kqz32lgc5cd4shxyzsal9hz"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 830c576c4062..03831f9b8b87 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.7.2"; + name = "disnix-0.8"; src = fetchurl { - url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.2/disnix-0.7.2.tar.gz; - sha256 = "1cgf7hgqrwsqgyc77sis0hr7cwgk3vx8cd4msgq11qbwywi3b6id"; + url = https://github.com/svanderburg/disnix/files/1756701/disnix-0.8.tar.gz; + sha256 = "02cmj1jqk5i90szjsn5csr7qb7n42v04rvl9syx0zi9sx9ldnb0w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 98d1802f881a..3604d011dec5 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.6.1"; + name = "disnixos-0.7"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.6.1/disnixos-0.6.1.tar.gz; - sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa"; + url = https://github.com/svanderburg/disnixos/files/1756702/disnixos-0.7.tar.gz; + sha256 = "1qf9h3q1r27vg1ry55lj01knq6i0c213f6vlg7wj958mml7fk37b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 042d2c314b19..ab0ce5d75216 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.7.1"; + name = "dysnomia-0.8"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/files/1576949/dysnomia-0.7.1.tar.gz; - sha256 = "0fyyn6654p10mrm2rlgv017d74wjb8z9h2xzv8gwdly34kifj9dh"; + url = https://github.com/svanderburg/dysnomia/files/1756700/dysnomia-0.8.tar.gz; + sha256 = "0pc4zwmmlsz02a6a4srpwdwhqrfvn3wkn22sz3fg7lwxbdbd5k0z"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e8eb3050c6d3..06696a41324c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -30,7 +30,7 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 - ++ lib.optional (stdenv.isLinux && !hostPlatform.isRiscV) libseccomp + ++ lib.optional (hostPlatform.isSeccomputable) libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; @@ -57,7 +57,7 @@ let hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system ) ''--with-system=${hostPlatform.nix.system}'' # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 - ++ lib.optional hostPlatform.isRiscV "--disable-seccomp-sandboxing"; + ++ lib.optional (!hostPlatform.isSeccomputable) "--disable-seccomp-sandboxing"; makeFlags = "profiledir=$(out)/etc/profile.d"; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 4f027560547f..cdc035072daf 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite, systemd -, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive +, gobjectIntrospection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; - nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index edebd95303a9..af1bb14d02a1 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.10"; + version = "2.0.11"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "0clkalw2wz2zs0p5hsq57iqp2bdp7y17zf5l2d0y7xfddff9sd82"; + sha256 = "0d6rpkka27a57nv69yiw71jj3m6axdj5hygsz36dznnn8w76vvyv"; }; postInstall = '' diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 727fc1ccb8ee..effdaaecb18a 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool -, libfprint, glib, dbus_glib, polkit, nss, pam, systemd }: +, libfprint, glib, dbus-glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { name = "fprintd-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5"; }; - buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ]; + buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; nativeBuildInputs = [ pkgconfig intltool ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ]; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 51fff4c59ec1..7f6f28593d20 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs -, glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg +, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs - gtk3 libgnome_keyring gnome3.libgee xorg.libSM xorg.libICE + gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook ]; patches = [ ./makefile-mkdir.patch ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index c221a46d5f96..ee62ef3782ae 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.40"; + version = "1.0.42"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "05x0h87dinl8zaqikr1sx38bv1n6ymxqp440b384d8y76w66rphi"; + sha256 = "0vjwyg542hiswcs89csh2vbkfyixlzk3zswjn7x7d1pifrckys0r"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index e41ca6f05014..9bd3f3726729 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,34 +1,39 @@ -{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: +{ stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: let securityDependency = if stdenv.isDarwin then xmlsec else pam; -in -stdenv.mkDerivation rec { + +in stdenv.mkDerivation rec { name = "oath-toolkit-2.6.2"; - src = fetchgit { - url = "https://gitlab.com/oath-toolkit/oath-toolkit.git"; - sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; + src = fetchFromGitLab { + owner = "oath-toolkit"; + repo = "oath-toolkit"; rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; + sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; }; - buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ]; + buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; + + nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ]; + + # man file generation fails when true + enableParallelBuilding = false; configureFlags = [ "--disable-pskc" ]; - preConfigure = '' - # Replicate the steps from cfg.mk - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc - touch ChangeLog - autoreconf --force --install + # Replicate the steps from cfg.mk + preAutoreconf = '' + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc + touch ChangeLog ''; - meta = { - homepage = http://www.nongnu.org/oath-toolkit/; + meta = with stdenv.lib; { description = "Components for building one-time password authentication systems"; - platforms = with stdenv.lib.platforms; linux ++ darwin; + homepage = http://www.nongnu.org/oath-toolkit/; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index c551a8161aa2..ac00c1fd5443 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { patches = lib.optionals (gtk2 != null) [ (fetchpatch { url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch; - sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx"; + sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; }) ]; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 87c9fc59a5bd..8d520f90c652 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite -, hicolor_icon_theme, libdigidocpp, opensc, shared_mime_info, openldap -, gettext, desktop_file_utils, makeWrapper }: +, hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap +, gettext, desktop-file-utils, makeWrapper }: stdenv.mkDerivation rec { @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ccid qttools pcsclite qttranslations - hicolor_icon_theme libdigidocpp opensc shared_mime_info - openldap gettext desktop_file_utils makeWrapper + hicolor-icon-theme libdigidocpp opensc shared-mime-info + openldap gettext desktop-file-utils makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix index f99a9b6e5565..0c6d15e7d776 100644 --- a/pkgs/tools/security/qesteidutil/default.nix +++ b/pkgs/tools/security/qesteidutil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch , cmake, ccid, qttools, qttranslations -, pkgconfig, pcsclite, hicolor_icon_theme +, pkgconfig, pcsclite, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ccid qttools pcsclite qttranslations - hicolor_icon_theme + hicolor-icon-theme ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index dee99586c318..e664c0ef8e2c 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-template-${version}"; - version = "0.18.1"; + version = "0.19.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul-template"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "consul-template"; - sha256 = "0swyhc5smjbp5wql43qhpxrcbg47v89l5icb1s60gszhxizlkk7d"; + sha256 = "06agjzpax45gw7s9b69cz9w523nx7ksikqcg0z0vipwrp7pwrydd"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index f6b9863d1bec..1067e524788b 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "daemonize-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz"; - sha256 = "01gabcc8m4jkymd31p6v5883ii3g7126cici6rd03maf4jizxjmk"; + sha256 = "0q2c3i3si3k7wfhl6fyckkmkc81yp67pz52p3ggis79p4nczri10"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index eca3977f459f..8ffa85a5084a 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, getopt, libcap }: stdenv.mkDerivation rec { - version = "1.20.2"; + version = "1.22"; name = "fakeroot-${version}"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2"; - sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw"; + sha256 = "1zn67sp066q63vx95r671v0ki878i40a2wa57pmh64k43r56m05x"; }; patches = stdenv.lib.optional stdenv.isLinux ./einval.patch diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 5de03199fa51..2bcab1c36b27 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "fcron-${version}"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { url = "http://fcron.free.fr/archives/${name}.src.tar.gz"; - sha256 = "0sjz7r050myj6zgixzx3pk5ff819v6b0zfn0q1lkd19jkaix0531"; + sha256 = "0q5b1fdq1rpsd4lj7v717x47pmn62hhm13394g0yxqi614xd7sls"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/system/gptfdisk/cross-makefile.patch b/pkgs/tools/system/gptfdisk/cross-makefile.patch new file mode 100644 index 000000000000..0b87de0a17a0 --- /dev/null +++ b/pkgs/tools/system/gptfdisk/cross-makefile.patch @@ -0,0 +1,20 @@ +commit a5381e8aaa67647a4ba0fb41b951125ae309b078 +Author: Shea Levy <shea@shealevy.com> +Date: Sat Feb 24 08:35:54 2018 -0500 + + Makefile: Don't hard-code CC and CXX. + + These variables should be provided by the Make implementation and the + build environment. In particular, this fixes cross-compilation of + gptfdisk. + +diff --git a/Makefile b/Makefile +index a3576b3..d76fab4 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,3 @@ +-CC=gcc +-CXX=g++ + CFLAGS+=-D_FILE_OFFSET_BITS=64 + #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 + CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index f9fba2dde91d..4d7bcc365660 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -10,8 +10,10 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; sha256 = "0p0vr67lnqdsgdv2y144xmjqa1a2nijrrd3clc8dc2f46pn5mzc9"; }; + # https://sourceforge.net/p/gptfdisk/code/merge-requests/9/ + patches = [ ./cross-makefile.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.mac --replace \ "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6" substituteInPlace Makefile.mac --replace \ diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index ef92bdfe47e0..c90c67c77372 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; rev = name; - sha256 = "1wiv289lc5kxsd3ydyn1zvvgjrj1mv2jghv0cm425wsdsfr7fjb0"; + sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s"; }; nativeBuildInputs = [ pkgconfig autoreconfHook yacc ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 397ba053841d..a629e493c929 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.11.1"; + version = "3.13.2"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "1sa51bh3rs4gq4zpgkyv94lqcx3qvxa41d2dsa7hyxidkp1rs2b4"; + sha256 = "1s6kg91sb8h2w4n60v22zis6pl2rggarpjjp00c81039jggk2gcs"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 67dd3588b007..1300a6a87655 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus-glib, libxml2 }: stdenv.mkDerivation rec { name = "thermald-${version}"; - version = "1.6"; + version = "1.7.1"; src = fetchFromGitHub { owner = "01org"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3"; + sha256 = "0y0r8zcaxcnim3axc7kh5pm4py33pgv5mwh002cbrw6h90l2qzq1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus_libs dbus_glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus_libs dbus-glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8da6bcef4957..06da21813ae3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -34,6 +34,8 @@ mapAliases (rec { ammonite-repl = ammonite; # added 2017-05-02 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 + at_spi2_atk = at-spi2-atk; # added 2018-02-25 + at_spi2_core = at-spi2-core; # added 2018-02-25 bar = lemonbar; # added 2015-01-16 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 @@ -44,47 +46,63 @@ mapAliases (rec { cifs_utils = cifs-utils; # added 2016-08 clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 + clutter_gtk = clutter-gtk; # added 2018-02-25 conkerorWrapper = conkeror; # added 2015-01 cool-old-term = cool-retro-term; # added 2015-01-31 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cv = progress; # added 2015-09-06 + dbus_glib = dbus-glib; # added 2018-02-25 + deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 debian_devscripts = debian-devscripts; # added 2016-03-23 + desktop_file_utils = desktop-file-utils; # added 2018-02-25 digikam5 = digikam; # added 2017-02-18 double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 dwbWrapper = dwb; # added 2015-01 enblendenfuse = enblend-enfuse; # 2015-09-30 + evolution_data_server = evolution-data-server; # added 2018-02-25 exfat-utils = exfat; # 2015-09-11 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 + font-awesome-ttf = font-awesome_4; # 2018-02-25 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 gettextWithExpat = gettext; # 2016-02-19 gdb-multitarget = gdb; # added 2017-11-13 git-hub = gitAndTools.git-hub; # added 2016-04-29 + glib_networking = glib-networking; # added 2018-02-25 go-pup = pup; # added 2017-12-19 googleAuthenticator = google-authenticator; # added 2016-10-16 + gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 + gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 + gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 gst_ffmpeg = gst-ffmpeg; # added 2017-02 gst_plugins_base = gst-plugins-base; # added 2017-02 gst_plugins_good = gst-plugins-good; # added 2017-02 gst_plugins_bad = gst-plugins-bad; # added 2017-02 gst_plugins_ugly = gst-plugins-ugly; # added 2017-02 gst_python = gst-python; # added 2017-02 + gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 guile_lib = guile-lib; # added 2017-09-24 guileLint = guile-lint; # added 2017-09-27 guile_ncurses = guile-ncurses; # added 2017-09-24 + gupnp_av = gupnp-av; # added 2018-02-25 + gupnp_dlna = gupnp-dlna; # added 2018-02-25 + gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 + hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 + json_glib = json-glib; # added 2018-02-25 jquery_ui = jquery-ui; # added 2014-09-07 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepassx2-http = keepassx-reboot; # added 2016-10-17 @@ -94,9 +112,13 @@ mapAliases (rec { krename-qt5 = krename; # added 2017-02-18 letsencrypt = certbot; # added 2016-05-16 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 + libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 + libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 + libgnome_keyring = libgnome-keyring; # added 2018-02-25 + libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient @@ -110,20 +132,30 @@ mapAliases (rec { m3d-linux = m33-linux; # added 2016-08-13 manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 + piwik = matomo; # added 2018-01-16 midoriWrapper = midori; # added 2015-01 minc_tools = minc-tools; # 2017-12 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 + mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 module_init_tools = kmod; # added 2016-04-22 mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 ncat = nmap; # added 2016-01-26 + networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 + networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 + networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 + networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 + networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 + networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 + networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nfsUtils = nfs-utils; # added 2014-12-06 opencl-icd = ocl-icd; # added 2017-01-20 openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 + p11_kit = p11-kit; # added 2018-02-25 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidgin-latex; # added 2014-11-02 @@ -160,16 +192,28 @@ mapAliases (rec { saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 scim = sc-im; # added 2016-01-22 + shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 skype = skypeforlinux; # added 2017-07-27 spaceOrbit = space-orbit; # addewd 2016-05-23 speedtest_cli = speedtest-cli; # added 2015-02-17 + spice_gtk = spice-gtk; # added 2018-02-25 + spice_protocol = spice-protocol; # added 2018-02-25 sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 + telepathy_farstream = telepathy-farstream; # added 2018-02-25 + telepathy_gabble = telepathy-gabble; # added 2018-02-25 + telepathy_glib = telepathy-glib; # added 2018-02-25 + telepathy_haze = telepathy-haze; # added 2018-02-25 + telepathy_idle = telepathy-idle; # added 2018-02-25 + telepathy_logger = telepathy-logger; # added 2018-02-25 + telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 + telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 + telepathy_salut = telepathy-salut; # added 2018-02-25 tftp_hpa = tftp-hpa; # added 2015-04-03 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70516d3c5333..3fa73015ca91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -644,6 +644,8 @@ with pkgs; glyr = callPackage ../tools/audio/glyr { }; + imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -1627,7 +1629,7 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome_common libgee; + inherit (gnome3) gnome-common libgee; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -1852,7 +1854,7 @@ with pkgs; pythonPackages = python2Packages; }; - desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; + desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; dfc = callPackage ../tools/system/dfc { }; @@ -2667,11 +2669,11 @@ with pkgs; inherit (gnome2) libsoup; }; - gupnp_av = callPackage ../development/libraries/gupnp-av {}; + gupnp-av = callPackage ../development/libraries/gupnp-av {}; - gupnp_dlna = callPackage ../development/libraries/gupnp-dlna {}; + gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; - gupnp_igd = callPackage ../development/libraries/gupnp-igd {}; + gupnp-igd = callPackage ../development/libraries/gupnp-igd {}; gupnp-tools = callPackage ../tools/networking/gupnp-tools {}; @@ -3063,7 +3065,9 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; - kexectools = callPackage ../os-specific/linux/kexectools { }; + kexectools = if hostPlatform.isKexecable + then callPackage ../os-specific/linux/kexectools { } + else null; keybase = callPackage ../tools/security/keybase { }; @@ -3700,9 +3704,11 @@ with pkgs; nbd = callPackage ../tools/networking/nbd { }; - nccl = callPackage ../development/libraries/science/math/nccl { - cudatoolkit = cudatoolkit8; - }; + inherit (callPackages ../development/libraries/science/math/nccl { }) + nccl_cudatoolkit8 + nccl_cudatoolkit9; + + nccl = nccl_cudatoolkit9; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -3759,19 +3765,19 @@ with pkgs; networkmanager = callPackage ../tools/networking/network-manager { }; - networkmanager_iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; + networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; - networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; + networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; - networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; + networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; - networkmanager_l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; + networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; - networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; - networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager-openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; + networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { }; networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; @@ -4472,7 +4478,7 @@ with pkgs; remmina = callPackage ../applications/networking/remote/remmina { adwaita-icon-theme = gnome3.adwaita-icon-theme; - gsettings_desktop_schemas = gnome3.gsettings_desktop_schemas; + gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; }; rename = callPackage ../tools/misc/rename { @@ -4620,6 +4626,8 @@ with pkgs; qtbase = qt4; qmake = qmake4Hook; }; + scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; + scrot = callPackage ../tools/graphics/scrot { }; scrypt = callPackage ../tools/security/scrypt { }; @@ -6302,22 +6310,30 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = - if stdenv.isDarwin then jre8 else + if stdenv.isArm || stdenv.isAarch64 then + oraclejre8 + else if stdenv.isDarwin then + jre8 + else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk9 = openjdk9 // { outputs = [ "out" ]; }; - jre9 = lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" + jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; }; + jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk9.jre // { outputs = [ "jre" ]; })); jre9_headless = - if stdenv.isDarwin then jre9 else + if stdenv.isArm || stdenv.isAarch64 then + oraclejre9 + else if stdenv.isDarwin then + jre9 + else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}-headless" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk9.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); @@ -6648,7 +6664,6 @@ with pkgs; sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; - scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; @@ -7699,7 +7714,7 @@ with pkgs; global = callPackage ../development/tools/misc/global { }; - gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; + gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; @@ -7735,7 +7750,7 @@ with pkgs; grail = callPackage ../development/libraries/grail { }; - gtk_doc = callPackage ../development/tools/documentation/gtk-doc { }; + gtk-doc = callPackage ../development/tools/documentation/gtk-doc { }; gtkdialog = callPackage ../development/tools/misc/gtkdialog { }; @@ -8278,9 +8293,9 @@ with pkgs; attr = callPackage ../development/libraries/attr { }; - at_spi2_core = callPackage ../development/libraries/at-spi2-core { }; + at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; - at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { }; + at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { }; aqbanking = callPackage ../development/libraries/aqbanking { }; @@ -8420,7 +8435,7 @@ with pkgs; clutter-gst = callPackage ../development/libraries/clutter-gst { }; - clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; + clutter-gtk = callPackage ../development/libraries/clutter-gtk { }; cminpack = callPackage ../development/libraries/cminpack { }; @@ -8496,7 +8511,7 @@ with pkgs; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; - dbus_glib = callPackage ../development/libraries/dbus-glib { }; + dbus-glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; @@ -8820,12 +8835,13 @@ with pkgs; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc = callPackage ../development/libraries/glibc { + glibc_2_26 = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; }; glibc_2_27 = callPackage ../development/libraries/glibc/2.27.nix { installLocales = config.glibc.locales or false; }; + glibc = if hostPlatform.isRiscV then glibc_2_27 else glibc_2_26; glibc_memusage = callPackage ../development/libraries/glibc { installLocales = false; @@ -8924,6 +8940,7 @@ with pkgs; }; goocanvas = callPackage ../development/libraries/goocanvas { }; + goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; google-gflags = callPackage ../development/libraries/google-gflags { }; @@ -8993,7 +9010,9 @@ with pkgs; gnu-config = callPackage ../development/libraries/gnu-config { }; - gnu-efi = callPackage ../development/libraries/gnu-efi { }; + gnu-efi = if hostPlatform.isEfi + then callPackage ../development/libraries/gnu-efi { } + else null; gnutls = callPackage (if stdenv.isDarwin @@ -9048,7 +9067,7 @@ with pkgs; }; glibmm = callPackage ../development/libraries/glibmm { }; - glib_networking = callPackage ../development/libraries/glib-networking {}; + glib-networking = callPackage ../development/libraries/glib-networking {}; ace = callPackage ../development/libraries/ace { }; @@ -9211,16 +9230,20 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; - icu58 = callPackage ../development/libraries/icu/58.nix + icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) { + nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - icu59 = callPackage ../development/libraries/icu/59.nix - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + icu59 = callPackage ../development/libraries/icu/59.nix { + nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - icu60 = callPackage ../development/libraries/icu/60.nix - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + icu60 = callPackage ../development/libraries/icu/60.nix { + nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -9291,7 +9314,7 @@ with pkgs; jshon = callPackage ../development/tools/parsing/jshon { }; - json_glib = callPackage ../development/libraries/json-glib { }; + json-glib = callPackage ../development/libraries/json-glib { }; json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable json_c = callPackage ../development/libraries/json-c { }; @@ -9442,12 +9465,12 @@ with pkgs; }; libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; }; - libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; + libcanberra-gtk3 = pkgs.libcanberra.override { gtk = pkgs.gtk3; }; + libcanberra-gtk2 = pkgs.libcanberra-gtk3.override { gtk = pkgs.gtk2; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) then pkgs.libcanberra - else pkgs.libcanberra_gtk2; + else pkgs.libcanberra-gtk2; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -9625,8 +9648,8 @@ with pkgs; libgig = callPackage ../development/libraries/libgig { }; - libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome_keyring3 = gnome3.libgnome_keyring; + libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; + libgnome-keyring3 = gnome3.libgnome-keyring; libglvnd = callPackage ../development/libraries/libglvnd { }; @@ -9636,7 +9659,9 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; - libseccomp = callPackage ../development/libraries/libseccomp { }; + libseccomp = if hostPlatform.isSeccomputable + then callPackage ../development/libraries/libseccomp { } + else null; libsecret = callPackage ../development/libraries/libsecret { }; @@ -9708,6 +9733,11 @@ with pkgs; libgpgerror = callPackage ../development/libraries/libgpg-error { }; + # https://github.com/gpg/libgpg-error/blob/70058cd9f944d620764e57c838209afae8a58c78/README#L118-L140 + libgpgerror-gen-posix-lock-obj = libgpgerror.override { + genPosixLockObjOnly = true; + }; + libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; libgpod = callPackage ../development/libraries/libgpod { @@ -10598,10 +10628,13 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; - cudatoolkit = cudatoolkit8; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; + opencv3WithoutCuda = opencv3.override { + enableCuda = false; + }; + # this ctl version is needed by openexr_viewers openexr_ctl = ctl; @@ -10682,7 +10715,7 @@ with pkgs; osinfo-db = callPackage ../data/misc/osinfo-db { }; osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; - p11_kit = callPackage ../development/libraries/p11-kit { }; + p11-kit = callPackage ../development/libraries/p11-kit { }; paperkey = callPackage ../tools/security/paperkey { }; @@ -11277,9 +11310,9 @@ with pkgs; inherit (pythonPackages) pyparsing; }; - spice_gtk = callPackage ../development/libraries/spice-gtk { }; + spice-gtk = callPackage ../development/libraries/spice-gtk { }; - spice_protocol = callPackage ../development/libraries/spice-protocol { }; + spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; @@ -11379,11 +11412,11 @@ with pkgs; tectonic = callPackage ../tools/typesetting/tectonic { }; - telepathy_glib = callPackage ../development/libraries/telepathy/glib { }; + telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; - telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {}; + telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy_qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; + telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; tevent = callPackage ../development/libraries/tevent { python = python2; @@ -12484,6 +12517,8 @@ with pkgs; pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; + pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; }; @@ -12636,7 +12671,7 @@ with pkgs; shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - piwik = callPackage ../servers/web-apps/piwik { }; + matomo = callPackage ../servers/web-apps/matomo { }; axis2 = callPackage ../servers/http/tomcat/axis2 { }; @@ -12671,7 +12706,7 @@ with pkgs; xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig - libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind + libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool mtdev pixman cairo epoxy; @@ -13253,6 +13288,8 @@ with pkgs; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/module.nix { }; @@ -13983,7 +14020,6 @@ with pkgs; emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; encode-sans = callPackage ../data/fonts/encode-sans { }; @@ -13999,7 +14035,8 @@ with pkgs; fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome-ttf = callPackage ../data/fonts/font-awesome-ttf { }; + font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { }; + font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -14017,7 +14054,7 @@ with pkgs; gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - inherit (gnome3) gsettings_desktop_schemas; + inherit (gnome3) gsettings-desktop-schemas; go-font = callPackage ../data/fonts/go-font { }; @@ -14027,7 +14064,7 @@ with pkgs; helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; + hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; hanazono = callPackage ../data/fonts/hanazono { }; @@ -14116,7 +14153,7 @@ with pkgs; media-player-info = callPackage ../data/misc/media-player-info {}; - mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; monoid = callPackage ../data/fonts/monoid { }; @@ -14197,7 +14234,7 @@ with pkgs; mime-types = callPackage ../data/misc/mime-types { }; - shared_mime_info = callPackage ../data/misc/shared-mime-info { }; + shared-mime-info = callPackage ../data/misc/shared-mime-info { }; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; @@ -14297,7 +14334,6 @@ with pkgs; twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; tzdata = callPackage ../data/misc/tzdata { }; @@ -14521,12 +14557,10 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - avidemux_unwrapped = callPackage ../applications/video/avidemux { - libva = libva-full; # also wants libva-x11 + avidemux = libsForQt5.callPackage ../applications/video/avidemux { + libva = libva-full; }; - avidemux = callPackage ../applications/video/avidemux/wrapper.nix { }; - avogadro = callPackage ../applications/science/chemistry/avogadro { eigen = eigen2; }; @@ -14749,7 +14783,7 @@ with pkgs; cinelerra = callPackage ../applications/video/cinelerra { }; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { - inherit (gnome3) gsettings_desktop_schemas; + inherit (gnome3) gsettings-desktop-schemas; inherit (xorg) libSM; enableNetworkManager = config.networking.networkmanager.enable or false; }; @@ -14863,7 +14897,10 @@ with pkgs; pulseSupport = config.pulseaudio or true; }; - deadbeef-mpris2-plugin = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + deadbeefPlugins = { + mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + opus = callPackage ../applications/audio/deadbeef/plugins/opus.nix { }; + }; deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix { plugins = []; @@ -15251,7 +15288,7 @@ with pkgs; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; - evolution_data_server = gnome3.evolution_data_server; + evolution-data-server = gnome3.evolution-data-server; keepass = callPackage ../applications/misc/keepass { buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; @@ -16230,7 +16267,7 @@ with pkgs; liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) libpeas gsettings_desktop_schemas dconf; + inherit (gnome3) libpeas gsettings-desktop-schemas dconf; }; lightworks = callPackage ../applications/video/lightworks { @@ -16769,7 +16806,7 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { - inherit (gnome3) yelp_tools; + inherit (gnome3) yelp-tools; }; osm2xmap = callPackage ../applications/misc/osm2xmap { @@ -16925,7 +16962,7 @@ with pkgs; pinfo = callPackage ../applications/misc/pinfo { }; pinpoint = callPackage ../applications/office/pinpoint { - inherit (gnome3) clutter clutter_gtk; + inherit (gnome3) clutter clutter-gtk; }; pinta = callPackage ../applications/graphics/pinta { @@ -17187,6 +17224,8 @@ with pkgs; rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { @@ -17524,8 +17563,6 @@ with pkgs; syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; - syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; # linux only by now @@ -17570,17 +17607,17 @@ with pkgs; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; - telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; + telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; - telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; + telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; - telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; + telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {}; - telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; + telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + telepathy-salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; - telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -17591,7 +17628,7 @@ with pkgs; }; lxterminal = callPackage ../applications/misc/lxterminal { - vte = gnome2.vte; + vte = gnome3.vte; }; deepin-terminal = callPackage ../applications/misc/deepin-terminal { @@ -17837,7 +17874,6 @@ with pkgs; virtmanager = callPackage ../applications/virtualization/virt-manager { vte = gnome3.vte; dconf = gnome3.dconf; - spice_gtk = spice_gtk; system-libvirt = libvirt; }; @@ -18331,7 +18367,7 @@ with pkgs; roxterm = callPackage ../applications/misc/roxterm { inherit (pythonPackages) lockfile; - inherit (gnome3) gsettings_desktop_schemas vte; + inherit (gnome3) gsettings-desktop-schemas vte; }; xtrace = callPackage ../tools/X11/xtrace { }; @@ -18543,7 +18579,7 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) kcalcore; - opencv3 = opencv3.override { enableContrib = true; }; + opencv3 = opencv3WithoutCuda; }; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; @@ -19158,10 +19194,10 @@ with pkgs; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra_gtk2 + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 # Included for backwards compatibility - libsoup libwnck gtk_doc gnome_doc_utils; + libsoup libwnck gtk-doc gnome-doc-utils; gtk = self.gtk2; gtkmm = self.gtkmm2; @@ -19227,7 +19263,7 @@ with pkgs; gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; - gnome_themes_standard = gnome3.gnome_themes_standard; + gnome-themes-standard = gnome3.gnome-themes-standard; numix-gtk-theme = callPackage ../misc/themes/numix { }; @@ -19253,7 +19289,7 @@ with pkgs; mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gconf gsettings_desktop_schemas; + inherit (gnome3) gconf gsettings-desktop-schemas; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); @@ -19706,6 +19742,8 @@ with pkgs; 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; }; caffe2 = callPackage ../development/libraries/science/math/caffe2 { @@ -19713,14 +19751,16 @@ with pkgs; inherit (python3Packages) python future six numpy pydot; protobuf = protobuf3_1; python-protobuf = python3Packages.protobuf3_1; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; cntk = callPackage ../applications/science/math/cntk rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; inherit (linuxPackages) nvidia_x11; - cudatoolkit = cudatoolkit8; - cudnn = cudnn6_cudatoolkit8; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; ecm = callPackage ../applications/science/math/ecm { }; @@ -20700,6 +20740,10 @@ with pkgs; iterm2 = callPackage ../applications/misc/iterm2 {}; + sequeler = callPackage ../applications/misc/sequeler { + inherit (gnome3) gtksourceview libgda libgee; + }; + sequelpro = callPackage ../applications/misc/sequelpro {}; maphosts = callPackage ../tools/networking/maphosts {}; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d80c43b03f52..a589ceb7e0c9 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -9,7 +9,7 @@ , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl -, fetchFromGitHub, libmpack, which, fetchpatch +, fetchFromGitHub, libmpack, which, fetchpatch, writeText }: let @@ -35,7 +35,9 @@ let getLuaCPath = lib : getPath lib "so"; #define build lua package function - buildLuaPackage = callPackage ../development/lua-modules/generic lua; + buildLuaPackage = callPackage ../development/lua-modules/generic { + inherit lua writeText; + }; luarocks = callPackage ../development/tools/misc/luarocks { inherit lua; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8223fa698f18..fb5b46fa6600 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4848,10 +4848,10 @@ let self = _self // overrides; _self = with self; { }; Encode = buildPerlPackage rec { - name = "Encode-2.96"; + name = "Encode-2.97"; src = fetchurl { url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz"; - sha256 = "5dcb19fa5e62c6ca9294f28e9f4676f36477b1025f7e0dca92479633334b3cb1"; + sha256 = "044d2fc743bdf5ce4509a0e717a7adb31d488dafae63fde794f57a9f47b2ecb7"; }; meta = { description = "Character encodings in Perl"; @@ -7476,16 +7476,16 @@ let self = _self // overrides; _self = with self; { ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-${version}"; - version = "10.60"; + version = "10.80"; src = fetchurl { - url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1ymcnxf8miw0c1nadpxmvzabmaz837afrwp1k5khhv0s1vv8h2fz"; + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; + sha256 = "14rwr5wk2snqv4yva6fax1gfsdv88941n237m0wyzn3n0xh9dy5w"; }; meta = with stdenv.lib; { description = "ExifTool, a tool to read, write and edit EXIF meta information"; - homepage = http://www.sno.phy.queensu.ca/~phil/exiftool/; + homepage = https://www.sno.phy.queensu.ca/~phil/exiftool/; longDescription = '' ExifTool is a platform-independent Perl library plus a command-line @@ -11035,7 +11035,7 @@ let self = _self // overrides; _self = with self; { # tests fail; look unfinished doCheck = false; meta = { - homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; + homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 4f653cebebcb..39044b9ccacd 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.10.2"; + version = "2.10.3"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1h089zddza2n5cznq340ijvc34d1ffsja9ks0b67nax52w0197mi"; + sha256 = "0ir72sns8baz825dkvffr5rx1f261phhbc6d9v0ncc4xkhr5zjnh"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd03189b4725..0e4837ba325f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -279,6 +279,8 @@ in { Pmw = callPackage ../development/python-modules/Pmw { }; + py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + pyaes = callPackage ../development/python-modules/pyaes { }; pyamf = callPackage ../development/python-modules/pyamf { }; @@ -2205,6 +2207,7 @@ in { postPatch = '' cd bindings/python + sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py ''; postInstall = '' @@ -2213,6 +2216,12 @@ in { # It's not installed for some reason. cp cntk/cntk_py.py $out/${python.sitePackages}/cntk ''; + + # Actual tests are broken. + checkPhase = '' + cd $NIX_BUILD_TOP + ${python.interpreter} -c "import cntk" + ''; }; celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; @@ -4876,32 +4885,7 @@ in { }; }; - grip = buildPythonPackage rec { - version = "4.3.2"; - name = "grip-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "joeyespo"; - repo = "grip"; - rev = "v${version}"; - sha256 = "05a169sfaj280k7gibbc1rznjn43l5m6l1gpl6a5cmp5r8827khs"; - }; - buildInputs = with self; [ pytest responses ]; - - propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests ]; - - checkPhase = '' - export PATH="$PATH:$out/bin" - py.test -xm "not assumption" - ''; - - meta = with stdenv.lib; { - description = "Preview GitHub Markdown files like Readme locally before committing them"; - homepage = https://github.com/joeyespo/grip; - license = licenses.mit; - maintainers = with maintainers; [ koral ]; - }; - }; + grip = callPackage ../development/python-modules/grip { }; gst-python = callPackage ../development/python-modules/gst-python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; @@ -6124,74 +6108,12 @@ in { }; }; - python-axolotl = buildPythonPackage rec { - name = "python-axolotl-${version}"; - version = "0.1.39"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; - sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; - }; - - propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; - # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) - doCheck = false; - - meta = { - homepage = "https://github.com/tgalal/python-axolotl"; - description = "Python port of libaxolotl-android"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl3; - platforms = platforms.all; - }; - }; - - python-axolotl-curve25519 = buildPythonPackage rec { - name = "python-axolotl-curve25519-${version}"; - version = "0.1"; + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; - sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; - }; - - meta = { - homepage = "https://github.com/tgalal/python-axolotl-curve25519"; - description = "Curve25519 with ed25519 signatures"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl3; - platforms = platforms.all; - }; - }; + python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); - pypolicyd-spf = buildPythonPackage rec { - name = "pypolicyd-spf-${version}"; - majorVersion = "2.0"; - version = "${majorVersion}.1"; - disabled = !isPy3k; - - src = pkgs.fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; - sha256 = "09yi8y7pij5vzzrkc9sdw01x8w5n758d0qg7wv5hxd1l6if8c94i"; - }; - - propagatedBuildInputs = with self; [ pyspf ]; - - preBuild = '' - substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" - ''; - - meta = { - homepage = "https://launchpad.net/pypolicyd-spf/"; - description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.asl20; - platforms = platforms.all; - }; - }; - pyramid = buildPythonPackage rec { pname = "pyramid"; version = "1.9.1"; @@ -6338,25 +6260,7 @@ in { pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - pyspf = buildPythonPackage rec { - name = "pyspf-${version}"; - version = "2.0.12"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; - sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; - }; - - propagatedBuildInputs = with self; [ pydns ]; - - meta = { - homepage = "http://bmsi.com/python/milter.html"; - description = "Python API for Sendmail Milters (SPF)"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl2; - platforms = platforms.all; - }; - }; + pyspf = callPackage ../development/python-modules/pyspf { }; pysrt = callPackage ../development/python-modules/pysrt { }; @@ -6492,23 +6396,7 @@ in { doCheck = false; }; - sarge = buildPythonPackage rec { - name = "sarge-${version}"; - version = "0.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sarge/${name}.tar.gz"; - sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; - }; - - meta = { - homepage = "http://sarge.readthedocs.org/"; - description = "A wrapper for subprocess which provides command pipeline functionality"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + sarge = callPackage ../development/python-modules/sarge { }; subliminal = callPackage ../development/python-modules/subliminal {}; @@ -6616,53 +6504,7 @@ in { }; }; - scandir = self.buildPythonPackage rec { - name = "scandir-${version}"; - version = "1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scandir/${name}.tar.gz"; - sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d"; - }; - - meta = with stdenv.lib; { - description = "A better directory iterator and faster os.walk()"; - homepage = "https://github.com/benhoyt/scandir"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - scfbuild = self.buildPythonPackage rec { - name = "scfbuild-${version}"; - version = "1.0.3"; - - disabled = isPy3k; - - src = pkgs.fetchFromGitHub { - owner = "eosrei"; - repo = "scfbuild"; - rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; - sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - propagatedBuildInputs = with self; [ pyyaml fonttools fontforge ]; - - installPhase = '' - mkdir -p $out/${python.sitePackages} - cp -r scfbuild $out/${python.sitePackages} - cp -r bin $out - ''; - - meta = with stdenv.lib; { - description = "SVGinOT color font builder"; - homepage = "https://github.com/eosrei/scfbuild"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; + scandir = callPackage ../development/python-modules/scandir { }; schedule = buildPythonPackage rec { name = "schedule-0.3.2"; @@ -7507,25 +7349,7 @@ in { }; }; - enum-compat = buildPythonPackage rec { - pname = "enum-compat"; - version = "0.0.2"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; - }; - - propagatedBuildInputs = with self; [ enum34 ]; - - meta = { - homepage = "https://github.com/jstasiak/enum-compat"; - description = "enum/enum34 compatibility package"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - }; - }; + enum-compat = callPackage ../development/python-modules/enum-compat { }; enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec { pname = "enum34"; @@ -7794,24 +7618,7 @@ in { flask = callPackage ../development/python-modules/flask { }; - flask_assets = buildPythonPackage rec { - name = "Flask-Assets-${version}"; - version = "0.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; - sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; - }; - - propagatedBuildInputs = with self; [ flask webassets flask_script nose ]; - - meta = { - homepage = "http://github.com/miracle2k/flask-assets"; - description = "Asset management for Flask, to compress and merge CSS and Javascript files"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; - }; - }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask_cache = buildPythonPackage rec { name = "Flask-Cache-0.13.1"; @@ -7852,25 +7659,7 @@ in { flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; - flask_principal = buildPythonPackage rec { - name = "Flask-Principal-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; - sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; - }; - - propagatedBuildInputs = with self; [ flask blinker nose ]; - - meta = { - homepage = "http://packages.python.org/Flask-Principal/"; - description = "Identity management for flask"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; @@ -7878,26 +7667,7 @@ in { flask-restplus = callPackage ../development/python-modules/flask-restplus { }; - flask_script = buildPythonPackage rec { - name = "Flask-Script-${version}"; - version = "2.0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Script/${name}.tar.gz"; - sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; - }; - - nativeBuildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ flask ]; - - meta = { - homepage = "http://github.com/smurfix/flask-script"; - description = "Scripting support for Flask"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + flask_script = callPackage ../development/python-modules/flask-script { }; flask_sqlalchemy = buildPythonPackage rec { name = "Flask-SQLAlchemy-${version}"; @@ -9308,6 +9078,8 @@ in { jupyterhub = callPackage ../development/python-modules/jupyterhub { }; + jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + jsonpath_rw = buildPythonPackage rec { name = "jsonpath-rw-${version}"; version = "1.4.0"; @@ -9430,23 +9202,7 @@ in { pylast = callPackage ../development/python-modules/pylast/default.nix { }; - pylru = buildPythonPackage rec { - name = "pylru-${version}"; - version = "1.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pylru/${name}.tar.gz"; - sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; - }; - - meta = { - homepage = "https://github.com/jlhutch/pylru"; - description = "A least recently used (LRU) cache implementation"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + pylru = callPackage ../development/python-modules/pylru/default.nix { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; @@ -11216,7 +10972,7 @@ in { ''; nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; + buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus-glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -16384,24 +16140,7 @@ in { }; }; - sockjs-tornado = buildPythonPackage rec { - name = "sockjs-tornado-${version}"; - version = "1.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; - }; - - propagatedBuildInputs = with self; [ tornado ]; - - meta = { - homepage = "http://github.com/mrjoes/sockjs-tornado/"; - description = "SockJS python server implementation on top of Tornado framework"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - }; - }; + sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; sorl_thumbnail = buildPythonPackage rec { name = "sorl-thumbnail-11.12"; @@ -17737,31 +17476,7 @@ in { }; }; - virtkey = buildPythonPackage rec { - name = "virtkey-${version}"; - majorVersion = "0.63"; - version = "${majorVersion}.0"; - - src = pkgs.fetchurl { - url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; - sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - - buildInputs = - [ pkgs.gtk2 ] - ++ (with pkgs.xorg; [ libX11 libXtst libXi libxkbfile xextproto xproto ]); - - meta = { - description = "Extension to emulate keypresses and to get the layout information from the X server"; - homepage = "https://launchpad.net/virtkey"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = buildPythonPackage rec { name = "PyVirtualDisplay-0.1.5"; @@ -17936,32 +17651,7 @@ EOF waitress-django = callPackage ../development/python-modules/waitress-django { }; - webassets = buildPythonPackage rec { - name = "webassets-${version}"; - version = "0.12.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; - }; - - buildInputs = with self; [ nose jinja2 mock pytest ]; - propagatedBuildInputs = with self; [ pyyaml ]; - - doCheck = false; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = "http://github.com/miracle2k/webassets/"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + webassets = callPackage ../development/python-modules/webassets { }; webcolors = callPackage ../development/python-modules/webcolors { }; |