diff options
Diffstat (limited to 'nixpkgs/pkgs/applications')
174 files changed, 2316 insertions, 5650 deletions
diff --git a/nixpkgs/pkgs/applications/altcoins/freicoin.nix b/nixpkgs/pkgs/applications/altcoins/freicoin.nix index 1e9192bc6e40..78ce074eafd3 100644 --- a/nixpkgs/pkgs/applications/altcoins/freicoin.nix +++ b/nixpkgs/pkgs/applications/altcoins/freicoin.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h"; }; + enableParallelBuilding = false; + qmakeFlags = ["USE_UPNP=-"]; # I think that openssl and zlib are required, but come through other diff --git a/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix b/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix index d3b20ef2ea36..f5efa0bb52c2 100644 --- a/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix +++ b/nixpkgs/pkgs/applications/altcoins/particl/particl-core.nix @@ -17,11 +17,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.17.0.2"; + version = "0.17.1.2"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "0bkxdayl0jrfhgz8qzqqpwzv0yavz3nwsn6c8k003jnbcw65fkhx"; + sha256 = "16hcyxwp6yrypwvxz6i2987z3jmpk47xcgnsgh9klih8baqg64p5"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/audio/audacity/default.nix b/nixpkgs/pkgs/applications/audio/audacity/default.nix index fc32eb799cf9..3b12ffe3463f 100644 --- a/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.3.1"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0pi7ksm8hfvwbn580z4kkc55sbaylrrr7v08s04dmdgfvil7y4ip"; + sha256 = "089kz6hgqg0caz33sps19wpkfnza5gf7brdq2p9y6bnwkipw1w9f"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 0b7adefb3056..065dd01c8626 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.4.3"; + version = "2.5"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "17754y4ni0zj9vjxl8ldivi33gdb0nk6sdlcmlpskgffrlx8di08"; + sha256 = "1zkiz36lhck3qvl0cp0dq6pwbv4lx4sh9wh0ga92kx5zhvbjm098"; }; runtimeDependencies = [ diff --git a/nixpkgs/pkgs/applications/audio/cmus/default.nix b/nixpkgs/pkgs/applications/audio/cmus/default.nix index 9f69e305f249..b574993338de 100644 --- a/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -8,6 +8,7 @@ , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsaOss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null +, mprisSupport ? stdenv.isLinux, systemd ? null # TODO: add these #, artsSupport @@ -60,6 +61,7 @@ let (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate) (mkFlag ossSupport "CONFIG_OSS=y" alsaOss) (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio) + (mkFlag mprisSupport "CONFIG_MPRIS=y" systemd) #(mkFlag artsSupport "CONFIG_ARTS=y") #(mkFlag roarSupport "CONFIG_ROAR=y") diff --git a/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix index e9415335388e..e97341acbb44 100644 --- a/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,44 +1,45 @@ { stdenv, csound, desktop-file-utils, fetchFromGitHub, python, python-qt, qmake, - qtwebengine, rtmidi, unzip }: + qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }: stdenv.mkDerivation rec { name = "csound-qt-${version}"; - version = "0.9.6-beta2"; + version = "0.9.6-beta3"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; rev = "${version}"; - sha256 = "12jv7cvns3wj2npha0mvpn88kkkfsxsvhgzs2wrw04kbrvbhbffi"; + sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; }; - patches = [ ./rtmidipath.patch ]; + patches = [ + (fetchpatch { + name = "examplepath.patch"; + url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff"; + sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm"; + }) + ./rtmidipath.patch + ]; - nativeBuildInputs = [ qmake qtwebengine ]; + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ]; - buildInputs = [ csound desktop-file-utils rtmidi unzip ]; + buildInputs = [ csound desktop-file-utils rtmidi ]; qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" "CONFIG+=pythonqt" + "CONFIG+=record_support" "CONFIG+=html_webengine" "CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_LIBRARY_DIR=${csound}/lib" "RTMIDI_DIR=${rtmidi.src}" - "PYTHONQT_SRC_DIR=${python-qt}/lib" + "PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt" "PYTHONQT_LIB_DIR=${python-qt}/lib" - "LIBS+=${python-qt}/lib/libPythonQt-Qt5-Python2.7.so" - "LIBS+=${python-qt}/lib/libPythonQt_QtAll-Qt5-Python2.7.so" + "LIBS+=-L${python-qt}/lib" "INCLUDEPATH+=${python-qt}/include/PythonQt" "INCLUDEPATH+=${python}/include/python2.7" - "INSTALL_DIR=$(out)" - "SHARE_DIR=$(out)/share" + "INSTALL_DIR=${placeholder "out"}" + "SHARE_DIR=${placeholder "out"}/share" ]; - installPhase = '' - mkdir -p $out - cp -r bin $out - make install - ''; - meta = with stdenv.lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; homepage = https://csoundqt.github.io/; diff --git a/nixpkgs/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/nixpkgs/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch index f9522adb4b32..4cbab8a128fc 100644 --- a/nixpkgs/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch +++ b/nixpkgs/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch @@ -3,15 +3,15 @@ index e5e0c896..9a9fa513 100644 --- a/src/src.pri +++ b/src/src.pri @@ -155,9 +155,9 @@ pythonqt { - "src/pyqcsobject.cpp" - } - rtmidi { -- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h" -- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp" -- INCLUDEPATH += src/../$${RTMIDI_DIR} -+ HEADERS += "$${RTMIDI_DIR}/RtMidi.h" -+ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp" -+ INCLUDEPATH += $${RTMIDI_DIR} - } - - perfThread_build { + "src/pyqcsobject.cpp" + } + rtmidi { +- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h" +- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp" +- INCLUDEPATH += src/../$${RTMIDI_DIR} ++ HEADERS += "$${RTMIDI_DIR}/RtMidi.h" ++ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp" ++ INCLUDEPATH += $${RTMIDI_DIR} + } + + perfThread_build { diff --git a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix index fd5cc4a416e2..49ecf670f324 100644 --- a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "02j10khl3wd17z0wfs3crr55wv7h9f0qhhg90xg0kvrxvw83vzy9"; + sha256 = "1azzwqgrrr4zr509sib2jvigfvz5bkwnx82chdadxdwfarai8586"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/nixpkgs/pkgs/applications/audio/freewheeling/default.nix b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix index 4266b8c69bb8..efb832ae625f 100644 --- a/nixpkgs/pkgs/applications/audio/freewheeling/default.nix +++ b/nixpkgs/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "1xflbbnjdibjmyxb1zq8liylaw5k03nnl1z3272jh204pqh17ri9"; + sha256 = "1gjii2kndffj9iqici4vb9zrkrdqj1hs9q43x7jv48wv9872z78r"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix new file mode 100644 index 000000000000..3310bfdf3f03 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "parlatype"; + version = "1.6-beta"; + + src = fetchFromGitHub { + owner = "gkarsay"; + repo = pname; + rev = "v${version}"; + sha256 = "0bi0djic9kf178s7vl3y83v4rzhvynlvyf64n94fy80n2f100dj9"; + }; + + nativeBuildInputs = [ + pkgconfig + meson + ninja + gettext + appstream-glib + python3 + gobject-introspection + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.gtk + at-spi2-core + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + sphinxbase + pocketsphinx + glib + gsettings-desktop-schemas + hicolor-icon-theme + ]; + + mesonFlags = [ "-Dlibreoffice=false" ]; + + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + ''; + + doCheck = false; + enableParallelBuilding = true; + + buildPhase = '' + export GST_PLUGIN_SYSTEM_PATH_1_0="$out/lib/gstreamer-1.0/:$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with stdenv.lib; { + description = "GNOME audio player for transcription"; + longDescription = '' + Parlatype is a minimal audio player for manual speech transcription, written for the GNOME desktop environment. + It plays audio sources to transcribe them in your favourite text application. + It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files. + ''; + homepage = https://gkarsay.github.io/parlatype/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.melchips ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 4d9b856499aa..ce2979a5e530 100644 --- a/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -2,11 +2,12 @@ , libcanberra-gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - name = "pavucontrol-3.0"; + pname = "pavucontrol"; + version = "4.0"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; - sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; + url = "https://freedesktop.org/software/pulseaudio/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g"; }; preFixup = '' @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar jgeerds ]; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/audio/picard/default.nix b/nixpkgs/pkgs/applications/audio/picard/default.nix index 421c9eaac372..1ecb8be09ddf 100644 --- a/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5"; + sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj"; }; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/applications/audio/pithos/default.nix b/nixpkgs/pkgs/applications/audio/pithos/default.nix index c7bb1a4193f9..f2c798d1e6e7 100644 --- a/nixpkgs/pkgs/applications/audio/pithos/default.nix +++ b/nixpkgs/pkgs/applications/audio/pithos/default.nix @@ -35,6 +35,6 @@ pythonPackages.buildPythonApplication rec { description = "Pandora Internet Radio player for GNOME"; homepage = https://pithos.github.io/; license = licenses.gpl3; - maintainers = with maintainers; [ obadz jgeerds ]; + maintainers = with maintainers; [ obadz ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index 736f5c9f6744..ff38d4b16f50 100644 --- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.4.7"; + version = "4.5.5"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "14sxwy3mayzn9k5hy58mjzhxaj4wqxvs257xaj03mwvm48k7c7ia"; + sha256 = "0ll85c9xll2i42r1bdgbnxi5mc5jq2vxgp179jj2iq7wczq5psj1"; }; nativeBuildInputs = [ @@ -74,8 +74,8 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base # gst-fft + gst_all_1.gst-plugins-good # pulsesrc gst_all_1.gst-plugins-bad lilv lv2 serd sord sratom libbs2b diff --git a/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index 9ba225e8c58a..59bbceac7050 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "05xrzr48b19mghbpbzjqw5fy6pl9140bm5m929lrsi4rq5hp3xgg"; + sha256 = "1zsikhqj5xzhw2x3b6pqlmcwz3hxx07lbbif8v3m3j41snzjic22"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/sonata/default.nix b/nixpkgs/pkgs/applications/audio/sonata/default.nix index 4e24f1edf49a..5c22e3e77510 100644 --- a/nixpkgs/pkgs/applications/audio/sonata/default.nix +++ b/nixpkgs/pkgs/applications/audio/sonata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook +{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook , python3Packages, gnome3, gtk3, gobject-introspection}: let @@ -16,7 +16,7 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ intltool wrapGAppsHook gnome3.adwaita-icon-theme diff --git a/nixpkgs/pkgs/applications/audio/whipper/default.nix b/nixpkgs/pkgs/applications/audio/whipper/default.nix index 07ab9b55e5bd..382a1a8b2e21 100644 --- a/nixpkgs/pkgs/applications/audio/whipper/default.nix +++ b/nixpkgs/pkgs/applications/audio/whipper/default.nix @@ -44,7 +44,7 @@ python2.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/whipper-team/whipper; description = "A CD ripper aiming for accuracy over speed"; - maintainers = with maintainers; [ rycee jgeerds ]; + maintainers = with maintainers; [ rycee ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/backup/areca/default.nix b/nixpkgs/pkgs/applications/backup/areca/default.nix index 7a7f6f2ac496..a9647b11eeea 100644 --- a/nixpkgs/pkgs/applications/backup/areca/default.nix +++ b/nixpkgs/pkgs/applications/backup/areca/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { substituteInPlace bin/areca_run.sh --replace "/usr/java" "${jre}/lib/openjdk" substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" + # Fix for NixOS/nixpkgs/issues/53716 + sed -i -e 's;^;#include <attr/attributes.h>;' jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c + substituteInPlace jni/com_myJava_file_metadata_posix_jni_wrapper_FileAccessWrapper.c --replace attr/xattr.h sys/xattr.h + sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=$out/lib:${stdenv.lib.makeLibraryPath [ swt acl ]}#g" bin/areca_run.sh diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index a965ff4c8bb0..650bab334333 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb , glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox -, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala +, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala, fetchpatch , withQt4 ? false, qt4 , withQt5 ? false, qtbase }: @@ -49,7 +49,14 @@ stdenv.mkDerivation rec { ] ++ optional withQt4 qt4 ++ optional withQt5 qtbase; - patches = [ ./run-dir.patch ]; + patches = [ + ./run-dir.patch + # Adds option to disable writing dmrc files + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch"; + sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n"; + }) + ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; @@ -58,11 +65,12 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-static" + "--disable-dmrc" ] ++ optional withQt4 "--enable-liblightdm-qt" ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ - "sysconfdir=\${out}/etc" + "sysconfdir=${placeholder ''out''}/etc" "localstatedir=\${TMPDIR}" ]; @@ -76,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/CanonicalLtd/lightdm; - description = "A cross-desktop display manager."; + description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles worldofpeace ]; diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index a3e9554789c7..61db182f7446 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lightdm, pkgconfig, intltool , hicolor-icon-theme, makeWrapper , useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported -, exo +, exo, at-spi2-core }: #ToDo: bad icons with gtk2; @@ -26,13 +26,18 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" + "--disable-indicator-services-command" ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; + preConfigure = '' + configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) + ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; installFlags = [ "localstatedir=\${TMPDIR}" - "sysconfdir=\${out}/etc" + "sysconfdir=${placeholder "out"}/etc" ]; postInstall = '' diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index ed471f04d0c9..f3e5602a7996 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0smh3d3v8n0isxg7fkls20622gp52f58i2b6wa4a0g8wnvmd6mw2"; }; betaVersion = { - version = "3.4.0.14"; # "Android Studio 3.4 Beta 5" - build = "183.5310756"; - sha256Hash = "0np8600qvqpw9kcmgp04i1nak1339ck1iidkzr75kigp5rgdl2bq"; + version = "3.4.0.16"; # "Android Studio 3.4 RC 2" + build = "183.5370308"; + sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9"; }; latestVersion = { # canary & dev - version = "3.5.0.5"; # "Android Studio 3.5 Canary 6" - build = "183.5326993"; - sha256Hash = "06d43qw0p6zpy6vmriiihql5vgc6c4darplc2148y616hx0whrql"; + version = "3.5.0.6"; # "Android Studio 3.5 Canary 7" + build = "183.5346365"; + sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix index aed976051f20..34120db6aa70 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/cask/cask; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = [ maintainers.jgeerds ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/applications/editors/focuswriter/default.nix b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix index f656f874151a..ce553fa8b288 100644 --- a/nixpkgs/pkgs/applications/editors/focuswriter/default.nix +++ b/nixpkgs/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0ny0bri9yp6wcsj9s8vd0j4mzx44yw57axjx5piv44q2jgsgz401"; + sha256 = "1qsfcrscm3s0h7wcl6qn8zi0irr70zdacjxsdk73kpk1dhl2j85k"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 08a8b28117e7..c3d24b9776f6 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -175,7 +175,7 @@ let providing you almost everything you need for your comfortable and productive development! ''; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }).override { diff --git a/nixpkgs/pkgs/applications/editors/nano/default.nix b/nixpkgs/pkgs/applications/editors/nano/default.nix index 0e313d33736a..6bbdaf77a69b 100644 --- a/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -49,7 +49,6 @@ in stdenv.mkDerivation rec { description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ - jgeerds joachifm ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 9af60ca4fcbd..fa547875a175 100644 --- a/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem -, jdk, perl, python, unzip, which +{ stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick +, jdk, perl, python }: let + version = "10.0"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -10,13 +11,14 @@ let desktopName = "Netbeans IDE"; genericName = "Integrated Development Environment"; categories = "Application;Development;"; + icon = "netbeans"; }; in stdenv.mkDerivation { - name = "netbeans-8.2"; + name = "netbeans-${version}"; src = fetchurl { - url = https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; - sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; + url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip"; + sha512 = "ba83575f42c1d5515e2a5336a621bc2b4087b2e0bcacb6edb76f376f8272555609bdd4eefde8beae8ffc6c1a7db2fb721b844638ce27933c3dd78f71cbb41ad8"; }; buildCommand = '' @@ -26,23 +28,38 @@ stdenv.mkDerivation { # Copy to installation directory and create a wrapper capable of starting # it. - mkdir -p $out/bin + mkdir -pv $out/bin cp -a netbeans $out makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract $out/netbeans/nb/netbeans.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ -e netbeans_"$size"x"$size"x32.png ] + then + mv netbeans_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netbeans.png + else + convert -resize "$size"x"$size" netbeans_1024x1024x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/netbeans.png + fi + done; + # Create desktop item, so we can pick it from the KDE/GNOME menu - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -pv $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ makeWrapper perl python unzip ]; + buildInputs = [ makeWrapper perl python unzip libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; - maintainers = [ stdenv.lib.maintainers.sander ]; + homepage = "https://netbeans.org/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ sander rszibele ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix index 6d4b511e5983..eab51463f16f 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix @@ -12,8 +12,8 @@ in } {}; sublime3 = common { - buildVersion = "3176"; - x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; - x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; + buildVersion = "3200"; + x32sha256 = "01krmbji8z62x4kl1hf3c1nfj4c4n4xmg1df62ljiwhkcfm74izr"; + x64sha256 = "1gagc50fqb0d2bszi8m5spzb64shkaylvrwl6fxah55xcmy2kmdr"; } {}; } diff --git a/nixpkgs/pkgs/applications/editors/tiled/default.nix b/nixpkgs/pkgs/applications/editors/tiled/default.nix index ecdd7853d70c..1cfb04b7b2ef 100644 --- a/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -2,14 +2,14 @@ , python, qtbase, qttools }: stdenv.mkDerivation rec { - name = "tiled-${version}"; - version = "1.2.2"; + pname = "tiled"; + version = "1.2.3"; src = fetchFromGitHub { owner = "bjorn"; - repo = "tiled"; + repo = pname; rev = "v${version}"; - sha256 = "1yqw10izqhsnqwgxvws2n4ymcwawbh86srv7qmjwbsay752pfgfh"; + sha256 = "1zsfhw539zwyf5qfnirzkkgy5bmrrs2cry4gimrhpky9fjlaa9h8"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/nixpkgs/pkgs/applications/editors/vscode/default.nix b/nixpkgs/pkgs/applications/editors/vscode/default.nix index 78d7d96d3961..07333a4b8032 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/default.nix @@ -18,16 +18,16 @@ let }.${system}; sha256 = { - "i686-linux" = "04kbx1cx40lsy9irxy1arp1rixzk49ldhg34w3llmfbx63a4hchf"; - "x86_64-linux" = "1plvx0mjcbizl6iffib95p5224r9frf0mn6c5xp14p3qnrp32jhm"; - "x86_64-darwin" = "14h9gs6jpxydgd1h16ybq3ifw5jc7k83yg22pw3sk6vhy7hx7pxr"; + "i686-linux" = "1qll0hyqyn3vb0v35h9y8rk4l3r6zzc5bkra6pb23bnr4bna4y80"; + "x86_64-linux" = "1sfvv4g7kmvabqxasil41gasr7hsmgf8wwc4dl1940pb7x19fllq"; + "x86_64-darwin" = "0gjdppr59pyb2wawvf7yyk7357a5naxga74zf9gc7d9s1fz78hls"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.31.1"; + version = "1.32.3"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; diff --git a/nixpkgs/pkgs/applications/gis/qgis/default.nix b/nixpkgs/pkgs/applications/gis/qgis/default.nix index 61061a6d6721..0c76a489f13b 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/default.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/default.nix @@ -1,94 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl -, qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags, openssl, darwin, pkgconfig -, withGrass ? true, grass, saga, IOKit, ApplicationServices +{ stdenv, lib, makeWrapper, symlinkJoin +, qgis-unwrapped, extraPythonPackages ? (ps: [ ]) }: +with lib; +symlinkJoin rec { + inherit (qgis-unwrapped) version; + name = "qgis-${version}"; -stdenv.mkDerivation rec { - name = "qgis-2.18.28"; + paths = [ qgis-unwrapped ]; - buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig - saga ] - ++ - (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) - ++ - (stdenv.lib.optional withGrass grass) ++ - (stdenv.lib.optional (stdenv.isDarwin && withGrass) darwin.apple_sdk.libs.utmp) ++ - (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); + nativeBuildInputs = [ makeWrapper qgis-unwrapped.python3Packages.wrapPython ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + # extend to add to the python environment of QGIS without rebuilding QGIS application. + pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.python3Packages); - # `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`: - # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory - enableParallelBuilding = false; + postBuild = '' + # unpackPhase - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libspatialindex)" - ''; + buildPythonPath "$pythonInputs" - # To handle the lack of 'local' RPATH; required, as they call one of - # their built binaries requiring their libs, in the build process. - preBuild = '' - export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH + wrapProgram $out/bin/qgis \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH ''; - src = fetchurl { - url = "https://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "18pijqls1isd2bpg0mkrw07jqvdfaiwwb9mvz7p2xrgqcjx7dxsq"; - }; - - patches = [ - # already merged upstream in QGIS-3.*, but needs to be backported to QGIS-2 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/qgis/QGIS/pull/7263.patch"; - name = "Ensure_qgis.db_is_writable_when_copied_from_RO_source"; - sha256 = "19wr2kz0x8x6p2n0ylzd4lqrdmbkxyxr0zpwf2vl9hdp92rdjxbv"; - }) - ]; - - # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system - # installed frameworks - # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the - # installation which causes havoc - # Building RelWithDebInfo allows QGIS_DEBUG to print debugging information - cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}" - ++ stdenv.lib.optional stdenv.isDarwin - (["-DCMAKE_FIND_FRAMEWORK=never"] - ++ ["-DQGIS_MACAPP_BUNDLE=0"]); -# ++ ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"]; - - - - postInstall = - (stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/qgis \ - --set PYTHONPATH $PYTHONPATH \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} - '') + - (stdenv.lib.optionalString stdenv.isDarwin '' - # Necessary for QGIS to find the correct default GRASS path - # Plugins look for gdal tools like deminfo on the PATH - ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} - # Necessary for QGIS to find the right SAGA installation - ln -sf ${saga}/bin/saga_cmd $out/QGIS.app/Contents/MacOS/bin/saga_cmd - for file in $(find $out -type f -name "QGIS"); do - wrapProgram "$file" \ - --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ - --prefix DYLD_LIBRARY_PATH : "${qscintilla}/lib" \ - --prefix PATH : "${gdal}/bin" \ - ${stdenv.lib.optionalString withGrass "--prefix PATH : ${grass}/bin"} \ - --set PYTHONPATH $PYTHONPATH - done - mkdir -p $out/bin - ln -s $out/QGIS.app/Contents/MacOS/QGIS $out/bin/qgis - ''); - - meta = { - description = "User friendly Open Source Geographic Information System"; - homepage = http://www.qgis.org; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [mpickering]; - }; + meta = qgis-unwrapped.meta; } diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix new file mode 100644 index 000000000000..e30f4a428a3e --- /dev/null +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchurl, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql +, txt2tags, openssl, libzip, hdf5, netcdf +, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns +, withGrass ? true, grass +}: +with lib; +let + pythonBuildInputs = with python3Packages; + [ qscintilla-qt5 gdal jinja2 numpy psycopg2 + chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; +in stdenv.mkDerivation rec { + version = "3.4.5"; + name = "qgis-unwrapped-${version}"; + + src = fetchurl { + url = "http://qgis.org/downloads/qgis-${version}.tar.bz2"; + sha256 = "0myw1jgz8v8wncmrjsszn9ixylx84hafn0281c4hqhz623n3lxgx"; + }; + + passthru = { + inherit pythonBuildInputs; + inherit python3Packages; + }; + + buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt + fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf + qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ + (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs; + + nativeBuildInputs = [ cmake flex bison ninja ]; + + # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 + # + # TODO: Correct PyQt5 to provide the expected directory and fix + # build to use PYQT5_SIP_DIR consistently. + postPatch = '' + substituteInPlace cmake/FindPyQt5.py \ + --replace 'pyqtcfg.pyqt_sip_dir' '"${python3Packages.pyqt5}/share/sip/PyQt5"' + ''; + + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++ + stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + + meta = { + description = "A Free and Open Source Geographic Information System"; + homepage = http://www.qgis.org; + license = stdenv.lib.licenses.gpl2Plus; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ lsix ]; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index efbf5864faa8..f8753ecd1eb8 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; + broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118 maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 962940d076ba..2c7833acb5fe 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -1,15 +1,15 @@ { stdenv, makeDesktopItem, fetchurl, unzip , gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 -, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas +, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid }: stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.6.2"; + version = "3.6.12"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; + sha256 = "1qsxwqnkqfp4b9sgmhlv6wjl4mirhnx4bjj2vaq8iyz94pz637c8"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { libXrender libXtst libXScrnSaver + libuuid ]); desktopItem = makeDesktopItem { @@ -54,8 +55,8 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - nativeBuildInputs = [makeWrapper]; - buildInputs = [ unzip gtk3 gsettings-desktop-schemas]; + nativeBuildInputs = [makeWrapper wrapGAppsHook]; + buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder @@ -84,11 +85,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-rpath ${libPath}:$out/ $file - done - for file in $out/bin/*; do - wrapProgram $file \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + patchelf --set-rpath ${libPath}:$out/ $file || true done ''; diff --git a/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix index bf5a2e2c34d1..b15b57d8430c 100644 --- a/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.1"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "0y04cx0a0rwdclmn16f5y0z2vnm7yxly291gzjgdhcn59a77sga8"; + sha256 = "09ihbj0602spgc5lfbskf9am38n03gam2r8v3kj4dyfgxqr37ib3"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/nixpkgs/pkgs/applications/graphics/digikam/default.nix index 7fcdb46e32e9..cc2b955fcc21 100644 --- a/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -23,6 +23,7 @@ , boost , eigen , exiv2 +, ffmpeg , flex , jasper , lcms2 @@ -66,6 +67,7 @@ mkDerivation rec { boost eigen exiv2 + ffmpeg flex jasper lcms2 diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index fd8f88aa53ad..713eb4bfbb12 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -11,25 +11,34 @@ , libmicrohttpd , giflib , miniupnpc +, extra-cmake-modules +, libvpx }: stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.0.11"; + version = "2.1.2"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0h018rxhc0lwpqwmlihalz634nd0xaafk4p2b782djjd87irnjpk"; + sha256 = "02kkn317w9xhdqq2b4fq2bvipsnbp9945b6vghx3q2p6mckr9mhi"; }; + nativeBuildInputs = [ + extra-cmake-modules + ]; buildInputs = [ + # common deps: cmake qtbase qtsvg qtmultimedia qttools karchive # optional deps: + # server-specific: libsodium # ext-auth support libmicrohttpd # HTTP admin api + # client-specific: giflib # gif animation export support miniupnpc # automatic port forwarding kdnssd # local server discovery with Zeroconf + libvpx # WebM video export ]; configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out ."; diff --git a/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/nixpkgs/pkgs/applications/graphics/ipe/default.nix index d30f8c209c54..0673eec8c86f 100644 --- a/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, qtbase +, libjpeg, libpng, qtbase }: stdenv.mkDerivation rec { - name = "ipe-7.2.10"; + name = "ipe-7.2.11"; src = fetchurl { url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "0gw45d0albrsa0pbc5g4w3fmmjfxrdbpzyc7723ncbhncdyda01h"; + sha256 = "09d71fdpiz359mcnb57460w2mcfizvlnidd6g1k4c3v6rglwlbd2"; }; sourceRoot = "${name}/src"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { LUA_PACKAGE = "lua"; buildInputs = [ - libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript + libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix new file mode 100644 index 000000000000..01c203b407c1 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, rpmextract }: + +stdenv.mkDerivation rec { + name = "libsane-dsseries-${version}"; + version = "1.0.5-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf100974/${name}.x86_64.rpm"; + sha256 = "1wfdbfbf51cc7njzikdg48kwpnpc0pg5s6p0s0y3z0q7y59x2wbq"; + }; + + nativeBuildInputs = [ rpmextract ]; + + unpackCmd = '' + mkdir ${name} && pushd ${name} + rpmextract $curSrc + popd + ''; + + patchPhase = '' + substituteInPlace etc/udev/rules.d/50-Brother_DSScanner.rules \ + --replace 'GROUP="users"' 'GROUP="scanner", ENV{libsane_matched}="yes"' + + mkdir -p etc/sane.d/dll.d + echo "dsseries" > etc/sane.d/dll.d/dsseries.conf + ''; + + installPhase = '' + mkdir -p $out + cp -dr etc $out + cp -dr usr/lib64 $out/lib + ''; + + preFixup = '' + for f in `find $out/lib/sane/ -type f`; do + # Make it possible to find libstdc++.so.6 + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:$out/lib/sane $f + + # Horrible kludge: The driver hardcodes /usr/lib/sane/ as a dlopen path. + # We can directly modify the binary to force a relative lookup instead. + # The new path is NULL-padded to the same length as the original path. + sed -i "s|/usr/lib/sane/%s|%s\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00|g" $f + done + ''; + + meta = { + description = "Brother DSSeries SANE backend driver"; + homepage = http://www.brother.com; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ callahad ]; + }; +} diff --git a/nixpkgs/pkgs/applications/kde/default.nix b/nixpkgs/pkgs/applications/kde/default.nix index b9b318e75c3e..818b047af04f 100644 --- a/nixpkgs/pkgs/applications/kde/default.nix +++ b/nixpkgs/pkgs/applications/kde/default.nix @@ -108,6 +108,7 @@ let kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; + kfind = callPackage ./kfind.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; diff --git a/nixpkgs/pkgs/applications/kde/kfind.nix b/nixpkgs/pkgs/applications/kde/kfind.nix new file mode 100644 index 000000000000..10932b38032c --- /dev/null +++ b/nixpkgs/pkgs/applications/kde/kfind.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + karchive, kcoreaddons, kfilemetadata, ktextwidgets, kwidgetsaddons, kio +}: + +mkDerivation { + name = "kfind"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.iblech ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive kcoreaddons kfilemetadata ktextwidgets kwidgetsaddons kio + ]; +} diff --git a/nixpkgs/pkgs/applications/misc/almanah/default.nix b/nixpkgs/pkgs/applications/misc/almanah/default.nix new file mode 100644 index 000000000000..4997a9c7f2ac --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/almanah/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, intltool +, libxml2, desktop-file-utils, wrapGAppsHook, evolution-data-server, gtkspell3, gpgme, libcryptui +, glib, gtk3, gtksourceview3, sqlite, cairo, atk, gcr, gnome3 }: + +stdenv.mkDerivation rec { + pname = "almanah"; + version = "0.11.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1g0fyykq8bs3x1xqc0l0bk9zazcrxja784m68myymv1zfqqnp9h0"; + }; + + nativeBuildInputs = [ pkgconfig intltool libxml2 desktop-file-utils wrapGAppsHook ]; + + buildInputs = [ glib gtk3 gtksourceview3 sqlite cairo atk gcr gtkspell3 evolution-data-server gnome3.evolution gpgme libcryptui ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; # it is quite odd + }; + }; + + meta = with stdenv.lib; { + description = "Small GTK application to allow to keep a diary of your life"; + homepage = https://wiki.gnome.org/Apps/Almanah_Diary; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = gnome3.maintainers; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/appeditor/default.nix b/nixpkgs/pkgs/applications/misc/appeditor/default.nix new file mode 100644 index 000000000000..0530ec9c1b80 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/appeditor/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, gettext +, glib +, gtk3 +, hicolor-icon-theme +, libgee +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "appeditor"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "donadigo"; + repo = "appeditor"; + rev = version; + sha256 = "04x2f4x4dp5ca2y3qllqjgirbyl6383pfl4bi9bkcqlg8b5081rg"; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + hicolor-icon-theme + pantheon.granite + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Edit the Pantheon desktop application menu"; + homepage = https://github.com/donadigo/appeditor; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix index 3245a56e9de3..9c99dcee2b3c 100644 --- a/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix +++ b/nixpkgs/pkgs/applications/misc/bitcoinarmory/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages , pkgconfig, autoreconfHook, rsync -, swig, qt4, fcgi +, swig, qt48Full, fcgi , bitcoin, procps, utillinux }: let @@ -16,7 +16,6 @@ in buildPythonApplication { owner = "goatpig"; repo = "BitcoinArmory"; rev = "v${version}"; - #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2"; sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true; }; @@ -25,14 +24,18 @@ in buildPythonApplication { # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that. #patches = [ ./shutdown-fix.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ autoreconfHook + pkgconfig swig - qt4 - fcgi + pyqt4 + qt48Full rsync # used by silly install script (TODO patch upstream) ]; + buildInputs = [ + qt48Full + fcgi + ]; propagatedBuildInputs = [ pyqt4 diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index b52156beac6d..39b4dbe0fe50 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.39.1"; + version = "3.40.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "08c1wsdn0giv9zfb6bis9bbrw687rci8fs26qsal8ijmjk55dfsh"; + sha256 = "1s1kq8axfymr7agg7dqw47kanlrkzzhsy8pcj1fs5644zjp5n0bq"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/candle/default.nix b/nixpkgs/pkgs/applications/misc/candle/default.nix new file mode 100644 index 000000000000..35aa681df4ba --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/candle/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: + +stdenv.mkDerivation rec { + name = "candle-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "Denvi"; + repo = "Candle"; + rev = "v${version}"; + sha256 = "1gpx08gdz8awbsj6lsczwgffp19z3q0r2fvm72a73qd9az29pmm0"; + }; + + nativeBuildInputs = [ qmake ]; + + sourceRoot = "source/src"; + + installPhase = '' + runHook preInstall + install -Dm755 Candle $out/bin/candle + runHook postInstall + ''; + + buildInputs = [ qtbase qtserialport ]; + + meta = with stdenv.lib; { + description = "GRBL controller application with G-Code visualizer written in Qt"; + homepage = https://github.com/Denvi/Candle; + license = licenses.gpl3; + maintainers = with maintainers; [ matti-kariluoma ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index 1a162aca0d76..41660bc7f2b0 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -1,30 +1,37 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python3, fetchFromGitHub }: -with python3Packages; +with python3.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.3.1"; + version = "2.5.1"; - propagatedBuildInputs = [ docopt pygments ]; + propagatedBuildInputs = [ docopt pygments termcolor ]; src = fetchFromGitHub { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "1dcpjvbv648r8325qjf30m8b4cyrrjbzc2kvh40zy2mbjsa755zr"; + sha256 = "1i543hvg1yizamfd83bawflfcb500hvc72i59ikck8j1hjk50hsl"; }; # no tests available doCheck = false; postInstall = '' install -D man1/cheat.1.gz $out/share/man/man1/cheat.1.gz + mv $out/${python3.sitePackages}/etc $out/ + mv $out/${python3.sitePackages}/usr/share/* $out/share/ + rm -r $out/${python3.sitePackages}/usr ''; + makeWrapperArgs = [ + "--suffix" "CHEAT_PATH" ":" "$out/share/cheat" + ]; + meta = with stdenv.lib; { description = "cheat allows you to create and view interactive cheatsheets on the command-line"; maintainers = with maintainers; [ mic92 ]; - license = with licenses; [gpl3 mit]; + license = with licenses; [ gpl3 mit ]; homepage = https://github.com/chrisallenlane/cheat; }; } diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index c3e29d8a3703..51683a0a7208 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.3.5"; + version = "6.0.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0b9a2l8lcw8abilm9a3igbfm52fmix0vzh6kz6kwgmnflp6n9wib"; + sha256 = "1v7zvvphkyw7x5ziysk4gs2rpgc4dr108fn4ja80kijs1jmj5dxr"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index fff67b0add62..d0c8f79c9d45 100644 --- a/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, qtbase, makeWrapper, lib }: +{ lib, fetchurl, python3Packages, qtbase, makeWrapper }: let @@ -7,14 +7,14 @@ let in python3Packages.buildPythonApplication rec { - version = "3.3.2"; - name = "electron-cash-${version}"; + pname = "electron-cash"; + version = "3.3.6"; src = fetchurl { - url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz"; + url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "4538044cfaa4f87a847635849e0733f32b183ac79abbd2797689c86dc3cb0d53"; + sha256 = "ac435f2bf98b9b50c4bdcc9e3fb2ff19d9c66f8cce5df852f3a4727306bb0a84"; }; propagatedBuildInputs = with python3Packages; [ @@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec { qrcode requests tlslite-ng + qdarkstyle # plugins keepkey @@ -40,25 +41,18 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; postPatch = '' - # Remove pyqt5 check - sed -i '/pyqt5/d' setup.py - ''; + substituteInPlace contrib/requirements/requirements.txt \ + --replace "qdarkstyle<2.6" "qdarkstyle<3" - preBuild = '' - pyrcc5 icons.qrc -o gui/qt/icons_rc.py - # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' gui/qt/icons_rc.py + substituteInPlace setup.py \ + --replace "(share_dir" "(\"share\"" ''; doCheck = false; postInstall = '' - # These files are installed under $out/homeless-shelter ... - mv $out/${python.sitePackages}/homeless-shelter/.local/share $out - rm -rf $out/${python.sitePackages}/homeless-shelter - substituteInPlace $out/share/applications/electron-cash.desktop \ - --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u" + --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" # Please remove this when #44047 is fixed wrapProgram $out/bin/electron-cash \ @@ -70,17 +64,17 @@ python3Packages.buildPythonApplication rec { $out/bin/electron-cash help >/dev/null ''; - meta = with stdenv.lib; { - description = "A lightweight Bitcoin wallet"; + meta = with lib; { + description = "A Bitcoin Cash SPV Wallet"; longDescription = '' - An easy-to-use Bitcoin client featuring wallets generated from + An easy-to-use Bitcoin Cash client featuring wallets generated from mnemonic seeds (in addition to other, more advanced, wallet options) and the ability to perform transactions without downloading a copy of the blockchain. ''; homepage = https://www.electroncash.org/; platforms = platforms.linux; - maintainers = with maintainers; [ lassulus ]; + maintainers = with maintainers; [ lassulus nyanloutre ]; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/applications/misc/filet/default.nix b/nixpkgs/pkgs/applications/misc/filet/default.nix index 1e41cf4dd56a..edee9ab33e9e 100644 --- a/nixpkgs/pkgs/applications/misc/filet/default.nix +++ b/nixpkgs/pkgs/applications/misc/filet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "filet"; - version = "0.1.0"; + version = "0.1.3"; src = fetchFromGitHub { owner = "buffet"; repo = "filet"; rev = version; - sha256 = "0f73c4ipc13c7f4xzi3z103kvxpsw9chdfbvk0ahc60clkxy21k3"; + sha256 = "0hm7589ih30axafqxhhs4fg1pvfhlqzyzzmfi2ilx8haq5111fsf"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index da5cf83c02c1..2ffa784360fd 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, meson, ninja, gettext, python3, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, - vala, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection + vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.7.4.2"; + version = "0.7.4.3"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "15814czap0qg2h9nkcn9fg4i4xxa1lgw1vi6h3hi242qfwc7fh3i"; + sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5"; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { vala gnome3.yelp-tools wrapGAppsHook - # For setup hook + # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build gobject-introspection ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { json-glib sqlite librsvg - gnome3.gtk + gtk3 gnome3.adwaita-icon-theme ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - meta = { + meta = with stdenv.lib; { homepage = https://fontmanager.github.io/; description = "Simple font management for GTK+ desktop environments"; longDescription = '' @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { Font Manager is NOT a professional-grade font management solution. ''; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; repositories.git = https://github.com/FontManager/master; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix index 2257b2a98fb7..6bc18ba37904 100644 --- a/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/nixpkgs/pkgs/applications/misc/ganttproject-bin/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchzip, makeDesktopItem, makeWrapper -, jre }: +{ stdenv, lib, fetchzip, makeDesktopItem, makeWrapper +, jre +}: stdenv.mkDerivation rec { name = "ganttproject-bin-${version}"; - version = "2.7.2"; + version = "2.8.10"; - src = let build = "r1954"; in fetchzip { - sha256 = "0l655w6n88j7klz56af8xkpiv1pwlkfl5x1d33sqv9dnyisyw2hc"; + src = let build = "r2364"; in fetchzip { + sha256 = "0cclgyqv4f9pjsdlh93cqvgbzrp8ajvrpc2xszs03sknqz2kdh7r"; url = "https://dl.ganttproject.biz/ganttproject-${version}/" + "ganttproject-${version}-${build}.zip"; }; @@ -28,18 +29,21 @@ stdenv.mkDerivation rec { categories = "Office;Application;"; }; + javaOptions = [ + "-Dawt.useSystemAAFontSettings=on" + ]; + in '' mkdir -pv "$out/share/ganttproject" cp -rv * "$out/share/ganttproject" mkdir -pv "$out/bin" wrapProgram "$out/share/ganttproject/ganttproject" \ - --set JAVA_HOME "${jre}" + --set JAVA_HOME "${jre}" \ + --set _JAVA_OPTIONS "${builtins.toString javaOptions}" + mv -v "$out/share/ganttproject/ganttproject" "$out/bin" - install -v -Dm644 \ - plugins/net.sourceforge.ganttproject/data/resources/icons/ganttproject.png \ - "$out/share/pixmaps/ganttproject.png" cp -rv "${desktopItem}/share/applications" "$out/share" ''; @@ -51,5 +55,6 @@ stdenv.mkDerivation rec { # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = [ maintainers.vidbina ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/glava/default.nix b/nixpkgs/pkgs/applications/misc/glava/default.nix index 8432ddee0073..3831780c7919 100644 --- a/nixpkgs/pkgs/applications/misc/glava/default.nix +++ b/nixpkgs/pkgs/applications/misc/glava/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { name = "glava-${version}"; - version = "1.5.8"; + version = "1.6.3"; src = fetchFromGitHub { owner = "wacossusca34"; repo = "glava"; rev = "v${version}"; - sha256 = "0mps82qw2mhxx8069jvqz1v8n4x7ybrrjv92ij6cms8xi1y8v0fm"; + sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i"; }; buildInputs = [ @@ -45,6 +45,9 @@ in ]; preConfigure = '' + substituteInPlace Makefile \ + --replace 'unknown' 'v${version}' + export CFLAGS="-march=native" ''; diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 8473e997e7af..9adb1f60b334 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { name = "hugo-${version}"; version = "0.54.0"; @@ -13,13 +13,11 @@ buildGoPackage rec { sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; }; - goDeps = ./deps.nix; + modSha256 = "0fqmxmhbzkd5617gch836l7clqbxx8b1mxx09v3v2c4jjxcm85cm"; buildFlags = "-tags extended"; - postInstall = '' - rm $bin/bin/generate - ''; + subPackages = [ "." ]; meta = with stdenv.lib; { description = "A fast and modern static website engine."; diff --git a/nixpkgs/pkgs/applications/misc/hugo/deps.nix b/nixpkgs/pkgs/applications/misc/hugo/deps.nix deleted file mode 100644 index d3d300db85b3..000000000000 --- a/nixpkgs/pkgs/applications/misc/hugo/deps.nix +++ /dev/null @@ -1,777 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "v1.6.8"; - "sha256" = "1xh26j9bji8c4hr05f89kbc4fhqniba00bdcic4gs5xfnp2vj7gk"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - "sha256" = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/BurntSushi/locker"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/locker"; - rev = "a6e239ea1c69"; - sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e64"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "v1.1.0"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad4578"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/alecthomas/assert"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/assert"; - rev = "405dbfeb8e38"; - sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; - }; - } - { - goPackagePath = "github.com/alecthomas/chroma"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/chroma"; - rev = "v0.6.2"; - sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; - }; - } - { - goPackagePath = "github.com/alecthomas/colour"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/colour"; - rev = "60882d9e2721"; - sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; - }; - } - { - goPackagePath = "github.com/alecthomas/kong"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kong"; - rev = "v0.1.15"; - sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; - }; - } - { - goPackagePath = "github.com/alecthomas/repr"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/repr"; - rev = "d37bc2a10ba1"; - sha256 = "0jnx1ypdl4zi010ds2z857ajkr5cx51wkx950rfqb126hvql7svx"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/bep/debounce"; - fetch = { - type = "git"; - url = "https://github.com/bep/debounce"; - rev = "v1.1.0"; - sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; - }; - } - { - goPackagePath = "github.com/bep/gitmap"; - fetch = { - type = "git"; - url = "https://github.com/bep/gitmap"; - rev = "v1.0.0"; - sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; - }; - } - { - goPackagePath = "github.com/bep/go-tocss"; - fetch = { - type = "git"; - url = "https://github.com/bep/go-tocss"; - rev = "v0.6.0"; - sha256 = "0w5i3ig3bbdrwbrcwzx8xsxhlb8xr17jj3wdcb6klqglg7551yvm"; - }; - } - { - goPackagePath = "github.com/chaseadamsio/goorgeous"; - fetch = { - type = "git"; - url = "https://github.com/chaseadamsio/goorgeous"; - rev = "v1.1.0"; - sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; - }; - } - { - goPackagePath = "github.com/cheekybits/is"; - fetch = { - type = "git"; - url = "https://github.com/cheekybits/is"; - rev = "68e9c0620927"; - sha256 = "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.8"; - sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; - }; - } - { - goPackagePath = "github.com/danwakefield/fnmatch"; - fetch = { - type = "git"; - url = "https://github.com/danwakefield/fnmatch"; - rev = "cbb64ac3d964"; - sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "v1.5.0"; - sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; - }; - } - { - goPackagePath = "github.com/dlclark/regexp2"; - fetch = { - type = "git"; - url = "https://github.com/dlclark/regexp2"; - rev = "v1.1.6"; - sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/eknkc/amber"; - fetch = { - type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "cdade1c07385"; - sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; - }; - } - { - goPackagePath = "github.com/fortytw2/leaktest"; - fetch = { - type = "git"; - url = "https://github.com/fortytw2/leaktest"; - rev = "v1.2.0"; - sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "v0.2.3"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "v1.0.0"; - sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.0"; - sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.0"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jdkato/prose"; - fetch = { - type = "git"; - url = "https://github.com/jdkato/prose"; - rev = "v1.1.0"; - sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/kyokomi/emoji"; - fetch = { - type = "git"; - url = "https://github.com/kyokomi/emoji"; - rev = "v1.5.1"; - sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; - }; - } - { - goPackagePath = "github.com/magefile/mage"; - fetch = { - type = "git"; - url = "https://github.com/magefile/mage"; - rev = "v1.4.0"; - sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/markbates/inflect"; - fetch = { - type = "git"; - url = "https://github.com/markbates/inflect"; - rev = "v1.0.0"; - sha256 = "072a73ij23mp8vabr8xwga2kj8dimya44ciiy9g4x4r9imm86psw"; - }; - } - { - goPackagePath = "github.com/matryer/try"; - fetch = { - type = "git"; - url = "https://github.com/matryer/try"; - rev = "9ac251b645a2"; - sha256 = "19fnqmpl3p54vmxgm1hmqvdc87brqx754wf3cdhq1bj04fcbb5h9"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.3"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - { - goPackagePath = "github.com/miekg/mmark"; - fetch = { - type = "git"; - url = "https://github.com/miekg/mmark"; - rev = "v1.3.6"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; - }; - } - { - goPackagePath = "github.com/mitchellh/hashstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/hashstructure"; - rev = "v1.0.0"; - sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/muesli/smartcrop"; - fetch = { - type = "git"; - url = "https://github.com/muesli/smartcrop"; - rev = "f6ebaa786a12"; - sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "github.com/nicksnyder/go-i18n"; - fetch = { - type = "git"; - url = "https://github.com/nicksnyder/go-i18n"; - rev = "v1.10.0"; - sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "d4647c9c7a84"; - sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "46c73eb196ba"; - sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj"; - }; - } - { - goPackagePath = "github.com/sanity-io/litter"; - fetch = { - type = "git"; - url = "https://github.com/sanity-io/litter"; - rev = "v1.1.0"; - sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "86672fcb3f95"; - sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.2.1"; - sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - { - goPackagePath = "github.com/spf13/fsync"; - fetch = { - type = "git"; - url = "https://github.com/spf13/fsync"; - rev = "12a01e648f05"; - sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "94f6ae3ed3bc"; - sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; - }; - } - { - goPackagePath = "github.com/spf13/nitro"; - fetch = { - type = "git"; - url = "https://github.com/spf13/nitro"; - rev = "24d7ef30a12d"; - sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.1"; - sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "04af85275a5c"; - sha256 = "1al7hgvg34xbajds99ss5wmlndxbzzmz5l0wrg6wchvvfaiwxlx0"; - }; - } - { - goPackagePath = "github.com/tdewolff/minify"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/minify"; - rev = "v2.3.7"; - sha256 = "1mj1lmd8s0mrg9cfj1ihvsqrbsbpzh3icm0pmayd2r6jp6rbffw6"; - }; - } - { - goPackagePath = "github.com/tdewolff/parse"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/parse"; - rev = "v2.3.5"; - sha256 = "05w859s31dx6525wrjryby601z9c0xpncilznk6shgqygpxda6cz"; - }; - } - { - goPackagePath = "github.com/tdewolff/test"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/test"; - rev = "v1.0.0"; - sha256 = "10vyp4bhanzg3yl9k8zqfdrxpsmx8yc53xv4lqxfymd7jjyqgssj"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/wellington/go-libsass"; - fetch = { - type = "git"; - url = "https://github.com/wellington/go-libsass"; - rev = "c63644206701"; - sha256 = "1ml0fk4wldnjlkmliydnig9f3rpp3cdzwgz331mlqyadvma3c0lf"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yosssi/ace"; - fetch = { - type = "git"; - url = "https://github.com/yosssi/ace"; - rev = "v0.0.5"; - sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "c73c2afc3b81"; - sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "161cd47e91fd"; - sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b4a75ba826a6"; - sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 7304ad7141a9..8fab25fbce02 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14620"; + version = "14760"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0ypn2awmclxsx4i7mmghs5blz2j5srdayzcxcqn5b4p1r57072bn"; + sha256 = "1ya05z3i37ynpaqrm99cirkbap03q7wgbbps2y95l7r2k9l4sxsi"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix b/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix index f6814119b5a7..8a3aaf202a70 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/2.0.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = https://www.keepassx.org/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/keepassx/default.nix b/nixpkgs/pkgs/applications/misc/keepassx/default.nix index 89ceca8a4f10..05ad9b05abb0 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/default.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; homepage = https://www.keepassx.org/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/khal/default.nix b/nixpkgs/pkgs/applications/misc/khal/default.nix index bc2c8978a67e..da0c8c38e73d 100644 --- a/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -45,6 +45,6 @@ with python3.pkgs; buildPythonApplication rec { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ jgeerds gebner ]; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix index ec571c0284b6..c27fda31a8fd 100644 --- a/nixpkgs/pkgs/applications/misc/latte-dock/default.nix +++ b/nixpkgs/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.5"; + version = "0.8.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1yhnmppp65xy8skainn438q3hwlpsz8qcj4ksvl8xdz5jzn7gs7k"; + sha256 = "1qzf9fkfkbv8vnc9p6lm7ya9hzydwk2f7671by9ij26f77lmxfb3"; name = "${name}.tar.xz"; }; diff --git a/nixpkgs/pkgs/applications/misc/ocropus/default.nix b/nixpkgs/pkgs/applications/misc/ocropus/default.nix index 40432c18aa38..a604349afb01 100644 --- a/nixpkgs/pkgs/applications/misc/ocropus/default.nix +++ b/nixpkgs/pkgs/applications/misc/ocropus/default.nix @@ -18,12 +18,12 @@ let in pythonPackages.buildPythonApplication rec { - name = "ocropus-${version}"; - version = "20170811"; + pname = "ocropus"; + version = "1.3.3"; src = fetchFromGitHub { - sha256 = "0qx0d8yj0w66qglkrmfavp5dh1sky72njfaqii7bnrpv5n4j3q39"; - rev = "ae84a8edaf0b76135f749ba66fc30c272d0726d0"; + sha256 = "02p1334mic5cfhvpfphfrbim4036yfd8s2zzpwm0xmm829z71nr7"; + rev = "v${version}"; repo = "ocropy"; owner = "tmbdev"; }; diff --git a/nixpkgs/pkgs/applications/misc/overmind/default.nix b/nixpkgs/pkgs/applications/misc/overmind/default.nix index d7f601b50cd8..c1255b6152ea 100644 --- a/nixpkgs/pkgs/applications/misc/overmind/default.nix +++ b/nixpkgs/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "overmind-${version}"; - version = "1.2.1"; + version = "2.0.1"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,11 +15,11 @@ buildGoPackage rec { owner = "DarthSim"; repo = "overmind"; rev = "v${version}"; - sha256 = "11ws9rsy8ladjp1y3b6vva9sjmw4s24xc1w18lyhfz63xc908nfw"; + sha256 = "1j3cpcfgacn5ic19sgrs1djn5jr4d7j7lxaz0vbaf414lrl76qz8"; }; meta = with stdenv.lib; { - homepage = https://github.com/DarthSim/; + homepage = https://github.com/DarthSim/overmind; description = "Process manager for Procfile-based applications and tmux"; license = with licenses; [ mit ]; maintainers = [ maintainers.adisbladis ]; diff --git a/nixpkgs/pkgs/applications/misc/plover/default.nix b/nixpkgs/pkgs/applications/misc/plover/default.nix index b9323ece1f44..0bd28811d55b 100644 --- a/nixpkgs/pkgs/applications/misc/plover/default.nix +++ b/nixpkgs/pkgs/applications/misc/plover/default.nix @@ -16,6 +16,7 @@ sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r"; }; + nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ pytest mock ]; propagatedBuildInputs = [ six setuptools pyserial appdirs hidapi wxPython xlib wmctrl diff --git a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix index 878de748dec9..d995bfcc0f3e 100644 --- a/nixpkgs/pkgs/applications/misc/qlcplus/default.nix +++ b/nixpkgs/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { name = "qlcplus-${version}"; - version = "4.12.0"; + version = "4.12.1"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "056ccgcz3rpbic2hqg4r1rq8svq7070j2h6l3hbb1p8h3qxwamzh"; + sha256 = "1kz2zbz7blnm91dysn949bjsy4xqxg658k47p3gbl0pjl58c44hp"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/misc/rtv/default.nix b/nixpkgs/pkgs/applications/misc/rtv/default.nix index a3be9cad3aef..dd60147f4e6b 100644 --- a/nixpkgs/pkgs/applications/misc/rtv/default.nix +++ b/nixpkgs/pkgs/applications/misc/rtv/default.nix @@ -41,6 +41,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; + maintainers = with maintainers; [ matthiasbeyer wedens ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/sigal/default.nix b/nixpkgs/pkgs/applications/misc/sigal/default.nix index 978ac2b7035c..2b44b0398b55 100644 --- a/nixpkgs/pkgs/applications/misc/sigal/default.nix +++ b/nixpkgs/pkgs/applications/misc/sigal/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages, ffmpeg }: python3Packages.buildPythonApplication rec { - version = "1.4.1"; + version = "2.0"; pname = "sigal"; src = python3Packages.fetchPypi { inherit version pname; - sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61"; + sha256 = "0ff8hpihbd30xjy155ksfpypjskilqg4zmyavgvpri8jaf1qpv89"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix b/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix index 1018a53ce21d..dc632f3ed757 100644 --- a/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskwarrior/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Highly flexible command-line tool to manage TODO lists"; homepage = https://taskwarrior.org; license = licenses.mit; - maintainers = with maintainers; [ marcweber jgeerds ]; + maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix index a34c5e4766ac..2ae86c5d5102 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix @@ -1,22 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "terminal-parrot-1.1.0"; - version = "1.1.0"; - goPackagePath = "github.com/jmhobbs/terminal-parrot"; +buildGoModule rec { + name = "terminal-parrot-${version}"; + version = "1.1.1"; - src = fetchFromGitHub { - owner = "jmhobbs"; - repo = "terminal-parrot"; - rev = "22c9bde916c12d8b13cf80ab252995dbf47837d1"; - sha256 = "1mrxmifsmndf6hdq1956p1gyrrp3abh3rmwjcmxar8x2wqbv748y"; - }; + src = fetchFromGitHub { + owner = "jmhobbs"; + repo = "terminal-parrot"; + rev = "${version}"; + sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; + }; - meta = with stdenv.lib; { - description = "Shows colorful, animated party parrot in your terminial"; - homepage = https://github.com/jmhobbs/terminal-parrot; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.heel ]; - }; + modSha256 = "0ymqhrkgk94z4f2p3c6v75g2h8qlqzdi7byivqzxzmdczmq9zq2s"; + + meta = with stdenv.lib; { + description = "Shows colorful, animated party parrot in your terminial"; + homepage = https://github.com/jmhobbs/terminal-parrot; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.heel ]; + }; } diff --git a/nixpkgs/pkgs/applications/misc/todoist/default.nix b/nixpkgs/pkgs/applications/misc/todoist/default.nix index abe1fda23445..31901bf5616b 100644 --- a/nixpkgs/pkgs/applications/misc/todoist/default.nix +++ b/nixpkgs/pkgs/applications/misc/todoist/default.nix @@ -1,11 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { name = "todoist-${version}"; version = "0.13.1"; - goPackagePath = "github.com/sachaos/todoist"; - src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; @@ -13,7 +11,7 @@ buildGoPackage rec { sha256 = "1kwvlsjr2a7wdhlwpxxpdh87wz8k9yjwl59vl2g7ya6m0rvhd3mc"; }; - goDeps = ./deps.nix; + modSha256 = "0ng1paw2mizhs4g28ypxz0ryh43l90qw8qsq46sshsiiswvrpl0k"; meta = { homepage = https://github.com/sachaos/todoist; diff --git a/nixpkgs/pkgs/applications/misc/todoist/deps.nix b/nixpkgs/pkgs/applications/misc/todoist/deps.nix deleted file mode 100644 index 9b132e29c779..000000000000 --- a/nixpkgs/pkgs/applications/misc/todoist/deps.nix +++ /dev/null @@ -1,237 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "v3.2.0"; - sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.0.0"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/browser"; - fetch = { - type = "git"; - url = "https://github.com/pkg/browser"; - rev = "0a3d74bf9ce4"; - sha256 = "0lv6kwvm31n79mh14a63zslaf4l9bspi2q0i8i9im4njfl42iv1c"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.2.0"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.2.1"; - sha256 = "0y7czxki8zhjhanh5ydnx4sf2darw70z2i5dskgarbk4gjmagx6k"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8cf3aee42992"; - sha256 = "1l2hyd5z91jzml5isn1i0g882pxbxk0x6ry5vdwghrprcx06syag"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "77439c55185e"; - sha256 = "15f7yghpw9yn00s1k8czld8cm3kvjx5rzda2gfm8pq5542i8w9rs"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/misc/vit/default.nix b/nixpkgs/pkgs/applications/misc/vit/default.nix index 40a399247e90..3eb797f182e7 100644 --- a/nixpkgs/pkgs/applications/misc/vit/default.nix +++ b/nixpkgs/pkgs/applications/misc/vit/default.nix @@ -1,36 +1,40 @@ -{ pkgs, fetchgit, stdenv, makeWrapper, taskwarrior, ncurses, -perl, perlPackages }: +{ stdenv, fetchFromGitHub +, makeWrapper, which +, taskwarrior, ncurses, perlPackages }: -let - version = "1.2"; -in -stdenv.mkDerivation { - name = "vit-${version}"; +stdenv.mkDerivation rec { + pname = "vit"; + version = "1.3"; - src = fetchgit { - url = "https://git.tasktools.org/scm/ex/vit.git"; - rev = "7d0042ca30e9d09cfbf9743b3bc72096e4a8fe1e"; - sha256 = "92cad7169b3870145dff02256e547ae270996a314b841d3daed392ac6722827f"; + src = fetchFromGitHub { + owner = "scottkosty"; + repo = pname; + rev = "v${version}"; + sha256 = "0a34rh5w8393wf7jwwr0f74rp1zv2vz606z5j8sr7w19k352ijip"; }; preConfigure = '' substituteInPlace Makefile.in \ --replace sudo "" substituteInPlace configure \ - --replace /usr/bin/perl ${perl}/bin/perl + --replace /usr/bin/perl ${perlPackages.perl}/bin/perl + substituteInPlace cmdline.pl \ + --replace "view " "vim -R " ''; postInstall = '' wrapProgram $out/bin/vit --prefix PERL5LIB : $PERL5LIB ''; - buildInputs = [ taskwarrior ncurses perlPackages.Curses perl makeWrapper ]; + nativeBuildInputs = [ makeWrapper which ]; + buildInputs = [ taskwarrior ncurses ] + ++ (with perlPackages; [ perl Curses TryTiny TextCharWidth ]); - meta = { + meta = with stdenv.lib; { description = "Visual Interactive Taskwarrior"; - maintainers = with pkgs.lib.maintainers; [ ]; - platforms = pkgs.lib.platforms.all; - license = pkgs.lib.licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.all; + license = licenses.gpl3; }; } diff --git a/nixpkgs/pkgs/applications/misc/worker/default.nix b/nixpkgs/pkgs/applications/misc/worker/default.nix index f5c92592cd10..9657dd99e211 100644 --- a/nixpkgs/pkgs/applications/misc/worker/default.nix +++ b/nixpkgs/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.3"; + version = "3.15.4"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "03dv50h68grscxiaxslzv486v1bfi8y81vrjr2gs39svw7bwz5d4"; + sha256 = "03zixi4yqcl05blyn09mlgk102yjbir8bp0yi4czd1sng0rhfc9x"; }; buildInputs = [ libX11 ]; diff --git a/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix b/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix index d33135ccad70..4b7be4b2b50e 100644 --- a/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.8.3"; + version = "2.10.1"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1yanyaz6gh5wbccj9mfd39pyrg69gb4jn6sjvx1k63pkjrwr2ap3"; + sha256 = "0381r4nr5cx0zv3dhsvld4ibpp5gq911815h03v92688za3swhng"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/nixpkgs/pkgs/applications/misc/xteddy/default.nix b/nixpkgs/pkgs/applications/misc/xteddy/default.nix new file mode 100644 index 000000000000..6f67ed96c57f --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/xteddy/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchzip, pkg-config, xorg, imlib2, makeWrapper }: + +stdenv.mkDerivation rec { + name = "xteddy-${version}"; + version = "2.2"; + src = fetchzip { + url = "https://deb.debian.org/debian/pool/main/x/xteddy/xteddy_${version}.orig.tar.gz"; + sha256 = "0sap4fqvs0888ymf5ga10p3n7n5kr35j38kfsfd7nj0xm4hmcma3"; + }; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ imlib2 xorg.libX11 xorg.libXext ]; + + makeFlags = [ "LIBS=-lXext" ]; + + postPatch = '' + sed -i 's/man 1 xteddy/man 6 xteddy/' xteddy.c + sed -i "s:/usr/games/xteddy:$out/bin/xteddy:" xtoys + sed -i "s:/usr/share/xteddy:$out/share/xteddy:" xtoys + ''; + + postInstall = '' + cp -R images $out/share/images + # remove broken test script + rm $out/bin/xteddy_test + ''; + + postFixup = '' + # this is needed, because xteddy expects images to reside + # in the current working directory + wrapProgram $out/bin/xteddy --run "cd $out/share/images/" + ''; + + meta = with stdenv.lib; { + description = "Cuddly teddy bear for your X desktop"; + homepage = https://weber.itn.liu.se/~stegu/xteddy/; + license = licenses.gpl2; + maintainers = [ maintainers.xaverdh ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index d1fa28318d00..edafb0034800 100644 --- a/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; - buildInputs = [ stdenv qtbase qtquickcontrols pyotherside python3 ]; + buildInputs = [ stdenv qtbase qtquickcontrols python3 ]; nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" wrapProgram $out/bin/yubioath-desktop \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \ --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" diff --git a/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix new file mode 100644 index 000000000000..eb2a0f1c1e14 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/zathura/cb/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core +, girara, gettext, libarchive }: + +stdenv.mkDerivation rec { + name = "zathura-cb-${version}"; + version = "0.1.8"; + + src = fetchurl { + url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz"; + sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + buildInputs = [ libarchive zathura_core girara ]; + + PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + + meta = with lib; { + homepage = https://pwmt.org/projects/zathura-cb/; + description = "A zathura CB plugin"; + longDescription = '' + The zathura-cb plugin adds comic book support to zathura. + ''; + license = licenses.zlib; + platforms = platforms.unix; + maintainers = with maintainers; [ jlesquembre ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 4cf05a21636a..f3258c0c7116 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -2,6 +2,7 @@ , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2 , sqlite, glib, texlive, libintl, libseccomp +, file, librsvg , gtk-mac-integration, synctexSupport ? true }: @@ -11,15 +12,25 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zathura-core-${version}"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; - sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn"; + sha256 = "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky"; }; outputs = [ "bin" "man" "dev" "out" ]; + # Flag list: + # https://github.com/pwmt/zathura/blob/master/meson_options.txt + mesonFlags = [ + "-Dsqlite=enabled" + "-Dmagic=enabled" + # "-Dseccomp=enabled" + "-Dmanpages=enabled" + "-Dconvert-icon=enabled" + ] ++ optional synctexSupport "-Dsynctex=enabled"; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx gettext makeWrapper libxml2 @@ -27,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl libseccomp - sqlite glib + sqlite glib file librsvg ] ++ optional synctexSupport texlive.bin.core ++ optional stdenv.isDarwin [ gtk-mac-integration ]; diff --git a/nixpkgs/pkgs/applications/misc/zathura/default.nix b/nixpkgs/pkgs/applications/misc/zathura/default.nix index 315df5639466..dfddfe7d91e1 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/default.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/default.nix @@ -20,10 +20,13 @@ let zathura_ps = callPackage ./ps { }; + zathura_cb = callPackage ./cb { }; + zathuraWrapper = callPackage ./wrapper.nix { plugins = [ zathura_djvu zathura_ps + zathura_cb (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) ]; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index d146cd81782b..de2159849b75 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.60.45"; + version = "0.61.50"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0c3jfiswbma53lkngndqrcagvhld7q7hqhk9wpm4r6z9y1kskjwy"; + sha256 = "1lbajxnxqkd422rckfjm65pwwzl66v7anq4jrzxi29d5x7abl3c1"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 5d59f7514c60..36576df4b732 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, gtk3, dbus-glib +, glib, gtk3, dbus-glib , glibc , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups @@ -104,7 +104,7 @@ let else result; base = rec { - name = "${packageName}-${version}"; + name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; inherit packageName buildType buildPath; @@ -120,7 +120,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 gtk3 dbus-glib + glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage at-spi2-core ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -132,6 +132,8 @@ let patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch + ./patches/jumbo-sorted.patch + ./patches/no-build-timestamps.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch new file mode 100644 index 000000000000..cdf0f695f761 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch @@ -0,0 +1,11 @@ +--- chromium-70.0.3538.67/build/config/merge_for_jumbo.py.old 2018-10-25 19:15:54.578222230 +0300 ++++ chromium-70.0.3538.67/build/config/merge_for_jumbo.py 2018-10-25 19:20:44.397613032 +0300 +@@ -132,6 +132,8 @@ + assert not inputs + continue + ++ inputs.sort() ++ outputs.sort() + write_jumbo_files(inputs, outputs, written_input_set, written_output_set) + + assert set(args.outputs) == written_output_set, "Did not fill all outputs" diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch new file mode 100644 index 000000000000..e06d848095c8 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/no-build-timestamps.patch @@ -0,0 +1,17 @@ +--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 +@@ -94,6 +94,14 @@ + 'build_type', help='The type of build', choices=('official', 'default')) + args = argument_parser.parse_args() + ++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here ++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) ++ if SOURCE_DATE_EPOCH is not None: ++ print SOURCE_DATE_EPOCH ++ return 0 ++ else: ++ raise RuntimeError("SOURCE_DATE_EPOCH not set") ++ + # The mtime of the revision in build/util/LASTCHANGE is stored in a file + # next to it. Read it, to get a deterministic time close to "now". + # That date is then modified as described at the top of the file so that diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix index a097b9fac4ec..e4ec550d60c4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "32.0.0.142"; + version = "32.0.0.156"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1mifgrfcvz1mc5w9s0df498z2dma50yq3vqw3pz82wxynmk28gq9"; + sha256 = "0mf2p3qk82s2nwz1x8g92434wpdqgnd9jj8w88z4qksa9qhbbfh7"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 804702b08d54..cc54db0a38ae 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/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 = "00vh4vgkg4dc9vw6slgb086420l2sc6sykr15zw29jhnxaa7b1ij"; - sha256bin64 = "0vpwsgz71ykaid240241f7jzsm4d46wad00vvrd4fh9224q4h6ww"; - version = "73.0.3683.56"; + sha256 = "0z6m7l76qzqsf5d54k331cl7cx1f0lh4x13269mjk7664q382143"; + sha256bin64 = "0pv5aafwdwcp1ssijgx19ba1ap40j6ayv15ynxvv8fsh51ara1vp"; + version = "73.0.3683.75"; }; dev = { - sha256 = "1cfy6m1ijqh7b8rlrjym8igpm5i549kz1h3jwbpxn52zy3mlk7jr"; - sha256bin64 = "02bgg20rh50lsz2ay4p7bkjfb18ay01hj0bcbd3g29valddr35p8"; - version = "74.0.3717.0"; + sha256 = "19fwzxnsd1parqghv4b2mif3cj1k1m5hzqnjsnglkgv6xnqny98g"; + sha256bin64 = "1aag76dgcnwga1q4jdgm3ziqvxs1qvrsyqfd7bbsi7axz6qi135v"; + version = "74.0.3724.8"; }; stable = { - sha256 = "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk"; - sha256bin64 = "1jdj2jp4jvzi5a24dm56ls5kx6xpiiv98yx4si9z19lm5srrji8j"; - version = "72.0.3626.121"; + sha256 = "0z6m7l76qzqsf5d54k331cl7cx1f0lh4x13269mjk7664q382143"; + sha256bin64 = "10j93186f3ipynyw6nb6bx4haav33gzvmc72sl9ybz6zljd88dpq"; + version = "73.0.3683.75"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index c48c36ad7a06..aa571d175347 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "32.0.0.142"; + version = "32.0.0.156"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1g3c0hzpf6lwfvlh8h3fl1vwfxc909nkpvrymwlc3vi3zpqwv4r7" + "0h16vdar4p8zj6w57ihll71xjr9sy7hdiq4qwvvqndah5c4ym8xl" else - "14pyhynmjb88n5r9ds7v59vsrlzxfkr8zqnzgf6bj0h0x9grzhdv" + "06l59zid6n4b606254r937cvk95pyymlczadh4cpl6l4xncspdy6" else if arch == "x86_64" then - "102ixxh2sq7bmasnifm9arvlqqvmmm4bazzdppib3pz2yh4yy7m2" + "0b3qssn1fgm2v715l6nksqmwly7j9asgqh9yqjhpp7jsb84bvzk4" else - "1hg03fb4xc7h7lbx57wn1xvkhq096aijaxkb4b60wna04p62bdim"; + "03qdwrlvs4090s9b9fn2l6g3wsbi6q81jf59s1s5gh7qhi4i0lhy"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index dd7b931b9405..0da07f2d2bef 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "32.0.0.142"; + version = "32.0.0.156"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1vp1nfys9pjmh3fmyp95yymmyvwrbmwjsmjhl5rnpwv5a0xn9nc6" + "0fzs2x8yxpykkza1r3yn17hmrdz51c7qigbm5qifvw59q9zl15i9" else - "05r1z87zpllyb2hvj0fbps39hvkx5jzsqafyg62am8qm9khzs2qh"; + "11733155aznijwhnc5wv0v6wmw9g1akbqwl07kx3lam571s8aywr"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index a90fd74eced0..9537f1365bd1 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.3.1440.57-1"; + version = "2.3.1440.60-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0q8kdhsgk7ppc6cckzfk730ab136qqfdk8zrxkindjpzvl1lmmlv"; + sha256 = "1vw4lyqs87cw7v1jy3dcsgnb56s61zl21q95a3kiavqw7412sips"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 4839ec1a2c81..ec2646440b31 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "72.0.3626.121"; + version = "72.0.3626.122"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "2bcwgv75cmv92i89vhwd253hcgzgjxjpxr9zp46wfcw5hbiya1xx95p01wsny0blnwv76s9n7n41z3r7fkv6mnv1zb2mnb2lrzvmghb"; + sha512 = "1477g5dgi4m0zbiqwm9w6jqkmjfmgjlbl3qs9ljldx8bif8my1jbz4hzws954aqxyxdbf5rjpvmrrqqppk5347prvsyl37rbsndaaqf"; }; buildInputs = [ ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix index fe2420a719d5..259f7982a6b8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,18 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub, ... }: +{ lib, buildGoModule, fetchFromGitHub }: -let version = "0.3.1"; in - -buildGoPackage { +buildGoModule rec { name = "hetzner-kube-${version}"; + version = "0.4.1"; src = fetchFromGitHub { owner = "xetys"; repo = "hetzner-kube"; rev = "${version}"; - sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w"; + sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; }; - goPackagePath = "github.com/xetys/hetzner-kube"; + modSha256 = "1mx74nci7j7h44pw1qf5fxkvfnhppj46898f8895ay8hhxd28lbm"; + + buildFlagsArray = '' + -ldflags= + -X github.com/xetys/hetzner-kube/cmd.version=${version} + ''; meta = { description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch b/nixpkgs/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch new file mode 100644 index 000000000000..223d6c6c2477 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch @@ -0,0 +1,36 @@ +From 40b8eaacb3a24c466c17c8a65938330d5805b112 Mon Sep 17 00:00:00 2001 +From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> +Date: Fri, 8 Mar 2019 14:10:11 -0800 +Subject: [PATCH] chore: fix the location of thrift + +Thrift is no longer available at the git.apache.org and it's now +distributed on GitHub at github.com/apache/thrift. + +fixes #3320 +--- + go.mod | 2 ++ + go.sum | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/go.mod b/go.mod +index 04bcc84cc..e26c4cf1d 100644 +--- a/go.mod ++++ b/go.mod +@@ -184,3 +184,5 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d + replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 + + replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible ++ ++replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 +diff --git a/go.sum b/go.sum +index c9fdf8768..6ed69e69d 100644 +--- a/go.sum ++++ b/go.sum +@@ -87,6 +87,7 @@ github.com/antham/chyle v1.4.0/go.mod h1:D94Z4aE/ECudyNoTHwkhqu77mjGPZtfPG8dNoeI + github.com/antham/envh v1.2.0/go.mod h1:ocIRPHuwwjyBVBtuUJOJc2TYzGg+d23xSAZexl4y9hQ= + github.com/antham/strumt v0.0.0-20171215230529-6776189777d3/go.mod h1:sE7EYIUE0nQzPiv5zQAmw2aVkei0j2xmb4gTIIqSFSI= + github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= ++github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= + github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= + github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= + github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= diff --git a/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index c31389a78c23..7fd3e6b9cd91 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -1,57 +1,39 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -let - removeVendoredPackages = goDeps: - '' - echo "Removing any vendored duplicate of direct dependency... " - for dir in $(find $NIX_BUILD_TOP/go/src -type d -name vendor); do - ${builtins.concatStringsSep "\n" (map (goDep: '' - if test -d $dir/${goDep.goPackagePath}; then - echo "Removing duplicate directory at $dir/${goDep.goPackagePath}" - rm -rf $dir/${goDep.goPackagePath} - fi - '') goDeps)} - done - echo "Done" - ''; -in -buildGoPackage rec { +buildGoModule rec { name = "jx"; - version = "1.3.955"; - - goPackagePath = "github.com/jenkins-x/jx"; - subPackages = [ "cmd/jx" ]; + version = "1.3.967"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0h4ck1a8rlyg10gaxbnwvlabwjlhdrigrina84x4m2gsqr3lnp9a"; + sha256 = "0a25m7sz134kch21bg6l86kvwl4cg6babqf57kqidq6kid1zgdaq"; }; - # Some of the dependencies have their own checked in vendor directory that - # vendor their dependencies. However, some of those dependencies are also - # directly pulled down through the vgo modules. Removing these dependencies - # as they confuse the go compiler and causes the build to fail. - # Removing all the vendor directories also breaks the build. - preBuild = removeVendoredPackages (import goDeps); + patches = [ + # https://github.com/jenkins-x/jx/pull/3321 + ./3321-fix-location-of-thrift.patch + ]; + + modSha256 = "0l6ccxzfxl918hzbky5ivlw413hiwagwc2cbp3f05i21qdi5mw5p"; + + subPackages = [ "cmd/jx" ]; buildFlagsArray = '' -ldflags= - -X ${goPackagePath}/pkg/version.Version=${version} - -X ${goPackagePath}/pkg/version.Revision=${version} + -X github.com/jenkins-x/jx/pkg/version.Version=${version} + -X github.com/jenkins-x/jx/pkg/version.Revision=${version} ''; - goDeps = ./deps.nix; - meta = with lib; { description = "JX is a command line tool for installing and using Jenkins X."; + homepage = https://jenkins-x.io; longDescription = '' Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Jenkins, Knative Build, Prow, Skaffold and Helm. ''; - homepage = https://github.com/jenkins-x/jx; license = licenses.asl20 ; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/applications/networking/cluster/jx/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/jx/deps.nix deleted file mode 100644 index 1e8beb18738a..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/jx/deps.nix +++ /dev/null @@ -1,3380 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -# file was patched manually to account for the `replace` statements in the -# upstream go.mod that's not yet supported by vgo2nix. -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.34.0"; - sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; - }; - } - { - goPackagePath = "code.gitea.io/sdk"; - fetch = { - type = "git"; - url = "https://github.com/go-gitea/go-sdk"; - rev = "79a281c4e34a"; - sha256 = "1bkcsmjagsyaynyi562rsi3xvypnb2z38inq6ni5k9mxk9q5r8h0"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/exporter/aws"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-exporter-aws"; - rev = "dd54a7ef511e"; - sha256 = "05xs00w0miw7ci329dmfhxdav3wfjcn3z63px7s8cqd78k18a4sn"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver"; - rev = "v0.6.0"; - sha256 = "0qhxpfmzn5jsh1qrq7w2zkg87xvalqam2ciq65qfq38mfkssda3v"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/integrations/ocsql"; - fetch = { - type = "git"; - url = "https://github.com/opencensus-integrations/ocsql"; - rev = "v0.1.2"; - sha256 = "0rs8dyr8jp4907h8f6ih3bgqbqjhq9q7m8b3pfvargmr7kq5si70"; - }; - } - { - goPackagePath = "git.apache.org/thrift.git"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift.git"; - rev = "2566ecd5d999"; - sha256 = "14gl0j85x3hj3gncf417f8zf92phrpvkj4clxmvbcq1dcgjdn6mc"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "v0.1.8"; - sha256 = "0p2m31l893377na7dmsjfpjd5swqnb7p0vhsng3vyn237i8f1336"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v21.1.0"; - sha256 = "1rway7ksn6c98pxs036hl8nvljs3vxspgsjj9y1ncc0vzavg29d1"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-blob-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-blob-go"; - rev = "cf01652132cc"; - sha256 = "0pcb59nsn094flpqwl7yz7cqvvwki0wam9r8gjbzqbsjn7ib3gac"; - }; - } - { - goPackagePath = "github.com/Azure/draft"; - fetch = { - type = "git"; - url = "https://github.com/Azure/draft"; - rev = "v0.15.0"; - sha256 = "03396zlalfsdxaiqpb97m8x9r060yyydvh0dkg7506pz5zrfm4pn"; - }; - } - { - goPackagePath = "github.com/Azure/go-ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ansiterm"; - rev = "d6e3b3328b78"; - sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "v10.15.5"; - sha256 = "158xbd8wn1bna1k1ichlirz6a1zvlh3rg7klr9cnp72l2q8jwvcl"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-go"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-go"; - rev = "281ae9f2d895"; - sha256 = "1n82vl636zcpfrhh7yhmszvdxdba5hn2fjl39dvnk0a8pm2afmkx"; - }; - } - { - goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; - fetch = { - type = "git"; - url = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; - rev = "ac834ce67862"; - sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; - }; - } - { - goPackagePath = "github.com/IBM-Cloud/bluemix-go"; - fetch = { - type = "git"; - url = "https://github.com/IBM-Cloud/bluemix-go"; - rev = "d718d474c7c2"; - sha256 = "1div1yrr7lbamh469hkd41acbjsln7jyaf0kzjxbjgb4rwmnh2jk"; - }; - } - { - goPackagePath = "github.com/Jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/Jeffail/gabs"; - rev = "v1.1.1"; - sha256 = "1lk6cn7fnnfyq8xb0xlv8zv3gvdd0vb2g8ikc9rfcppl7hwy51n8"; - }; - } - { - goPackagePath = "github.com/MakeNowJust/heredoc"; - fetch = { - type = "git"; - url = "https://github.com/MakeNowJust/heredoc"; - rev = "e9091a26100e"; - sha256 = "04lh2vm6d6s1vikzh9xb4ya744snr5c4v5797y2b8ri4pyfgd9h2"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "v1.4.2"; - sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "6b2a58267f6a"; - sha256 = "10vzhx710vaxqzh45vrkw4vc3fgcbycpn04shcylzcmlxmfnpjv1"; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.6"; - sha256 = "0i3z8yrxlldq0n70ic30517437jzzxmvbglhbxrz75qnlzrglhlp"; - }; - } - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "63027b26b87e"; - sha256 = "1px0rlhxpap7rk37w0qlq66zzxwfvbpdc2sps2i2rqxgd3w5n31g"; - }; - } - { - goPackagePath = "github.com/Netflix/go-expect"; - fetch = { - type = "git"; - url = "https://github.com/Netflix/go-expect"; - rev = "124a37274874"; - sha256 = "1cq3d7d4cpwgyzb0syka4a4dspcymq5582qzvbdkbkc4s81kjr4c"; - }; - } - { - goPackagePath = "github.com/Nvveen/Gotty"; - fetch = { - type = "git"; - url = "https://github.com/Nvveen/Gotty"; - rev = "cd527374f1e5"; - sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; - }; - } - { - goPackagePath = "github.com/Pallinder/go-randomdata"; - fetch = { - type = "git"; - url = "https://github.com/Pallinder/go-randomdata"; - rev = "15df0648130a"; - sha256 = "1kdrchnhp71spz6amcbxr5m0pdksbqx8jjydvxb82pw43rrbx6s7"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "v1.1.0"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad4578"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/SAP/go-hdb"; - fetch = { - type = "git"; - url = "https://github.com/SAP/go-hdb"; - rev = "v0.13.2"; - sha256 = "0gzw594y039chx22a3zn9y3j2y6bqsgi9zq7lzpf7schzl52ii7h"; - }; - } - { - goPackagePath = "github.com/SermoDigital/jose"; - fetch = { - type = "git"; - url = "https://github.com/SermoDigital/jose"; - rev = "v0.9.1"; - sha256 = "0fc6w0hl9n39ixpayg1j3b4nvnr06bgvhqx5mxgxcydjci5pqi8m"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a6"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/acarl005/stripansi"; - fetch = { - type = "git"; - url = "https://github.com/acarl005/stripansi"; - rev = "5a71ef0e047d"; - sha256 = "02sxiishdixm791jqbkmhdcvc712l0fb8rqmibxzgc61h0qs6rs3"; - }; - } - { - goPackagePath = "github.com/alcortesm/tgz"; - fetch = { - type = "git"; - url = "https://github.com/alcortesm/tgz"; - rev = "9c5fe88206d7"; - sha256 = "04dcwnz2c2i4wbq2vx3g2wrdgqpncr2r1h6p1k08rdwk4bq1h8c5"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/alexflint/go-filemutex"; - fetch = { - type = "git"; - url = "https://github.com/alexflint/go-filemutex"; - rev = "d358565f3c3f"; - sha256 = "19fzbm0x8821awsmqj9ig49dxxkd72p1yfqbijmdwwszvw2r0ggz"; - }; - } - { - goPackagePath = "github.com/andygrunwald/go-gerrit"; - fetch = { - type = "git"; - url = "https://github.com/andygrunwald/go-gerrit"; - rev = "43cfd7a94eb4"; - sha256 = "1350r7pvvgl26kiiz4x96ac5gym2xc9968ddx18z8wlv776azidr"; - }; - } - { - goPackagePath = "github.com/andygrunwald/go-jira"; - fetch = { - type = "git"; - url = "https://github.com/andygrunwald/go-jira"; - rev = "v1.5.0"; - sha256 = "13fp8qim22znvlqclsg2sdlpvbnmgh549rrsa9cxk04klgaapdqy"; - }; - } - { - goPackagePath = "github.com/anmitsu/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/anmitsu/go-shlex"; - rev = "648efa622239"; - sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7"; - }; - } - { - goPackagePath = "github.com/antham/chyle"; - fetch = { - type = "git"; - url = "https://github.com/antham/chyle"; - rev = "v1.4.0"; - sha256 = "144ja4g7b238dm3hwgqbl71skxp5mx7438w78hjpbfn5zq2cbrs2"; - }; - } - { - goPackagePath = "github.com/antham/envh"; - fetch = { - type = "git"; - url = "https://github.com/antham/envh"; - rev = "v1.2.0"; - sha256 = "0l0mn4vwns9b6faxvx464a38mjgk5rhn58sxai1g7l8c3qqr3g0h"; - }; - } - { - goPackagePath = "github.com/antham/strumt"; - fetch = { - type = "git"; - url = "https://github.com/antham/strumt"; - rev = "6776189777d3"; - sha256 = "0m7xhjnfpxvhx3a59k46k33i0zmy427vxmx67smndjxgxgmpqzd0"; - }; - } - { - goPackagePath = "github.com/aokoli/goutils"; - fetch = { - type = "git"; - url = "https://github.com/aokoli/goutils"; - rev = "v1.0.1"; - sha256 = "1yj4yjfwylica31sgj69ygb04p9xxi22kgfxd0j5f58zr8vwww2n"; - }; - } - { - goPackagePath = "github.com/armon/circbuf"; - fetch = { - type = "git"; - url = "https://github.com/armon/circbuf"; - rev = "bbbad097214e"; - sha256 = "1idpr0lzb2px2p3wgfq2276yl7jpaz43df6n91kf790404s4zmk3"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "f0300d1749da"; - sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "v1.0.0"; - sha256 = "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503"; - }; - } - { - goPackagePath = "github.com/asaskevich/govalidator"; - fetch = { - type = "git"; - url = "https://github.com/asaskevich/govalidator"; - rev = "f9ffefc3facf"; - sha256 = "02rsz7v49in9bmgsjciqcyik9xmy3yfz0znw739ssgy6px00cg04"; - }; - } - { - goPackagePath = "github.com/aws/aws-k8s-tester"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-k8s-tester"; - rev = "b411acf57dfe"; - sha256 = "1yhgmkdd003v99w9kdl96phfmg3f3a5ahmn49srdbakc3p1wwxh8"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.16.20"; - sha256 = "0a5wwmjmlbdgmsv1myxr9vmr9k9cic5d31kc30qbasm7p15ljxr1"; - }; - } - { - goPackagePath = "github.com/banzaicloud/bank-vaults"; - fetch = { - type = "git"; - url = "https://github.com/banzaicloud/bank-vaults"; - rev = "e31657d7c4fe"; - sha256 = "0f642k5prrvq7wcm96hk7vw8ma86x7k1bvkr8mrcvabnvvp5jcfk"; - }; - } - { - goPackagePath = "github.com/bazelbuild/buildtools"; - fetch = { - type = "git"; - url = "https://github.com/bazelbuild/buildtools"; - rev = "80c7f0d45d7e"; - sha256 = "1r2590m283k2449ikjmvrifz1ik8gn4wyq563r4v03ssylf3rv40"; - }; - } - { - goPackagePath = "github.com/beevik/etree"; - fetch = { - type = "git"; - url = "https://github.com/beevik/etree"; - rev = "v1.0.1"; - sha256 = "0f3lj7azxd5qq29hqd32211ds7n56i3rgmfll6c1f4css1f3srxg"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/bitly/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-hostpool"; - rev = "a3a6125de932"; - sha256 = "1m82mvnfw6k2ylpn598bcsg8mdgbq4fnsk7yc23hpvps9glsrbb6"; - }; - } - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { - goPackagePath = "github.com/bmizerany/assert"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/assert"; - rev = "b7ed37b82869"; - sha256 = "18hy1wyl9zdi7sgxafrn3m7fadh6in0rhhb8l0cvkxqzdl0jcw2s"; - }; - } - { - goPackagePath = "github.com/bouk/monkey"; - fetch = { - type = "git"; - url = "https://github.com/bouk/monkey"; - rev = "v1.0.0"; - sha256 = "1ngcjmn6bys10zd22x8fh5lf0iyqkjqmbx47b0inw9ddh56sdzph"; - }; - } - { - goPackagePath = "github.com/bwmarrin/snowflake"; - fetch = { - type = "git"; - url = "https://github.com/bwmarrin/snowflake"; - rev = "68117e6bbede"; - sha256 = "1zpjxm82d55map8bvvpa1l9xjxg03005dza3rd7a6bapm31f3107"; - }; - } - { - goPackagePath = "github.com/c2h5oh/datasize"; - fetch = { - type = "git"; - url = "https://github.com/c2h5oh/datasize"; - rev = "4eba002a5eae"; - sha256 = "02sxd659q7m7axfywiqfxk5rh6djh2m5240bin1makldj1nj16j3"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.0.0"; - sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; - }; - } - { - goPackagePath = "github.com/chai2010/gettext-go"; - fetch = { - type = "git"; - url = "https://github.com/chai2010/gettext-go"; - rev = "bf70f2a70fb1"; - sha256 = "0bwjwvjl7zqm7kxram1rzz0ri3h897kiin13ljy9hx3fzz1i9lml"; - }; - } - { - goPackagePath = "github.com/chromedp/cdproto"; - fetch = { - type = "git"; - url = "https://github.com/chromedp/cdproto"; - rev = "57cf4773008d"; - sha256 = "1m9qq4nvdj5rbpq123s88agiv3604lvg0q2af7fhr1m16rs4xg1k"; - }; - } - { - goPackagePath = "github.com/chromedp/chromedp"; - fetch = { - type = "git"; - url = "https://github.com/chromedp/chromedp"; - rev = "v0.1.1"; - sha256 = "1wcj54ff3qa6sypl8bdaabwlhf3v9b7br3nr9rq0ls64jfdw1sla"; - }; - } - { - goPackagePath = "github.com/circonus-labs/circonus-gometrics"; - fetch = { - type = "git"; - url = "https://github.com/circonus-labs/circonus-gometrics"; - rev = "v2.2.6"; - sha256 = "11j6bm05baskaavjzjkf48jkxis5sk621wkvi3j2315abkyhsf6f"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/codeship/codeship-go"; - fetch = { - type = "git"; - url = "https://github.com/codeship/codeship-go"; - rev = "7793ca823354"; - sha256 = "1jr93ddbb1v27vd4w8wx2dcha8g32gc6rl0chyz75rmypi6888h7"; - }; - } - { - goPackagePath = "github.com/containerd/continuity"; - fetch = { - type = "git"; - url = "https://github.com/containerd/continuity"; - rev = "004b46473808"; - sha256 = "0js7wjap44db6vvdpz4dvblqx6j36r1kb09ggvlwx4inkwg2ds2d"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "v1.3.1-coreos.6"; - sha256 = "0r39wj5fv6d7nkkirjnnrnhikcp6sqa5dgmr6cimz5s0smvfm8vw"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "c6f51f82210d"; - sha256 = "1vnccmnkjl6n539l4cliz6sznpqn6igf5v7mbmsgahb838742clb"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "399ea9e2e55f"; - sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.8"; - sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; - }; - } - { - goPackagePath = "github.com/danwakefield/fnmatch"; - fetch = { - type = "git"; - url = "https://github.com/danwakefield/fnmatch"; - rev = "cbb64ac3d964"; - sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/deckarep/golang-set"; - fetch = { - type = "git"; - url = "https://github.com/deckarep/golang-set"; - rev = "1d4478f51bed"; - sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff"; - }; - } - { - goPackagePath = "github.com/denisenkom/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/denisenkom/go-mssqldb"; - rev = "2fea367d496d"; - sha256 = "0qq3b68ziqhfy8j9xrzpq2czsbacakbraicm7gp7l6mdbifi06zr"; - }; - } - { - goPackagePath = "github.com/denormal/go-gitignore"; - fetch = { - type = "git"; - url = "https://github.com/denormal/go-gitignore"; - rev = "75ce8f3e513c"; - sha256 = "0yqicwkrw7plrc6zybv025ssaqzhy01s0c7x8ifp0x3vmxrzy57k"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "v3.2.0"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "v1.4.2"; - sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8"; - }; - } - { - goPackagePath = "github.com/djherbis/atime"; - fetch = { - type = "git"; - url = "https://github.com/djherbis/atime"; - rev = "v1.0.0"; - sha256 = "1zwxsk2r2p53qpgsxkky4x1gvxca4fx6qy9y10jvgpn4wf57m4ja"; - }; - } - { - goPackagePath = "github.com/dnaeon/go-vcr"; - fetch = { - type = "git"; - url = "https://github.com/dnaeon/go-vcr"; - rev = "v1.0.1"; - sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "edc3ab29cdff"; - sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "5e5fadb3c020"; - sha256 = "14rbpynz304xh0aqphjspld3955wcis1d1gcg4dicw0q1klhhw8v"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "v0.3.0"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "v0.3.2"; - sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "bc6354cbbc29"; - sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; - }; - } - { - goPackagePath = "github.com/dsnet/compress"; - fetch = { - type = "git"; - url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad76"; - sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; - }; - } - { - goPackagePath = "github.com/duosecurity/duo_api_golang"; - fetch = { - type = "git"; - url = "https://github.com/duosecurity/duo_api_golang"; - rev = "539434bf0d45"; - sha256 = "1dzf280gin51gww2hkcc5r5dmrjfjirsmkmksjw2ipkgy8kp40nz"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "v1.0.0"; - sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; - }; - } - { - goPackagePath = "github.com/elazarl/goproxy"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/goproxy"; - rev = "2ce16c963a8a"; - sha256 = "1jdgwbma4zs77w66y6hf7677hwpww1wzw27qdk1dr0pms0y7zlzp"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "v2.8.0"; - sha256 = "1zqcjhg4q7788hyrkhwg4b6r1vc4qnzbw8c5j994mr18x42brxzg"; - }; - } - { - goPackagePath = "github.com/emirpasic/gods"; - fetch = { - type = "git"; - url = "https://github.com/emirpasic/gods"; - rev = "v1.9.0"; - sha256 = "1zhkppqzy149fp561pif8d5d92jd9chl3l9z4yi5f8n60ibdmmjf"; - }; - } - { - goPackagePath = "github.com/erikstmartin/go-testdb"; - fetch = { - type = "git"; - url = "https://github.com/erikstmartin/go-testdb"; - rev = "8d10e4a1bae5"; - sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "v4.1.0"; - sha256 = "1yqakqyqspdwpq2dzvrd9rb79z24zmrafscj284dnrl421ns3zvh"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.0.0"; - sha256 = "040grl40gcqd1y852lnf0l1l5wi73g0crnaihzl0nfsas9ydk3h4"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/fsouza/fake-gcs-server"; - fetch = { - type = "git"; - url = "https://github.com/fsouza/fake-gcs-server"; - rev = "e85be23bdaa8"; - sha256 = "185kw9cap458s9ldlb2nm0vlwx82rd6jnx13600p8hnb5y36fjw7"; - }; - } - { - goPackagePath = "github.com/gfleury/go-bitbucket-v1"; - fetch = { - type = "git"; - url = "https://github.com/gfleury/go-bitbucket-v1"; - rev = "3a732135aa4d"; - sha256 = "0bnzxd1p6kbv3cym38l0kry1jbxhyz905lkbkhmiswmjg7mmlq1k"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/gliderlabs/ssh"; - fetch = { - type = "git"; - url = "https://github.com/gliderlabs/ssh"; - rev = "v0.1.1"; - sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.39.0"; - sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-ldap/ldap"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "v3.0.1"; - sha256 = "0dn4v340wdrfhah5kp2pyi69a1kwwllrz84whsiiwbial8fac483"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "v1.2.1"; - sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "v0.17.0"; - sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "v0.17.0"; - sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "v0.17.1"; - sha256 = "14n5x2nxlj2x62v3km96yw7rncxk2b9v94k3j0c22r43c60m38mx"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "v0.17.0"; - sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.4.0"; - sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/go-test/deep"; - fetch = { - type = "git"; - url = "https://github.com/go-test/deep"; - rev = "v1.0.1"; - sha256 = "0f4rbdl6qmlq4bzh0443i634bm675bbrkyzwp8wkc1yhdl9qsij7"; - }; - } - { - goPackagePath = "github.com/go-yaml/yaml"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "v2.1.0"; - sha256 = "0k7afgp9gkx6pmilijx1wf1sgl3vfbnlfjj05qhnw3whhy4yyyqs"; - }; - } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "v1.6.5"; - sha256 = "14ak10gap2xmy0vxwl0kplck8dhg6xyqcvra5wfana9w1520a622"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "v0.2.3"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gocql/gocql"; - fetch = { - type = "git"; - url = "https://github.com/gocql/gocql"; - rev = "8516aabb0f99"; - sha256 = "0b68630xizfzndl368l7inda8q8py69wxh967y9knvx33yfs7bzp"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "6f2cf27854a4"; - sha256 = "01wzacrqyqz10g29s88yjcm6w2wisffbadfppas51pfqmijhc11k"; - }; - } - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255db"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/subcommands"; - fetch = { - type = "git"; - url = "https://github.com/google/subcommands"; - rev = "46f0354f6315"; - sha256 = "043j9y17kp73972vblkzmr222143hja3gg6cnry4wsiri9lslc2l"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.0"; - sha256 = "0yx4kiafyshdshrmrqcf2say5mzsviz7r94a0y1l6xfbkkyvnc86"; - }; - } - { - goPackagePath = "github.com/google/wire"; - fetch = { - type = "git"; - url = "https://github.com/google/wire"; - rev = "v0.2.0"; - sha256 = "07arvzwyari18dz1lq4kzysm2dnph93wsbbdzq58hzcmar9snm8g"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.0"; - sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "v0.2.0"; - sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; - }; - } - { - goPackagePath = "github.com/gophercloud/gophercloud"; - fetch = { - type = "git"; - url = "https://github.com/gophercloud/gophercloud"; - rev = "bdd8b1ecd793"; - sha256 = "0q9rss8yl11v9l10nb2203crsqzqpfxwnwfckaaszjx37rnd98cg"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gorilla/securecookie"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/securecookie"; - rev = "v1.1.1"; - sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"; - }; - } - { - goPackagePath = "github.com/gorilla/sessions"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/sessions"; - rev = "v1.1.3"; - sha256 = "0a99mlw5gvqbghnc1nx76gaanpxzjqfd74klp3s3sgbss69clayi"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/gotestyourself/gotestyourself"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotestyourself"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "9cad4c3443a7"; - sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "v1.5.1"; - sha256 = "1q3l6ydf37lm6hdm9df8y385bacycj4pin1b06w7dpm6m045l3sp"; - }; - } - { - goPackagePath = "github.com/hailocab/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/hailocab/go-hostpool"; - rev = "e80d13ce29ed"; - sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "v1.4.2"; - sha256 = "1nprl9kcb98ikcmk7safji3hl4kfacx0gnh05k8m4ysfz6mr7zri"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "v0.5.0"; - sha256 = "1mwl96a815x1843pnqn7lk38s05bgn5rdjw57xd46jzr62izcnsq"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-hclog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-hclog"; - rev = "4783caec6f2e"; - sha256 = "1sjhmsysr5vp5y6y9s0l49hjgqb14s0m9p7wwc2m4cga4qps299s"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "v1.0.0"; - sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-memdb"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-memdb"; - rev = "032f93b25bec"; - sha256 = "1bkbvx93a7li9myy2vs27wh6yyxn67gyvlmb6ywidr4lf50azi5v"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-msgpack"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-msgpack"; - rev = "v0.5.3"; - sha256 = "00jv0ajqd58pkb2yyhlrjp0rv1mvb1ijx3yqjyikcmzvk9jb4h5m"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-plugin"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-plugin"; - rev = "362c99b11937"; - sha256 = "0q23ri3s5r2w7z20bpk76vlb79mdwz0xbk7ppdlcbrkbylrpw9ai"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-retryablehttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-retryablehttp"; - rev = "e651d75abec6"; - sha256 = "1bw09c1q3hlgmp954w9y0xqzb1m82im28z2yfc85hanm3v71f76y"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-sockaddr"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-sockaddr"; - rev = "v1.0.0"; - sha256 = "1yn1xq8ysn0lszmkygz3a9lgpswbz1p91jv7q8l20s4749a22xgi"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "v1.0.0"; - sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.1"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "270f2f71b1ee"; - sha256 = "1d43wlp932nqbwkca4bhw8l4x6cg25jyh8l1s3814vddscfpfz2v"; - }; - } - { - goPackagePath = "github.com/hashicorp/go.net"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go.net"; - rev = "v0.0.1"; - sha256 = "06arwi95xp5rxyz7rndvhc3wlwg0jn9a5z6djf3yyg5h9zfab9i4"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.0"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; - }; - } - { - goPackagePath = "github.com/hashicorp/logutils"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/logutils"; - rev = "v1.0.0"; - sha256 = "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv"; - }; - } - { - goPackagePath = "github.com/hashicorp/mdns"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/mdns"; - rev = "v1.0.0"; - sha256 = "0qr4l91hhi97s8a1isnrw3s4q8pjzacqiks870vnwh15v7ig3axd"; - }; - } - { - goPackagePath = "github.com/hashicorp/memberlist"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/memberlist"; - rev = "v0.1.3"; - sha256 = "0k1spq7dagvqj3baqw2dhxx1zxrb02y6m3apzr3a7gyirii890g3"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "v0.8.2"; - sha256 = "0nrslghvdjhaczr2xp9mn8xgcx1dxl4jgpbk0l61ssmxahpx4iyc"; - }; - } - { - goPackagePath = "github.com/hashicorp/vault"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/vault"; - rev = "v0.11.4"; - sha256 = "0snqa3kar40mygcacdv55k60k9blq2zqx9hfcv42v7p0x3zqh0z0"; - }; - } - { - goPackagePath = "github.com/hashicorp/vault-plugin-secrets-kv"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/vault-plugin-secrets-kv"; - rev = "edbfe287c5d9"; - sha256 = "0rg7k3azsmk2kiwjvylfryhadxly7x2yj0gb4wkaacvka728kxrz"; - }; - } - { - goPackagePath = "github.com/hashicorp/yamux"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/yamux"; - rev = "3520598351bb"; - sha256 = "15r8yzj7a7bki9d0k3da5pab6byhyc63kvmi0by92x61mz7svqa5"; - }; - } - { - goPackagePath = "github.com/heptio/sonobuoy"; - fetch = { - type = "git"; - url = "https://github.com/jenkins-x/sonobuoy"; - rev = "dad27c12bf17"; - sha256 = "1xs8h3rx4s9yvv0klxwjb2qw05qh65hllxhz688wrw7ynyrwcmr1"; - }; - } - { - goPackagePath = "github.com/hinshun/vt10x"; - fetch = { - type = "git"; - url = "https://github.com/hinshun/vt10x"; - rev = "d55458df857c"; - sha256 = "0vwsp5iii7pf4na8pkd7cn3bawkwnsimkv1sysy7bslclg5jm370"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "v1.0.0"; - sha256 = "0bnyh4awmr9aagqhhi19xdadzksrkl01d987ycqx86dwlvqqxnxf"; - }; - } - { - goPackagePath = "github.com/iancoleman/orderedmap"; - fetch = { - type = "git"; - url = "https://github.com/iancoleman/orderedmap"; - rev = "22c6ecc9fe13"; - sha256 = "0k8axkkg84ik5v5b4m398c7lbaygb815y1wsj7fn5y2d1mqndd4q"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.6"; - sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/influxdata/influxdb"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/influxdb"; - rev = "049f9b42e9a5"; - sha256 = "1m9p7zwwwk3fb9z3xxzv86avpnknvc1nya8l6q8maylyb89rk6ir"; - }; - } - { - goPackagePath = "github.com/jbenet/go-context"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-context"; - rev = "d14ea06fba99"; - sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl"; - }; - } - { - goPackagePath = "github.com/jbrukh/bayesian"; - fetch = { - type = "git"; - url = "https://github.com/jbrukh/bayesian"; - rev = "bf3f261f9a9c"; - sha256 = "12xylsachg2br784909nf0n2c4bk1k7qwabfy4nccbvadyqscg82"; - }; - } - { - goPackagePath = "github.com/jefferai/jsonx"; - fetch = { - type = "git"; - url = "https://github.com/jefferai/jsonx"; - rev = "v1.0.0"; - sha256 = "15j4lch1k2bdrkcc2wnqbdcsf8avair0b7fn9ymhjqkz1zcqvpby"; - }; - } - { - goPackagePath = "github.com/jenkins-x/draft-repo"; - fetch = { - type = "git"; - url = "https://github.com/jenkins-x/draft-repo"; - rev = "2f66cc518135"; - sha256 = "1rwyyzakij8c13wvphksdf903dq9kw1k32lwsjwg3pxcr3rw9nr6"; - }; - } - { - goPackagePath = "github.com/jenkins-x/golang-jenkins"; - fetch = { - type = "git"; - url = "https://github.com/jenkins-x/golang-jenkins"; - rev = "65b83ad42314"; - sha256 = "1mvvwklcp0cwg4vrsycamly7k9zck185bma3j9rr7pga12cwdsid"; - }; - } - { - goPackagePath = "github.com/jetstack/cert-manager"; - fetch = { - type = "git"; - url = "https://github.com/jetstack/cert-manager"; - rev = "v0.5.2"; - sha256 = "0xic07v4fzvhn14sri6dlwklilq1966pc0l6vv664p4msgqldc9a"; - }; - } - { - goPackagePath = "github.com/jinzhu/gorm"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/gorm"; - rev = "572d0a0ab1eb"; - sha256 = "1fzxbq89gdi57ql1pd9hf5q6jqzinz54v84lwp1bkv0mpipxqydr"; - }; - } - { - goPackagePath = "github.com/jinzhu/inflection"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/inflection"; - rev = "3272df6c21d0"; - sha256 = "129xn1lm768ikbvwy5cap20d3p38hw4d631za34zapfxyy2p96c0"; - }; - } - { - goPackagePath = "github.com/jinzhu/now"; - fetch = { - type = "git"; - url = "https://github.com/jinzhu/now"; - rev = "8ec929ed50c3"; - sha256 = "0ydl9cx17zkx21b5cqhrl8x4j7yhmyl3ki4kn1c0ql38jw4pww7y"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e8439af"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "v0.1.0"; - sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.5"; - sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.2.1"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "95032a82bc51"; - sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; - }; - } - { - goPackagePath = "github.com/kevinburke/ssh_config"; - fetch = { - type = "git"; - url = "https://github.com/kevinburke/ssh_config"; - rev = "9fc7bb800b55"; - sha256 = "102icrla92zmr5zngipc8c9yfbqhf73zs2w2jq6s7p0gdjifigc8"; - }; - } - { - goPackagePath = "github.com/keybase/go-crypto"; - fetch = { - type = "git"; - url = "https://github.com/keybase/go-crypto"; - rev = "255a5089e85a"; - sha256 = "0c2n05lpkpq7ii8c2x3p228x3sm6msn33532zyfk2k9dk7zigzy9"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/knative/build"; - fetch = { - type = "git"; - url = "https://github.com/knative/build"; - rev = "v0.3.0"; - sha256 = "1zn9ngl3wr8mgg31m8dw1w5jfjdiq0gkrdv0936vabazxjgsyb5q"; - }; - } - { - goPackagePath = "github.com/knative/build-pipeline"; - fetch = { - type = "git"; - url = "https://github.com/knative/build-pipeline"; - rev = "7c289d8aedf7"; - sha256 = "132flxjg6aj12xmz5px6dyljj630q0icdmxr9dz7l6j01ll4yagk"; - }; - } - { - goPackagePath = "github.com/knative/pkg"; - fetch = { - type = "git"; - url = "https://github.com/knative/pkg"; - rev = "994b801b03ef"; - sha256 = "15xpdk9zmsljdd3rwcxmk1nml9nync9yj71pqih69bgxfqpbyrx1"; - }; - } - { - goPackagePath = "github.com/knq/snaker"; - fetch = { - type = "git"; - url = "https://github.com/knq/snaker"; - rev = "d9ad1e7f342a"; - sha256 = "1020q2faxm12lshmyd6qh1dnhls145nyrmisw4gy3zlk3ccy5jif"; - }; - } - { - goPackagePath = "github.com/knq/sysutil"; - fetch = { - type = "git"; - url = "https://github.com/knq/sysutil"; - rev = "0218e141a794"; - sha256 = "11nsjv7bm370gbiwv7l4kp573gv5zj1xajxjf4x57wynzxhij5lq"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.2"; - sha256 = "1jhi5g23xsrqkfjg9a7l7rqzgx2mlf2w11892nng9p9f7xp55k6h"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - }; - } - { - goPackagePath = "github.com/lusis/go-slackbot"; - fetch = { - type = "git"; - url = "https://github.com/lusis/go-slackbot"; - rev = "401027ccfef5"; - sha256 = "125rraz8nwid7vw7x8xj4cz7i74xycx3jddvzn0r3sqajnq94s0l"; - }; - } - { - goPackagePath = "github.com/lusis/slack-test"; - fetch = { - type = "git"; - url = "https://github.com/lusis/slack-test"; - rev = "3c758769bfa6"; - sha256 = "110gs02k9bqrch248jycb7a3yzx2i3yh02k9s16fhdw612ag2sak"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "60711f1a8329"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; - }; - } - { - goPackagePath = "github.com/markbates/inflect"; - fetch = { - type = "git"; - url = "https://github.com/markbates/inflect"; - rev = "v1.0.4"; - sha256 = "0pd50b8q6bib84yab14csd6nc08hfdapzbh1nnw6qrmc1zxi7r7m"; - }; - } - { - goPackagePath = "github.com/mattbaird/jsonpatch"; - fetch = { - type = "git"; - url = "https://github.com/mattbaird/jsonpatch"; - rev = "81af80346b1a"; - sha256 = "0ll22kpf75m72r7i5ddg3r87gdlagbj2x24bppgbi8jp018pdq95"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.2"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "38ee283dabf1"; - sha256 = "18xyi0n1dhspvy6z982k7v545w7k0idpmvlqmrn6nkd6dkw7pfdw"; - }; - } - { - goPackagePath = "github.com/mattn/go-zglob"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-zglob"; - rev = "49693fbb3fe3"; - sha256 = "1j7li9jbqfakm3glj1hf0bl062y25jmaqw3d6v973c1vcgmdxvgw"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mgutz/ansi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/ansi"; - rev = "9520e82c474b"; - sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; - }; - } - { - goPackagePath = "github.com/mholt/archiver"; - fetch = { - type = "git"; - url = "https://github.com/mholt/archiver"; - rev = "v3.1.1"; - sha256 = "1v18xzzwi836rdxnr5dssllc083rdiry9baqaqnz6x3f1xvfnqp9"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.0.14"; - sha256 = "1qgli6yp59bv6vc6zag84cwxmcxgnyxm1q2f301yyijk3wy5b2ak"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - goPackagePath = "github.com/mitchellh/copystructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/copystructure"; - rev = "v1.0.0"; - sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "3864e76763d9"; - sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "v1.0.0"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/gox"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/gox"; - rev = "v0.4.0"; - sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r"; - }; - } - { - goPackagePath = "github.com/mitchellh/iochan"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/iochan"; - rev = "v1.0.0"; - sha256 = "058n9bbf536f2nw3pbs7pysrg9cqvgkb28z2zf5wjyrzrknyk53g"; - }; - } - { - goPackagePath = "github.com/mitchellh/ioprogress"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/ioprogress"; - rev = "6a23b12fa88e"; - sha256 = "1fcfwi5fzv17iahif42y7dhjfnjwkslk03zb9cniw42wyiwhj3jk"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "f15292f7a699"; - sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "v1.0.0"; - sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nbio/st"; - fetch = { - type = "git"; - url = "https://github.com/nbio/st"; - rev = "e9e8d9816f32"; - sha256 = "14r4acm82gp9ikqnp41a06bm4mrdlbskakhibbxsc5ljav7bni27"; - }; - } - { - goPackagePath = "github.com/nlopes/slack"; - fetch = { - type = "git"; - url = "https://github.com/nlopes/slack"; - rev = "347a74b1ea30"; - sha256 = "0wkj2kvvg2jl01bajkjavcpn1c98yhxd96cadpm522ag3gqdlw81"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "v1.0.0"; - sha256 = "1dsq1wcddl7r1y0d94px368biiy1dgzl3nab47f0rb0fp1b24l1x"; - }; - } - { - goPackagePath = "github.com/oklog/run"; - fetch = { - type = "git"; - url = "https://github.com/oklog/run"; - rev = "v1.0.0"; - sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "a0225b3f23b5"; - sha256 = "0bp9r6xzy6d3p7l2hjmvr25y3rp3p8c9xv1agkllkksm45ng6681"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.6.0"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.4.2"; - sha256 = "0f1lpgdcfan3bj545xjrlkdkmi7g0l8gn82gsxay1x6rsqv6nl0b"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "v1.0.1"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "v0.1.1"; - sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go"; - rev = "v0.1.1"; - sha256 = "0kd5yc4117dlqc80v0f29kb2l8nrx2da9c03ljns5n8hynnjgb27"; - }; - } - { - goPackagePath = "github.com/operator-framework/operator-sdk"; - fetch = { - type = "git"; - url = "https://github.com/operator-framework/operator-sdk"; - rev = "913cbf711929"; - sha256 = "1fq6g8q11qx842zsj8k16ng6p2xpmp52v91m24vz35rh9pl4kdg0"; - }; - } - { - goPackagePath = "github.com/ory/dockertest"; - fetch = { - type = "git"; - url = "https://github.com/ory/dockertest"; - rev = "v3.3.4"; - sha256 = "0gwdbxszjzv3cr42kmwjvqab1y8y8g9j0p3yl1n0rzmsfxcz1mmb"; - }; - } - { - goPackagePath = "github.com/pascaldekloe/goe"; - fetch = { - type = "git"; - url = "https://github.com/pascaldekloe/goe"; - rev = "57f6aae5913c"; - sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "v2.1.0"; - sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "e790cca94e6c"; - sha256 = "0y1crv4wkly2naki2f68ln9sc8l9skswkc696vr8vc43p4p67wam"; - }; - } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "v0.2.0"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "v2.0.1"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/petergtz/pegomock"; - fetch = { - type = "git"; - url = "https://github.com/petergtz/pegomock"; - rev = "b113d17a7e81"; - sha256 = "1si2dxz6wvx7px8g1455gz1vvlfwsm014wdbvyr69c3m2ad86wm0"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "v2.0.5"; - sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; - }; - } - { - goPackagePath = "github.com/pkg/browser"; - fetch = { - type = "git"; - url = "https://github.com/pkg/browser"; - rev = "c90ca0c84f15"; - sha256 = "05xpqsns08blmwdh8aw5kpq2d9x4fl91535j6np1ylw1q2b67b8i"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.1"; - sha256 = "01gnylazia30pcp069xcng482gwmm3xcx5zgrlwdkhic1lyb6i9l"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.2.0"; - sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "185b4288413d"; - sha256 = "0d85429kdw5dgj5zhyiz1sq3i5691vj2gjnda93nnxxzx9acg8cv"; - }; - } - { - goPackagePath = "github.com/qor/inflection"; - fetch = { - type = "git"; - url = "https://github.com/qor/inflection"; - rev = "04140366298a"; - sha256 = "1s4qcnwaajp3c5ykwx4dfy32hykwsm0ki7kx8lcw8b0z0grkz6qh"; - }; - } - { - goPackagePath = "github.com/rifflock/lfshook"; - fetch = { - type = "git"; - url = "https://github.com/rifflock/lfshook"; - rev = "bf539943797a"; - sha256 = "0hns4zidw8g3s5l9dyl894fnyjr0a5xgdvx26rnal9jrn4n6z835"; - }; - } - { - goPackagePath = "github.com/rodaine/hclencoder"; - fetch = { - type = "git"; - url = "https://github.com/rodaine/hclencoder"; - rev = "0680c4321930"; - sha256 = "0xyzmbhg0qnaybbd4sxly8932kswx2gplcw788gh811ylhjj2liy"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.1"; - sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "9b3edd62028f"; - sha256 = "1ya1idkbb0a9fjlhkcnh5a9yvpwzwfmbyg7d56lpplwr9rqi1da4"; - }; - } - { - goPackagePath = "github.com/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "256dc444b735"; - sha256 = "07rsd7hranghwc68ib0r2zxd9d5djanzjvd84j9dgj3wqsyg5mi2"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.2.0"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/sean-/seed"; - fetch = { - type = "git"; - url = "https://github.com/sean-/seed"; - rev = "e2103e2c3529"; - sha256 = "0glir8jxi1w7aga2jwdb63pp1h8q4whknili7xixsqzwyy716125"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/sethgrid/pester"; - fetch = { - type = "git"; - url = "https://github.com/sethgrid/pester"; - rev = "03e26c9abbbf"; - sha256 = "0xhzs8xjaxr00n0sc0hjhlp78l01jwqqv9r6yfcxqy86cfyrdfgw"; - }; - } - { - goPackagePath = "github.com/sethvargo/go-password"; - fetch = { - type = "git"; - url = "https://github.com/sethvargo/go-password"; - rev = "v0.1.2"; - sha256 = "0z6jz4b7cfdwiqrzhcyvraq2s1rw4fpw4fbna9r7xi1vvj26gyrf"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "eb1f1ab16f2e"; - sha256 = "0qn5nn4kcqcw5wkcg82s9jbjh6wvrfq88zinm35xlpwhpdklznjw"; - }; - } - { - goPackagePath = "github.com/shirou/w32"; - fetch = { - type = "git"; - url = "https://github.com/shirou/w32"; - rev = "bb4de0191aa4"; - sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; - }; - } - { - goPackagePath = "github.com/shurcooL/githubv4"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/githubv4"; - rev = "51d7b505e2e9"; - sha256 = "0zy2aci0gr9x08fl8bicknc2v9nqnxhqr3y05dzvmr0b5av9q24f"; - }; - } - { - goPackagePath = "github.com/shurcooL/go"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/go"; - rev = "9e1955d9fb6e"; - sha256 = "1lad9bvs75jsn61cfza19739c2c057k0bqxg2b4xz3z3l4w1mkqj"; - }; - } - { - goPackagePath = "github.com/shurcooL/graphql"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/graphql"; - rev = "e4a3a37e6d42"; - sha256 = "0d4a6njigzis6hgac5dpxaw6nzrm4cqmfyj53icr3isa38c2isrf"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "ef6db91d284a"; - sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7"; - }; - } - { - goPackagePath = "github.com/soheilhy/cmux"; - fetch = { - type = "git"; - url = "https://github.com/soheilhy/cmux"; - rev = "v0.1.4"; - sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.1"; - sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.2.0"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ec"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.0.2"; - sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis"; - }; - } - { - goPackagePath = "github.com/src-d/gcfg"; - fetch = { - type = "git"; - url = "https://github.com/src-d/gcfg"; - rev = "v1.3.0"; - sha256 = "1hrdxlha4kkcpyydmjqd929rmwn5a9xq7arvwhryxppxq7502axk"; - }; - } - { - goPackagePath = "github.com/stoewer/go-strcase"; - fetch = { - type = "git"; - url = "https://github.com/stoewer/go-strcase"; - rev = "v1.0.1"; - sha256 = "0axc5sq5n9gkhy7npn9w12ycxddngmbphdywhfrsskm44kvd8rpx"; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "27835f1a64e9"; - sha256 = "1py7lsrk0a4r0fx91jq6nn0vdv8phzw5wlnjbl38gmlq32hsff7k"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "v1.1.0"; - sha256 = "0m19fh7djlwl188ddw4myspck92hq0pck4xwmvx6msq7pz2mhds9"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "1731857f09b1"; - sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; - }; - } - { - goPackagePath = "github.com/tmc/grpc-websocket-proxy"; - fetch = { - type = "git"; - url = "https://github.com/tmc/grpc-websocket-proxy"; - rev = "830351dc03c6"; - sha256 = "0d1b7jydlwfx9m78fbmfdva2yf1cd8x4j0bq5wxj5n7ihwyf07jg"; - }; - } - { - goPackagePath = "github.com/trivago/tgo"; - fetch = { - type = "git"; - url = "https://github.com/trivago/tgo"; - rev = "v1.0.1"; - sha256 = "10243ai91r57fkh8jpyxg9dz503cb5nkmlsj10p3g8a38v808mrl"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "8333dd449516"; - sha256 = "16bix8957bgszzm176jn12q1dzi6flha4bif5h8j8lqbxc6pab3q"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "v0.5.6"; - sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.18.0"; - sha256 = "0al7w7yjyijx9dldndnj1bws5w1li0a7wjbwbkxa5kd0z7l39x81"; - }; - } - { - goPackagePath = "github.com/viniciuschiele/tarx"; - fetch = { - type = "git"; - url = "https://github.com/viniciuschiele/tarx"; - rev = "6e3da540444d"; - sha256 = "0r7d6s5znbr69xm9334c8b404yk1jqg0h8n6bjs8zwgwk20cwxjf"; - }; - } - { - goPackagePath = "github.com/wbrefvem/go-bitbucket"; - fetch = { - type = "git"; - url = "https://github.com/wbrefvem/go-bitbucket"; - rev = "fc08fd046abb"; - sha256 = "1h7wpl442cl4qfhm2115rwnch8bs2314qi09kwgy2zjrv5gq969n"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "f3bc634ab936"; - sha256 = "1lznkdlhm1jvka745qkynlyci4svw38s9chrz0lvwpl680kazv1q"; - }; - } - { - goPackagePath = "github.com/xanzy/ssh-agent"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/ssh-agent"; - rev = "v0.2.0"; - sha256 = "069nlriymqswg52ggiwi60qhwrin9nzhd2g65a7h59z2qbcvk2hy"; - }; - } - { - goPackagePath = "github.com/xi2/xz"; - fetch = { - type = "git"; - url = "https://github.com/xi2/xz"; - rev = "48954b6210f8"; - sha256 = "178r0fa2dpzxf0sabs7dn0c8fa7vs87zlxk6spkn374ls9pir7nq"; - }; - } - { - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "07dd2e8dfe18"; - sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; - }; - } - { - goPackagePath = "github.com/xlab/handysort"; - fetch = { - type = "git"; - url = "https://github.com/xlab/handysort"; - rev = "fb3537ed64a1"; - sha256 = "0g1q7qx259xhywkiqmcf0siwvyqbwdyc4ng0hz5z8r9zc68ic647"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.1-etcd.7"; - sha256 = "0f2brc4zyc1z3s1bw9krgj7gijdrdz9sw2w8i7s0xvidd54qr32l"; - }; - } - { - goPackagePath = "go.etcd.io/etcd"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/etcd"; - rev = "83304cfc808c"; - sha256 = "1jfiv4a6n6ik5l1sscgmvll9yyic5ax0a03vis8n3b5g5qycws34"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.18.0"; - sha256 = "0flvv47h3988k1sg56qyh3hfskn563kblp4bs7mi6kzjc9jqz817"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "v1.1.0"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "v1.9.1"; - sha256 = "19a1i6fipqj8w7h6qjmg1sfbg18yzzqsgfn0vmr55hkgc0y6nmny"; - }; - } - { - goPackagePath = "gocloud.dev"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cloud"; - rev = "v0.9.0"; - sha256 = "0rk0k2iy4rk0vqjyq98l89zkhq194bgdr95542ks5jbwinc82h36"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "509febef88a4"; - sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "c73c2afc3b81"; - sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "c67002cb31c3"; - sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d668ce993890"; - sha256 = "17m8d02fazil0dwvk33vpwvsb91asgbmmpqy05751csrfqhhdqna"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "aca44879d564"; - sha256 = "106vs2md02h16rwnk9mq2h4ix7iyv2n6bfm7v9zp0kknswlag1x0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d2"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "06f26fdaaa28"; - sha256 = "07qj9wfjygy64krr8rgbxf43v007y7hmbimh8j95qfrq5fh7bp21"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.1.0"; - sha256 = "1az6n10i35ls13wry20nnm5afzr3j3s391nia8ghgx5vfskgzn56"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.3.0"; - sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "082222b4a5c5"; - sha256 = "1q57b7c01wwcgd488fdkipizaxnwm4pkl0bzs2p7wbdagsbvv1g9"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.17.0"; - sha256 = "0ibwav7p5cqng8yslarix521i1s11r7w9y2rjliahm75cj5crrb8"; - }; - } - { - goPackagePath = "gopkg.in/AlecAivazis/survey.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/AlecAivazis/survey.v1"; - rev = "v1.6.2"; - sha256 = "1w8pfgnnr0wz13fcnfhjkc20yh42in3ia7v6nczzyn38r2fdr43g"; - }; - } - { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "f715ec2f112d"; - sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "v1.0.25"; - sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - }; - } - { - goPackagePath = "gopkg.in/h2non/gock.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/h2non/gock.v0"; - rev = "1baf36abac00"; - sha256 = "1gddy7cl8d84r3s2kkzm25bm19n8ml8iznch94q6wnsrz3g6bsqq"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "v0.9.1"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.39.0"; - sha256 = "0j7pyl5v7xfzkhsyz193iq56ilan69pp11g2n5jw1k4h4g8s4k9b"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "9856a29383ce"; - sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; - }; - } - { - goPackagePath = "gopkg.in/pipe.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/pipe.v2"; - rev = "3c2ca4d52544"; - sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv"; - }; - } - { - goPackagePath = "gopkg.in/robfig/cron.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/robfig/cron.v2"; - rev = "be2e0b0deed5"; - sha256 = "1cmm6dc4cl8269wlknxmicyn1s63irg66lj76b9ncjjfrvijpf0y"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-billy.v4"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-billy.v4"; - rev = "v4.2.0"; - sha256 = "18fghcyk69g460px8rvmhmqldkbhw17dpnhg45qwdvaq90b0bkx9"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git-fixtures.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-git-fixtures.v3"; - rev = "v3.3.0"; - sha256 = "1xbnd2ln95xgr6385ahl1y7108ifr3fh0zhy7fmb7cjasq8zlvw9"; - }; - } - { - goPackagePath = "gopkg.in/src-d/go-git.v4"; - fetch = { - type = "git"; - url = "https://gopkg.in/src-d/go-git.v4"; - rev = "v4.5.0"; - sha256 = "1krg24ncckwalmhzs2vlp8rwyk4rfnhfydwg8iw7gaywww2c1wfc"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/warnings.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/warnings.v0"; - rev = "v0.1.2"; - sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "6db15a15d2d3"; - sha256 = "0jqb0c57yzaajrl17hbziw19x5n14q46dg73y0gmv0blpa6laxcy"; - }; - } - { - goPackagePath = "k8s.io/apiextensions-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiextensions-apiserver"; - rev = "1f84094d7e8e"; - sha256 = "1b73cwjgsxjr00jbygmgs13bgyz6593kqqx2xksn9rir42qb3zil"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "bebe27e40fb7"; - sha256 = "1g1q2f77b320z0v9b1gmal056dz189wf069400a44c0v5y61ak8l"; - }; - } - { - goPackagePath = "k8s.io/cli-runtime"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/cli-runtime"; - rev = "1ee5ba10d7e3"; - sha256 = "1nr5s217sy9s23xkhn2fpa6ck473wxq3a8m3vrmxq6xd0c60fkyy"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "701b91367003"; - sha256 = "1qmz3s7yfa1l07lpyn3g7x9wnc9bxc0lk0p893vana96xj177zih"; - }; - } - { - goPackagePath = "k8s.io/code-generator"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/code-generator"; - rev = "8c97d6ab64da"; - sha256 = "137ih44qiaaidjw5xk7giqngi0x01awvknb0vrnf60ajq2dy9sdh"; - }; - } - { - goPackagePath = "k8s.io/gengo"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/gengo"; - rev = "906d99f89cd6"; - sha256 = "08hcvmn6n02a5yjl9yby1n6ybqf7b4jwzppj0v6rr73hh6w3kfi4"; - }; - } - { - goPackagePath = "k8s.io/helm"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/helm"; - rev = "v2.7.2"; - sha256 = "087f8wnf0kcbkh6flxlv07knrb964zyszi2k4i1ihaajg3bkbpq6"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "d8ea2fe547a4"; - sha256 = "1m64xrp2vz7il2b3nikdjxf8l4yw2b2yp8997mwkj4rldznfxlxb"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "v1.11.3"; - sha256 = "123qk5y9cwsj1cyswbpbdha84ynraam1xmqd5cpr4w29kw7nsjr8"; - }; - } - { - goPackagePath = "k8s.io/metrics"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/metrics"; - rev = "3954d62a524d"; - sha256 = "0y3ywkbhc9kdzp1dl4crphijx0ajd7apqpq3gvrmq4v224078hic"; - }; - } - { - goPackagePath = "k8s.io/test-infra"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/test-infra"; - rev = "a22cef183a8f"; - sha256 = "17cjbbadx2qsr1si5v6pb1ma59j9162mzk62zdimr8jr8q2pc402"; - }; - } - { - goPackagePath = "k8s.io/utils"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/utils"; - rev = "5e321f9a457c"; - sha256 = "0bgmjzjhxjldbd2n046fywk8351xnp8acf3nh8si0f0s5saniy7i"; - }; - } - { - goPackagePath = "sigs.k8s.io/yaml"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/yaml"; - rev = "v1.1.0"; - sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; - }; - } - { - goPackagePath = "vbom.ml/util"; - fetch = { - type = "git"; - url = "https://github.com/fvbommel/util"; - rev = "256737ac55c4"; - sha256 = "0pvsbh23fpa8w1gx2hv2rcw6nlb7r4nalfhfy3385sj0pc0b62lc"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index c9edaae1e536..a521f394ebfb 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -1,9 +1,8 @@ - { stdenv, buildGoPackage, fetchFromGitHub, go-bindata }: buildGoPackage rec { name = "kops-${version}"; - version = "1.11.0"; + version = "1.11.1"; goPackagePath = "k8s.io/kops"; @@ -11,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1z67jl66g79q6v5kjy9qxx2xp656ybv5hrc10h3wmzy0b0n30s4n"; + sha256 = "0jia8dhawh786grnbpn64hvsdm6wz5p7hqir01q5xxpd1psnzygj"; }; buildInputs = [go-bindata]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index c44b7ac1dc76..13c7f59f7944 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,9 +14,9 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.30.0"; + version = "0.35.0"; - kubernetesVersion = "1.11.2"; + kubernetesVersion = "1.13.4"; goPackagePath = "k8s.io/minikube"; @@ -24,7 +24,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z"; + sha256 = "1qb342zs50sdfvfb8vbn7vrx11qqjy1hw518c053s7p34ljb24qd"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; @@ -35,7 +35,9 @@ in buildGoPackage rec { go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... - ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//") + VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") + VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") + ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") KUBERNETES_VERSION=${kubernetesVersion} @@ -66,7 +68,7 @@ in buildGoPackage rec { homepage = https://github.com/kubernetes/minikube; description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; - maintainers = with maintainers; [ ebzzry copumpkin ]; + maintainers = with maintainers; [ ebzzry copumpkin vdemeester ]; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index c276c2e752fd..618bea36de86 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "pachyderm-${version}"; - version = "1.4.6"; + version = "1.8.5"; rev = "v${version}"; goPackagePath = "github.com/pachyderm/pachyderm"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "pachyderm"; repo = "pachyderm"; - sha256 = "1fivihn9s04lmzdiwg0f05qm708fb14xy81pbc31wxdyjw28m8ns"; + sha256 = "1b9x2xn0sxsjid15lnwr79lps8xzf24i7jfl0i48nabdigmi04wp"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 45c8dcf98002..bb29f234040f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -43,7 +43,7 @@ let description = "Tool for building, changing, and versioning infrastructure"; homepage = https://www.terraform.io/; license = licenses.mpl20; - maintainers = with maintainers; [ jgeerds zimbatm peterhoeg kalbasit ]; + maintainers = with maintainers; [ zimbatm peterhoeg kalbasit ]; }; } // attrs'); diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix index 1e25db0a381c..22b2e2f43c45 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook -, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { curl glib json-glib libnotify libsecret sqlite gumbo gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas gnome3.gnome-online-accounts + hicolor-icon-theme # for setup hook ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 80f98e232310..58335f1faad2 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.14"; - previewVersion = "2.2.0a1"; + previewVersion = "2.2.0a2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w"; + sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni"; + sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9"; }; } diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index 8207c2cecfa4..556d341231f6 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -53,7 +53,7 @@ in python.pkgs.buildPythonPackage { aiohttp-cors yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) - ] ++ stdenv.lib.optional (!stable) python.pkgs.distro; + ] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ]; # Requires network access doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 2f563cc07a85..1eba34423426 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,11 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.8"; - name = "${pname}-${version}"; + version = "0.0.9"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1p786ma54baljs0bw8nl9sr37ypbpjblcndxsw4djgyxkd9ii16r"; + sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 56f0f367c221..9e1b9fe9c39f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -82,6 +82,6 @@ in stdenv.mkDerivation { homepage = http://www.hipchat.com; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jgeerds puffnfresh ]; + maintainers = with maintainers; [ puffnfresh ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 5fbf385ed07b..f407ed6cabe3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "SkypeWeb plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index 37b2a1f0c62d..dfdc92cfd4b8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Pidgin plugin that merges the Buddy List window with a conversation window"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 6cb51478b731..4ab3c64d16d8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -44,7 +44,7 @@ in mkDerivation rec { description = "Qt Tox client"; homepage = https://tox.chat; license = licenses.gpl3; - maintainers = with maintainers; [ jgeerds akaWolf peterhoeg ]; + maintainers = with maintainers; [ akaWolf peterhoeg ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 5a2d3b220327..2201efdc028a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0p2aj8zj1ynn75g0rjyx7dkhvcmvh3d38wpx0hf4fvg9q13vby85"; + sha256 = "1gwz47wi9g9g9zzf46ry3q9s855rvlcjlg3dsxr1xdvz4arci195"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index fdb3326803ce..f79622b39cfd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.5.1"; + version = "3.6.1"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "0ygb867ff2fvi9n9hgs4hldpg4y012w4i1d9cx4f5mpli1xim6da" - else "0g1cixsldpdbfzg2vain7h3hr5j3xjdngjw66r0aqnzbx743gjzj"; + then "0wgnb7fdy393anridymm1frlgr86j0awxnzvd498ar5fch06ij87" + else "0x6p1z4qvgy464n6gnkaqrm7dns1ysyadm68sr260d39a7028q1c"; }; buildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6028e732c8fb..c8bd75a3fec9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,5 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; + version = "1.5.18"; + sha256Hash = "1xc9153r5asivq2fkham83gfy48rfsda1ashp0n6fzrlf8ibwa05"; }); } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index c8cd91f07277..c4acb22c810c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix index 97f04eea2d79..cffe74a0e806 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,10 +1,11 @@ -{ stdenv, python3Packages }: +{ stdenv, python36Packages }: with stdenv.lib; -with python3Packages; + +# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4 +with python36Packages; buildPythonPackage rec { - name = "${pname}-${version}"; pname = "turses"; version = "0.3.1"; @@ -13,7 +14,9 @@ buildPythonPackage rec { sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6"; }; - buildInputs = [ mock pytest coverage tox ]; + disabled = ! python36Packages.pythonOlder "3.7"; + + checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; checkPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix index 3c5e65ffe778..6fafe26aa30e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Lightweight Tox client"; homepage = https://github.com/uTox/uTox; license = licenses.gpl3; - maintainers = with maintainers; [ domenkozar jgeerds ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index a0513f7dfb18..870e40d81282 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-cluster-${version}"; - version = "0.8.0"; + version = "0.9.0"; rev = "v${version}"; goPackagePath = "github.com/ipfs/ipfs-cluster"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "0vqj6h885dy0d3zabris8f5sbqdwm5ljhpf8z466pwm7qx8m5afn"; + sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "ipfs-cluster"; inherit rev; - sha256 = "0q5j825hzsrlfv3y79376l6pd2d3hiczymw3w9nqh955rphjg7ci"; + sha256 = "1bxwcp0355f1ykjcidbxv218zp9d20nma7lnpn9xcjqc8vaq03kn"; }; nativeBuildInputs = [ gx-go ]; diff --git a/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/nixpkgs/pkgs/applications/networking/ipfs/default.nix index 08b5ca077af6..28eec458ee03 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.18"; + version = "0.4.19"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "05d5m6c2i2kl4rvb0hddyqbidn76ljr2zryi8v2r9i8dbi0164gm"; + sha256 = "0bj2kzxjssp7szp1wr9pp08bsi55jgf0k7gi4h70phlib2q673j2"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "0h4j18qpycfmmlhb9khvhbk8c1zqajflvw8gk3l8j7wxrxh5j2s6"; + sha256 = "061mgkawimhw3gq506h8m6kw50a2v26qysa5kc5jdqgaqx5yvqh4"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix index b9860fa42273..f03e4c4e9e34 100644 --- a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = https://hexchat.github.io/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ romildo jgeerds ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix index 75645fdb33aa..6aacdde544bc 100644 --- a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix @@ -33,13 +33,13 @@ let in with stdenv; mkDerivation rec { name = "quassel${tag}-${version}"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "quassel"; repo = "quassel"; rev = version; - sha256 = "1jnmc0xky91h81xjjgwg5zylfns0f1pvjy2rv39wlah890k143zr"; + sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/linssid/default.nix b/nixpkgs/pkgs/applications/networking/linssid/default.nix index 0139a3f3a93d..be010c471790 100644 --- a/nixpkgs/pkgs/applications/networking/linssid/default.nix +++ b/nixpkgs/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }: +{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt, makeWrapper }: stdenv.mkDerivation rec { name = "linssid-${version}"; @@ -9,25 +9,29 @@ stdenv.mkDerivation rec { sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; buildInputs = [ qtbase qtsvg boost qwt ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' + sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ -i linssid-app/linssid-app.pro linssid-app/linssid.desktop sed -e "s|\.\./\.\./\.\./\.\./usr|$out|g" -i linssid-app/*.ui - sed -e "s|iwlist|${wirelesstools}/sbin/iwlist|g" -i linssid-app/Getter.cpp - sed -e "s|iw dev|${iw}/sbin/iw dev|g" -i linssid-app/MainForm.cpp - # Remove bundled qwt rm -fr qwt-lib ''; + postInstall = '' + wrapProgram $out/bin/linssid \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ wirelesstools iw ]} + ''; + meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; homepage = https://sourceforge.net/projects/linssid/; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 34361e1dab9a..42f29574eef3 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -2,7 +2,7 @@ , 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 +, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. # TODO: Plugins that complain about their missing dependencies, even when @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { ++ optional enableNetworkManager networkmanager ++ optional enableLdap openldap ++ optional enablePluginPdf poppler - ++ optional enablePluginFancy webkitgtk24x-gtk2; + ++ optional enablePluginFancy webkitgtk24x-gtk2 + ++ optional enablePluginVcalendar libical; configureFlags = optional (!enableLdap) "--disable-ldap" diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix index 6c39dc78e57a..8a16aeb55182 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -44,6 +44,6 @@ in pythonPackages.buildPythonApplication rec { homepage = https://github.com/pulb/mailnag; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index b6d552d96d50..305535029c28 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28.2"; + version = "0.28.3"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5"; + sha256 = "1v0ff6qqwj42p3n6qw30czzqi52nvgf3dn05vd7a03g39a5js8af"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/mumble/default.nix b/nixpkgs/pkgs/applications/networking/mumble/default.nix index d4e624e6ad5c..f589a149d85c 100644 --- a/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = https://mumble.info; license = licenses.bsd3; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }); diff --git a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix index 1dc4e3e43513..88f07f0a8a50 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix @@ -2,14 +2,14 @@ python2Packages.buildPythonApplication rec { pname = "zeronet"; - version = "0.6.4"; + version = "0.6.5"; format = "other"; src = fetchFromGitHub { owner = "HelloZeroNet"; repo = "ZeroNet"; rev = "v${version}"; - sha256 = "04mpnkx0pbvcfjs337f0ajabdbh6h0gypnaz6n395avkf8r1g4c3"; + sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a"; }; propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; diff --git a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 7557f04dc581..eac1acb1e6a3 100644 --- a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.1.1-1"; + version = "1.1.3-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "148syyz92yqxp2fw18fhflhmdrakxz7cc30va7h0pwysz97gni2p"; + sha256 = "15kyhyx1v4bb2sqzwq7bqrxxw7g733p5jnsgjqka2ygzg6dl2c5n"; }; nativeBuildInputs = [ makeWrapper ]; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,lib,share/applications} mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} - cp -r usr/lib/protonmail/bridge/protonmail-bridge{,.sh} $out/lib + cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg cp ${desktopItem}/share/applications/* $out/share/applications diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index a2e38577ecdc..39144935e9cd 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,18 +3,20 @@ let common = { stname, target, postInstall ? "" }: buildGoPackage rec { - version = "1.0.1"; + version = "1.1.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "09qrdh6rvphh6sjyzh3jjil1fkrp9jp8mzrbz9ncqhvqra70f6sw"; + sha256 = "1qmrh3c4p5vxzjqd0zdmvcqffq75gl4qfg0s8qpkgvdc7qrzzi7i"; }; goPackagePath = "github.com/syncthing/syncthing"; + goDeps = ./deps.nix; + patches = [ ./add-stcli-target.patch ]; diff --git a/nixpkgs/pkgs/applications/networking/syncthing/deps.nix b/nixpkgs/pkgs/applications/networking/syncthing/deps.nix new file mode 100644 index 000000000000..351b4e30d568 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/syncthing/deps.nix @@ -0,0 +1,480 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/AudriusButkevicius/go-nat-pmp"; + fetch = { + type = "git"; + url = "https://github.com/AudriusButkevicius/go-nat-pmp"; + rev = "452c97607362"; + sha256 = "1accmpl1llk16a19nlyy991fqrgfay6l53gb64hgmdfmqljdvbk7"; + }; + } + { + goPackagePath = "github.com/AudriusButkevicius/recli"; + fetch = { + type = "git"; + url = "https://github.com/AudriusButkevicius/recli"; + rev = "v0.0.5"; + sha256 = "1m1xna1kb78pkmr1lfmvvnpk9j7c4x71j3a7c6vj7zpzc4srpsmf"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "7224d8d8f27e"; + sha256 = "10lmya17vdqg2pvqni0p73iahni48s1v11ya9a0hcz4jh5vw4dkb"; + }; + } + { + goPackagePath = "github.com/calmh/du"; + fetch = { + type = "git"; + url = "https://github.com/calmh/du"; + rev = "v1.0.1"; + sha256 = "0qb3a6y3p9nkyn3s66k6zcm16y8n8578qh23ddj14cxf2scrr2n2"; + }; + } + { + goPackagePath = "github.com/calmh/xdr"; + fetch = { + type = "git"; + url = "https://github.com/calmh/xdr"; + rev = "v1.1.0"; + sha256 = "072wqdncz3nd4a3zkhvzzx1y3in1lm29wfvl0d8wrnqs5pyqh0mh"; + }; + } + { + goPackagePath = "github.com/chmduquesne/rollinghash"; + fetch = { + type = "git"; + url = "https://github.com/chmduquesne/rollinghash"; + rev = "a60f8e7142b5"; + sha256 = "0fpaqq4zb0wikgbhn7vwqqj1h865f5xy195vkhivsp922p7qwsjr"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "v1.2.1"; + sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/flynn-archive/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn-archive/go-shlex"; + rev = "3f9db97f8568"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "51eb1ee00b6d"; + sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.2.0"; + sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "84a468cf14b4"; + sha256 = "1ky1r9qh54yi9zp2769qrjngzndgd8fn7mja2qfac285n06chmcn"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "553a64147049"; + sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; + }; + } + { + goPackagePath = "github.com/jackpal/gateway"; + fetch = { + type = "git"; + url = "https://github.com/jackpal/gateway"; + rev = "5795ac81146e"; + sha256 = "0fkwkwmhfadwk3cha8616bhqxfkr9gjjnynhhxyldlphixgs3f25"; + }; + } + { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "cd60e84ee657"; + sha256 = "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.0.0"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/minio/sha256-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/sha256-simd"; + rev = "cc1980cb0338"; + sha256 = "04fp98nal0wsb26zwhw82spn5camxslc68g3xp8g4af9w6k9g31j"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "6c46eb8334b3"; + sha256 = "0lxmpg3zhn7r2q8c29wcw0sqn5c48ihhb7qfh9m676c9j455rpm8"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "ba3724c94e4d"; + sha256 = "0fqs7kyqzz2lykbr2xbvd8imvx748xv4lh4d6fdy3wkwxs2f9fhp"; + }; + } + { + goPackagePath = "github.com/oschwald/geoip2-golang"; + fetch = { + type = "git"; + url = "https://github.com/oschwald/geoip2-golang"; + rev = "v1.1.0"; + sha256 = "10pvjmbm1wc8xxwqlcfhdj2mciiyfddghmp6jyn7brd4mg65ppy2"; + }; + } + { + goPackagePath = "github.com/oschwald/maxminddb-golang"; + fetch = { + type = "git"; + url = "https://github.com/oschwald/maxminddb-golang"; + rev = "26fe5ace1c70"; + sha256 = "0szb96zq1jbd9zpf4qn9zng4582ww9mg8zgrqxbkkpf3862r6n49"; + }; + } + { + goPackagePath = "github.com/petermattis/goid"; + fetch = { + type = "git"; + url = "https://github.com/petermattis/goid"; + rev = "3db12ebb2a59"; + sha256 = "0z18a3mr72c52g7g94n08gxw0ksnaafbfwdl5p5jav2sffirb0kd"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "4724e9255275"; + sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "e181e095bae9"; + sha256 = "1pwkyw801hy7n94skzk6h177zqcil6ayrmb5gs3jdpsfayh8ia5w"; + }; + } + { + goPackagePath = "github.com/sasha-s/go-deadlock"; + fetch = { + type = "git"; + url = "https://github.com/sasha-s/go-deadlock"; + rev = "v0.2.0"; + sha256 = "13p7b7pakd9k1c2k0fs1hfim3c8mivz679977ai6zb01s4aw7gyg"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/syncthing/notify"; + fetch = { + type = "git"; + url = "https://github.com/syncthing/notify"; + rev = "4e389ea6c0d8"; + sha256 = "19gvl14s1l9m82f8c2xsjcr8lmbqrvw1mxkayvfcpimvxfz0j61i"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "34011bf325bc"; + sha256 = "097ja0vyj6p27zrxha9nhk09fj977xsvhmd3bk2hbyvnbw4znnhd"; + }; + } + { + goPackagePath = "github.com/thejerf/suture"; + fetch = { + type = "git"; + url = "https://github.com/thejerf/suture"; + rev = "v3.0.2"; + sha256 = "03bdrl78jfwk0kw40lj63ga9cxhgccgss8yi9lp5j0m0ml7921gh"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/vitrun/qart"; + fetch = { + type = "git"; + url = "https://github.com/vitrun/qart"; + rev = "bf64b92db6b0"; + sha256 = "1xk7qki703xmay9ghi3kq2bjf1iw9dz8wik55739d6i7sn77vvkc"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "0fcca4842a8d"; + sha256 = "033ghifvrxmqr54nm8gmgxz7qxlqgw9z7z976kp88yf1rmxm2kjr"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "351d144fa1fc"; + sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "4d1cda033e06"; + sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "e19ae1496984"; + sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "6dc17368e09b"; + sha256 = "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "379148ca0225"; + sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "v2.5.1"; + sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "287cf08546ab"; + sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; + }; + } +] diff --git a/nixpkgs/pkgs/applications/office/cb2bib/default.nix b/nixpkgs/pkgs/applications/office/cb2bib/default.nix index 1faf47d680aa..461d428787b9 100644 --- a/nixpkgs/pkgs/applications/office/cb2bib/default.nix +++ b/nixpkgs/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.9"; + version = "2.0.0"; src = fetchurl { url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "12x7zv964r26cfmf3yx5pa8ihc5bd9p199w2g4vc0sb44izryg47"; + sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix index aabdacd6198f..f5fc705eed4c 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,8 +2,8 @@ rec { major = "6"; - minor = "1"; - patch = "4"; + minor = "2"; + patch = "1"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1zip7clhh3bp9smlxx1y5zpnwhaa6p0xlxg7k5d644q8gqbyk3v4"; + sha256 = "0p2r48n27v5ifbj3cb9bs38nb6699awmdqx4shy1c6p28b24y78f"; }; } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 5853face10c7..9113eedc06cd 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -2,9 +2,9 @@ , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis +, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mariadb , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1lgyns8zmwky1p78rvilnixqmicpfaal6x6286l4m7hv46pha181"; + sha256 = "180d4rrzb3lq7g2w7x512fn8chfkjg4ld20ikrj6hkg11kj4hbmy"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0ia490xksnhh4m5fas6irr7qbnkaap7zs3fg8jbq4qrfjh81bcpm"; + sha256 = "06fgd5jkqqbvskyj1ywmsmb4crsj064s8r45nrv0r8j6ydn0hi1l"; }; }; @@ -70,18 +70,21 @@ in stdenv.mkDerivation rec { patches = [ ./xdg-open-brief.patch - ./poppler.patch ]; + tarballPath = "external/tarballs"; + postUnpack = '' - mkdir -v $sourceRoot/src + mkdir -v $sourceRoot/${tarballPath} '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/src/${f.md5name} - ln -sfv ${f} $sourceRoot/src/${f.name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')) + '' - ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} - ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} + ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} + ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} + tar -xf ${srcs.help} + tar -xf ${srcs.translations} ''; postPatch = '' @@ -130,6 +133,9 @@ in stdenv.mkDerivation rec { # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # Pivot chart tests. Fragile. + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # this I actually hate, this should be a data consistency test! @@ -149,6 +155,7 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -156,6 +163,77 @@ in stdenv.mkDerivation rec { sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + # bunch of new Fresh failures. Sigh. + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" '' # This to avoid using /lib:/usr/lib at linking + '' @@ -230,6 +308,10 @@ in stdenv.mkDerivation rec { "--disable-libnumbertext" # system-libnumbertext" + # We do tarball prefetching ourselves + "--disable-fetch-external" + "--enable-build-opensymbol" + # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" @@ -271,7 +353,7 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib + gst_all_1.gst-plugins-base glib mariadb neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libtool @@ -280,7 +362,7 @@ in stdenv.mkDerivation rec { libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook gdb ]; + nativeBuildInputs = [ wrapGAppsHook gdb fontforge ]; passthru = { inherit srcs jdk; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 4ab15a3a91e6..adec14748088 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_65_1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; - sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; + name = "boost_1_66_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; + sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; md5 = ""; - md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; + md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; } { name = "breakpad.zip"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.61.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz"; - sha256 = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae"; + name = "curl-7.63.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.63.0.tar.gz"; + sha256 = "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41"; md5 = ""; - md5name = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae-curl-7.61.1.tar.gz"; + md5name = "d483b89062832e211c887d7cf1b65c902d591b48c11fe7d174af781681580b41-curl-7.63.0.tar.gz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -133,18 +133,18 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libepubgen-0.1.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; - sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; + name = "libepubgen-0.1.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; - md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; + md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; - sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; + name = "libetonyek-0.1.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"; + sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"; md5 = ""; - md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz"; } { name = "expat-2.2.5.tar.bz2"; @@ -266,11 +266,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "amiri-0.109.zip"; - url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip"; - sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6"; + name = "Amiri-0.111.zip"; + url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; - md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; @@ -280,11 +280,11 @@ md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { - name = "ReemKufi-0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"; - sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b"; + name = "ReemKufi-0.7.zip"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; - md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; + md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -329,11 +329,11 @@ md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; - sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; + name = "harfbuzz-1.8.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; + sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; md5 = ""; - md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; + md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -357,18 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-60_2-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; - sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + name = "icu4c-61_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"; + sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"; md5 = ""; - md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz"; } { - name = "icu4c-60_2-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; - sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + name = "icu4c-61_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"; + sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a"; md5 = ""; - md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; + md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -455,11 +455,11 @@ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2018-03-30.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; - sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; + name = "language-subtag-registry-2018-04-23.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"; + sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878"; md5 = ""; - md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; + md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -469,18 +469,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; - sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + name = "lcms2-2.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; - md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { - name = "libassuan-2.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; - sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; + name = "libassuan-2.5.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; - md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; + md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; @@ -518,6 +518,13 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { + name = "libnumbertext-1.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"; + sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b"; + md5 = ""; + md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz"; + } + { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; @@ -532,18 +539,18 @@ md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; - sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; + name = "libxml2-2.9.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; + sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; md5 = ""; - md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz"; + md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; } { - name = "libxslt-1.1.32.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; - sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + name = "libxslt-1.1.33.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; + sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; md5 = ""; - md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; + md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -553,6 +560,13 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { + name = "lxml-4.1.1.tgz"; + url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + md5 = ""; + md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; + } + { name = "mariadb_client-2.0.0-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; @@ -574,18 +588,18 @@ md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; - sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; + name = "libmspub-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; - md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; + md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.13.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; - sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; + name = "libmwaw-0.3.14.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; + sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; md5 = ""; - md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; + md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -644,18 +658,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2m.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; - sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; + name = "openssl-1.0.2p.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; + sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; md5 = ""; - md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; + md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; } { - name = "liborcus-0.13.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"; - sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9"; + name = "liborcus-0.13.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"; + sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b"; md5 = ""; - md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz"; + md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -672,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3235.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; - sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; + name = "pdfium-3426.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"; + sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957"; md5 = ""; - md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; + md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -693,11 +707,11 @@ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.66.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"; - sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7"; + name = "poppler-0.73.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; + sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; md5 = ""; - md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz"; + md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -763,11 +777,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; - sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; + name = "libstaroffice-0.0.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; + sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; md5 = ""; - md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; + md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; } { name = "swingExSrc.zip"; @@ -777,6 +791,13 @@ md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } { + name = "twaindsm_2.4.1.orig.tar.gz"; + url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; + md5 = ""; + md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; + } + { name = "ucpp-1.3.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; @@ -805,11 +826,11 @@ md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; - sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; + name = "libwps-0.4.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"; + sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"; md5 = ""; - md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; + md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index ce3b3533bec3..e9eeacf63b52 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; - sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; + name = "cairo-1.15.12.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.15.12.tar.xz"; + sha256 = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9"; md5 = ""; - md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; + md5name = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9-cairo-1.15.12.tar.xz"; } { - name = "libcdr-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; - sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; + name = "libcdr-0.1.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; + sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; md5 = ""; - md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; + md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -77,11 +77,11 @@ md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { - name = "libcmis-0.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; - sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; + name = "libcmis-0.5.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; - md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; + md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.61.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz"; - sha256 = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae"; + name = "curl-7.64.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz"; + sha256 = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5"; md5 = ""; - md5name = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae-curl-7.61.1.tar.gz"; + md5name = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5-curl-7.64.0.tar.gz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -119,11 +119,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; - sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; + name = "libepoxy-1.5.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz"; + sha256 = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"; md5 = ""; - md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; + md5name = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8-libepoxy-1.5.2.tar.xz"; } { name = "epm-3.7.tar.gz"; @@ -140,11 +140,11 @@ md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { - name = "libetonyek-0.1.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"; - sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d"; + name = "libetonyek-0.1.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; - md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz"; + md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.5.tar.bz2"; @@ -196,18 +196,18 @@ md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; - sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; - md5 = "134d8262145fc793c6af494dcace3e71"; - md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; + md5 = ""; + md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; - sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + name = "liberation-fonts-ttf-2.00.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; + md5 = ""; + md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -231,6 +231,13 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { + name = "source-serif-font-2.007R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; + sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + md5 = ""; + md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + } + { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; @@ -343,11 +350,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.6.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; - sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + name = "hunspell-1.7.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; - md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; + md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -357,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-61_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"; - sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"; + name = "icu4c-63_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; + sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; md5 = ""; - md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz"; + md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; } { - name = "icu4c-61_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"; - sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a"; + name = "icu4c-63_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; + sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; md5 = ""; - md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip"; + md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -448,11 +455,11 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; - sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; + name = "libjpeg-turbo-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; - md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; + md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { name = "language-subtag-registry-2018-04-23.tar.bz2"; @@ -469,11 +476,11 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; - sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; + name = "lcms2-2.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; - md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; + md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; @@ -483,11 +490,11 @@ md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { - name = "libatomic_ops-7_2d.zip"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; - sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + name = "libatomic_ops-7.6.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; - md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; + md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -518,11 +525,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"; - sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b"; + name = "libnumbertext-1.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; + sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; md5 = ""; - md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz"; + md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; } { name = "ltm-1.0.zip"; @@ -532,25 +539,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.25.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; - sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; + name = "xmlsec1-1.2.27.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; + sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; md5 = ""; - md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; + md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; } { - name = "libxml2-2.9.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"; - sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"; + name = "libxml2-2.9.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; + sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; md5 = ""; - md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz"; + md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; } { - name = "libxslt-1.1.32.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; - sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + name = "libxslt-1.1.33.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; + sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; md5 = ""; - md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; + md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -574,18 +581,18 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; - sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; + name = "mdds-1.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; + sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; md5 = ""; - md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; + md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; } { - name = "mDNSResponder-576.30.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; - sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; + name = "mDNSResponder-878.200.35.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; - md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; + md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; @@ -602,13 +609,6 @@ md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; } { - name = "mysql-connector-c++-1.1.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; - sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; - } - { name = "mythes-1.2.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; @@ -637,11 +637,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; - sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; md5 = ""; - md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -665,11 +665,11 @@ md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; } { - name = "liborcus-0.13.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"; - sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b"; + name = "liborcus-0.14.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; + sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; md5 = ""; - md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz"; + md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3426.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"; - sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957"; + name = "pdfium-3550.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; + sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; md5 = ""; - md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2"; + md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,32 +707,32 @@ md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.66.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"; - sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7"; + name = "poppler-0.73.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz"; + sha256 = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03"; md5 = ""; - md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz"; + md5name = "e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03-poppler-0.73.0.tar.xz"; } { - name = "postgresql-9.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; - sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + name = "postgresql-9.2.24.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; + md5 = ""; + md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz"; - sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009"; + name = "Python-3.5.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.6.tar.xz"; + sha256 = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f"; md5 = ""; - md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz"; + md5name = "f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f-Python-3.5.6.tar.xz"; } { - name = "libqxp-0.0.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; - sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + name = "libqxp-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; - md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; + md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -812,25 +812,25 @@ md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; - sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; + name = "libwpd-0.10.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; - md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; + md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { - name = "libwpg-0.3.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; - sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; + name = "libwpg-0.3.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; - md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; + md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"; - sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"; + name = "libwps-0.4.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; + sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; md5 = ""; - md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz"; + md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/poppler.patch b/nixpkgs/pkgs/applications/office/libreoffice/poppler.patch deleted file mode 100644 index 29defb679422..000000000000 --- a/nixpkgs/pkgs/applications/office/libreoffice/poppler.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 06e4faead..d4174e208 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -298,7 +298,7 @@ void writePpm_( OutputBuffer& o_rOutputBuf, - o_rOutputBuf.resize(header_size); - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - std::unique_ptr<ImageStream> imgStr( - new ImageStream(str, -@@ -401,7 +401,7 @@ void writeImage_( OutputBuffer& o_rOutputBuf, - oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; - if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) - { -- Guchar nIndex = 0; -+ unsigned char nIndex = 0; - colorMap->getRGB( &nIndex, &zeroColor ); - nIndex = 1; - colorMap->getRGB( &nIndex, &oneColor ); -@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath ) - PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - m_pDoc( pDoc ), - m_aFontMap(), -- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), -+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), - m_bSkipImages(false) - { - } -@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*) - LinkAction* pAction = link->getAction(); - if (pAction && pAction->getKind() == actionURI) - { -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str(); -+#else - const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); -+#endif - - std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) ); - -@@ -578,7 +582,11 @@ void PDFOutDev::restoreState(GfxState*) - printf( "restoreState\n" ); - } - -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+void PDFOutDev::setDefaultCTM(const double *pMat) -+#else - void PDFOutDev::setDefaultCTM(double *pMat) -+#endif - { - assert(pMat); - -@@ -752,8 +760,11 @@ void PDFOutDev::updateFont(GfxState *state) - printf( " %lld", fontID ); - - aFont = it->second; -- -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); -+#else - std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); -+#endif - printf( " %d %d %d %d %f %d %s", - aFont.isEmbedded, - aFont.isBold, -@@ -939,11 +950,11 @@ void PDFOutDev::endTextObject(GfxState*) - } - - void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, -- int width, int height, GBool invert, -+ int width, int height, poppler_bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif -- GBool /*inlineImg*/ ) -+ poppler_bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -972,9 +983,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif -- int* maskColors, GBool /*inlineImg*/ ) -+ int* maskColors, poppler_bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -1023,13 +1034,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str, - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, -- GBool maskInvert -+ poppler_bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , poppler_bool /*maskInterpolate*/ - #endif - ) - { -@@ -1045,13 +1056,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str, - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ poppler_bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap* maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , poppler_bool /*maskInterpolate*/ - #endif - ) - { -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 7e65f085d..4b5c14d15 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -129,6 +129,12 @@ namespace pdfi - GooString & getFamilyName() const - { return const_cast<GooString &>(familyName); } - }; -+ // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71 -+typedef GBool poppler_bool; -+#else -+typedef bool poppler_bool; -+#endif - - class PDFOutDev : public OutputDev - { -@@ -151,22 +157,26 @@ namespace pdfi - - // Does this device use upside-down coordinates? - // (Upside-down means (0,0) is the top left corner of the page.) -- virtual GBool upsideDown() override { return gTrue; } -+ virtual poppler_bool upsideDown() override { return true; } - - // Does this device use drawChar() or drawString()? -- virtual GBool useDrawChar() override { return gTrue; } -+ virtual poppler_bool useDrawChar() override { return true; } - - // Does this device use beginType3Char/endType3Char? Otherwise, - // text in Type 3 fonts will be drawn with drawChar/drawString. -- virtual GBool interpretType3Chars() override { return gFalse; } -+ virtual poppler_bool interpretType3Chars() override { return false; } - - // Does this device need non-text content? -- virtual GBool needNonText() override { return gTrue; } -+ virtual poppler_bool needNonText() override { return true; } - - //----- initialization and control - - // Set default transform matrix. -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+ virtual void setDefaultCTM(const double *ctm) override; -+#else - virtual void setDefaultCTM(double *ctm) override; -+#endif - - // Start a page. - virtual void startPage(int pageNum, GfxState *state -@@ -233,40 +243,40 @@ namespace pdfi - - //----- image drawing - virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, -- int width, int height, GBool invert, -+ int width, int height, poppler_bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif -- GBool inlineImg) override; -+ poppler_bool inlineImg) override; - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif -- int *maskColors, GBool inlineImg) override; -+ int *maskColors, poppler_bool inlineImg) override; - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif - Stream *maskStr, int maskWidth, int maskHeight, -- GBool maskInvert -+ poppler_bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , poppler_bool maskInterpolate - #endif - ) override; - virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ poppler_bool interpolate, - #endif - Stream *maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap *maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , poppler_bool maskInterpolate - #endif - ) override; - -@@ -279,7 +289,7 @@ extern FILE* g_binary_out; - - // note: if you ever change Output_t, please keep in mind that the current code - // relies on it being of 8 bit size --typedef Guchar Output_t; -+typedef unsigned char Output_t; - typedef std::vector< Output_t > OutputBuffer; - - #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX -diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -index 44f30c0ba..66c175165 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx -@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p, *pm; -+ unsigned char *p, *pm; - GfxRGB rgb; - GfxGray alpha; - ImageStream* imgStr = -@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - ImageStream* imgStr = - new ImageStream(str, -@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, - { - for( int x = 0; x < maskWidth; ++x ) - { -- Guchar aPixel = 0; -+ unsigned char aPixel = 0; - imgStrMask->getPixel( &aPixel ); - int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line - (x*width/maskWidth)*4 + 1 + 3 // mapped column -diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -index 16db05afe..cd559cab0 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -@@ -69,7 +69,7 @@ int main(int argc, char **argv) - - // read config file - globalParams = new GlobalParams(); -- globalParams->setErrQuiet(gTrue); -+ globalParams->setErrQuiet(true); - #if defined(_MSC_VER) - globalParams->setupBaseFonts(nullptr); - #endif -@@ -143,7 +143,7 @@ int main(int argc, char **argv) - i, - PDFI_OUTDEV_RESOLUTION, - PDFI_OUTDEV_RESOLUTION, -- 0, gTrue, gTrue, gTrue); -+ 0, true, true, true); - rDoc.processLinks(&aOutDev, i); - } - diff --git a/nixpkgs/pkgs/applications/office/libreoffice/still-primary-src.nix b/nixpkgs/pkgs/applications/office/libreoffice/still-primary-src.nix index 29f8006d63ee..8049a664e138 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "6"; - minor = "0"; - patch = "7"; - tweak = "3"; + minor = "1"; + patch = "5"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0wjcnra06d9z51kjb5njlpy4d8zd8wqfvkif2kc6mzhrsz5kqqxr"; + sha256 = "1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb"; }; } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/still.nix b/nixpkgs/pkgs/applications/office/libreoffice/still.nix index 64b12263e9a5..1da6160e85bb 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/still.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/still.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1rk8f77gwqyrnrxpfrvmr03n49bb09idxwzzindxxgcagh3d0p5f"; + sha256 = "15fdni68b3kyl6115v0d24cl0dp1hdjhkx571w086lrpz0fk9mfi"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "076xq1vlsyi2fv3r7rw595075pi08slbzwwc5h9gda3frx1jkj4i"; + sha256 = "0bfjg14bnqlqwjcc3lkax0nfrhpm6nrqn7ycrmf4r3dzn10lgr64"; }; }; @@ -68,17 +68,23 @@ in stdenv.mkDerivation rec { # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; - patches = [ ./xdg-open-brief.patch ]; + patches = [ + ./xdg-open-brief.patch + ]; + + tarballPath = "external/tarballs"; postUnpack = '' - mkdir -v $sourceRoot/src + mkdir -v $sourceRoot/${tarballPath} '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/src/${f.md5name} - ln -sfv ${f} $sourceRoot/src/${f.name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} + ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')) + '' - ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} - ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} + ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} + ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} + tar -xf ${srcs.help} + tar -xf ${srcs.translations} ''; postPatch = '' @@ -225,6 +231,11 @@ in stdenv.mkDerivation rec { # Without these, configure does not finish "--without-junit" + "--disable-libnumbertext" # system-libnumbertext" + + # We do tarball prefetching ourselves + "--disable-fetch-external" + # I imagine this helps. Copied from go-oo. # Modified on every upgrade, though "--disable-odk" @@ -284,7 +295,7 @@ in stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { - description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; + description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 1b1f8421ee7e..f28c49ce4dd7 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.2.3"; + version = "19.3.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "1favfyanwy2lp3c8abw6ng12vnzgv127k0772a8pax9cqbd5gyry"; + sha256 = "09265d9xgqmdw3fbf94fj2irgq2dp2jhkfd2kq33axfzgpm85bdz"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index 7ea4de464661..dc9f0b89b2ff 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.29.1"; + version = "0.30.4"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1yyd650l628x3kvyn73d5b35sj7ixmdlqkb6h1swdjp0z2n00w4w"; + sha256 = "1541z56rk329sj7a20llhhmv2f552amj1n3cisvqga4gn2yq3hnm"; }; # Fetch from source repo, no longer included in release. diff --git a/nixpkgs/pkgs/applications/radio/chirp/default.nix b/nixpkgs/pkgs/applications/radio/chirp/default.nix index 4ed278ebd67a..72adb38c62eb 100644 --- a/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "chirp-daily"; - version = "20190206"; + version = "20190304"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "16agynxjl2b6y9ly2fl1imgy51k4fqnzn1w6bah2gnmifssxfny3"; + sha256 = "1m18f7j0bdimp0fvs5ms02amd5pzis581hqn38y8qffny4y9f6ij"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix index 0a5d4f56d278..45e416a6c941 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gnuradio +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio , pythonSupport ? true, python, swig, limesuite } : @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + pkgconfig ] ++ stdenv.lib.optionals pythonSupport [ swig ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/radio/urh/default.nix b/nixpkgs/pkgs/applications/radio/urh/default.nix index 8f490c971c71..452407d9c49a 100644 --- a/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "14aw8bvqb32976qmm124i5sv99nwv1jvs1r9ylbsmlg31dvla7ql"; + sha256 = "06656lwbsjfs4hmh5xg38a1icgi49f37dkich0fx5yc92dvl8yfd"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite ]; diff --git a/nixpkgs/pkgs/applications/radio/wsjtx/default.nix b/nixpkgs/pkgs/applications/radio/wsjtx/default.nix index 930515b93825..6e287b571d75 100644 --- a/nixpkgs/pkgs/applications/radio/wsjtx/default.nix +++ b/nixpkgs/pkgs/applications/radio/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "wsjtx-${version}"; - version = "2.0.0"; + version = "2.0.1"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "66434f69f256742da1fe057ec51e4464cab2614f0bfb1a310c04a385b77bd014"; + sha256 = "1kd0w57i9d9srbbfacza491vah8wa8100zjzzwqwdv70yy9qzw8q"; }; # Hamlib builds with autotools, wsjtx builds with cmake diff --git a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 57cecb3cb4cd..8c970440de50 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "feb19b"; - version = "20190201_b"; + srcVersion = "mar19b"; + version = "20190301_b"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; - sha256 = "5b6da12ac869176d7a9a3d6a6620db1dbaa44a4785e2dd59dd1a8c38ea9cab87"; + sha256 = "c3722863e7f3043e2d6e675557421c2eb0978fd21148386440d0139664d19f99"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 2ba5964d6104..5a17b547b87e 100644 --- a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.25"; + version = "2.18.27"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "03d3mnf3gddngn3dhwb00v8k40x6ncgprn22w4vyfr96917p2snx"; + sha256 = "1pc9mhp35n0dl7j06c1564b797v6iqg6vhmd2xxvysc96hnsbyvc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix b/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix index ffe508569553..024f2f4e8294 100644 --- a/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/isabelle/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchurl, perl, nettools, java, polyml, z3 }: +{ stdenv, fetchurl, perl, nettools, java, polyml, z3, rlwrap }: # nettools needed for hostname -let - dirname = "Isabelle2017"; -in +stdenv.mkDerivation rec { + pname = "isabelle"; + version = "2018"; -stdenv.mkDerivation { - name = "isabelle-2017"; - inherit dirname; + dirname = "Isabelle${version}"; src = if stdenv.isDarwin then fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb"; + sha256 = "0jwnvsf5whklq14ihaxs7b9nbic94mm56nvxljrdbvl6y628j9r5"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw"; + sha256 = "1928lwrw1v1p9s23kix30ncpqm8djmrnjixj82f3ni2a8sc3hrsp"; }; buildInputs = [ perl polyml z3 ] @@ -25,26 +23,33 @@ stdenv.mkDerivation { sourceRoot = dirname; postPatch = '' - ENV=$(type -p env) - patchShebangs "." - substituteInPlace lib/Tools/env \ - --replace /usr/bin/env $ENV - substituteInPlace lib/Tools/install \ - --replace /usr/bin/env $ENV - sed -i 's|isabelle_java java|${java}/bin/java|g' lib/Tools/java - substituteInPlace etc/settings \ - --subst-var-by ML_HOME "${polyml}/bin" - substituteInPlace contrib/jdk/etc/settings \ - --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME=' - substituteInPlace contrib/polyml-*/etc/settings \ - --replace '$POLYML_HOME/$ML_PLATFORM' ${polyml}/bin \ - --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly - substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \ - --replace '$ML_HOME/poly' ${polyml}/bin/poly - substituteInPlace contrib/z3*/etc/settings \ - --replace '$Z3_HOME/z3' '${z3}/bin/z3' + patchShebangs . - for comp in contrib/jdk contrib/polyml*; do + cat >contrib/z3*/etc/settings <<EOF + Z3_HOME=${z3} + Z3_VERSION=${z3.version} + Z3_SOLVER=${z3}/bin/z3 + Z3_INSTALLED=yes + EOF + + cat >contrib/polyml-*/etc/settings <<EOF + ML_SYSTEM_64=true + ML_SYSTEM=${polyml.name} + ML_PLATFORM=${stdenv.system} + ML_HOME=${polyml}/bin + ML_OPTIONS="--minheap 1000" + POLYML_HOME="\$COMPONENT" + ML_SOURCES="\$POLYML_HOME/src" + EOF + + cat >contrib/jdk/etc/settings <<EOF + ISABELLE_JAVA_PLATFORM=${stdenv.system} + ISABELLE_JDK_HOME=${java} + EOF + + echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings + + for comp in contrib/jdk contrib/polyml-* contrib/z3-*; do rm -rf $comp/x86* done '' + (if ! stdenv.isLinux then "" else '' diff --git a/nixpkgs/pkgs/applications/science/logic/sad/default.nix b/nixpkgs/pkgs/applications/science/logic/sad/default.nix index 426f1928938c..8e94356f376a 100644 --- a/nixpkgs/pkgs/applications/science/logic/sad/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/sad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, spass }: +{ stdenv, fetchurl, haskell, spass }: stdenv.mkDerivation { name = "system-for-automated-deduction-2.3.25"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; - buildInputs = [ ghc spass ]; + buildInputs = [ haskell.compiler.ghc844 spass ]; patches = [ ./patch # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with diff --git a/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix index 802a03bd4c7a..340073b016e3 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -6,6 +6,9 @@ url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4"; }; + nativeBuildInputs = with python2Packages; [ + pyqt4 + ]; propagatedBuildInputs = with python2Packages; [ pyqt4 lxml diff --git a/nixpkgs/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix index 4283ebd931a4..562874ccc136 100644 --- a/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.5.2"; + name = "R-3.5.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "0qjvdic1qd5vndc4f0wjndpm0x18lbvbcc8nkix8saqgy8y8qgg5"; + sha256 = "1337irx9y0r3jm1rcq1dcwnxsgfhnvgjs5wadcyh17vhpnvkgyib"; }; dontUseImakeConfigure = true; diff --git a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index 76e5071908f1..e3760533edae 100644 --- a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.1.5"; in +let version = "4.2.1"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46"; + sha256 = "1f11481e68900dc256f88aaed18d03e93b416ba01e9e8c3dc3f6d59a211f0561"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/nixpkgs/pkgs/applications/science/math/maxima/5.41.nix b/nixpkgs/pkgs/applications/science/math/maxima/5.41.nix new file mode 100644 index 000000000000..583391d08dde --- /dev/null +++ b/nixpkgs/pkgs/applications/science/math/maxima/5.41.nix @@ -0,0 +1,102 @@ +{ stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, rlwrap ? null +, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +}: + +let + name = "maxima"; + # old version temporarily kept for sage, see discussion at + # https://github.com/NixOS/nixpkgs/commit/82254747af35f3e0e0d6f78023ded3a81e25331b + version = "5.41.0"; + + searchPath = + stdenv.lib.makeBinPath + (stdenv.lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]); +in +stdenv.mkDerivation ({ + inherit version; + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; + sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s"; + }; + + buildInputs = stdenv.lib.filter (x: x != null) [ + sbcl ecl texinfo perl python makeWrapper + ]; + + postInstall = '' + # Make sure that maxima can find its runtime dependencies. + for prog in "$out/bin/"*; do + wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}" + done + # Move emacs modules and documentation into the right place. + mkdir -p $out/share/emacs $out/share/doc + ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp + ln -s ../maxima/${version}/doc $out/share/doc/maxima + '' + + (stdenv.lib.optionalString ecl-fasl '' + cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" + '') + ; + + patches = [ + # fix path to info dir (see https://trac.sagemath.org/ticket/11348) + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; + }) + + # fix https://sourceforge.net/p/maxima/bugs/2596/ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; + }) + + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; + }) + + # upstream bug https://sourceforge.net/p/maxima/bugs/2520/ (not fixed) + # introduced in https://trac.sagemath.org/ticket/13364 + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "0xa0b6cr458zp7lc7qi0flv5ar0r3ivsqhjl0c3clv86di2y522d"; + }) + ] ++ stdenv.lib.optionals ecl-fasl [ + # build fasl, needed for ECL support + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; + }) + # There are some transient test failures. I hope this disables all those tests. + # If those test failures ever happen in the non-ecl version, that should be + # reportetd upstream. + ./known-ecl-failures.patch + ]; + + # Failures in the regression test suite won't abort the build process. We run + # the suite only so that potential errors show up in the build log. See also: + # https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "Computer algebra system"; + homepage = http://maxima.sourceforge.net; + license = stdenv.lib.licenses.gpl2; + + longDescription = '' + Maxima is a fairly complete computer algebra system written in + lisp with an emphasis on symbolic computation. It is based on + DOE-MACSYMA and licensed under the GPL. Its abilities include + symbolic integration, 3D plotting, and an ODE solver. + ''; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.peti ]; + }; +}) diff --git a/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/nixpkgs/pkgs/applications/science/math/maxima/default.nix index 39ed763413be..5843f38a74a8 100644 --- a/nixpkgs/pkgs/applications/science/math/maxima/default.nix +++ b/nixpkgs/pkgs/applications/science/math/maxima/default.nix @@ -70,10 +70,6 @@ stdenv.mkDerivation ({ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar"; }) - # There are some transient test failures. I hope this disables all those tests. - # If those test failures ever happen in the non-ecl version, that should be - # reportetd upstream. - ./known-ecl-failures.patch ]; # The test suite is disabled since 5.42.2 because of the following issues: diff --git a/nixpkgs/pkgs/applications/science/math/sage/default.nix b/nixpkgs/pkgs/applications/science/math/sage/default.nix index ddb22bcb1ef2..92ec32d5cc52 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/default.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/default.nix @@ -60,7 +60,7 @@ let # the files its looking fore are located. Also see `sage-env`. env-locations = callPackage ./env-locations.nix { inherit pari_data ecl; - inherit singular; + inherit singular maxima-ecl; cysignals = python.pkgs.cysignals; three = nodePackages.three; mathjax = nodePackages.mathjax; @@ -71,21 +71,21 @@ let sage-env = callPackage ./sage-env.nix { sagelib = python.pkgs.sagelib; inherit env-locations; - inherit python ecl singular palp flint pynac pythonEnv; + inherit python ecl singular palp flint pynac pythonEnv maxima-ecl; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; # The documentation for sage, building it takes a lot of ram. sagedoc = callPackage ./sagedoc.nix { inherit sage-with-env; - inherit python; + inherit python maxima-ecl; }; # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. sage-with-env = callPackage ./sage-with-env.nix { inherit pythonEnv; inherit sage-env; - inherit pynac singular; + inherit pynac singular maxima-ecl; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages.three; }; @@ -129,6 +129,9 @@ let singular = pkgs.singular.override { inherit flint; }; + # https://trac.sagemath.org/ticket/26625 + maxima-ecl = pkgs.maxima-ecl-5_41; + # *not* to confuse with the python package "pynac" pynac = pkgs.pynac.override { inherit singular flint; }; diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 834590216870..51a83d70415b 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -50,6 +50,15 @@ stdenv.mkDerivation rec { # Fixes a potential race condition which can lead to transient doctest failures. ./patches/fix-ecl-race.patch + + # Parallelize docubuild using subprocesses, fixing an isolation issue. See + # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE + (fetchpatch { + name = "sphinx-docbuild-subprocesses.patch"; + url = "https://salsa.debian.org/science-team/sagemath/raw/8a215b17e6f791ddfae6df8ce6d01dfb89acb434/debian/patches/df-subprocess-sphinx.patch"; + sha256 = "07p9i0fwjgapmfvmi436yn6v60p8pvmxqjc93wsssqgh5kd8qw3n"; + stripLen = 1; + }) ]; # Patches needed because of package updates. We could just pin the versions of diff --git a/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index 36c7884d108b..2262e342fc95 100644 --- a/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cytoscape-${version}"; - version = "3.6.1"; + version = "3.7.1"; src = fetchurl { - url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "1pkdilv1nw6vvdxk71bwjngr8yafrsqwaqvlakhp8yb342r1jd4s"; + url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${name}.tar.gz"; + sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k"; }; buildInputs = [jre makeWrapper]; diff --git a/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix index 2d579a803698..761766ffdf0d 100644 --- a/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { name = "apmplanner2-${version}"; + # TODO revert Qt59 to Qt5 in pkgs/top-level/all-packages.nix on next release version = "2.0.26"; src = fetchFromGitHub { owner = "ArduPilot"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index a8df4846bf5c..5a5b666b7cdf 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, docutils, makeWrapper, gnupg1compat, curl, rsync }: +{ stdenv, fetchFromGitHub, docutils, makeWrapper +, gnupg1compat, curl, rsync, coreutils +, gawk, gnused, gnugrep +}: stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; @@ -19,7 +22,8 @@ stdenv.mkDerivation rec { installPhase = '' prefix="$out" ./install.sh wrapProgram "$out/bin/git-remote-gcrypt" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync ]}" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync coreutils + gawk gnused gnugrep ]}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix index 6979a47cdfc1..899f33218a10 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.7.3"; + version = "0.8.2"; pname = "gita"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0ccqjf288513im7cvafiw4ypbp9s3z0avyzd4jzr13m38jrsss3r"; + sha256 = "16jpnl323x86dkrnh4acyvi9jknhgi3r0ccv63rkjcmd0srkaxkk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 698de486b5be..c75af4718541 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ offline jgeerds ]; + maintainers = with maintainers; [ offline ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index daec9ce9d2af..2d02287f2617 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lab-${version}"; - version = "0.14.0"; + version = "0.15.2"; goPackagePath = "github.com/zaquestion/lab"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0dqahzm721kpps4i33qgk78y982n8gj5afpk73qyzbraf5y3cw92"; + sha256 = "1210cf6ss4ivm2jxq3k3c34vpra02pl91fpmvqbvw5sm53j7xfaf"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix index 03959300b435..c0526595d4fa 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix @@ -1,327 +1,507 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "github.com/avast/retry-go"; + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/avast/retry-go"; fetch = { type = "git"; url = "https://github.com/avast/retry-go"; - rev = "5469272a8171235352a56af37e5f7facf814423f"; + rev = "5469272a8171"; sha256 = "0ql8x5c99sh1f4vdd5614zd0bi4z8z19228vm4xkvii11bsj8dx6"; }; } { - goPackagePath = "github.com/cpuguy83/go-md2man"; + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"; + rev = "v1.0.8"; sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; }; } { - goPackagePath = "github.com/davecgh/go-spew"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } { - goPackagePath = "github.com/fsnotify/fsnotify"; + goPackagePath = "github.com/derekparker/delve"; + fetch = { + type = "git"; + url = "https://github.com/derekparker/delve"; + rev = "v1.1.0"; + sha256 = "0gpsd9hb7r65rn4ml9jzsmy72b8j0id6wik2l48ghzkwjm72rsdz"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + rev = "v1.4.7"; sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } { - goPackagePath = "github.com/gdamore/encoding"; + goPackagePath = "github.com/gdamore/encoding"; fetch = { type = "git"; url = "https://github.com/gdamore/encoding"; - rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + rev = "b23993cbb635"; sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; }; } { - goPackagePath = "github.com/gdamore/tcell"; + goPackagePath = "github.com/gdamore/tcell"; fetch = { type = "git"; url = "https://github.com/gdamore/tcell"; - rev = "2f258105ca8ce35819115b49f5ac58197241653e"; + rev = "2f258105ca8c"; sha256 = "1sji4fjd7i70lc6l19zhz718xld96k0h1sb1as1mmrx0iv858xaz"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; }; } { - goPackagePath = "github.com/google/go-querystring"; + goPackagePath = "github.com/google/go-querystring"; fetch = { type = "git"; url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "d547d1d9531e"; + sha256 = "0rhgxfh8b3qq4imkw6dmv0hxsmflm9pkax8i7a9z8q464z1ixrz7"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + rev = "ef8a98b0bbce"; sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; }; } { - goPackagePath = "github.com/inconshreveable/mousetrap"; + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; fetch = { type = "git"; url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + rev = "v1.0.0"; sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; }; } { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.2.1"; + sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; fetch = { type = "git"; url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "231272389856c976b7500c4fffcc52ddf06ff4eb"; + rev = "231272389856"; sha256 = "161n224v46mln3swzv0009ffj9fxg2n814l9vqs3zh9dq1dmj0jn"; }; } { - goPackagePath = "github.com/lunixbochs/vtclean"; + goPackagePath = "github.com/lunixbochs/vtclean"; fetch = { type = "git"; url = "https://github.com/lunixbochs/vtclean"; - rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41"; + rev = "2d01aacdc34a"; sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; }; } { - goPackagePath = "github.com/magiconair/properties"; + goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"; + rev = "v1.7.6"; sha256 = "04ccjc9nd1wffvw24ixyfw3v5g48zq7pbq1wz1zg9cyqyxy14qgr"; }; } { - goPackagePath = "github.com/mattn/go-runewidth"; + goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; + rev = "v0.0.2"; sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + rev = "00c29f56e238"; sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; }; } { - goPackagePath = "github.com/pelletier/go-toml"; + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.6.0"; + sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + rev = "v1.1.0"; sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; }; } { - goPackagePath = "github.com/pkg/errors"; + goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + rev = "v0.8.0"; sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } { - goPackagePath = "github.com/pmezard/go-difflib"; + goPackagePath = "github.com/pmezard/go-difflib"; fetch = { type = "git"; url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + rev = "v1.0.0"; sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } { - goPackagePath = "github.com/rivo/tview"; + goPackagePath = "github.com/rivo/tview"; fetch = { type = "git"; url = "https://github.com/rivo/tview"; - rev = "f855bee0205c35e6a055b86cc341effea0f446ce"; + rev = "f855bee0205c"; sha256 = "0jn9r3gzvm3gr72rb7zz2g8794nnl56l8flqfav00pfk0qiqp8xw"; }; } { - goPackagePath = "github.com/russross/blackfriday"; + goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; + rev = "v1.5.1"; sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; }; } { - goPackagePath = "github.com/spf13/afero"; + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "044398e4856c"; + sha256 = "0nrrk25vzzrrsmmprs72ldfy041crjjsj44n47aj9w8gw379hl5p"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "63644898a8da0bc22138abf860edaf5277b6102e"; + rev = "v1.1.0"; sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; }; } { - goPackagePath = "github.com/spf13/cast"; + goPackagePath = "github.com/spf13/cast"; fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; + rev = "v1.2.0"; sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; }; } { - goPackagePath = "github.com/spf13/cobra"; + goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "615425954c3b0d9485a7027d4d451fdcdfdee84e"; - sha256 = "01zsislgc72j86a1zq7xs7xj3lvxjjviz4lgn4144jzgppwanpk6"; + url = "https://github.com/rsteube/cobra"; + rev = "v0.0.1-zsh-completion-custom"; + sha256 = "0l0c9p5pdv3fq27ich4psaffivwv43acknqnzyql3bgx08vhnsxd"; }; } { - goPackagePath = "github.com/spf13/jwalterweatherman"; + goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + rev = "7c0cea34c8ec"; sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + rev = "v1.0.1"; sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; }; } { - goPackagePath = "github.com/spf13/viper"; + goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; + rev = "15738813a09d"; sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; - sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; }; } { - goPackagePath = "github.com/tcnksm/go-gitconfig"; + goPackagePath = "github.com/tcnksm/go-gitconfig"; fetch = { type = "git"; url = "https://github.com/tcnksm/go-gitconfig"; - rev = "d154598bacbf4501c095a309753c5d4af66caa81"; + rev = "v0.1.2"; sha256 = "0sz7h383h7ngrqkk35ic37kfvhlk07g4kanps8bnapwczrcm2am9"; }; } { - goPackagePath = "github.com/xanzy/go-gitlab"; + goPackagePath = "github.com/wadey/gocovmerge"; + fetch = { + type = "git"; + url = "https://github.com/wadey/gocovmerge"; + rev = "b5bfa59ec0ad"; + sha256 = "00m7kxcmmw0l9z0m7z6ii06n5j4bcrxqjbhxjbfzmsdgdsvkic31"; + }; + } + { + goPackagePath = "github.com/xanzy/go-gitlab"; fetch = { type = "git"; url = "https://github.com/xanzy/go-gitlab"; - rev = "8d21e61ce4a9b9c7fe645e48672872e9fdb71138"; - sha256 = "1lac57ard1vrd16ri8gfyd0ck8d7xg7zbcjlz90223jp0vc3l8nv"; + rev = "7bc4155e8bf8"; + sha256 = "1zk3f00i9ji57m85hzkrg8f1b9l5acd5p75kpzhr087skk943rdm"; + }; + } + { + goPackagePath = "golang.org/x/arch"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/arch"; + rev = "5a4828bb7045"; + sha256 = "1c550zdqvyjvc5xc1yqaxa3pmkcdjc5cmbmrhy1li6g3ysfbcil3"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "e73bf333ef8920dbb52ad18d4bd38ad9d9bc76d7"; - sha256 = "1amcpva20vff8v0lww655icaaf7388ns8xhm859whn4w4v0vanyg"; + rev = "0709b304e793"; + sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f4c29de78a2a91c00474a2e689954305c350adf9"; - sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; + rev = "03003ca0c849"; + sha256 = "09ag58l678hr9bzy5fn8i3m5rxn2scps74zm0kmkb6p25lg5z4sl"; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f"; - sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl"; + rev = "f42d05182288"; + sha256 = "1cbwgr3f3wj84kjpldzzvrlkvlpp0jz8rgbj31xw8n3h502phwab"; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "79b0c6888797020a994db17c8510466c72fe75d9"; - sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag"; + rev = "d0be0721c37e"; + sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + rev = "v0.3.0"; sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "e063def13b29"; + sha256 = "1aphxa8g0936jbmqjlfjczq6wlr0mc2iz965fql764kvqb5szkkw"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + rev = "v1.3.0"; + sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370"; + }; + } + { + goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; + rev = "v1.3.0"; + sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } -] \ No newline at end of file +] diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix index b5edd256256b..7b86b5429b26 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix @@ -1,12 +1,12 @@ { stdenv, python3Packages }: with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "1.14.2"; + version = "1.14.4"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "010fwih91gbc20hm2hmkyicm2a2xwrjjg4r4wv24x3n7zn4abdrc"; + sha256 = "1ly40348x9lkzsr7a9grkn7m8m6lhfsv0ihlnp288xbvmrirrmnk"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 54b7272b0d43..6f72b2e1775c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh +, git, bash, gzip, openssh, pam , sqliteSupport ? true +, pamSupport ? true }: with stdenv.lib; @@ -31,9 +32,11 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ optional pamSupport pam; - buildFlags = optional sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite" + ++ optional pamSupport "-tags pam"; buildFlagsArray = '' -ldflags= -X=main.Version=${version} diff --git a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index b27ade204ed2..1208a42e3325 100644 --- a/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.2.2"; + version = "5.0.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "0zbnw2x15688hjdj10kpp2ipka3j7b2p945a4mzwlsc8a245ljgb"; + sha256 = "14n0xqp6y7ij26r5k7h0phf29krbpx54yzfbvrax5sd9cwg2762g"; }; libPath = makeLibraryPath [ @@ -78,9 +78,7 @@ stdenv.mkDerivation rec { pushd usr pushd share substituteInPlace applications/gitkraken.desktop \ - --replace /usr/share/gitkraken $out/bin \ - --replace Icon=app Icon=gitkraken - mv pixmaps/app.png pixmaps/gitkraken.png + --replace /usr/share/gitkraken $out/bin popd rm -rf bin/gitkraken share/lintian cp -av share bin $out/ diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index b9423ccb328a..bb48a441253f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ ruby bundler go ]; - GOCACHE="$TMPDIR/go-cache"; - patches = [ ./remove-hardcoded-locations.patch ]; installPhase = '' + export GOCACHE="$TMPDIR/go-cache" + ruby bin/compile mkdir -p $out/ cp -R . $out/ diff --git a/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/nixpkgs/pkgs/applications/version-management/gogs/default.nix index 0b63a8f21985..238540a1c981 100644 --- a/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh +, git, bash, gzip, openssh, pam , sqliteSupport ? true +, pamSupport ? true }: with stdenv.lib; @@ -23,9 +24,11 @@ buildGoPackage rec { substituteInPlace pkg/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ optional pamSupport pam; - buildFlags = optionalString sqliteSupport "-tags sqlite"; + buildFlags = optional sqliteSupport "-tags sqlite" + ++ optional pamSupport "-tags pam"; outputs = [ "bin" "out" "data" ]; diff --git a/nixpkgs/pkgs/applications/version-management/meld/default.nix b/nixpkgs/pkgs/applications/version-management/meld/default.nix index 83f26fa08fc3..0e0e63f14ae1 100644 --- a/nixpkgs/pkgs/applications/version-management/meld/default.nix +++ b/nixpkgs/pkgs/applications/version-management/meld/default.nix @@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme + gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; checkInputs = [ xvfb_run python3.pkgs.pytest dbus ]; diff --git a/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix index dc458eba1673..9e42880dd7da 100644 --- a/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.8.2"; + version = "4.9"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "02av8k241rn7b68g4kl22s7jqmlq545caah1a5rvbgy41y7zzjvh"; + sha256 = "01na1ymdlh9nd121gmq3vkssr183sd2fcwjfdnq5n5fpys6bazjc"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/nixpkgs/pkgs/applications/video/avidemux/default.nix b/nixpkgs/pkgs/applications/video/avidemux/default.nix index 5fcab43c86ba..ae1e0c5dc868 100644 --- a/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w"; + sha256 = "07fdz3y4iln7cizikdjj96dqvp2f8zzhs31ncxxwzdkngn5v8138"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/video/clipgrab/default.nix b/nixpkgs/pkgs/applications/video/clipgrab/default.nix index 3937244f25be..a94bb7ade33e 100644 --- a/nixpkgs/pkgs/applications/video/clipgrab/default.nix +++ b/nixpkgs/pkgs/applications/video/clipgrab/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4, qmake4Hook }: +{ stdenv, fetchurl, makeDesktopItem, ffmpeg +, qmake, qttools +, qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine +}: stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.7.2"; + version = "3.8.2"; src = fetchurl { - sha256 = "1xkap4zgx8k0h0qfcqfwi3lj7s3mqsj0dp1cddiqmxbibbmg3rcc"; + sha256 = "0dhiv1mldp5f555im6mkjxdh6iivn1hnx2xdaqa6wxzsrwrvv5dd"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; - buildInputs = [ ffmpeg qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; + nativeBuildInputs = [ qmake qttools ]; postPatch = stdenv.lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ diff --git a/nixpkgs/pkgs/applications/video/shotcut/default.nix b/nixpkgs/pkgs/applications/video/shotcut/default.nix index bbb11c497668..27a0fa3388ed 100644 --- a/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.12.23"; + version = "19.02.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1i6gkqvg31q7g5s3zgqzg4i5kyas7k4svclgbk459i5h1ar3v5vn"; + sha256 = "14l0cm81jy7syi08d8dg4nzp7s9zji9cycnf2mvh7zc7x069d1jr"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix index dbf22aa9f8ee..4cc0890a8475 100644 --- a/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.14.2"; + version = "1.0.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "1njwfy1h8a9n5z6crrfnknlw4ys0bap2jam6ga6njgkd10aly9qr"; + sha256 = "12x8gnp6lv3vi1z2wfb0vjim2wm6abpr938yy48kqj7qff385ihd"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 94b21a77a702..a8561e0523dc 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -4,13 +4,13 @@ with lib; buildGoPackage rec { name = "containerd-${version}"; - version = "1.2.2"; + version = "1.2.5"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; + sha256 = "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 8e1934487cba..7ab11ee6a5c7 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -41,7 +41,6 @@ buildPythonApplication rec { description = "Multi-container orchestration for Docker"; license = licenses.asl20; maintainers = with maintainers; [ - jgeerds ]; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index d4ba9568fed4..b634625206a6 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -94,13 +94,14 @@ rec { dontStrip = true; - buildPhase = (optionalString (stdenv.isLinux) '' + buildPhase = '' + export GOCACHE="$TMPDIR/go-cache" + '' + (optionalString (stdenv.isLinux) '' # build engine cd ./components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" export VERSION="${version}" - export GOCACHE="$TMPDIR/go-cache" ./hack/make.sh dynbinary cd - '') + '' diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 2e98194bb9d3..e50803db4e33 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "1fk9gqhr9yijf0fbxvidmza455x59d94id6d142isv8s36rkw858"; + sha256 = "180sv1a7k3866ilb0mxbhiysms9xy4v6xbpy4in6ch8m8qym9amh"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 26307f3f38d6..bb16660db87e 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -23,10 +23,11 @@ python3Packages.buildPythonApplication rec { gobject-introspection # for setup hook populating GI_TYPELIB_PATH ]; - buildInputs = - [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi - gsettings-desktop-schemas libosinfo gtk3 - ] ++ optional spiceSupport spice-gtk; + buildInputs = [ + libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi + gsettings-desktop-schemas libosinfo gtk3 + gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + ] ++ optional spiceSupport spice-gtk; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix index 746c45beccfa..7c90f9b3483f 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix @@ -13,12 +13,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "7.0"; + version = "8.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; + sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; }; nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/window-managers/sway/beta.nix b/nixpkgs/pkgs/applications/window-managers/sway/beta.nix deleted file mode 100644 index 83c8e9328caf..000000000000 --- a/nixpkgs/pkgs/applications/window-managers/sway/beta.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub -, meson, ninja -, pkgconfig, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev -, pango, cairo, libinput, libcap, pam, gdk_pixbuf -, wlroots, wayland-protocols -, buildDocs ? true -}: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "sway"; - version = "1.0-rc5"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "sway"; - rev = version; - sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i"; - }; - - postPatch = '' - sed -iE "s/version: '1.0',/version: '${version}',/" meson.build - ''; - - nativeBuildInputs = [ - pkgconfig meson ninja - ] ++ stdenv.lib.optional buildDocs scdoc; - - buildInputs = [ - wayland libxkbcommon pcre json_c dbus libevdev - pango cairo libinput libcap pam gdk_pixbuf - wlroots wayland-protocols - ]; - - enableParallelBuilding = true; - - mesonFlags = [ - "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dtray=enabled" - ] ++ stdenv.lib.optional buildDocs "-Dman-pages=enabled"; - - meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; - homepage = https://swaywm.org; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/nixpkgs/pkgs/applications/window-managers/sway/default.nix index fb30f0073bfd..ad06b1ee832c 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -1,40 +1,53 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl -, wayland, wlc, libxkbcommon, pcre, json_c, dbus -, pango, cairo, libinput, libcap, pam, gdk_pixbuf, libpthreadstubs -, libXdmcp -, buildDocs ? true +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja +, pkgconfig, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, wlroots, wayland-protocols }: stdenv.mkDerivation rec { - name = "sway-${version}"; - version = "0.15.2"; + name = "${pname}-${version}"; + pname = "sway"; + version = "1.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1p9j5gv85lsgj4z28qja07dqyvqk41w6mlaflvvm9yxafx477g5n"; + sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; }; - nativeBuildInputs = [ - cmake pkgconfig - ] ++ stdenv.lib.optional buildDocs [ asciidoc libxslt docbook_xsl ]; + patches = [ + # Fix for a compiler warning that causes a build failure + # (see https://github.com/swaywm/sway/issues/3862): + (fetchpatch { + url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch"; + sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp"; + }) + ./sway-config-no-nix-store-references.patch + ]; + + nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; + buildInputs = [ - wayland wlc libxkbcommon pcre json_c dbus - pango cairo libinput libcap pam gdk_pixbuf libpthreadstubs - libXdmcp + wayland libxkbcommon pcre json_c dbus libevdev + pango cairo libinput libcap pam gdk_pixbuf + wlroots wayland-protocols ]; enableParallelBuilding = true; - cmakeFlags = "-DVERSION=${version} -DLD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib"; + mesonFlags = [ + "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Dtray=enabled" "-Dman-pages=enabled" + ]; meta = with stdenv.lib; { - description = "i3-compatible window manager for Wayland"; + description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. + maintainers = with maintainers; [ primeos synthetica ]; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch new file mode 100644 index 000000000000..009c12959430 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch @@ -0,0 +1,21 @@ +diff --git a/config.in b/config.in +--- a/config.in ++++ b/config.in +@@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec + + ### Output configuration + # +-# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/) +-output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill ++# Default wallpaper ++#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill + # + # Example configuration: + # +@@ -213,5 +213,3 @@ bar { + inactive_workspace #32323200 #32323200 #5c5c5c + } + } +- +-include @sysconfdir@/sway/config.d/* + |