diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-28 08:26:42 +0200 |
commit | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (patch) | |
tree | 4a4ee79a6e0694d3c7ad6fbeff33343d83458e6c /pkgs/applications/networking | |
parent | a2538606e3115e16db2e5075ecf37b886ad64ede (diff) | |
parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking')
63 files changed, 517 insertions, 1027 deletions
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index dcf3224e20774..ca5d3d0b6657f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { # Fix paths substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser $out/bin/brave + --replace /usr/bin/brave-browser-stable $out/bin/brave substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ --replace /opt/brave.com $out/opt/brave.com substituteInPlace $out/share/menu/brave-browser.menu \ diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index aecebb08e0da9..a0ea67133c6fc 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,17 +94,17 @@ let envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; }} ''; - + meta.platforms = platforms.x86_64; }; flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.223"; + version = "32.0.0.238"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0xm6jcdip4gki267ldw106l5j43im0ji2zjsarvi7n2nvvnwwgnl"; + sha256 = "0jqx68lfqjpy6wbxdi0giclvh9mc9rha92hqdj1nx42v95k3gc65"; stripRoot = false; }; @@ -135,7 +135,7 @@ let ''; dontStrip = true; - + meta.platforms = platforms.x86_64; }; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f464972a9df28..e6f143c976298 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -314,6 +314,9 @@ stdenv.mkDerivation rec { ] ++ extraMakeFlags; + RUSTFLAGS = if (lib.versionAtLeast ffversion "67"/*somewhere betwween ESRs*/) + then null else "--cap-lints warn"; + enableParallelBuilding = true; doCheck = false; # "--disable-tests" above diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc1678335947b..2a4db14b2c6d4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,10 +3,9 @@ ## various stuff that can be plugged in , flashplayer, hal-flash , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd -, jrePlugin, icedtea_web +, jrePlugin, adoptopenjdk-icedtea-web , bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ -, esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native , udev @@ -55,13 +54,12 @@ let ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea icedtea_web + ++ lib.optional icedtea adoptopenjdk-icedtea-web ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader - ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin ++ extraPlugins ); nativeMessagingHosts = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix deleted file mode 100644 index a25857582765f..0000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, gtk2, openssl, pcsclite, pkgconfig, opensc }: - -stdenv.mkDerivation rec { - version = "3.12.1.1142"; - pname = "esteidfirefoxplugin"; - - src = fetchurl { - url = "https://installer.id.ee/media/ubuntu/pool/main/e/esteidfirefoxplugin/esteidfirefoxplugin_3.12.1.1142.orig.tar.xz"; - sha256 = "0y7759x1xr00p5r3c5wpllcqqnnxh2zi74cmy4m9m690z3ywn0fx"; - }; - - unpackPhase = '' - mkdir src - tar xf $src -C src - cd src - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 openssl pcsclite opensc ]; - - buildPhase = '' - sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile - make plugin - ''; - - installPhase = '' - plugins=$out/lib/mozilla/plugins - mkdir -p $plugins - cp -a npesteid-firefox-plugin.so $plugins/ - rp=$(patchelf --print-rpath $plugins/npesteid-firefox-plugin.so) - patchelf --set-rpath "$rp:${opensc}/lib:${opensc}/lib/pkcs11" $plugins/npesteid-firefox-plugin.so - ''; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - dontStrip = true; - dontPatchELF = true; - - meta = with stdenv.lib; { - description = "Firefox ID card signing plugin"; - homepage = http://www.id.ee/; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 04c988812157c..772ca926cd756 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.223"; + version = "32.0.0.238"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "165zsh4dzzsy38kc8yxp0jdygk4qid5xd642gchlky7z6fwza223" + "1f5i64nzkvxy20vi7kldaamwp6pi2zgmjiw061cgqrwf7hj45wkg" else - "1by2zqw9xgvpf1jnbf5qjl3kcjn5wxznl44f47f8h2gkgcnrf749" + "09jvxqp83hpk89ak8flq14s3s3nhy3ary91jc6k47v325axh1cl9" else if arch == "x86_64" then - "07hbg98pgpp81v2sr4vw8siava7wkg1r6hg8i6rg00w9mhvn9vcz" + "05gvssjdz43pvgivdngrf8qr5b30p45hr2sr97cyl6b87581qw9s" else - "1z2nmznmwvg3crdj3gbz2bxvi8dq2jk5yiwk79y90h199nsan1n2"; + "06l7zhgh5rfxxw46b500zdgcqsk2h7kivng5b0b74s3vy7f0g270"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index e9431866047e3..2d2d2a6910069 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { pname = "flashplayer-standalone"; - version = "32.0.0.223"; + version = "32.0.0.238"; 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 - "1f3098vfznnx8d7rimgbalr2728jhzwca9val7pdi9b8yf9labwk" + "1vhfjpwsmg96irfvz81ldzn2m4qcjnql5psg4cifjay423yxabvy" else - "005iyajgp55ww25rcyxg5g0kbzddp6izfly9p4agahmzlzv18y4h"; + "0am95xi2jasvxj5b2i12wzpvl3bvxli537k1i04698cg0na6x0y0"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix index 083383f0ef5b6..9a4d61a50aee5 100644 --- a/pkgs/applications/networking/browsers/qtchan/default.nix +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtchan"; - version = "0.100"; + version = "1.0.1"; src = fetchFromGitHub { owner = "siavash119"; repo = "qtchan"; rev = "v${version}"; - sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a"; + sha256 = "1x11m1kwqindzc0dkpfifcglsb362impaxs85kgzx50p898sz9ll"; }; - patches = [ - (fetchpatch { - url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch; - sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z"; - }) - ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qt.qmake qt.wrapQtAppsHook ]; - buildInputs = [ qt.qtbase ]; - + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; qmakeFlags = [ "CONFIG-=app_bundle" ]; installPhase = '' @@ -29,7 +21,7 @@ stdenv.mkDerivation rec { cp qtchan $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "4chan browser in qt5"; homepage = "https://github.com/siavash119/qtchan"; license = licenses.mit; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index f82cc3535f26d..0a72099e653cc 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = https://fanglingsu.github.io/vimb/; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = []; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index b06edaf9dcbe6..246c5e7e60dc1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.6.1566.51-1"; + version = "2.7.1628.30-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0582f16saldgn482806f9igb97is4p3ayvh99j0wx9plxnyq5xmm"; + sha256 = "1lz8adwiwll8g246s5pa0ipfraph51s9f4lcfysdrp1s3s1qhw8x"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 36c26001afc8e..eb2946cec7718 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, libvirt, pkgconfig, minikube }: +{ stdenv, buildGoModule, libvirt, pkgconfig, minikube }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-machine-kvm2"; version = minikube.version; @@ -9,6 +9,8 @@ buildGoPackage rec { src = minikube.src; + modSha256 = minikube.go-modules.outputHash; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvirt ]; @@ -17,7 +19,7 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2 + mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 29ec50ce36241..b0f6793226596 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.13.1"; + version = "1.13.3"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "0g8yfvwh6hjh70a0i4ssbb6hq3i9f75wj8yqy1aaafycq598zbdx"; + sha256 = "0l2gc9p2jz1zyl527rr0r3qklm4j86d4biviq8a30jl9rsx6z4cy"; }; modSha256 = "1q5g9hd0ansdc2acpysf6wi74q50w0psrpyhk4y6mm6kjvhlcn87"; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 7522307032e5b..438fdfb2ebac8 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash +, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 +}: let - common = { version, sha256, dependencies-sha256, tomcat }: + common = { version, sha256, dependencies-sha256, tomcat, opensslPkg ? openssl }: let # compile the hadoop tarball from sources, it requires some patches binary-distributon = stdenv.mkDerivation rec { @@ -33,7 +35,7 @@ let }; nativeBuildInputs = [ maven cmake pkgconfig ]; - buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ]; + buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated postPatch = '' for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ @@ -85,7 +87,7 @@ let mv $n $out/bin.wrapped/ makeWrapper $out/bin.wrapped/$(basename $n) $n \ --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ - --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ + --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ opensslPkg snappy zlib bzip2 ]}" \ --set JAVA_HOME "${jre}" \ --set HADOOP_PREFIX "$out" fi @@ -128,18 +130,21 @@ in { sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; + opensslPkg = openssl_1_0_2; }; hadoop_2_8 = common { version = "2.8.4"; sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w"; dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; tomcat = tomcat_6_0_48; + opensslPkg = openssl_1_0_2; }; hadoop_2_9 = common { version = "2.9.1"; sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7"; dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; tomcat = tomcat_6_0_48; + opensslPkg = openssl_1_0_2; }; hadoop_3_0 = common { version = "3.0.3"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix new file mode 100644 index 0000000000000..a69dc8890a7ba --- /dev/null +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubeless"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "kubeless"; + repo = "kubeless"; + rev = "v${version}"; + sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; + }; + modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd"; + + subPackages = [ "cmd/kubeless" ]; + + buildFlagsArray = '' + -ldflags=-X github.com/kubeless/kubeless/pkg/version.Version=${version} + ''; + + meta = with stdenv.lib; { + homepage = "https://kubeless.io"; + description = "The Kubernetes Native Serverless Framework"; + license = licenses.asl20; + maintainers = with maintainers; [ "00-matt" ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 8c85370728f5a..5637e486ef116 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -49,6 +49,7 @@ in buildGoModule rec { ''; postInstall = '' + wrapProgram $out/bin/${pname} --prefix PATH : $out/bin:${stdenv.lib.makeBinPath binPath} mkdir -p $out/share/bash-completion/completions/ MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube mkdir -p $out/share/zsh/site-functions/ diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index a6749083c2452..16056d9185b5c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-acme"; - version = "1.3.4"; - sha256 = "1kam9mwgqh31f1m8kn86bkdi4ccfj5h38f80g3frrla4p2zw9l55"; + version = "1.3.5"; + sha256 = "0xjxxz3vxq7vk7sv6b5p57z5x92dmrm44v6ksffcg76ngc40nrxk"; }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.52.2"; - sha256 = "1s127p6rm3kmrxjk9kr02rgjk58rs864c0b46i8lmaj7x5yznaz5"; + version = "1.54.0"; + sha256 = "01pmhwdnhfsk785ja11hxn5l5fmklnkiv12kv2pw2280cdljfcv4"; }; archive = { @@ -39,8 +39,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "2.21.0"; - sha256 = "18aw0fz3pzd7wci3z19nain499rfr9npb3sm0k34nkajjjryqngc"; + version = "2.23.0"; + sha256 = "0yscy0qmdl07air0b16i6zd0w8y3z20pk5l53pwm78ssdxn3w6qc"; }; azuread = { @@ -53,8 +53,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.32.0"; - sha256 = "01287yknd2bp2yqzyn2221mkv2hz4xd5dghps5pzrkdv0m1w4p35"; + version = "1.32.1"; + sha256 = "0ydzibmvz52i62pk0g96rl7vxhff5izrsgdwk6lgc56nw63w2l8g"; }; azurestack = { @@ -109,8 +109,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.16.1"; - sha256 = "0lxx7wkvmi6zpql7g33bg12gx67i4xm2v885j70b9vf8brj40h2j"; + version = "1.17.1"; + sha256 = "0kmkk5fhgsvjakqrfs7p92dcljn04asxq15af1r9n5csq54q7na3"; }; cloudscale = { @@ -151,8 +151,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "1.5.0"; - sha256 = "14kqyp4j4ld8gla8rn3an6wpjh942h5bn39d68nnf4y7nx3vvbfs"; + version = "1.6.0"; + sha256 = "06cxm3qcym8jwp4nl1bzk3p9fbaz26bvddqzn3p8l57c802qqds6"; }; dme = { @@ -179,8 +179,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "2.1.0"; - sha256 = "183pkjf6x8xk84sij2w2v3sms8pjv7hzwricamd2sf3n0fkqvjiq"; + version = "2.1.1"; + sha256 = "0px3xj76ay5ixpmynas49z31xmk4zmpn0917y6a20kr2x2abi9zb"; }; dyn = { @@ -200,8 +200,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.8.1"; - sha256 = "1ghvf7nwj02r31zgnrnmhagqbbq696ll39b2wjzlimb6c3fw7ik0"; + version = "0.9.0"; + sha256 = "0g3rgi6s9hyb6vzl682n8zqz5virdxvxh04v88n9iy5r7hwrxxzg"; }; flexibleengine = { @@ -228,15 +228,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "2.11.0"; - sha256 = "16577pkp3m5pqqqhvxq1rvx99p1230pmqksm6wplh25ry5yp5v7w"; + version = "2.12.0"; + sha256 = "15fdpmdikm77hlfksdbcblysb82sd51vw4ninx60hzgddqp6ll4m"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - version = "2.11.0"; - sha256 = "0hj2c17kb6k4zy1630fvmyniln5m1ncpyys4wl8v1j0arb8vg2wz"; + version = "2.12.0"; + sha256 = "11aky7jvm7i39pnj3ypy42d9yk9akqb3wjb03hyllzfddwhvay5q"; }; grafana = { @@ -249,8 +249,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.11.0"; - sha256 = "037hbwp10h57cj74ja6c4wjgfrfggbpd4glbc81xpp22rxij40j9"; + version = "1.12.0"; + sha256 = "1r61s7chq636fcjv67g0vjlc35xx0ycy58hg6b5i5rdc9737v7hp"; }; hedvig = { @@ -263,15 +263,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.10.0"; - sha256 = "09qxpgdljkfbyn1ihki2pp2m9wxmrxvp91d1myinml466jylxjar"; + version = "0.10.2"; + sha256 = "1xp8dx6ncskmfa9bjd54434f4a7pnjz5r3yvnh1hmv3i5ykfxzdn"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "2.1.0"; - sha256 = "17gb8lpcp7fwgv6mv3sw5was571pa0pp00izrrkyhbcddw5p84mc"; + version = "2.1.2"; + sha256 = "0n8id5rw4hzsiic9yv4rzm709npagv9sfp6dd1ax6np5kai78b87"; }; http = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - version = "1.6.0"; - sha256 = "03f92mq4ydfwnxh0v4sm6brllxw6m7kh8j19md9aq0wxcwr5wp6q"; + version = "1.7.0"; + sha256 = "1yhyyh33hvzs74pryb383p1w0c0d4vn23pnm6snxi1cw49wgiiyf"; }; icinga2 = { @@ -305,15 +305,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.2.0"; - sha256 = "1nldywbwg5lgzhlq8hmisv63riipd0aaa4p5ya6qvx5cnj5yhsx8"; + version = "1.3.0"; + sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; version = "1.8.1"; - sha256 = "1c69p7rqijinzr0lqh4iwa0g89w2hjm2csadbxkfha0a8iqq73r1"; + sha256 = "0jcc3i10x0qz7sj8l5yv98jc2g32a6yhdpc45sq33wmhcvp1fsn4"; }; librato = { @@ -382,22 +382,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - version = "1.4.0"; - sha256 = "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4"; + version = "1.4.1"; + sha256 = "1v4wwinnb2qc71jgil4607kgdccjivssabqgb5l3yk8pwfidgdnr"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "1.4.1"; - sha256 = "1zcl7yda0rqj76d9slm92kvj5ry3v5va48l8i5vlxa1znnf8d89d"; + version = "1.5.0"; + sha256 = "1m6f1hsx2gcb5b50sm8cj04hkmn71xlxji8qwlswasz2sg1sllrx"; }; nsxt = { owner = "terraform-providers"; repo = "terraform-provider-nsxt"; - version = "1.1.0"; - sha256 = "0y9n4acbrjf5n2v8j10qfnz8677gil60by5miz3wd2qpxwgmhhm8"; + version = "1.1.1"; + sha256 = "19bbycify25bshpyq65qjxnl72b6wmwwwdb7hxl94hhbgx2c9z29"; }; null = { @@ -417,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.35.0-rc1"; - sha256 = "1728zap32iabsa2a6762caf9h7fgspi1z8gnq03269qhy7jsknv8"; + version = "3.37.0-rc1"; + sha256 = "0ahqnh9qzixp434qn2ckj8p32kb9x26l1xz8yr84h6sqfrn58bcv"; }; oneandone = { @@ -431,22 +431,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.3.6"; - sha256 = "1b11837j0d8s59pjkankbm3p5l87aw1s17mn2q7nvy65kgzalsra"; + version = "1.3.7"; + sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.20.0"; - sha256 = "0hfcypz95aj1wwhybpkc74k8g2iqax724qdm11s2iyjmq5c7iz2z"; + version = "1.21.1"; + sha256 = "0nvhn2bnk11sz4i98yw7rpxi8b3c2y04qq37ybvqx2jyi3n9kj30"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.10.0"; - sha256 = "12c7qjlmvsxd4nv0k2vsvlnl1iq2k0b8xx29q5a6h98dnhrnpfic"; + version = "1.11.0"; + sha256 = "175j2bbw3bdbjq1b7b1kwsr8iay9aafz165d0brfpb8gf096y7xa"; }; opsgenie = { @@ -473,15 +473,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "2.2.1"; - sha256 = "05zhrpynn2yrimlg553f0567b284x51g5yafz29g647vvsqd1rpn"; + version = "2.3.0"; + sha256 = "1v2758wjhrn7rhwdx658w3sf1q5lp4cawl6llbv4p16c5fyzwwc2"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.3.0"; - sha256 = "1l3rk7c31qafadpg2b0mzvfx7lwwk82vcn489fr35rvmv99zfkh8"; + version = "1.3.1"; + sha256 = "1x29ya0xcjj2b3x2q2q7iyqric8vswf18a5bwhwv2017c1g4n299"; }; panos = { @@ -501,8 +501,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-powerdns"; - version = "0.1.0"; - sha256 = "1k9xjx2smk6478dsrcnqk1k6r2pddpa9n8aghq5d1a5yhfsq5zzz"; + version = "1.0.0"; + sha256 = "1qh4z69b0sqxwjjgc8xis165gdszav9yc85ba6pgyl3wbymkld30"; }; profitbricks = { @@ -522,15 +522,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.3.0"; - sha256 = "0b62hhb87xqmc1izl5lyk2kvkrkgrjil5z1xwprfdl6yz4fnin0w"; + version = "1.4.0"; + sha256 = "106arszmdjmgrz4iv01bbf72jarn7zjqvmc43b6n1s3lzd7jnfpc"; }; random = { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "2.1.2"; - sha256 = "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw"; + version = "2.2.0"; + sha256 = "0vg33jbvyxvg4dwcwjb2p57jjkq7qj50d356r4a1f2ysl2axwwjw"; }; rightscale = { @@ -543,8 +543,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-rundeck"; - version = "0.3.0"; - sha256 = "10xhj3xxdhbdxq14linqabn8cm0gnnswfwr0r20s1yp7pn36lgkj"; + version = "0.4.0"; + sha256 = "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr"; }; runscope = { @@ -613,8 +613,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - version = "1.13.0"; - sha256 = "0mdgpkzv1gfyvpndvv195f6nxmvpv4wvssxlqvmccf8vvmb32nyn"; + version = "1.15.0"; + sha256 = "1ics91fxsl1z1wqd961wdn2s22ck25yphp341qlbs8ln2dcwk8r7"; }; terraform = { @@ -662,15 +662,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "2.1.0"; - sha256 = "1nbiz2mnknaimfvh1zmmsp1crrhcpy4q6maaakqybqzabkn9wibr"; + version = "2.2.0"; + sha256 = "0k9frx29pjrrx67cwzsrnj0x90ff5k99l5yzfgb58sajkz1j8nln"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - version = "2.3.0"; - sha256 = "1x9ydp6kscgj0m7vkf4ly0y80016qcfbshgmlydrvq7dbw44qlr9"; + version = "2.4.0"; + sha256 = "020wmdl5cbma9r7sv3bx6v8b59w5nwkzgwj4xm7a2s6kn8jygr2x"; }; vsphere = { @@ -683,8 +683,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - version = "0.8.2"; - sha256 = "07p88asjcjndpv36dhvfazb440k2f2v4j7rpvqqmfccwyyqkwwjr"; + version = "0.9.0"; + sha256 = "0x3l0pbpdsm43jsx42xzc46r9j40l7szkcf851q16wsxf70lchqr"; }; matchbox = { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 02803daa219ef..de1e86fa07364 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.6"; - sha256 = "0vxvciv4amblxx50wivlm60fyj1ardfgdpj3l8cj9fhi79b3khxl"; + version = "0.12.7"; + sha256 = "09zsak1a9z2mk88vb6xs9jaxfpazhs0p7x68mw62c9mm13m8kq02"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index c40750752996f..b4707327bc728 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,20 +5,20 @@ buildGoPackage rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.9.7"; + version = "0.10.4"; src = fetchFromGitHub { owner = "windmilleng"; repo = pname; rev = "v${version}"; - sha256 = "0b7jk7iwjzdsb2wp9qx4gs9g3gi2vcqw5ilkax3gfz7wsplm0n65"; + sha256 = "0nxgmldbcaj91jq47qxpf6jqwvi9bhg243qchdkiliphybvilcrg"; }; goPackagePath = "github.com/windmilleng/tilt"; subPackages = [ "cmd/tilt" ]; - buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-07-30"); + buildFlagsArray = ("-ldflags=-X main.version=${version} -X main.date=2019-08-14"); meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix new file mode 100644 index 0000000000000..21f1e555a2912 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook +, pkgconfig +, glib +, ronn +, curl +, id3lib +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "castget"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "mlj"; + repo = pname; + # Upstream uses `_` instead of `.` for the version, let's hope it will + # change in the next release + rev = "rel_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1pfrjmsikv35cc0praxgim26zq4r7dfp1pkn6n9fz3fm73gxylyv"; + }; + # Otherwise, the autoreconfHook fails since Makefile.am requires it + preAutoreconf = '' + touch NEWS + touch README + touch ChangeLog + ''; + + buildInputs = [ glib curl id3lib libxml2 ]; + nativeBuildInputs = [ ronn autoreconfHook pkgconfig ]; + + meta = with stdenv.lib; { + description = "A simple, command-line based RSS enclosure downloader"; + longDescription = '' + castget is a simple, command-line based RSS enclosure downloader. It is + primarily intended for automatic, unattended downloading of podcasts. + ''; + homepage = "http://castget.johndal.com/"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index fea062805d0f0..959649c4b1509 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook +, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas - gnome3.gnome-online-accounts + gnome-online-accounts hicolor-icon-theme # for setup hook ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f990f8de52913..f01849919ab09 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,11 +24,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.15"; + version = "2.21.16"; src = fetchPypi { inherit pname version; - sha256 = "0p1pa5l9apd40mdlgzp9vfpd8x9laqiah2i8l3q9m6nnibk1ipx8"; + sha256 = "1skb73nsg5gqlqqcs64c9kiidd74p3gm0xx93jaky2gagn0jn7rv"; }; postPatch = '' diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index fdd8e004c8b28..e37dc9e7cac60 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer-${version}"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "0qv74marzdv99xc2jbzzcwx3b2hm6byjl734h9x42g4mcg5pq9yf"; + sha256 = "0gjmb8s3d7nj9jp5zkz5q6a59777ay6b1sg4ghl8iw9m8l4h42xa"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cc0bdf603944f..e24ac2e18317b 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchFromGitHub , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf -}: - +, automake, autoconf }: stdenv.mkDerivation rec { pname = "freetalk"; version = "4.1"; @@ -19,11 +17,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + buildInputs = [ guile glib loudmouth gmp libidn readline libtool - libunwind ncurses curl jansson texinfo - autoconf automake + libunwind ncurses curl jansson ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 111efb182e584..6556283089713 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, cmake +{ mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , libqmatrixclient_0_5 }: let - generic = version: sha256: prefix: library: stdenv.mkDerivation rec { + generic = version: sha256: prefix: library: mkDerivation rec { pname = "quaternion"; inherit version; @@ -14,9 +14,9 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain qttools library ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake qttools ]; postInstall = if stdenv.isDarwin then '' mkdir -p $out/Applications @@ -29,7 +29,7 @@ let meta = with lib; { description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = https://matrix.org/docs/projects/client/quaternion.html; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index ffa55a88c8ab1..9a0aab6f8ce16 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.1.4"; + version = "1.1.6"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "0vwh3km3h46bgynd10s8ijl3aj5sskzncdj14h3k7h4sibd8r71a"; + sha256 = "1jdamjdl649315ms5g1c7m7gpy04rv7xpy6bsvink242adaq2pjz"; }; installPhase = '' 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 edf10ed2cb428..2e9602458e7fa 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-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.0", + "version": "1.3.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { 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 b84807c69a04a..b76848c2b8109 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -1,7 +1,6 @@ -{fetchurl, linkFarm}: rec { +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ - { name = "_types_node___node_9.6.45.tgz"; path = fetchurl { @@ -10,7 +9,6 @@ sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; }; } - { name = "ajv___ajv_6.10.0.tgz"; path = fetchurl { @@ -19,7 +17,6 @@ sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; }; } - { name = "applescript___applescript_1.0.0.tgz"; path = fetchurl { @@ -28,7 +25,6 @@ sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; }; } - { name = "asn1___asn1_0.2.4.tgz"; path = fetchurl { @@ -37,7 +33,6 @@ sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; }; } - { name = "assert_plus___assert_plus_1.0.0.tgz"; path = fetchurl { @@ -46,7 +41,6 @@ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; } - { name = "asynckit___asynckit_0.4.0.tgz"; path = fetchurl { @@ -55,7 +49,6 @@ sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; } - { name = "auto_launch___auto_launch_5.0.5.tgz"; path = fetchurl { @@ -64,7 +57,6 @@ sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0"; }; } - { name = "aws_sign2___aws_sign2_0.7.0.tgz"; path = fetchurl { @@ -73,7 +65,6 @@ sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; } - { name = "aws4___aws4_1.8.0.tgz"; path = fetchurl { @@ -82,7 +73,6 @@ sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; }; } - { name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; path = fetchurl { @@ -91,7 +81,6 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } - { name = "bignumber.js___bignumber.js_2.4.0.tgz"; path = fetchurl { @@ -100,7 +89,6 @@ sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; }; } - { name = "bmp_js___bmp_js_0.0.3.tgz"; path = fetchurl { @@ -109,7 +97,6 @@ sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; }; } - { name = "buffer_equal___buffer_equal_0.0.1.tgz"; path = fetchurl { @@ -118,7 +105,6 @@ sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; }; } - { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { @@ -127,7 +113,6 @@ sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; } - { name = "combined_stream___combined_stream_1.0.7.tgz"; path = fetchurl { @@ -136,7 +121,6 @@ sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; }; } - { name = "conf___conf_2.2.0.tgz"; path = fetchurl { @@ -145,7 +129,6 @@ sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; }; } - { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -154,7 +137,6 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } - { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -163,7 +145,6 @@ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; } - { name = "deep_equal___deep_equal_1.0.1.tgz"; path = fetchurl { @@ -172,7 +153,6 @@ sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; }; } - { name = "define_properties___define_properties_1.1.3.tgz"; path = fetchurl { @@ -181,7 +161,6 @@ sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; }; } - { name = "delayed_stream___delayed_stream_1.0.0.tgz"; path = fetchurl { @@ -190,7 +169,6 @@ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; } - { name = "dom_walk___dom_walk_0.1.1.tgz"; path = fetchurl { @@ -199,7 +177,6 @@ sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; }; } - { name = "dot_prop___dot_prop_4.2.0.tgz"; path = fetchurl { @@ -208,7 +185,6 @@ sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; } - { name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; path = fetchurl { @@ -217,7 +193,6 @@ sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; } - { name = "electron_store___electron_store_2.0.0.tgz"; path = fetchurl { @@ -226,7 +201,6 @@ sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; }; } - { name = "electron_window_state___electron_window_state_4.1.1.tgz"; path = fetchurl { @@ -235,7 +209,6 @@ sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; }; } - { name = "env_paths___env_paths_1.0.0.tgz"; path = fetchurl { @@ -244,7 +217,6 @@ sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; }; } - { name = "es_abstract___es_abstract_1.13.0.tgz"; path = fetchurl { @@ -253,7 +225,6 @@ sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; }; } - { name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; path = fetchurl { @@ -262,7 +233,6 @@ sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; }; } - { name = "es6_promise___es6_promise_3.3.1.tgz"; path = fetchurl { @@ -271,7 +241,6 @@ sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; } - { name = "exif_parser___exif_parser_0.1.12.tgz"; path = fetchurl { @@ -280,7 +249,6 @@ sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; }; } - { name = "extend___extend_3.0.2.tgz"; path = fetchurl { @@ -289,7 +257,6 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } - { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { @@ -298,7 +265,6 @@ sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; } - { name = "extsprintf___extsprintf_1.4.0.tgz"; path = fetchurl { @@ -307,7 +273,6 @@ sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; }; } - { name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; path = fetchurl { @@ -316,7 +281,6 @@ sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; } - { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; path = fetchurl { @@ -325,7 +289,6 @@ sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; } - { name = "file_type___file_type_3.9.0.tgz"; path = fetchurl { @@ -334,7 +297,6 @@ sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; } - { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { @@ -343,7 +305,6 @@ sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; }; } - { name = "for_each___for_each_0.3.3.tgz"; path = fetchurl { @@ -352,7 +313,6 @@ sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; }; } - { name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { @@ -361,7 +321,6 @@ sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; } - { name = "form_data___form_data_2.3.3.tgz"; path = fetchurl { @@ -370,7 +329,6 @@ sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; }; } - { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -379,7 +337,6 @@ sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; }; } - { name = "getpass___getpass_0.1.7.tgz"; path = fetchurl { @@ -388,7 +345,6 @@ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; } - { name = "global___global_4.3.2.tgz"; path = fetchurl { @@ -397,7 +353,6 @@ sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; } - { name = "graceful_fs___graceful_fs_4.1.15.tgz"; path = fetchurl { @@ -406,7 +361,6 @@ sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; }; } - { name = "har_schema___har_schema_2.0.0.tgz"; path = fetchurl { @@ -415,7 +369,6 @@ sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; } - { name = "har_validator___har_validator_5.1.3.tgz"; path = fetchurl { @@ -424,7 +377,6 @@ sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; }; } - { name = "has_symbols___has_symbols_1.0.0.tgz"; path = fetchurl { @@ -433,7 +385,6 @@ sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; } - { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -442,7 +393,6 @@ sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } - { name = "http_signature___http_signature_1.2.0.tgz"; path = fetchurl { @@ -451,7 +401,6 @@ sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; } - { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { @@ -460,7 +409,6 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } - { name = "ip_regex___ip_regex_1.0.3.tgz"; path = fetchurl { @@ -469,7 +417,6 @@ sha1 = "dc589076f659f419c222039a33316f1c7387effd"; }; } - { name = "is_callable___is_callable_1.1.4.tgz"; path = fetchurl { @@ -478,7 +425,6 @@ sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; }; } - { name = "is_date_object___is_date_object_1.0.1.tgz"; path = fetchurl { @@ -487,7 +433,6 @@ sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; } - { name = "is_function___is_function_1.0.1.tgz"; path = fetchurl { @@ -496,7 +441,6 @@ sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; }; } - { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { @@ -505,7 +449,6 @@ sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; } - { name = "is_regex___is_regex_1.0.4.tgz"; path = fetchurl { @@ -514,7 +457,6 @@ sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; } - { name = "is_symbol___is_symbol_1.0.2.tgz"; path = fetchurl { @@ -523,7 +465,6 @@ sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; }; } - { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { @@ -532,7 +473,6 @@ sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; } - { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { @@ -541,7 +481,6 @@ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; } - { name = "jimp___jimp_0.2.28.tgz"; path = fetchurl { @@ -550,7 +489,6 @@ sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2"; }; } - { name = "jpeg_js___jpeg_js_0.2.0.tgz"; path = fetchurl { @@ -559,7 +497,6 @@ sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; }; } - { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { @@ -568,7 +505,6 @@ sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; } - { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -577,7 +513,6 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } - { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { @@ -586,7 +521,6 @@ sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; } - { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; path = fetchurl { @@ -595,7 +529,6 @@ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; } - { name = "jsonfile___jsonfile_2.4.0.tgz"; path = fetchurl { @@ -604,7 +537,6 @@ sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; } - { name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { @@ -613,7 +545,6 @@ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; } - { name = "load_bmfont___load_bmfont_1.4.0.tgz"; path = fetchurl { @@ -622,7 +553,6 @@ sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; }; } - { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -631,7 +561,6 @@ sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; } - { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { @@ -640,7 +569,6 @@ sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; }; } - { name = "mime_db___mime_db_1.38.0.tgz"; path = fetchurl { @@ -649,7 +577,6 @@ sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; }; } - { name = "mime_types___mime_types_2.1.22.tgz"; path = fetchurl { @@ -658,7 +585,6 @@ sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; }; } - { name = "mime___mime_1.6.0.tgz"; path = fetchurl { @@ -667,7 +593,6 @@ sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } - { name = "min_document___min_document_2.19.0.tgz"; path = fetchurl { @@ -676,7 +601,6 @@ sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; } - { name = "minimist___minimist_0.0.8.tgz"; path = fetchurl { @@ -685,7 +609,6 @@ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; } - { name = "minimist___minimist_1.2.0.tgz"; path = fetchurl { @@ -694,7 +617,6 @@ sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; } - { name = "mkdirp___mkdirp_0.5.1.tgz"; path = fetchurl { @@ -703,7 +625,6 @@ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } - { name = "oauth_sign___oauth_sign_0.9.0.tgz"; path = fetchurl { @@ -712,7 +633,6 @@ sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; }; } - { name = "object_keys___object_keys_1.1.0.tgz"; path = fetchurl { @@ -721,7 +641,6 @@ sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; }; } - { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { @@ -730,7 +649,6 @@ sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; }; } - { name = "p_locate___p_locate_2.0.0.tgz"; path = fetchurl { @@ -739,7 +657,6 @@ sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; } - { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { @@ -748,7 +665,6 @@ sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; } - { name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; path = fetchurl { @@ -757,7 +673,6 @@ sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; }; } - { name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz"; path = fetchurl { @@ -766,7 +681,6 @@ sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; }; } - { name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz"; path = fetchurl { @@ -775,7 +689,6 @@ sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389"; }; } - { name = "parse_headers___parse_headers_2.0.2.tgz"; path = fetchurl { @@ -784,7 +697,6 @@ sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; }; } - { name = "path_exists___path_exists_3.0.0.tgz"; path = fetchurl { @@ -793,7 +705,6 @@ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } - { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -802,7 +713,6 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } - { name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { @@ -811,7 +721,6 @@ sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; } - { name = "phin___phin_2.9.3.tgz"; path = fetchurl { @@ -820,7 +729,6 @@ sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; }; } - { name = "pify___pify_3.0.0.tgz"; path = fetchurl { @@ -829,7 +737,6 @@ sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; } - { name = "pixelmatch___pixelmatch_4.0.2.tgz"; path = fetchurl { @@ -838,7 +745,6 @@ sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; }; } - { name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { @@ -847,7 +753,6 @@ sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; }; } - { name = "png_to_ico___png_to_ico_1.0.7.tgz"; path = fetchurl { @@ -856,7 +761,6 @@ sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"; }; } - { name = "pngjs___pngjs_3.4.0.tgz"; path = fetchurl { @@ -865,7 +769,6 @@ sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f"; }; } - { name = "process___process_0.5.2.tgz"; path = fetchurl { @@ -874,7 +777,6 @@ sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; }; } - { name = "psl___psl_1.1.31.tgz"; path = fetchurl { @@ -883,7 +785,6 @@ sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; }; } - { name = "punycode___punycode_1.4.1.tgz"; path = fetchurl { @@ -892,7 +793,6 @@ sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; } - { name = "punycode___punycode_2.1.1.tgz"; path = fetchurl { @@ -901,7 +801,6 @@ sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; }; } - { name = "qs___qs_6.5.2.tgz"; path = fetchurl { @@ -910,7 +809,6 @@ sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; }; } - { name = "read_chunk___read_chunk_1.0.1.tgz"; path = fetchurl { @@ -919,7 +817,6 @@ sha1 = "5f68cab307e663f19993527d9b589cace4661194"; }; } - { name = "request___request_2.88.0.tgz"; path = fetchurl { @@ -928,7 +825,6 @@ sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; }; } - { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -937,7 +833,6 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } - { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { @@ -946,7 +841,6 @@ sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; }; } - { name = "sax___sax_1.2.4.tgz"; path = fetchurl { @@ -955,7 +849,6 @@ sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; } - { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { @@ -964,7 +857,6 @@ sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; } - { name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { @@ -973,7 +865,6 @@ sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; }; } - { name = "stream_to_buffer___stream_to_buffer_0.1.0.tgz"; path = fetchurl { @@ -982,7 +873,6 @@ sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9"; }; } - { name = "stream_to___stream_to_0.2.2.tgz"; path = fetchurl { @@ -991,7 +881,6 @@ sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d"; }; } - { name = "string.prototype.trim___string.prototype.trim_1.1.2.tgz"; path = fetchurl { @@ -1000,7 +889,6 @@ sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; }; } - { name = "tinycolor2___tinycolor2_1.4.1.tgz"; path = fetchurl { @@ -1009,7 +897,6 @@ sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; }; } - { name = "tough_cookie___tough_cookie_2.4.3.tgz"; path = fetchurl { @@ -1018,7 +905,6 @@ sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; }; } - { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -1027,7 +913,6 @@ sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; } - { name = "tweetnacl___tweetnacl_0.14.5.tgz"; path = fetchurl { @@ -1036,7 +921,6 @@ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; } - { name = "untildify___untildify_3.0.3.tgz"; path = fetchurl { @@ -1045,7 +929,6 @@ sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; }; } - { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { @@ -1054,7 +937,6 @@ sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; }; } - { name = "url_regex___url_regex_3.2.0.tgz"; path = fetchurl { @@ -1063,7 +945,6 @@ sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; }; } - { name = "uuid___uuid_3.3.2.tgz"; path = fetchurl { @@ -1072,7 +953,6 @@ sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; }; } - { name = "verror___verror_1.10.0.tgz"; path = fetchurl { @@ -1081,7 +961,6 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } - { name = "winreg___winreg_1.2.4.tgz"; path = fetchurl { @@ -1090,7 +969,6 @@ sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; }; } - { name = "write_file_atomic___write_file_atomic_2.4.2.tgz"; path = fetchurl { @@ -1099,7 +977,6 @@ sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; }; } - { name = "xhr___xhr_2.5.0.tgz"; path = fetchurl { @@ -1108,7 +985,6 @@ sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd"; }; } - { name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz"; path = fetchurl { @@ -1117,7 +993,6 @@ sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; }; } - { name = "xml2js___xml2js_0.4.19.tgz"; path = fetchurl { @@ -1126,7 +1001,6 @@ sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; }; } - { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; path = fetchurl { @@ -1135,7 +1009,6 @@ sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; } - { name = "xtend___xtend_4.0.1.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 7400393d92bab..2c4557f2cc086 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,32 +1,26 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }: -# Note for maintainers: -# Versions of `riot-web` and `riot-desktop` should be kept in sync. - -with (import ./yarn2nix.nix { inherit pkgs; }); +# Notes for maintainers: +# * versions of `riot-web` and `riot-desktop` should be kept in sync. +# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>` let executableName = "riot-desktop"; - version = "1.3.0"; + version = "1.3.3"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; + sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; }; -in mkYarnPackage rec { +in yarn2nix-moretea.mkYarnPackage rec { name = "riot-desktop-${version}"; inherit version; src = "${riot-web-src}/electron_app"; - # The package manifest should be copied on each update of this package. - # > cp ${riot-web-src}/electron_app/package.json riot-desktop-package.json packageJSON = ./riot-desktop-package.json; - - # The dependency expression can be regenerated using nixos.yarn2nix with the following command: - # > yarn2nix --lockfile=${riot-web-src}/electron_app/yarn.lock > riot-desktop-yarndeps.nix yarnNix = ./riot-desktop-yarndeps.nix; nativeBuildInputs = [ makeWrapper ]; @@ -36,7 +30,9 @@ in mkYarnPackage rec { mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" - cp -r '.' "$out/share/riot/electron" + cp -r './deps/riot-web' "$out/share/riot/electron" + rm "$out/share/riot/electron/node_modules" + cp -r './node_modules' "$out/share/riot/electron" # icons for icon in $out/share/riot/electron/build/icons/*.png; do @@ -49,7 +45,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" ''; @@ -65,7 +61,7 @@ in mkYarnPackage rec { # * category and StartupWMClass from the build.linux section of # https://github.com/vector-im/riot-web/blob/develop/package.json desktopItem = makeDesktopItem { - inherit name; + name = "riot"; exec = executableName; icon = "riot"; desktopName = "Riot"; @@ -82,7 +78,6 @@ in mkYarnPackage rec { homepage = https://about.riot.im/; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; - inherit (electron.meta) platforms; + inherit (electron_5.meta) platforms; }; } - diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ba0f8c48fbde9..2755d181da2b5 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.3.0"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; + sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh new file mode 100755 index 0000000000000..b646a9e03adf0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix + +set -euo pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates the Yarn dependency lock files for the riot-desktop package." + echo "Usage: $0 <git release tag>" + exit 1 +fi + +RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-web/$1" + +wget "$RIOT_WEB_SRC/electron_app/package.json" -O riot-desktop-package.json +wget "$RIOT_WEB_SRC/electron_app/yarn.lock" -O riot-desktop-yarndeps.lock +yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix +rm riot-desktop-yarndeps.lock diff --git a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix b/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix deleted file mode 100644 index 5dd79fdf1d869..0000000000000 --- a/pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix +++ /dev/null @@ -1,320 +0,0 @@ -{ pkgs ? import <nixpkgs> {} -, nodejs ? pkgs.nodejs -, yarn ? pkgs.yarn -}: - -let - inherit (pkgs) stdenv lib fetchurl linkFarm; -in rec { - # Export yarn again to make it easier to find out which yarn was used. - inherit yarn; - - # Re-export pkgs - inherit pkgs; - - unlessNull = item: alt: - if item == null then alt else item; - - reformatPackageName = pname: - let - # regex adapted from `validate-npm-package-name` - # will produce 3 parts e.g. - # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ] - # "somepackage" -> [ null null "somepackage" ] - parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname); - # if there is no organisation we need to filter out null values. - non-null = builtins.filter (x: x != null) parts; - in builtins.concatStringsSep "-" non-null; - - # https://docs.npmjs.com/files/package.json#license - # TODO: support expression syntax (OR, AND, etc) - spdxLicense = licstr: - if licstr == "UNLICENSED" then - lib.licenses.unfree - else - lib.findFirst - (l: l ? spdxId && l.spdxId == licstr) - { shortName = licstr; } - (builtins.attrValues lib.licenses); - - # Generates the yarn.nix from the yarn.lock file - mkYarnNix = yarnLock: - pkgs.runCommand "yarn.nix" {} - "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out"; - - # Loads the generated offline cache. This will be used by yarn as - # the package source. - importOfflineCache = yarnNix: - let - pkg = import yarnNix { inherit fetchurl linkFarm; }; - in - pkg.offline_cache; - - defaultYarnFlags = [ - "--offline" - "--frozen-lockfile" - "--ignore-engines" - "--ignore-scripts" - ]; - - mkYarnModules = { - name, - pname, - packageJSON, - yarnLock, - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - pkgConfig ? {}, - preBuild ? "", - workspaceDependencies ? [], - }: - let - offlineCache = importOfflineCache yarnNix; - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key} . buildInputs or [] - ) (builtins.attrNames pkgConfig))); - postInstall = (builtins.map (key: - if (pkgConfig.${key} ? postInstall) then - '' - for f in $(find -L -path '*/node_modules/${key}' -type d); do - (cd "$f" && (${pkgConfig.${key}.postInstall})) - done - '' - else - "" - ) (builtins.attrNames pkgConfig)); - workspaceJSON = pkgs.writeText - "${name}-workspace-package.json" - (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat - workspaceDependencyLinks = lib.concatMapStringsSep "\n" - (dep: '' - mkdir -p "deps/${dep.pname}" - ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json" - '') - workspaceDependencies; - in stdenv.mkDerivation { - inherit preBuild name; - phases = ["configurePhase" "buildPhase"]; - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - configurePhase = '' - # Yarn writes cache directories etc to $HOME. - export HOME=$PWD/yarn_home - ''; - - buildPhase = '' - runHook preBuild - - mkdir -p "deps/${pname}" - cp ${packageJSON} "deps/${pname}/package.json" - cp ${workspaceJSON} ./package.json - cp ${yarnLock} ./yarn.lock - chmod +w ./yarn.lock - - yarn config --offline set yarn-offline-mirror ${offlineCache} - - # Do not look up in the registry, but in the offline cache. - # TODO: Ask upstream to fix this mess. - sed -i -E '/resolved /{s|https://registry.yarnpkg.com/||;s|[@/:-]|_|g}' yarn.lock - - ${workspaceDependencyLinks} - yarn install ${lib.escapeShellArgs yarnFlags} - - ${lib.concatStringsSep "\n" postInstall} - - mkdir $out - mv node_modules $out/ - mv deps $out/ - patchShebangs $out - ''; - }; - - # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into - # the shell-hook environment. - linkNodeModulesHook = '' - if [[ -d node_modules || -L node_modules ]]; then - echo "./node_modules is present. Replacing." - rm -rf node_modules - fi - - ln -s "$node_modules" node_modules - ''; - - mkYarnWorkspace = { - src, - packageJSON ? src+"/package.json", - yarnLock ? src+"/yarn.lock", - packageOverrides ? {}, - ... - }@attrs: - let - package = lib.importJSON packageJSON; - packageGlobs = package.workspaces; - globElemToRegex = lib.replaceStrings ["*"] [".*"]; - # PathGlob -> [PathGlobElem] - splitGlob = lib.splitString "/"; - # Path -> [PathGlobElem] -> [Path] - # Note: Only directories are included, everything else is filtered out - expandGlobList = base: globElems: - let - elemRegex = globElemToRegex (lib.head globElems); - rest = lib.tail globElems; - children = lib.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir base)); - matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children; - in if globElems == [] - then [ base ] - else lib.concatMap (child: expandGlobList (base+("/"+child)) rest) matchingChildren; - # Path -> PathGlob -> [Path] - expandGlob = base: glob: expandGlobList base (splitGlob glob); - packagePaths = lib.concatMap (expandGlob src) packageGlobs; - packages = lib.listToAttrs (map (src: - let - packageJSON = src+"/package.json"; - package = lib.importJSON packageJSON; - allDependencies = lib.foldl (a: b: a // b) {} (map (field: lib.attrByPath [field] {} package) ["dependencies" "devDependencies"]); - in rec { - name = reformatPackageName package.name; - value = mkYarnPackage (builtins.removeAttrs attrs ["packageOverrides"] // { - inherit src packageJSON yarnLock; - workspaceDependencies = lib.mapAttrsToList (name: version: packages.${name}) - (lib.filterAttrs (name: version: packages ? ${name}) allDependencies); - } // lib.attrByPath [name] {} packageOverrides); - }) packagePaths); - in packages; - - mkYarnPackage = { - name ? null, - src, - packageJSON ? src + "/package.json", - yarnLock ? src + "/yarn.lock", - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - yarnPreBuild ? "", - pkgConfig ? {}, - extraBuildInputs ? [], - publishBinsFor ? null, - workspaceDependencies ? [], - ... - }@attrs: - let - package = lib.importJSON packageJSON; - pname = package.name; - safeName = reformatPackageName pname; - version = package.version; - baseName = unlessNull name "${safeName}-${version}"; - deps = mkYarnModules { - name = "${safeName}-modules-${version}"; - preBuild = yarnPreBuild; - workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname yarnLock yarnNix yarnFlags pkgConfig; - }; - publishBinsFor_ = unlessNull publishBinsFor [pname]; - linkDirFunction = '' - linkDirToDirLinks() { - target=$1 - if [ ! -f "$target" ]; then - mkdir -p "$target" - elif [ -L "$target" ]; then - local new=$(mktemp -d) - trueSource=$(realpath "$target") - if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then - ln -s $trueSource/* $new/ - fi - rm -r "$target" - mv "$new" "$target" - fi - } - ''; - workspaceDependenciesTransitive = lib.unique ((lib.flatten (builtins.map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies); - workspaceDependencyCopy = lib.concatMapStringsSep "\n" - (dep: '' - # ensure any existing scope directory is not a symlink - linkDirToDirLinks "$(dirname node_modules/${dep.pname})" - mkdir -p "deps/${dep.pname}" - tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1 - if [ ! -e "deps/${dep.pname}/node_modules" ]; then - ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules" - fi - '') - workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig" "workspaceDependencies"] // { - inherit src; - - name = baseName; - - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - node_modules = deps + "/node_modules"; - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - for localDir in npm-packages-offline-cache node_modules; do - if [[ -d $localDir || -L $localDir ]]; then - echo "$localDir dir present. Removing." - rm -rf $localDir - fi - done - - mkdir -p "deps/${pname}" - shopt -s extglob - cp -r !(deps) "deps/${pname}" - shopt -u extglob - ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules" - - cp -r $node_modules node_modules - chmod -R +w node_modules - - ${linkDirFunction} - linkDirToDirLinks "$(dirname node_modules/${pname})" - ln -s "deps/${pname}" "node_modules/${pname}" - ${workspaceDependencyCopy} - - # Help yarn commands run in other phases find the package - echo "--cwd deps/${pname}" > .yarnrc - runHook postConfigure - ''; - - # Replace this phase on frontend packages where only the generated - # files are an interesting output. - installPhase = attrs.installPhase or '' - runHook preInstall - - mkdir -p $out/{bin,libexec/${pname}} - mv node_modules $out/libexec/${pname}/node_modules - mv deps $out/libexec/${pname}/deps - node ${./nix/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_} - - runHook postInstall - ''; - - doDist = true; - distPhase = attrs.distPhase or '' - # pack command ignores cwd option - rm -f .yarnrc - cd $out/libexec/${pname}/deps/${pname} - mkdir -p $out/tarballs/ - yarn pack --ignore-scripts --filename $out/tarballs/${baseName}.tgz - ''; - - passthru = { - inherit pname package packageJSON deps; - workspaceDependencies = workspaceDependenciesTransitive; - } // (attrs.passthru or {}); - - meta = { - inherit (nodejs.meta) platforms; - description = packageJSON.description or ""; - homepage = packageJSON.homepage or ""; - version = packageJSON.version or ""; - license = if packageJSON ? license then spdxLicense packageJSON.license else ""; - } // (attrs.meta or {}); - }); - - yarn2nix = mkYarnPackage { - src = ./.; - # yarn2nix is the only package that requires the yarnNix option. - # All the other projects can auto-generate that file. - yarnNix = ./yarn.nix; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index dd76063a0fa58..cbab67e5e1a5b 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg -, at-spi2-atk }: +, at-spi2-atk, libuuid, at-spi2-core }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.50.0.38"; + version = "8.51.0.72"; rpath = stdenv.lib.makeLibraryPath [ alsaLib atk at-spi2-atk + at-spi2-core cairo cups curl @@ -23,6 +24,7 @@ let glib glibc libsecret + libuuid gnome2.GConf gdk-pixbuf @@ -58,7 +60,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1g0aacp4qgzp3018w1s685yr3ssqlw0z2x6ifrj01k4ig82jfkn6"; + sha256 = "1rv3jxirlfy0gvphw8cxmwmghbak5m5wj0y3bgamcvma48mzdfk3"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index fab9c28ec9738..d3aa302d601ad 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -6,7 +6,7 @@ at-spi2-atk, libuuid, nodePackages let - version = "4.0.1"; + version = "4.0.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -51,7 +51,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1g7c8jka750pblsfzjvfyf7sp1m409kybqagml9miif1v71scxv2"; + sha256 = "053j5py16ilpwy868rhh5l2g93xj1fq4fwxrsi2bkfsnmq261hkm"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix deleted file mode 100644 index 77a8d57f8b6ff..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchgit -, qtbase, qtmultimedia, qtquick1, qtquickcontrols -, qtimageformats, qtgraphicaleffects, qtwebkit -, telegram-qml, libqtelegram-aseman-edition -, gst_all_1 -, makeWrapper, qmake }: - -stdenv.mkDerivation rec { - name = "cutegram-${meta.version}"; - - src = fetchgit { - url = "https://github.com/Aseman-Land/Cutegram.git"; - rev = "1dbe2792fb5a1760339379907f906e236c09db84"; - sha256 = "146vd3ri05da2asxjjxibnqmb685lgwl2kaz7mwb7ja7vi4149f0"; - }; - - buildInputs = - [ qtbase qtmultimedia qtquick1 qtquickcontrols - qtimageformats qtgraphicaleffects qtwebkit - telegram-qml libqtelegram-aseman-edition - ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]); - - - enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper qmake ]; - - fixupPhase = '' - wrapProgram $out/bin/cutegram \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - meta = with stdenv.lib; { - version = "2.7.1"; - description = "Telegram client forked from sigram"; - homepage = http://aseman.co/en/products/cutegram/; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} -#TODO: appindicator, for system tray plugin diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix deleted file mode 100644 index 49368da708e9a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmake }: - -stdenv.mkDerivation rec { - name = "libqtelegram-aseman-edition-${meta.version}"; - - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "libqtelegram-aseman-edition"; - rev = "v${meta.version}-stable"; - sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6"; - }; - - buildInputs = [ qtbase qtmultimedia qtquick1 ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; - - patchPhase = '' - substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" "" - substituteInPlace libqtelegram-ae.pro --replace "/\$\$LIB_PATH" "" - ''; - - meta = with stdenv.lib; { - version = "6.1"; - description = "A fork of libqtelegram by Aseman, using qmake"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = [ maintainers.Profpatsch ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index ce7f47fe4ff76..3d88e50221d6b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch -, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc8 +, pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -8,14 +8,16 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.0"; + version = "1.8.2"; + # Note: Due to our strong dependency on the Arch patches it's probably best + # to also wait for the Arch update (especially if the patches don't apply). # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "09r62dra6gab8hiyzyysslgqkzswf8vwfkcixbcb0jk5la0m07yy"; + sha256 = "0dls6s8721zjm8351fcgfbsifr9d7wsxbf5dra5cbk8r555ibf3j"; fetchSubmodules = true; }; @@ -31,6 +33,8 @@ mkDerivation rec { sha256 = "1s5xvcp9dk0jfywssk8xfcsh7bk5xxif8xqnba0413lfx5rgvs5v"; }; + # Note: It would be best if someone could get as many patches upstream as + # possible (we currently depend a lot on custom patches...). patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/no-gtk2.patch" @@ -45,12 +49,12 @@ mkDerivation rec { --replace '"notify"' '"${libnotify}/lib/libnotify.so"' ''; - nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc8 ]; - # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; dontWrapQtApps = true; + nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake wrapGAppsHook wrapQtAppsHook gcc9 ]; + buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 @@ -157,6 +161,10 @@ mkDerivation rec { meta = { description = "Telegram Desktop messaging app"; + longDescription = '' + Desktop client for the Telegram messenger, based on the Telegram API and + the MTProto secure protocol. + ''; license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix deleted file mode 100644 index c0b1de893c73a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchgit, libconfig, libevent, openssl -, readline, zlib, lua5_2, python, pkgconfig, jansson -, runtimeShell -}: - -stdenv.mkDerivation rec { - name = "telegram-cli-2016-03-23"; - - src = fetchgit { - url = "https://github.com/vysheng/tg.git"; - sha256 = "07sss5cnw2ygd7mp8f5532lmj7qm6ywqf4cjaq5g13i8igzqzwzj"; - rev = "6547c0b21b977b327b3c5e8142963f4bc246187a"; - }; - - buildInputs = [ - libconfig libevent openssl readline zlib - lua5_2 python pkgconfig jansson - ]; - installPhase = '' - mkdir -p $out/bin - cp ./bin/telegram-cli $out/bin/telegram-wo-key - cp ./tg-server.pub $out/ - cat > $out/bin/telegram-cli <<EOF - #!${runtimeShell} - $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" - EOF - chmod +x $out/bin/telegram-cli - ''; - - meta = { - description = "Command-line interface for Telegram messenger"; - homepage = https://telegram.org/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix deleted file mode 100644 index 0efa7bee1d0ba..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtmultimedia, qtquick1, qmake -, libqtelegram-aseman-edition }: - -stdenv.mkDerivation rec { - name = "telegram-qml-${meta.version}"; - - src = fetchFromGitHub { - owner = "Aseman-Land"; - repo = "TelegramQML"; - rev = "v${meta.version}"; - sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499"; - }; - - propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ]; - enableParallelBuilding = true; - nativeBuildInputs = [ qmake ]; - - patchPhase = '' - substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" "" - substituteInPlace telegramqml.pro --replace "INSTALL_HEADERS_PREFIX/telegramqml" "INSTALL_HEADERS_PREFIX" - ''; - - qmakeFlags = [ "BUILD_MODE+=lib" ]; - - meta = with stdenv.lib; { - version = "0.9.2"; - description = "Telegram API tools for QtQml and Qml"; - homepage = src.meta.homepage; - license = licenses.gpl3; - maintainers = [ maintainers.Profpatsch ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix new file mode 100644 index 0000000000000..5648d027d9e2b --- /dev/null +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -0,0 +1,38 @@ +{ appimageTools, fetchurl, lib }: + +let + pname = "irccloud"; + version = "0.13.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; + sha256 = "0ff69m5jav2c90918avsr5wvik2gds3klij3dzhkb352fgrd1s0l"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 rec { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \ + $out/share/icons/hicolor/512x512/apps/irccloud.png + substituteInPlace $out/share/applications/irccloud.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A desktop client for IRCCloud"; + homepage = "https://www.irccloud.com"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lightbulbjim ]; + }; +} diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 2840d85bddd19..04f1072936f8f 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -10,12 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses glib openssl perl libintl ]; + buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; configureFlags = [ "--with-proxy" "--with-bot" "--with-perl=yes" + "--with-otr=yes" "--enable-true-color" ]; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix deleted file mode 100644 index 6f7cd2cda8bcf..0000000000000 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: - -with stdenv.lib; -stdenv.mkDerivation rec { - pname = "irssi-otr"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "cryptodotis"; - repo = "irssi-otr"; - rev = "v${version}"; - sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp"; - }; - - preConfigure = "sh ./bootstrap"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libotr automake autoconf libtool glib irssi ]; - - NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/"; - - meta = { - homepage = https://github.com/cryptodotis/irssi-otr; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 439e0e116141a..cd9ecbf43370c 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -6,7 +6,7 @@ }; weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { - inherit (luaPackages) cjson; + inherit (luaPackages) cjson luaffi; }; wee-slack = callPackage ./wee-slack { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 233fe418df3a0..ea5052f37a3f0 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation { mkdir -p $out/{share,lib} cp {matrix.lua,olm.lua} $out/share - cp ${cjson}/lib/lua/5.2/cjson.so $out/lib/cjson.so + cp ${cjson}/lib/lua/${cjson.lua.luaversion}/cjson.so $out/lib/cjson.so cp ${olm}/lib/libolm.so $out/lib/libolm.so - cp ${luaffi}/lib/ffi.so $out/lib/ffi.so + cp ${luaffi}/lib/lua/${luaffi.lua.luaversion}/ffi.so $out/lib/ffi.so ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix index c773aecf28949..e6fa95488e102 100644 --- a/pkgs/applications/networking/irc/weechat/wrapper.nix +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -56,7 +56,7 @@ let init = let init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or ""); - mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}"); + mkScript = drv: lib.forEach drv.scripts (script: "/script load ${drv}/share/${script}"); scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) [ ] (config.scripts or [])); diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 1417a8c7b1b39..492cd640d871f 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -2,7 +2,6 @@ , openldap }: -# NOTE: Please check if any changes here are applicable to ../realpine/ as well stdenv.mkDerivation rec { pname = "alpine"; version = "2.21"; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 2ee071fec57bc..d9eae3c9c5034 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0jpaxlfxz7mj76z3cyj8sq053p0mkp46kaw05nimzwaq5yx923fv"; + sha256 = "0vhac8yjnhb1gz60jfzg27spyn96c1rr849gc6vjym5xamw7zp0v"; }; nativeBuildInputs = [ gawk mercury pandoc ]; diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix deleted file mode 100644 index f53c5d61050af..0000000000000 --- a/pkgs/applications/networking/mailreaders/realpine/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos -, openldap -}: -# NOTE: Please check if any changes here are applicable to ../alpine/ as well -let - baseName = "re-alpine"; - version = "2.03"; -in -stdenv.mkDerivation { - name = "${baseName}-${version}"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/re-alpine/re-alpine-${version}.tar.bz2"; - sha256 = "11xspzbk9cwmklmcw6rxsan7j71ysd4m9c7qldlc59ck595k5nbh"; - }; - - buildInputs = [ - ncurses tcl openssl pam kerberos openldap - ]; - - hardeningDisable = [ "format" ]; - - configureFlags = [ - "--with-ssl-include-dir=${openssl.dev}/include/openssl" - "--with-tcl-lib=${tcl.libPrefix}" - "--with-passfile=.pine-passfile" - ]; - - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" - ''; - - meta = { - description = "Console mail reader"; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = https://sourceforge.net/projects/re-alpine/; - downloadPage = "https://sourceforge.net/projects/re-alpine/files/"; - }; -} diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 2e61753346df4..6dcc35f44d338 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,4 +1,19 @@ -{ stdenv, pkgconfig, python3, fetchhg, gtk3, glib, gdbm, gtkspell3, itstool, libappindicator-gtk3, perlPackages, glibcLocales, meson, ninja }: +{ stdenv +, pkgconfig +, python3 +, fetchhg +, gtk3 +, glib +, gdbm +, gtkspell3 +, ofono +, itstool +, libappindicator-gtk3 +, perlPackages +, glibcLocales +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "modem-manager-gui"; @@ -10,14 +25,11 @@ stdenv.mkDerivation rec { sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; }; - LC_ALL = "en_US.utf-8"; - nativeBuildInputs = [ pkgconfig python3 perlPackages.Po4a itstool - glibcLocales meson ninja ]; @@ -27,6 +39,7 @@ stdenv.mkDerivation rec { glib gdbm gtkspell3 + ofono libappindicator-gtk3 ]; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 9ee16298ef1cd..b0786d742db78 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.6"; + version = "2019.7"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0hlkka8mk7qzfhgsl10nz495nswh27gn7l9bd24c6lpkqnapz0vg"; + sha256 = "1hjndcdkin98l6jv39r98zfw33qg0gnvlv8q80qsj5x36a19d4v9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index 185672a21f8c1..babb3812bb926 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -12,10 +12,10 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/lib - ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1 + ln -s ${mumble}/lib/libmumble.so.1.2.* $out/lib/libmumble.so.1 ${lib.optionalString (mumble_i686 != null) '' mkdir -p $out/lib32 - ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1 + ln -s ${mumble_i686}/lib/libmumble.so.1.2.* $out/lib32/libmumble.so.1 ''} install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 5792aadf56889..776255e7a12cb 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { cp ndppd.conf-dist $out/etc/ndppd.conf ''; - meta = { + meta = with stdenv.lib; { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = https://github.com/DanielAdolfsson/ndppd; - license = stdenv.lib.licenses.gpl3; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.fadenb ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ fadenb globin ]; }; } diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch new file mode 100644 index 0000000000000..ab7cb9bffa45d --- /dev/null +++ b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -0,0 +1,25 @@ +From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 23 Aug 2019 00:19:20 +0200 +Subject: [PATCH] Explicitly copy dbus files into the store dir + +--- + shell_integration/libcloudproviders/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt +index 1f35335..7f76951 100644 +--- a/shell_integration/libcloudproviders/CMakeLists.txt ++++ b/shell_integration/libcloudproviders/CMakeLists.txt +@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable) + ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable) + + macro(dbus_add_activation_service _sources) +- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir) ++ set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") + foreach (_i ${_sources}) + get_filename_component(_service_file ${_i} ABSOLUTE) + string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) +-- +2.19.2 + diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 828ffc1664c14..6f7f47bdcfa09 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,46 +1,63 @@ -{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, wrapQtAppsHook, openssl_1_1, pcre, qtwebengine, libsecret +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, inotify-tools , libcloudproviders +, libsecret +, openssl +, pcre +, pkgconfig +, qtbase +, qtkeychain +, qttools +, qtwebengine +, qtwebkit +, sqlite }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "nextcloud-client"; - version = "2.5.2"; + version = "2.5.3"; - src = fetchgit { - url = "git://github.com/nextcloud/desktop.git"; - rev = "refs/tags/v${version}"; - sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "nextcloud"; + repo = "desktop"; + rev = "v${version}"; + sha256 = "1pzlq507fasf2ljf37gkw00qrig4w2r712rsy05zfwlncgcn7fnw"; }; - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - - buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools libcloudproviders ]; - - enableParallelBuilding = true; + patches = [ + ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch + ]; - NIX_LDFLAGS = "${openssl_1_1.out}/lib/libssl.so ${openssl_1_1.out}/lib/libcrypto.so"; + nativeBuildInputs = [ + pkgconfig + cmake + ]; - cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" - "-DCMAKE_BUILD_TYPE=Release" - "-DOPENSSL_LIBRARIES=${openssl_1_1.out}/lib" - "-DOPENSSL_INCLUDE_DIR=${openssl_1_1.dev}/include" - "-DINOTIFY_LIBRARY=${inotify-tools}/lib/libinotifytools.so" - "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" + buildInputs = [ + inotify-tools + libcloudproviders + openssl + pcre + qtbase + qtkeychain + qttools + qtwebengine + qtwebkit + sqlite ]; qtWrapperArgs = [ - ''--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}'' + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" ]; - postInstall = '' - sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ - $out/share/applications/nextcloud.desktop - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Nextcloud themed desktop client"; homepage = https://nextcloud.com; license = licenses.gpl2; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 715d8e13ec308..eaa6b07c8faef 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,20 +1,24 @@ { stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor , libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring , makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib -, libpulseaudio, libopus, libogg }: +, libpulseaudio, libopus, libogg, jansson }: stdenv.mkDerivation rec { - name = "gnunet-0.11.0"; + pname = "gnunet"; + version = "0.11.6"; src = fetchurl { - url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"; + url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; + sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q"; }; + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig libtool makeWrapper ]; buildInputs = [ - adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn - libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses - pkgconfig sqlite zlib libpulseaudio libopus libogg + adns curl gmp gnutls libextractor libgcrypt libgnurl libidn + libmicrohttpd libunistring libxml2 ncurses gettext + sqlite zlib libpulseaudio libopus libogg jansson ]; preConfigure = '' @@ -29,26 +33,18 @@ stdenv.mkDerivation rec { find . \( -iname \*test\*.c -or -name \*.conf \) | \ xargs sed -ie "s|/tmp|$TMPDIR|g" - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - patchShebangs src/gns/nss/install-nss-plugin.sh - sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \ src/regex/Makefile.in \ src/fs/Makefile.in ''; + # unfortunately, there's still a few failures with impure tests doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ + checkPhase = '' + export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; meta = with stdenv.lib; { description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; @@ -69,9 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = https://gnunet.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix new file mode 100644 index 0000000000000..80b8251f2a3ff --- /dev/null +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "stig"; + # This project has a different concept for pre release / alpha, + # Read the project's README for details: https://github.com/rndusr/stig#stig + version = "0.10.1a"; + + src = fetchFromGitHub { + owner = "rndusr"; + repo = "stig"; + rev = "v${version}"; + sha256 = "076rlial6h1nhwdxf1mx5nf2zld5ci43cadj9wf8xms7zn8s6c8v"; + }; + + # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged + # in nixpkgs) is not uploaded to pypi and 1.0.1 has a problematic `setup.py`. + # As long as we don't have any problems installing it, no special features / specific bugs + # were fixed in 1.0.3 that aren't available in 1.0.2 are used by stig. + # See https://github.com/rndusr/stig/issues/120 + postPatch = '' + substituteInPlace setup.py \ + --replace "urwidtrees>=1.0.3dev0" "urwidtrees" + ''; + + buildInputs = with python3.pkgs; [ + urwid + urwidtrees + aiohttp + async-timeout + pyxdg + blinker + natsort + maxminddb + setproctitle + ]; + + checkInputs = with python3.pkgs; [ + asynctest + pytest + ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "TUI and CLI for the BitTorrent client Transmission"; + homepage = "https://github.com/rndusr/stig"; + license = licenses.gpl3; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 9627fef7597b0..8d21f64765dc6 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -58,7 +58,7 @@ let versions = [ "13.8.0" "13.9.0" "13.9.1" ]; in lib.listToAttrs - (lib.flip map versions + (lib.forEach versions (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}"))); in deprecatedVersions // supportedVersions; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index faab83e9492f5..a0980cf42bf7a 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -62,7 +62,7 @@ let versions = [ ]; in lib.listToAttrs - (lib.flip map versions + (lib.forEach versions (v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}"))); in deprecatedVersions // supportedVersions; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix deleted file mode 100644 index f85f6cbb7ba46..0000000000000 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu -, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }: - -stdenv.mkDerivation rec { - pname = "ssvnc"; - version = "1.0.29"; - - src = fetchurl { - url = "mirror://sourceforge/ssvnc/${pname}-${version}.src.tar.gz"; - sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d"; - }; - - buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ]; - - dontUseImakeConfigure = true; - - makeFlags = "PREFIX=$(out)"; - - hardeningDisable = [ "format" ]; - - postInstall = '' - sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl - sed -i -e 's|/usr/bin/perl|${perl}/bin/perl|' $out/lib/ssvnc/util/ss_vncviewer - ''; - - meta = { - description = "VNC viewer that adds encryption security to VNC connections"; - homepage = http://www.karlrunge.com/x11vnc/ssvnc.html; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.edwtjo ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index c265d9356e105..f9b17b42bdee1 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: +{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus +, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc +, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes +, wrapQtAppsHook +}: - -stdenv.mkDerivation rec { +mkDerivation rec { pname = "teamviewer"; - version = "14.4.2669"; + version = "14.5.1691"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "0vk782xpp8plbaz8cfggp0jrw7n8d5p9lv605pzmgxyq5h8z72za"; + sha256 = "1dzvjyvcqcah6z1dvw4zvmbdn8iks9j2909slbkksavn1rp3akxc"; }; unpackPhase = '' @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { tar xf data.tar.* ''; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; propagatedBuildInputs = [ qtquickcontrols ]; @@ -41,13 +44,18 @@ stdenv.mkDerivation rec { --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ --replace '/var/run/' '/run/' - wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" + + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + + wrapQtApp $out/bin/teamviewer ''; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 1b12dde85dbe1..16430d31e8355 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools -, seafile-shared, ccnet, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools +, seafile-shared, ccnet , withShibboleth ? true, qtwebengine }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { version = "6.2.11"; pname = "seafile-client"; @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj"; }; - nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qttools seafile-shared ] ++ optional withShibboleth qtwebengine; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] ++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; - postInstall = '' - wrapProgram $out/bin/seafile-applet \ - --suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]} - ''; + qtWrapperArgs = [ + "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}" + ]; meta = with stdenv.lib; { homepage = https://github.com/haiwen/seafile-client; diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 2881f3b537764..dbff491fa8078 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -1,34 +1,23 @@ { stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre -, openssl, ncurses, glib, gtk2, atk, pango, flex, bison -, fetchpatch }: +, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip +, pkgconfig }: stdenv.mkDerivation rec { pname = "ettercap"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; + sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-8366.patch"; - url = "https://github.com/Ettercap/ettercap/commit/1083d604930ebb9f350126b83802ecd2cbc17f90.patch"; - sha256 = "1ff6fp8fxisvd3fkkd01y4fjykgcj414kczzpfscdmi52ridwg8m"; - }) - (fetchpatch { - name = "CVE-2017-6430.patch"; - url = "https://github.com/Ettercap/ettercap/commit/7f50c57b2101fe75592c8dc9960883bbd1878bce.patch"; - sha256 = "0s13nc9yzxzp611rixsd1c8aw1b57q2lnvfq8wawxyrw07h7b2j4"; - }) - ]; - + strictDeps = true; + nativeBuildInputs = [ cmake flex bison pkgconfig ]; buildInputs = [ - cmake libpcap libnet zlib curl pcre openssl ncurses - glib gtk2 atk pango flex bison + libpcap libnet zlib curl pcre openssl ncurses + glib gtk3 atk pango geoip ]; preConfigure = '' @@ -37,8 +26,8 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DBUNDLED_LIBS=Off" + "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 643e421625f27..aa965a0c86839 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib -, libssh, nghttp2, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper +, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -29,7 +29,7 @@ in stdenv.mkDerivation { ]; nativeBuildInputs = [ - bison cmake extra-cmake-modules flex pkgconfig + bison cmake flex pkgconfig ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index 40026275a1e33..8d6d5e2a4f948 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -1,13 +1,13 @@ { appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }: let - pname = "patchwork"; - version = "3.14.1"; + pname = "ssb-patchwork"; + version = "3.16.2"; name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/ssbc/patchwork/releases/download/v${version}/ssb-${pname}-${version}-x86_64.AppImage"; - sha256 = "01vsldabv9nmbx8kzlgw275zykm72s1dxglnaq4jz5vbysbyn0qd"; + url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; + sha256 = "0hi9ysmwhiiww82a3mqdd2b1anj7qa41b46f6zb3q9d0b8nmvlz4"; }; binary = appimageTools.wrapType2 { @@ -20,8 +20,8 @@ let }; desktopItem = makeDesktopItem { - name = "patchwork"; - exec = "${binary}/bin/patchwork"; + name = "ssb-patchwork"; + exec = "${binary}/bin/ssb-patchwork"; icon = "ssb-patchwork.png"; comment = "Decentralized messaging and sharing app"; desktopName = "Patchwork"; |