diff options
Diffstat (limited to 'pkgs/applications/networking')
17 files changed, 84 insertions, 134 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 52773bf291a6..7505e7e21967 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native @@ -66,7 +66,7 @@ let ++ extraNativeMessagingHosts ); libs = lib.optionals stdenv.isLinux [ udev libva ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index e5cd08f7df7f..fb30bbfd2b6c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -7,6 +7,9 @@ , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa +# Command line programs +, coreutils + # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -58,7 +61,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa + kerberos libdrm mesa coreutils ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index df39e5d86768..304a3c6fa289 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.31"; + version = "2.1.65"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; + sha256 = "0zkp0z5qpqw44bjnl20xna7s251k7jsxccqnqkdqqrzmqjpkkwgx"; }; - vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; + vendorSha256 = "0zi2n8fywzy87yfwcx7di74s8mx0468zmg6kwjln7mwhr6q23adf"; subPackages = [ "cmd/jx" ]; diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index a3cb55ce329c..cd946284fa77 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "0.3.1"; + version = "0.4.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h"; + sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa"; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index bf4ec9492157..b8bef9ecc052 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.13.1"; in +let version = "0.16.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "0x2mg13p8r1sgqr1bbzh57kfymb8z392y43djgks2agc7rjnd45f"; + sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4"; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 48540bffb536..5b1f12452469 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "kubeless"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "kubeless"; repo = "kubeless"; rev = "v${version}"; - sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; + sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd"; }; goPackagePath = "github.com/kubeless/kubeless"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index daffb5930903..42ed3d21066f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { pname = "terraform-provider-libvirt"; - version = "0.6.1"; + version = "0.6.2"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz"; + sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index acb63ff7454f..f9a5ebdbebe3 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.4", + "version": "1.6.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -48,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.2.1", + "matrix-js-sdk": "6.2.2", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index e6573a508184..30e1c9464755 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -3154,11 +3154,11 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz"; - sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz"; + sha1 = "103d951f61945217b110962f55ae43996756f615"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 64652afd7e4d..acdf40e772ea 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2"; + sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60"; }; electron = electron_7; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 942917a46757..c08d1dbe0332 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2"; + sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 388144c4e12f..d4493355951f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst @@ -42,7 +42,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix new file mode 100644 index 000000000000..719965455f9c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchgit +, rustPlatform +, pkgconfig +, openssl +, dbus +, sqlite +, file +, gzip +, notmuch + # Build with support for notmuch backend +, withNotmuch ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "meli"; + version = "alpha-0.5.1"; + + src = fetchgit { + url = "https://git.meli.delivery/meli/meli.git"; + rev = version; + sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv"; + }; + + cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y"; + + cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; + + nativeBuildInputs = [ pkgconfig gzip ]; + + buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; + + checkInputs = [ file ]; + + postInstall = '' + mkdir -p $out/share/man/man1 + gzip < meli.1 > $out/share/man/man1/meli.1.gz + mkdir -p $out/share/man/man5 + gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + ''; + + meta = with stdenv.lib; { + description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; + homepage = "https://meli.delivery"; + license = licenses.gpl3; + maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 03be60a99489..c72c7c6da8ab 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab , meson, ninja, pkgconfig, scdoc , wayland, wayland-protocols, openssh -, mesa, lz4, zstd, ffmpeg_4, libva +, mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols # Optional dependencies: - mesa lz4 zstd ffmpeg_4 libva + mesa lz4 zstd ffmpeg libva ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index c6dc66a0ca78..d025222b0100 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -31,6 +31,9 @@ in stdenv.mkDerivation { "-DCMAKE_INSTALL_LIBDIR=lib" ]; + # Avoid referencing -dev paths because of debug assertions. + NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + nativeBuildInputs = [ bison cmake flex pkgconfig ] ++ optional withQt qt5.wrapQtAppsHook; diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index db33e7e6bb21..db33e7e6bb21 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix deleted file mode 100644 index 74a02f47c3bf..000000000000 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv, fetchurl, lib, makeWrapper, - # build dependencies - alsaLib, atk, cairo, cups, dbus, expat, fontconfig, - freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg, - glibc, systemd -}: - -stdenv.mkDerivation { - - version = "2.12.0"; - - pname = "patchwork-classic"; - - src = fetchurl { - url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; - sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj"; - }; - - sourceRoot = "."; - - unpackCmd = '' - ar p "$src" data.tar.xz | tar xJ - ''; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R usr/share opt $out/ - - # fix the path in the desktop file - substituteInPlace \ - $out/share/applications/ssb-patchwork-electron.desktop \ - --replace /opt/ $out/opt/ - - # symlink the binary to bin/ - ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic - ''; - - - preFixup = let - packages = [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - nspr - nss - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - stdenv.cc.cc.lib - stdenv.cc.cc - glibc - ]; - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - in '' - # patch executable - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \ - $out/opt/ssb-patchwork-electron/ssb-patchwork-electron - - # patch libnode - patchelf \ - --set-rpath "${libPath}" \ - $out/opt/ssb-patchwork-electron/libnode.so - - # libffmpeg is for some reason not executable - chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so - - # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1 - wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \ - --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron - ''; - - meta = with stdenv.lib; { - description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser"; - homepage = "https://github.com/ssbc/patchwork-classic-electron"; - license = licenses.gpl3; - maintainers = with maintainers; [ mrVanDalo ]; - platforms = platforms.linux; - }; -} |