diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 22:45:50 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 22:45:50 +0100 |
commit | a84844de037258229272c2e901df4f043f6e006b (patch) | |
tree | fdee8fc63f8a2cdf489a5eed874036fbdf7c15c6 /pkgs/applications | |
parent | eea55393abb1c63285629ad9ff7e467515fd230c (diff) | |
parent | 0ac5af9f3aa5beaa94fdf84349afb23f33cc4405 (diff) | |
download | nixlib-a84844de037258229272c2e901df4f043f6e006b.tar nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.gz nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.bz2 nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.lz nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.xz nixlib-a84844de037258229272c2e901df4f043f6e006b.tar.zst nixlib-a84844de037258229272c2e901df4f043f6e006b.zip |
Merge branch 'master' into gcc-7
... to fix lispPackages.*
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/sunvox/default.nix | 48 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/memo/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/welle-io/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/wsjtx/default.nix | 41 | ||||
-rw-r--r-- | pkgs/applications/misc/wsjtx/wsjtx.patch | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/falkon/default.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/google-chrome/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/nextcloud-client/default.nix | 5 |
10 files changed, 126 insertions, 20 deletions
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix new file mode 100644 index 000000000000..ccbceddefd2f --- /dev/null +++ b/pkgs/applications/audio/sunvox/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }: + +let + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ]; + arch = + if stdenv.isAarch64 + then "arm64" + else if stdenv.isArm + then "arm_armhf_raspberry_pi" + else if stdenv.is64bit + then "x86_64" + else "x86"; +in +stdenv.mkDerivation rec { + name = "SunVox-${version}"; + version = "1.9.3b"; + + src = fetchurl { + url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; + sha256 = "0k74rcq7niw4p17vj3zp9lpgi932896dmzqv4ln43g0pz7l18c8b"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = "unzip $src"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share $out/bin + mv sunvox $out/share/ + + bin="$out/share/sunvox/sunvox/linux_${arch}/sunvox" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + "$bin" + + ln -s "$bin" $out/bin/sunvox + ''; + + meta = with stdenv.lib; { + description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; + license = licenses.unfreeRedistributable; + homepage = "http://www.warmplace.ru/soft/sunvox/"; + maintainers = with maintainers; [ puffnfresh ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 8599ff8e93e4..4c825cc9891a 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.20.0"; + version = "1.20.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0lhfljcdb05v0p3kc6zimgd2z057397blfp56bhr7v7wnsi6i40k"; - "x86_64-linux" = "138kvqa5cixry62yry0lwzxlk9fs8hb4zqzmsd8ag1jjfma8y45k"; - "x86_64-darwin" = "1adnwlqf2kw8wfjf86a3xg83j1yqnlsdckksw82b06x3j11g91i8"; + "i686-linux" = "0gycz857bl9ikfrylim970qgmyw7rcy3gbg2zsjddp9cgdk9basn"; + "x86_64-linux" = "0rx0qyxv173s9wjw97f94h61f12lh42grnmabgsvwd87b8zx4qim"; + "x86_64-darwin" = "0mqxmmkp3bsmy1g35prsgan61zzq5368gp720v37cwx1rskl0bfg"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 642b0c65efcd..fc1c08dc2b2c 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ack , tree, stdenv, ... }: +{ fetchFromGitHub, ag, tree, stdenv, ... }: stdenv.mkDerivation rec { @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} + substituteInPlace memo \ + --replace "ack " "${ag}/bin/ag " \ + --replace "tree " "${tree}/bin/tree " mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 mv completion/memo.bash $out/share/bash-completion/completions/memo.sh @@ -32,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; platforms = stdenv.lib.platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index b1db01873a3a..d705de1a8cd6 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -3,7 +3,7 @@ , faad2, rtl-sdr, libusb, fftwSinglePrec }: let - version = "1.0-rc1"; + version = "1.0-rc2"; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "AlbrechtL"; repo = "welle.io"; rev = "V${version}"; - sha256 = "1xi59rmk3rdqqxxxrm2pbllrlsql46vxs95l1pkfx7bp8f7n7rsv"; + sha256 = "01x4ldq6lvmdrmxi857594nj9xpn2h7848vvf3f54sh1zrawn4k4"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix new file mode 100644 index 000000000000..8a23134e3ed0 --- /dev/null +++ b/pkgs/applications/misc/wsjtx/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, + docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase, + qtmultimedia, qtserialport, texinfo, libusb1 }: + +stdenv.mkDerivation rec { + name = "wsjtx-${version}"; + version = "1.8.0"; + + # This is a composite source tarball containing both wsjtx and a hamlib fork + src = fetchurl { + url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz"; + sha256 = "21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce"; + }; + + # Hamlib builds with autotools, wsjtx builds with cmake + # Omitting pkgconfig because it causes issues locating the built hamlib + nativeBuildInputs = [ + asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool + texinfo + ]; + buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; + + # Composite build has its own patch step after it extracts the inner archives + postPatch = "cp ${./wsjtx.patch} wsjtx.patch"; + + meta = with stdenv.lib; { + description = "Weak-signal digital communication modes for amateur radio"; + longDescription = '' + WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9, + JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for + detecting and measuring your own radio signals reflected from the Moon. + These modes were all designed for making reliable, confirmed ham radio + contacts under extreme weak-signal conditions. + ''; + homepage = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html; + # Older licenses are for the statically-linked hamlib + license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; + platforms = platforms.linux; + maintainers = [ maintainers.lasandell ]; + }; +} diff --git a/pkgs/applications/misc/wsjtx/wsjtx.patch b/pkgs/applications/misc/wsjtx/wsjtx.patch new file mode 100644 index 000000000000..a5bd7ec3e196 --- /dev/null +++ b/pkgs/applications/misc/wsjtx/wsjtx.patch @@ -0,0 +1,12 @@ +Index: wsjtx/CMakeLists.txt +=================================================================== +--- wsjtx/CMakeLists.txt (revision 8382) ++++ wsjtx/CMakeLists.txt (working copy) +@@ -866,6 +866,7 @@ + find_package (Qt5Widgets 5 REQUIRED) + find_package (Qt5Multimedia 5 REQUIRED) + find_package (Qt5PrintSupport 5 REQUIRED) ++find_package (Qt5SerialPort 5 REQUIRED) + + if (WIN32) + add_definitions (-DQT_NEEDS_QTMAIN) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 9356794bb5d6..90aec9831930 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -2,16 +2,17 @@ , libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }: stdenv.mkDerivation rec { - # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a - # release but it is basically 2.1.2 with the falkon name + # KDE hasn't made a release of falkon yet so we just track git for now which is + # based on the most recent release of qupzilla + # This wip version is 2.1.99 so we add the .1 name = "falkon-${version}.1"; - version = "2.1.2"; + version = "2.1.99"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; - rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db"; - sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy"; + rev = "dd3c570c41b4b3d0ad17202b78bf14cf1ac56495"; + sha256 = "07d40cpckaprj74mr06k3mfriwb471bdmq60smls34y62ss55q9d"; }; preConfigure = '' @@ -21,8 +22,6 @@ stdenv.mkDerivation rec { export FALKON_PREFIX=$out ''; - dontUseCmakeConfigure = true; - buildInputs = [ libpthreadstubs libxcb libXdmcp kwallet @@ -31,8 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ]; - # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm' - enableParallelBuilding = false; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - broken = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 010f60881b5b..12ea714fb234 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -71,7 +71,7 @@ let ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash - ++ lib.optional (config.pulseaudio or false) libpulseaudio; + ++ lib.optional (config.pulseaudio or true) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra_gtk2 ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b1b1132f22b0..17c285d9bdf7 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,6 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at_spi2_atk +, kerberos # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -57,6 +58,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at_spi2_atk + kerberos ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 652de194a5e7..3cbc03e8d73c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { "-DINOTIFY_INCLUDE_DIR=${inotify-tools}/include" ]; - postInstall = stdenv.lib.optionalString (withGnomeKeyring) '' + postInstall = '' + sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ + $out/share/applications/nextcloud.desktop + '' + stdenv.lib.optionalString (withGnomeKeyring) '' wrapProgram "$out/bin/nextcloud" \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libgnome_keyring ]} ''; |