diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
| commit | e51f73652d38d5c53b331b7bcae2e2483e1b8afe (patch) | |
| tree | 9126d3fd0737db3a0d57cda866d96c377fc0e452 /pkgs/applications | |
| parent | a283bec71cec60c2b9c84ea9af320fc8df0dfd5f (diff) | |
| parent | 4e0d2706f174bb893378a8241df7bd2055901b9e (diff) | |
| download | nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.gz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.bz2 nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.lz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.xz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.zst nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.zip | |
Merge recent master into staging
Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
Diffstat (limited to 'pkgs/applications')
136 files changed, 917 insertions, 412 deletions
diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 61b11c05de77..340a83e7963f 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ]; meta = { - description = "BEAST - the Bedevilled Sound Engine"; + description = "A music composition and modular synthesis application"; homepage = http://beast.gtk.org; license = ["GPL-2" "LGPL-2.1"]; }; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 31d5240529f7..88931520c42a 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.3.4"; + version = "1.4.1"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { src = fetchurl { inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU"; - sha256 = "0ris41v44nwd68f3zis9n9lyyc089dyhlxp37rrzflanrc6glpwq"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60eXhuZ1Z3bGM2bjQ"; + sha256 = "b0d5a1798efd275d72dffb87bc0f016fc865dbd1384b7c9af039cebdffe0cca3"; }; buildInputs = @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; unpackPhase = "tar -xvf $src"; - sourceRoot = "cantata-1.3.4"; + sourceRoot = "${name}"; # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 2ea37e2bd237..4f9c491a3a59 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; meta = { - description = "cmus is a small, fast and powerful console music player for Linux and *BSD"; + description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = http://cmus.sourceforge.net; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index e5264f5c3d2f..5c6a1d6ac54e 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; + description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 0f33726eaeed..ede31ac9beb6 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor"; + description = "MP3 technical info viewer and ID3 1.x tag editor"; longDescription = '' MP3Info is a little utility used to read and modify the ID3 tags of diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index cd4343b1beb4..ac945bee7f74 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://mpc123.sourceforge.net/; - description = "mpc123, a Musepack (.mpc) audio player"; + description = "A Musepack (.mpc) audio player"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index e58397350cb1..939c9f79e4d4 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [libao libid3tag libmad zlib]; meta = { - description = "mpg321, a command-line MP3 player"; + description = "Command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index acdda1799d03..d273c2381778 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "pamixer is like amixer but for pulseaudio."; + description = "Like amixer but for pulseaudio"; longDescription = "Features: - Get the current volume of the default sink, the default source or a selected one by his id - Set the volume for the default sink, the default source or any other device diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 1ce09a6dd884..235a81a6a32a 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, gettext, pyqt4 -, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter +, pkgconfig, libdiscid, libofa, ffmpeg, chromaprint }: pythonPackages.buildPythonPackage rec { @@ -9,14 +9,16 @@ pythonPackages.buildPythonPackage rec { src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz"; - md5 = "d1086687b7f7b0d359a731b1a25e7b66"; + sha256 = "0sbsf8hzxhxcnnjqvsd6mc23lmk7w33nln0f3w72f89mjgs6pxm6"; }; postPatch = let - fpr = "${acoustidFingerprinter}/bin/acoustid_fpcalc"; + discid = "${libdiscid}/lib/libdiscid.so.0"; + fpr = "${chromaprint}/bin/fpcalc"; in '' - sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \ - picard/ui/options/fingerprinting.py + substituteInPlace picard/disc.py --replace libdiscid.so.0 ${discid} + substituteInPlace picard/const.py \ + --replace "FPCALC_NAMES = [" "FPCALC_NAMES = ['${fpr}'," ''; buildInputs = [ @@ -46,9 +48,11 @@ pythonPackages.buildPythonPackage rec { doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; description = "The official MusicBrainz tagger"; - license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ emery ]; + license = licenses.gpl2; + platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59b82d155da9..47919a7d7f88 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; - description = "Spotify for Linux allows you to play music from the Spotify music service"; + description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 91142691055b..67edc7f521da 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c"; + sha256 = "00bp699k8gnilin2rvgj35334s9jrizp82qwlmzzvvfliwcgqlqw"; }; buildInputs = [ diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index b1b9616eaab3..ea8b2b27987b 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzip ]; meta = { - description = "GNU ed, an implementation of the standard Unix editor"; + description = "An implementation of the standard Unix editor"; longDescription = '' GNU ed is a line-oriented text editor. It is used to create, diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 329fa3a5626e..3bfee481c9c0 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl +, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo , withX ? !stdenv.isDarwin, withGTK ? true }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-new-sections.patch ]; buildInputs = - [ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ] + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix new file mode 100644 index 000000000000..35f9bd3ceb2a --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchgit, emacs, colorTheme}: + +stdenv.mkDerivation rec { + name = "color-theme-6.5.5"; + + src = fetchgit { + url = https://github.com/sellout/emacs-color-theme-solarized.git; + rev = "6a2c7ca0181585858e6e8054cb99db837e2ef72f"; + sha256 = "3c46a3d66c75ec4456209eeafdb03282148b289b12e8474f6a8962f3894796e8"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ colorTheme ]; + + + buildPhase = '' + emacs -L . -L ${colorTheme}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Precision colors for machines and people"; + homepage = http://ethanschoonover.com/solarized; + license = stdenv.lib.licenses.mit; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 28375dcb68df..4e9d1cfd77cd 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "idris-mode"; - version = "0.9.13.1"; + version = "0.9.14"; src = fetchurl { url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "0ymjbkwsq7qra691wyldw91xcdgrbx3468vvrha5jj92v7nwb8wx"; + sha256 = "1qlkbf14mcibp6h5r84fp5xdjspyaw1xdmnkmaxbypwjhhjg4s83"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index 47e62a281fb0..00123bfc8c75 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - sha256 = "dbdc07b864a9506a21af445c7fb1c75fbffadaac980ee7bbf752470d8054bd65"; + rev = "b250efaad886dd07b8c69d4573425d095c6652e2"; + sha256 = "30e61e7d364e9175d408bdaf57fda886a4eea22cf5cbd97abb5c307c52b05918"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e5cfbcdfe178..caa9523af6f6 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -2,10 +2,12 @@ , coreutils, gnugrep, which, git }: +assert stdenv.isLinux; + let buildIdea = - { name, version, build, src, description, license }: + { name, version, build, src, description, longDescription, license }: stdenv.mkDerivation rec { inherit name build src; @@ -56,6 +58,7 @@ let meta = { homepage = http://www.jetbrains.com/idea/; inherit description; + inherit longDescription; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = stdenv.lib.platforms.linux; @@ -64,27 +67,39 @@ let in { - idea_community = buildIdea rec { + idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "13.1.3"; - build = "IC-135.909"; - description = "IntelliJ IDEA 13 Community Edition"; + version = "13.1.4b"; + build = "IC-135.1230"; + description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; + longDescription = '' + Lightweight IDE for Java SE, Groovy & Scala development + Powerful environment for building Google Android apps + Integration with JUnit, TestNG, popular SCMs, Ant & Maven + Free, open-source, Apache 2 licensed. + ''; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51"; + sha256 = "8b4ee25fd2934e06b87230b50e1474183ed4b331c1626a7fee69b96294d9616d"; }; }; - idea_ultimate = buildIdea rec { + idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "13.1.3"; - build = "IU-135.909"; - description = "IntelliJ IDEA 13 Ultimate Edition"; + version = "13.1.4b"; + build = "IU-135.1230"; + description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; + longDescription = '' + Full-featured IDE for JVM-based and polyglot development + Java EE, Spring/Hibernate and other technologies support + Deployment and debugging with most application servers + Duplicate code search, dependency structure matrix, etc. + ''; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "6d99e49a63a197e19381a85535ab424a7832653db8cceb3bca7d53615ec7a53d"; + sha256 = "84660d97c9c3e4e7cfd6c2708f4685dc7322157f1e1c2888feac64df119f0606"; }; }; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 058a54c45a71..6901aed774ba 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://homepage.boetes.org/software/mg/; - description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team"; + description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; license = "public domain"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index ce863312251c..a258b6341057 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "${xmodmap}/bin:${which}/bin"; meta = { - description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists"; + description = "WYSIWYW editing platform with special features for scientists"; longDescription = '' GNU TeXmacs is a free wysiwyw (what you see is what you want) editing platform with special features for scientists. The software diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index 59b6992a3692..2678f0a00489 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -13,7 +13,9 @@ cabal.mkDerivation (self: { homepage = "http://haskell.org/haskellwiki/Yi"; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = "GPL"; + broken = true; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index ae5e9a83452f..9b9287a50f12 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -58,6 +58,8 @@ cabal.mkDerivation (self: { description = "The Haskell-Scriptable Editor"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ]; + broken = true; }; }) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index b170b784aaa4..de906e3d8443 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Geeqie, a lightweight GTK+ based image viewer"; + description = "Lightweight GTK+ based image viewer"; longDescription = '' diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index aca4d822c820..bd155c59c6b2 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: stdenv.mkDerivation rec { - name = "gimp-2.8.10"; + name = "gimp-2.8.14"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; + sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"; }; buildInputs = diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 6b7c9a27694a..ee9df683c0a2 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = ''make install prefix="$out"''; meta = { - description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; + description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; homepage = http://code.google.co/p/grafx2/; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 2207e8884f0c..496078ffdb2e 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ]; meta = { homepage = "http://code.google.com/p/jbrout"; - description = "jBrout is a photo manager"; + description = "Photo manager"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix deleted file mode 100644 index cf6b47ee9597..000000000000 --- a/pkgs/applications/graphics/k3d/debian-patches.nix +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18"; -in -[ - { - url = "${prefix}/disable_mutable_in_boost_gil.patch"; - sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3"; - } - { - url = "${prefix}/k3d_gtkmm224.patch"; - sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji"; - } -] diff --git a/pkgs/applications/graphics/k3d/debian-patches.txt b/pkgs/applications/graphics/k3d/debian-patches.txt deleted file mode 100644 index a9b4abed2f09..000000000000 --- a/pkgs/applications/graphics/k3d/debian-patches.txt +++ /dev/null @@ -1,3 +0,0 @@ -k3d/0.8.0.2-15 -disable_mutable_in_boost_gil.patch -k3d_gtkmm224.patch diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 9f31d94ac7fb..35f3bed866d1 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; }; - patches = map fetchurl ((import ./debian-patches.nix) ++ - [ { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch; - sha256 = "1vl7dbvxg9b54ay0n8dd2v2k3j001h8h1bpr1cbm3vrzv31lnwzx"; - } ]); + patches = [ + # debian package source + ./disable_mutable_in_boost_gil.patch + ./k3d_gtkmm224.patch + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch + ./k3d-0.7.11.0-libpng14.patch + ]; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch new file mode 100644 index 000000000000..1774328c6186 --- /dev/null +++ b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch @@ -0,0 +1,20 @@ +--- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp ++++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp +@@ -114,7 +114,7 @@ + template <typename T2, typename Op> + struct reduce_bind1 { + const T2& _t2; +- mutable Op& _op; ++ Op& _op; + + typedef typename Op::result_type result_type; + +@@ -127,7 +127,7 @@ + struct reduce_bind2 { + const Bits1& _bits1; + std::size_t _index1; +- mutable Op& _op; ++ Op& _op; + + typedef typename Op::result_type result_type; + diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch new file mode 100644 index 000000000000..b54168227b40 --- /dev/null +++ b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch @@ -0,0 +1,54 @@ +diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp +--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200 ++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 +@@ -148,12 +148,12 @@ + // allocate/initialize the image information data + _info_ptr = png_create_info_struct(_png_ptr); + if (_info_ptr == NULL) { +- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr,NULL,NULL); + io_error("png_get_file_size: fail to call png_create_info_struct()"); + } + if (setjmp(png_jmpbuf(_png_ptr))) { + //free all of the memory associated with the png_ptr and info_ptr +- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL); + io_error("png_get_file_size: fail to call setjmp()"); + } + png_init_io(_png_ptr, get()); +@@ -165,7 +165,7 @@ + png_reader(const char* filename) : file_mgr(filename, "rb") { init(); } + + ~png_reader() { +- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); + } + point2<std::ptrdiff_t> get_dimensions() { + return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr), +@@ -177,7 +177,7 @@ + int bit_depth, color_type, interlace_type; + png_get_IHDR(_png_ptr, _info_ptr, + &width, &height,&bit_depth,&color_type,&interlace_type, +- int_p_NULL, int_p_NULL); ++ (int *) NULL, (int *) NULL); + io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), + "png_read_view: input view size does not match PNG file size"); + +@@ -219,7 +219,7 @@ + int bit_depth, color_type, interlace_type; + png_get_IHDR(_png_ptr, _info_ptr, + &width, &height,&bit_depth,&color_type,&interlace_type, +- int_p_NULL, int_p_NULL); ++ (int *) NULL, (int *) NULL); + io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), + "png_reader_color_convert::apply(): input view size does not match PNG file size"); + switch (color_type) { +@@ -308,7 +308,7 @@ + io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()"); + _info_ptr = png_create_info_struct(_png_ptr); + if (!_info_ptr) { +- png_destroy_write_struct(&_png_ptr,png_infopp_NULL); ++ png_destroy_write_struct(&_png_ptr,NULL); + io_error("png_write_initialize: fail to call png_create_info_struct()"); + } + if (setjmp(png_jmpbuf(_png_ptr))) { diff --git a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch new file mode 100644 index 000000000000..2484994531f0 --- /dev/null +++ b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch @@ -0,0 +1,40 @@ +--- a/k3dsdk/ngui/main_document_window.cpp ++++ b/k3dsdk/ngui/main_document_window.cpp +@@ -1371,7 +1371,7 @@ + Gtk::HBox import_box(false, 5); + Gtk::Label import_label(_("Choose import plugin:")); + +- Gtk::ComboBox import_combo(model); ++ Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &) model); + import_combo.pack_start(columns.icon, false); + import_combo.pack_start(columns.label); + import_combo.set_active(0); +@@ -1461,7 +1461,7 @@ + Gtk::HBox export_box(false, 5); + Gtk::Label export_label(_("Choose export plugin:")); + +- Gtk::ComboBox export_combo(model); ++ Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &) model); + export_combo.pack_start(columns.icon, false); + export_combo.pack_start(columns.label); + export_combo.set_active(0); +--- a/k3dsdk/ngui/render.cpp ++++ b/k3dsdk/ngui/render.cpp +@@ -169,7 +169,7 @@ + row[columns.separator] = false; + } + +- Gtk::ComboBox combo(model); ++ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); + + combo.pack_start(columns.icon, false); + +@@ -295,7 +295,7 @@ + row[columns.separator] = false; + } + +- Gtk::ComboBox combo(model); ++ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &) model); + + combo.pack_start(columns.icon, false); + diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 4c20a41061ae..201b59ad5e12 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Ocrad, optical character recognition (OCR) program & library"; + description = "Optical character recognition (OCR) program & library"; longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 86891f2cb937..01b0a1414a74 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { ''; meta = { - description = "qiv (quick image viewer)"; + description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; }; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 034a147b7874..ba7a916e3fe4 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cairo, gettext, glibmm, gtk, gtkmm +{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm , libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick , intltool }: @@ -42,10 +42,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool + ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool intltool libsigcxx libtool libxmlxx pkgconfig synfig ]; + preBuild = '' + export FONTCONFIG_FILE=${fontsConf} + ''; + meta = with stdenv.lib; { description = "A 2D animation program"; homepage = http://www.synfig.org; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 783832abd003..dbfda4e58195 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufraw.sourceforge.net/; - description = "UFRaw, a utility to read and manipulate raw images from digital cameras"; + description = "Utility to read and manipulate raw images from digital cameras"; longDescription = '' The Unidentified Flying Raw (UFRaw) is a utility to read and diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index dd8e01298ff4..478553d2c00a 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Viewnior is a fast and simple image viewer for GNU/Linux"; + description = "Fast and simple image viewer"; longDescription = '' Viewnior is insipred by big projects like Eye of Gnome, because of it's usability and richness,and by GPicView, because of it's lightweight design and diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 8387b3486d4d..cacefc9bcc12 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -28,7 +28,7 @@ rec { name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; - description = "XaoS - fractal viewer"; + description = "Fractal viewer"; license = a.stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index 1414310ebf33..48f277ad4c98 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: +assert stdenv.isLinux; + # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 0c3939b5c256..27f6c1223741 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "arbtt"; - version = "0.8.1"; - sha256 = "1qzmqjm8pfj59h0hrm28pp6qhzz2am5xq81mirnnchsgg52wrfn0"; + version = "0.8.1.2"; + sha256 = "074vb84vkygxamvq7xnwlpgbch6qkbhyzbakc343230p1ryxf62q"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix new file mode 100644 index 000000000000..2b99bad58da4 --- /dev/null +++ b/pkgs/applications/misc/bitcoin/altcoins.nix @@ -0,0 +1,100 @@ +{ fetchurl, stdenv, pkgconfig +, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf, utillinux }: + +with stdenv.lib; + +let + buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a: + stdenv.mkDerivation ({ + name = "${walletName}${toString (optional (!gui) "d")}-${a.version}"; + buildInputs = [ openssl db48 boost zlib miniupnpc ] + ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or []; + + configurePhase = optional gui "qmake"; + + preBuild = optional (!gui) "cd src"; + makefile = optional (!gui) "makefile.unix"; + + installPhase = if gui then '' + install -D "${walletName}-qt" "$out/bin/${walletName}-qt" + '' else '' + install -D "${walletName}d" "$out/bin/${walletName}d" + ''; + + passthru.walletName = walletName; + + meta = { + platforms = platforms.unix; + license = license.mit; + maintainers = [ maintainers.offline ]; + }; + } // a) + ); + +in rec { + inherit buildAltcoin; + + litecoin = buildAltcoin rec { + walletName = "litecoin"; + version = "0.8.5.3-rc3"; + + src = fetchurl { + url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; + sha256 = "1z4a7bm3z9kd7n0s38kln31z8shsd32d5d5v3br5p0jlnr5g3lk7"; + }; + + meta = { + description = "Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm."; + longDescription= '' + Litecoin is a peer-to-peer Internet currency that enables instant payments + to anyone in the world. It is based on the Bitcoin protocol but differs + from Bitcoin in that it can be efficiently mined with consumer-grade hardware. + Litecoin provides faster transaction confirmations (2.5 minutes on average) + and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target + the regular computers and GPUs most people already have. + The Litecoin network is scheduled to produce 84 million currency units. + ''; + homepage = https://litecoin.org/; + }; + }; + litecoind = litecoin.override { gui = false; }; + + namecoin = buildAltcoin rec { + walletName = "namecoin"; + version = "0.3.51.00"; + gui = false; + + src = fetchurl { + url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; + sha256 = "0r6zjzichfjzhvpdy501gwy9h3zvlla3kbgb38z1pzaa0ld9siyx"; + }; + + patches = [ ./namecoin_dynamic.patch ]; + + extraBuildInputs = [ glib ]; + + meta = { + description = "Namecoin is a decentralized key/value registration and transfer system based on Bitcoin technology."; + homepage = http://namecoin.info; + }; + }; + + dogecoin = buildAltcoin rec { + walletName = "dogecoin"; + version = "1.4"; + + src = fetchurl { + url = "https://github.com/dogecoin/dogecoin/archive/1.4.tar.gz"; + sha256 = "4af983f182976c98f0e32d525083979c9509b28b7d6faa0b90c5bd40b71009cc"; + }; + + meta = { + description = "Wow, such coin, much shiba, very rich"; + longDescription = "wow"; + homepage = http://www.dogecoin.com/; + maintainers = [ maintainers.offline maintainers.edwtjo ]; + }; + }; + dogecoind = dogecoin.override { gui = false; }; + +} diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index e38d427be8d5..2b68c58b12dd 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,19 +1,21 @@ { fetchurl, stdenv, openssl, db48, boost, zlib, miniupnpc, qt4, utillinux -, pkgconfig, protobuf, qrencode }: +, pkgconfig, protobuf, qrencode, gui ? true }: + +with stdenv.lib; stdenv.mkDerivation rec { version = "0.9.2.1"; - name = "bitcoin-${version}"; + name = "bitcoin${toString (optional (!gui) "d")}-${version}"; src = fetchurl { - url = "https://bitcoin.org/bin/${version}/${name}-linux.tar.gz"; + url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz"; sha256 = "0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54"; }; # hexdump from utillinux is required for tests buildInputs = [ - openssl db48 boost zlib miniupnpc qt4 utillinux pkgconfig protobuf qrencode - ]; + openssl db48 boost zlib miniupnpc utillinux pkgconfig protobuf + ] ++ optionals gui [ qt4 qrencode ]; unpackPhase = '' mkdir tmp-extract && (cd tmp-extract && tar xf $src) @@ -34,8 +36,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.walletName = "bitcoin"; + meta = { - description = "Bitcoin is a peer-to-peer currency"; + description = "Peer-to-peer electronic cash system"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { with each other, with the help of a P2P network to check for double-spending. ''; homepage = "http://www.bitcoin.org/"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.roconnor ]; + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch new file mode 100644 index 000000000000..ef4184ede73f --- /dev/null +++ b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch @@ -0,0 +1,11 @@ +diff -u -r a/src/makefile.unix b/src/makefile.unix +--- a/src/makefile.unix 2014-01-22 22:07:59.801601964 -0800 ++++ b/src/makefile.unix 2014-01-22 22:08:07.980332839 -0800 +@@ -12,7 +12,6 @@ + + # for boost 1.37, add -mt to the boost libraries + LIBS= \ +- -Wl,-Bstatic \ + -l boost_system \ + -l boost_filesystem \ + -l boost_program_options \ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3d814bf6a304..190b57e1070e 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite +{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng +, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp +, xdg_utils }: stdenv.mkDerivation rec { - name = "calibre-1.48.0"; + name = "calibre-2.0.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0wplmf3p4s5zwn9ri8ry18bx7k3pw1c1ngrc4msf7i8icq7hj177"; + sha256 = "1fpn8icfyag2ybj2ywd81sva56ycsin56gyap5m9j5crx63p4c91"; }; inherit python; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - patchPhase = '' - tar xf ${qt48.src} - qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src)) - sed -i setup/build_environment.py \ - -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s'%(m) for m in ('QtGui', 'QtCore')]|" + sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':" \ + setup/build_environment.py ''; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = - [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg - fontconfig podofo qt48 pil chmlib icu sqlite libusb1 libmtp + [ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg + fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw @@ -33,14 +32,15 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${popplerQt4}/include/poppler - export POPPLER_LIB_DIR=${popplerQt4}/lib + export POPPLER_INC_DIR=${poppler}/include/poppler + export POPPLER_LIB_DIR=${poppler}/lib export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_LIB=${imagemagick}/lib export FC_INC_DIR=${fontconfig}/include/fontconfig export FC_LIB_DIR=${fontconfig}/lib export PODOFO_INC_DIR=${podofo}/include/podofo export PODOFO_LIB_DIR=${podofo}/lib + export SIP_BIN=${sip_4_16}/bin/sip python setup.py install --prefix=$out PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py @@ -48,8 +48,12 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/ebooks/rtf2xml/*.py" sed -i "s/env python[0-9.]*/python/" $PYFILES + sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre + for a in $out/bin/*; do - wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib --prefix PATH : ${popplerQt4}/bin + wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${unrar}/lib \ + --prefix PATH : ${poppler}/bin done ''; @@ -57,7 +61,7 @@ stdenv.mkDerivation rec { description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; license = licenses.gpl3; - maintainers = with maintainers; [ viric iElectric ]; + maintainers = with maintainers; [ viric iElectric pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix index 56131425ab4b..9adac335c0c7 100644 --- a/pkgs/applications/misc/camlistore/default.nix +++ b/pkgs/applications/misc/camlistore/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content"; + description = "A way of storing, syncing, sharing, modelling and backing up content"; homepage = https://camlistore.org; license = licenses.asl20; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix new file mode 100644 index 000000000000..57f6c229a08f --- /dev/null +++ b/pkgs/applications/misc/clipit/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }: + +stdenv.mkDerivation rec { + name = "clipit-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz"; + sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; + }; + + buildInputs = [ intltool pkgconfig gtk xdotool ]; + + meta = with stdenv.lib; { + description = "Lightweight GTK+ Clipboard Manager"; + homepage = "http://clipit.rspwn.com"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cool-old-term/default.nix b/pkgs/applications/misc/cool-old-term/default.nix new file mode 100644 index 000000000000..76d78f004024 --- /dev/null +++ b/pkgs/applications/misc/cool-old-term/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, qt53 }: + +stdenv.mkDerivation rec { + version = "0.9"; + name = "cool-old-term-${version}"; + + src = fetchFromGitHub { + owner = "Swordifish90"; + repo = "cool-old-term"; + rev = "2494bc05228290545df8c59c05624a4b903e9068"; + sha256 = "8462f3eded7b2219acc143258544b0dfac32d81e10cac61ff14276d426704c93"; + }; + + buildInputs = [ qt53 ]; + + buildPhase = '' + pushd ./konsole-qml-plugin + qmake konsole-qml-plugin.pro PREFIX=$out + make + popd + ''; + + installPhase = '' + pushd ./konsole-qml-plugin + make install + popd + + install -d $out/bin $out/lib/cool-old-term $out/share/cool-old-term + cp -a ./imports $out/lib/cool-old-term/ + cp -a ./app $out/share/cool-old-term/ + + cat > $out/bin/cool-old-term <<EOF + #!${stdenv.shell} + ${qt53}/bin/qmlscene -I $out/lib/cool-old-term/imports $out/share/cool-old-term/app/main.qml + EOF + chmod a+x $out/bin/cool-old-term + ''; + + enableParallelBuilding = true; + + meta = { + description = "Terminal emulator which mimics the old cathode display"; + longDescription = '' + cool-old-term is a terminal emulator which tries to mimic the look and + feel of the old cathode tube screens. It has been designed to be + eye-candy, customizable, and reasonably lightweight. + ''; + homepage = "https://github.com/Swordifish90/cool-old-term"; + licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ skeidel ]; + }; +} diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index b9c8acb0d070..ea9383a6e10f 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, librsvg, glib, gtk, libXext, libXxf86vm, poppler }: -stdenv.mkDerivation { - name = "eaglemode-0.84.0"; +stdenv.mkDerivation rec { + name = "eaglemode-0.85.0"; src = fetchurl { - url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2; - sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs"; + url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; + sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc"; }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix new file mode 100644 index 000000000000..5921cc308b5b --- /dev/null +++ b/pkgs/applications/misc/evilvte/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, makeWrapper, pkgconfig, + gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, + configH +}: + +stdenv.mkDerivation rec { + name = "evilvte-${version}"; + version = "0.5.2-20140827"; + + src = fetchgit { + url = https://github.com/caleb-/evilvte.git; + rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; + sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; + }; + + buildInputs = [ + gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 + xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig + ]; + + buildPhase = '' + cat >src/config.h <<EOF + ${configH} + EOF + make + ''; + + meta = with stdenv.lib; { + description = "VTE based, highly customizable terminal emulator"; + homepage = http://www.calno.com/evilvte; + license = licenses.gpl2; + maintainers = [ maintainers.bodil ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index bf44f91056d7..5d4c2634952d 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs"; + description = "Convert, upload and download data from GPS and Map programs"; longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 4867bef1f719..3fad634b18b7 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.gnu.org/software/gv/; - description = "GNU gv, a PostScript/PDF document viewer"; + description = "PostScript/PDF document viewer"; longDescription = '' GNU gv allows users to view and navigate through PostScript and diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index d722367d1b49..1f2ecf911416 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { }; patches = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz; - sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; + url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-3.diff.gz; + sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8"; }; buildInputs = [ db gtk bzip2 ]; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix new file mode 100644 index 000000000000..c87b6a8bc0a1 --- /dev/null +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl +, pkgconfig +, autoconf, automake, intltool, gettext +, gtk, vte }: + +stdenv.mkDerivation rec { + + name = "lilyterm-${version}"; + version = "0.9.9.4"; + + src = fetchurl { + url = "http://lilyterm.luna.com.tw/file/${name}.tar.gz"; + sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; + }; + + buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ]; + + preConfigure = "sh autogen.sh"; + + configureFlags = '' + --enable-nls + --enable-safe-mode + ''; + + meta = { + description = "A fast, lightweight terminal emulator"; + longDescription = '' + LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. + ''; + homepage = http://lilyterm.luna.com.tw/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 0cad2fbd2cd3..f55af543f18d 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: stdenv.mkDerivation rec { - name = "posterazor-1.5"; + name = "posterazor-1.5.1"; src = fetchurl { - url = "mirror://sourceforge/posterazor/1.5/PosteRazor-1.5-Source.zip"; - sha256 = "0xy313d2j57s4wy2y3hjapbjr5zfaki0lhkfz6nw2p9gylcmwmjy"; + url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip"; + sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5"; }; buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://posterazor.sourceforge.net/"; - description = "The PosteRazor cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; + description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index cc26a74802b4..9a41bcc36ecc 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }: stdenv.mkDerivation rec { - name = "qgis-1.8.0"; + name = "qgis-2.4.0"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt fcgi libspatialindex libspatialite ]; nativeBuildInputs = [ cmake python ]; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh"; + sha256 = "711b7d81ddff45b083a21f05c8aa5093a6a38a0ee42dfcc873234fcef1fcdd76"; + + }; meta = { diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index ab8a803b7cb4..8b0ba581612e 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }: stdenv.mkDerivation { - name = "robomongo-0.8.3"; + name = "robomongo-0.8.4"; src = fetchurl { - url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz; - sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank"; + url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz; + sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc"; }; patches = [ ./robomongo.patch ]; @@ -17,9 +17,8 @@ stdenv.mkDerivation { meta = { homepage = "http://robomongo.org/"; description = "Query GUI for mongodb"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.amorsillo ]; - broken = true; }; } diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch index 2305ca732eae..3de6e940d9f9 100644 --- a/pkgs/applications/misc/robomongo/robomongo.patch +++ b/pkgs/applications/misc/robomongo/robomongo.patch @@ -1,6 +1,7 @@ Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment Fix typo in cmakelists +Add stdint.h include to mongo driver src diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt --- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400 +++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500 @@ -46,3 +47,15 @@ diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-pa CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}', CLIENT_DIST_BASENAME=get_option('client-dist-basename'), CLIENT_LICENSE='#distsrc/client/LICENSE.txt', + +diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h +--- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h 2013-12-13 12:56:35.000000000 -0500 ++++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h 2014-08-20 18:16:31.788396489 -0400 +@@ -39,6 +39,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <signal.h> ++#include <stdint.h> + + #include "time.h" + #include "string.h" diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 1ca8ec045d61..d4c41edde30e 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -37,8 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "stardict"; - homepage = "A international dictionary supporting fuzzy and glob style matching"; + description = "An international dictionary supporting fuzzy and glob style matching"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index 6b282116343d..09eb186013f3 100644 --- a/pkgs/applications/misc/taffybar/default.nix +++ b/pkgs/applications/misc/taffybar/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "taffybar"; - version = "0.4.0"; - sha256 = "1l6zl5mlpkdsvs3id6ivh4b74p65n6jr17k23y2cdwj2fr9prvr8"; + version = "0.4.1"; + sha256 = "0b4x78sq5x1w0xnc5fk4ixpbkl8cwjfyb4fq8vy21shf4n0fri26"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index aa1df2c9d1a6..0a2c1c88c239 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "tangoGPS, a user friendly map and GPS user interface"; + description = "User friendly map and GPS user interface"; longDescription = '' tangoGPS is an easy to use, fast and lightweight mapping diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 6508b12e1de8..9afabe0372d1 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "Viking, a GPS data editor and analyzer"; + description = "GPS data editor and analyzer"; longDescription = '' Viking is a free/open source program to manage GPS data. You diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix new file mode 100644 index 000000000000..c23be51c3e80 --- /dev/null +++ b/pkgs/applications/misc/vym/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, qt4 }: + +stdenv.mkDerivation rec { + name = "vym-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/vym/${version}/${name}.tar.bz2"; + sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; + }; + + buildInputs = [ pkgconfig qt4 ]; + + configurePhase = '' + qmake PREFIX="$out" + ''; + + meta = { + description = "A mind-mapping software"; + longDescription = '' + VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. + Such maps can help you to improve your creativity and effectivity. You can use them + for time management, to organize tasks, to get an overview over complex contexts, + to sort your ideas etc. + + Maps can be drawn by hand on paper or a flip chart and help to structure your thoughs. + While a tree like structure like shown on this page can be drawn by hand or any drawing software + vym offers much more features to work with such maps. + ''; + homepage = http://www.insilmaril.de/vym/; + license = stdenv.lib.licenses.gpl2; + maintainer = stdenv.lib.maintainers.AndersonTorres; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 7594014d769e..6ead69db2209 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "WordNet, a lexical database for the English language"; + description = "Lexical database for the English language"; longDescription = '' WordNet® is a large lexical database of English. Nouns, verbs, diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 0bc2170340c8..09edb086c9f2 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://xca.sourceforge.net/; platforms = platforms.all; license = licenses.bsd3; + broken = true; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index d09a899b897f..e216b19fab5a 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X"; + description = "MS-Explorer like file manager for X"; longDescription = '' X File Explorer (Xfe) is an MS-Explorer like file manager for X. It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b9011c0236f3..46dadd280c9a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -10,7 +10,7 @@ , python, pythonPackages, perl, pkgconfig , nspr, udev, krb5 , utillinux, alsaLib -, gcc, bison, gperf +, bison, gperf , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage @@ -145,6 +145,8 @@ let ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { + linux_use_bundled_binutils = false; + linux_use_bundled_gold = false; linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; @@ -161,9 +163,6 @@ let werror = ""; clang = false; - # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. - use_mojo = versionOlder source.version "37.0.0.0"; - # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, @@ -192,22 +191,12 @@ let ''; buildPhase = let - CC = "${gcc}/bin/gcc"; - CXX = "${gcc}/bin/g++"; - buildCommand = target: let - # XXX: Only needed for version 36 and older! - targetSuffix = optionalString - (versionOlder source.version "37.0.0.0" && target == "mksnapshot") - (if stdenv.is64bit then ".x64" else ".ia32"); - in '' - CC="${CC}" CC_host="${CC}" \ - CXX="${CXX}" CXX_host="${CXX}" \ - LINK_host="${CXX}" \ - "${ninja}/bin/ninja" -C "${buildPath}" \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "${target}${targetSuffix}" + buildCommand = target: '' + "${ninja}/bin/ninja" -C "${buildPath}" \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + "${target}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' - paxmark m "${buildPath}/${target}${targetSuffix}" + paxmark m "${buildPath}/${target}" ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 4a610827913f..71c825188c3c 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "38.0.2107.3"; - sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v"; - sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv"; - sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh"; + version = "38.0.2125.8"; + sha256 = "1h3vkp0mgznqv48ksnsndlh7ywh3jby25x6dxxd7py445pg6y3c6"; + sha256bin32 = "1ynqm5yp7m8j3mwgqaa2vvw835g9ifn3dfniqh9z9n0swha27a69"; + sha256bin64 = "1vdm4wffkvj3jwrb2nihghxkxcvp81xcc5wygpd1w495vrhy4bpf"; }; beta = { - version = "37.0.2062.58"; - sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl"; - sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk"; - sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi"; + version = "37.0.2062.94"; + sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; + sha256bin32 = "0pa209sjdfb0y96kicvp4lnn1inwdcgj8kpmn28cmi8l1cr8yy3b"; + sha256bin64 = "0kk2dm2gwvzvrrp03k7cw6zzp3197lrq2p1si3pr2wbgm8sb5dk5"; }; stable = { - version = "36.0.1985.125"; - sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp"; - sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03"; - sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc"; + version = "37.0.2062.94"; + sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; + sha256bin32 = "0vszphfz4mnw08yc6bid4g6q2w4f5smvfhlzyb2vvv65ndr64b8k"; + sha256bin64 = "0h4fb7v0b1w9d47iy6fk5g0fpzgczps7nzmknyk7vx68ybi39ssw"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 969ced923b3d..56ba95c661f5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -37,6 +37,8 @@ , systemd }: +assert stdenv.isLinux; + let version = "31.0"; sources = [ diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ad2ea75bd704..e23a6d94ec1a 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mozilla Firefox - the browser, reloaded"; + description = "Web browser"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco wizeman ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix deleted file mode 100644 index ef2c69422b62..000000000000 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnome_vfs, libgnomeui -, freetype, fontconfig, wirelesstools ? null, pixman -, application ? "browser" }: - -# Build the WiFi stuff on Linux-based systems. -# FIXME: Disable for now until it can actually be built: -# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 . -#assert stdenv.isLinux -> (wirelesstools != null); - -let version = "3.6.15"; in -stdenv.mkDerivation { - name = "icecat-${version}"; - - src = fetchurl { - url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz"; - sha256 = "1px018bd81c81a4hbz0qgf89pkshkbhg4abwq1d26dwy8128cxwg"; - }; - - buildInputs = - [ libgnomeui libnotify gnome_vfs alsaLib - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman - python ply dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - ] - ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools); - - patches = [ - ./skip-gre-registration.patch ./rpath-link.patch - ]; - - configureFlags = - [ "--enable-application=${application}" - "--enable-libxul" - "--disable-javaxpcom" - - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ] - ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi"); - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S "$out/lib/"*"/"* || true - - # This fixes starting IceCat when there already is a running - # instance. The `icecat' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. - libDir=$(cd $out/lib && ls -d icecat-[0-9]*) - test -n "$libDir" - - if [ -f "$out/bin/icecat" ] - then - # Fix references to /bin paths in the IceCat shell script. - substituteInPlace $out/bin/icecat \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - cd $out/bin - mv icecat ../lib/$libDir/ - ln -s ../lib/$libDir/icecat . - - # Register extensions etc. - echo "running \`icecat -register'..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false - fi - - if [ -f "$out/lib/$libDir/xpidl" ] - then - # XulRunner's IDL compiler. - echo "linking \`xpidl'..." - ln -s "$out/lib/$libDir/xpidl" "$out/bin" - fi - - # Put the GNU IceCat icon in the right place. - mkdir -p "$out/lib/$libDir/chrome/icons/default" - ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" - ''; - - enableParallelBuilding = true; - - meta = { - description = "GNU IceCat, a free web browser based on Mozilla Firefox"; - - longDescription = '' - Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat - is the GNU version of the Firefox browser. Its main advantage - is an ethical one: it is entirely free software. While the - source code from the Mozilla project is free software, the - binaries that they release include additional non-free software. - Also, they distribute and recommend non-free software as - plug-ins. In addition, GNU IceCat includes some privacy - protection features. - ''; - - homepage = http://www.gnu.org/software/gnuzilla/; - license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; - }; - - passthru = { - inherit gtk version; - isFirefox3Like = true; - broken = true; - }; -} diff --git a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch b/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch deleted file mode 100644 index d50784f13eea..000000000000 --- a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without this patch, IceCat ends up linking with -`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'. - ---- icecat-3.5/js/src/configure 2009-07-04 18:03:01.000000000 +0200 -+++ icecat-3.5/js/src/configure 2009-07-13 18:34:30.000000000 +0200 -@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)' - HOST_AR_FLAGS='$(AR_FLAGS)' - - MOZ_JS_LIBS='-L$(libdir) -lmozjs' --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib' - - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' - MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat' - diff --git a/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch b/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch deleted file mode 100644 index d1fb4e3f30ab..000000000000 --- a/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch +++ /dev/null @@ -1,12 +0,0 @@ -Skip "GRE" registration since that assumes write access to `/etc'. - ---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-07-27 12:52:16.000000000 +0200 -+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-09-08 17:19:17.000000000 +0200 -@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc - printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \ - $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@ - -+SKIP_GRE_REGISTRATION = yes - ifndef SKIP_GRE_REGISTRATION - # to register xulrunner per-user, override this with $HOME/.gre.d - regdir = /etc/gre.d diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 8cda5ad5762f..229aa4f23ba1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: -let version = "1.0.2"; in stdenv.mkDerivation rec { name = "fribid-${version}"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "https://fribid.se/releases/source/${name}.tar.bz2"; - sha256 = "d7cd9adf04fedf50b266a5c14ddb427cbb263d3bc160ee0ade03aca9d5356e5c"; + sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; }; buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ]; patches = [ ./translation-xgettext-to-intltool.patch ./plugin-linkfix.patch - ./emulated-version.patch ./ipc-lazytrace.patch ]; @@ -22,10 +21,15 @@ stdenv.mkDerivation rec { meta = { description = "A browser plugin to manage Swedish BankID:s"; + longDescription = '' + FriBID is an open source software for the Swedish e-id system + called BankID. FriBID also supports processor architectures and + Linux/BSD distributions that the official software doesn't + support. + ''; homepage = http://fribid.se; license = [ "GPLv2" "MPLv1" ]; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 5b6b2176d47e..105e5904715c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -8,9 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms"; }; - patches = - stdenv.lib.optional (browser ? isFirefox3Like) ./icecat3-idldir.patch; - postConfigure = (if browser ? isFirefox3Like then '' # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3 diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 80b09bcd8a8e..201a6b947c1a 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; - description = "The Opera web browser"; + description = "Web browser"; }; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 7c5b983f1b49..996bda67323a 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "1g6zm5fk3k52jk3vbbzj7rm0kanykd4zgxrqhlvj3qzj2nsn4a21"; + sha256 = "05i5p9827rgga4h27qy3qh4ps8aynkcr55j681ddhn16ci3dk8zr"; }; # Nixos default ca bundle diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 858e99c245ba..580591c18ade 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; meta = { - description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; + description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index ec614bf4b8c1..cf10c1e6fe20 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "BitlBee, an IRC to other chat networks gateway"; + description = "IRC instant messaging gateway"; longDescription = '' BitlBee brings IM (instant messaging) to IRC clients. It's a diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 9cf2558ef320..909d6404193c 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -41,7 +41,7 @@ rec { name = "carrier-2.5.0"; meta = { - description = "Carrier - PidginIM GUI fork with user-friendly development model"; + description = "PidginIM GUI fork with user-friendly development model"; homepage = http://funpidgin.sf.net; }; } // (if externalPurple2 then { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 07730a8c0ee1..e46956f3ccae 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Ekiga SIP client"; + description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 9ccada87fe2f..41ffb421f8e6 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Fuze for Linux"; + description = "Internet and mobile based unified communications solutions (Linux client)"; homepage = http://www.fuzebox.com; license = "unknown"; }; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6da12905f560..cf4c2e22ad6b 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { ''; meta = { - description = "HipChat Desktop Client"; + description = "Desktop client for HipChat services"; homepage = http://www.hipchat.com; license = stdenv.lib.licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index be12c7e8e2ae..e10b4f9c83c5 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Open Source video SIP softphone"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 6e6fd6d0eb6c..814a191c457a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") ; meta = with stdenv.lib; { - description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client"; + description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index eb052af13690..d7dc755e9abb 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { description = "The TeamSpeak voice communication tool"; homepage = http://teamspeak.com/; license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest"; + maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index b3e1ff74cfa5..f7d1a010ed8f 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,16 +2,13 @@ , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "7566aa9d26"; - date = "20140728"; -in -stdenv.mkDerivation rec { - name = "toxic-${date}-${version}"; + version = "0.4.7"; +in stdenv.mkDerivation rec { + name = "toxic-${version}"; src = fetchurl { - url = "https://github.com/Tox/toxic/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; + url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz"; + sha256 = "0rcrcqzvicz7787fa4b7f68qnwq6wqbyrm8ii850f1w7vnxq9dkq"; }; makeFlags = [ "-Cbuild" "VERSION=${version}" ]; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 823df5c27a28..b49d5f40a86b 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "notsecure"; repo = "uTox"; - rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961"; - sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0"; + rev = "a840b459210694fdf02671567bf33845a11d4c83"; + sha256 = "0jr0xajkv5vkq8gxspnq09k4bzc98fr3hflnz8a3lrwajyhrnpvp"; }; buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 2d5e6b66bf05..77aeb64478f0 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance."; + description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% pure Java application designed to load test functional behavior and diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 7a1eddfa8690..75ccb93ca954 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -70,8 +70,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Notmuch -- The mail indexer"; - longDescription = ""; + description = "Mail indexer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index 8efda554d732..3d537d83f430 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; + broken = true; }; dontStrip = true; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { buildPhase = '' # the builder uses git to get a listing of the files + export EMAIL="nobody@in.here" git init >/dev/null git add . git commit -m "message" >/dev/null diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 15acd5af8dfd..6add41edf7c3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -37,6 +37,8 @@ , pango }: +assert stdenv.isLinux; + let version = "31.0"; sources = [ diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index c933460af43b..fe13c756bd7f 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; meta = { - description = "The slrn (S-Lang read news) newsreader"; + description = "Text-based newsreader"; homepage = http://slrn.sourceforge.net/index.html; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 6c28840f7e5f..052c53112536 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { */ meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = '' GNUnet is a framework for secure peer-to-peer networking that diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 9ba9e3aa3fc4..09c20618d668 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation (rec { ]; meta = { - description = "rdesktop is an open source client for Windows Terminal Services"; + description = "Open source client for Windows Terminal Services"; }; }) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8fb929d53e10..8304f6dc091b 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; - description = "Remmina is a remote desktop client written in GTK+"; + description = "Remote desktop client written in GTK+"; maintainers = []; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 226b7f6d097b..64bf287b44f0 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://syncthing.net/; - description = "Syncthing replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; + description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = with stdenv.lib.licenses; mit; maintainers = with stdenv.lib.maintainers; [ matejc ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9c255f493d3f..8d6de404f986 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "GnuCash, a personal and small-business financial-accounting application"; + description = "Personal and small-business financial-accounting application"; longDescription = '' GnuCash is personal and small-business financial-accounting software, diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 41cf1ebc33df..63d4db20af37 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = http://libreoffice.org/; license = licenses.lgpl3; maintainers = [ maintainers.viric maintainers.raskin ]; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 696890f95f1e..1be1328da271 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; - description = "A beautiful OpenGL-based gravity simulator"; + description = "Beautiful OpenGL-based gravity simulator"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 96181c8ee6cb..c9974660da36 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { # ''; meta = { - description = "EMBOSS is 'The European Molecular Biology Open Software Suite'"; + description = "The European Molecular Biology Open Software Suite"; longDescription = ''EMBOSS is a free Open Source software analysis package specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 2a95d0cd65bb..62359baf2bc6 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { [ ocaml findlib ocamlgraph zarith lablgtk gmp ]; meta = { - description = "Alt-Ergo is a high-performance theorem prover and SMT solver"; + description = "High-performance theorem prover and SMT solver"; homepage = "http://alt-ergo.ocamlpro.com/"; license = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 8e6fde6bc240..ed922b3aedbe 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-8bc01590"; + version = "8.5pre-c70d5b2"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; idePath = if buildIde then '' @@ -16,17 +16,20 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "8bc0159095cb0230a50c55a1611c8b77134a6060"; - sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv"; + rev = "c70d5b27ad5872c74e20b6c997383fb4462a68dc"; + sha256 = "02wks2aivgjcf4h3ss9rn683vyawz8gl8rbysdq7awxh062316l2"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + patches = [ ./no-codesign.patch ]; + postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" + substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)" ''; preConfigure = '' diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 678ec6a4b049..da77a4c5a9aa 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { buildFlags = "revision coq coqide"; meta = { - description = "Coq proof assistant"; + description = "Formal proof management system"; longDescription = '' Coq is a formal proof management system. It provides a formal language to write mathematical definitions, executable algorithms and theorems diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch new file mode 100644 index 000000000000..0f917fbf56d4 --- /dev/null +++ b/pkgs/applications/science/logic/coq/no-codesign.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile.build b/Makefile.build +index 2963a3d..876479c 100644 +--- a/Makefile.build ++++ b/Makefile.build +@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS) + OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) + DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils + +-ifeq ($(ARCH),Darwin) +-LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist" +-CODESIGN=codesign -s - +-else + LINKMETADATA= + CODESIGN=true +-endif + + define bestocaml + $(if $(OPT),\ + diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index f601f97de62e..0f393b419f1d 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; - description = "Matita is an experimental, interactive theorem prover"; + description = "Experimental, interactive theorem prover"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index caaf4a94a1ed..94b1d5907620 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--prefix" "$(out)" ]; meta = { - description = "Prooftree is a program for proof-tree visualization"; + description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive proof development in a theorem prover. It is currently being developed diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index c6c7e4d9c1a7..f9680b475797 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Twelf logic proof assistant"; + description = "Logic proof assistant"; longDescription = '' Twelf is a language used to specify, implement, and prove properties of deductive systems such as programming languages and logics. Large diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 7ab08cf8799f..2685f5e53d06 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: +assert stdenv.isLinux; + let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 5a1a4ef19922..b6b34d96d154 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl }: +assert stdenv.isLinux; + let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; in diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 1817c43ed7be..6e187843404d 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fricas.sourceforge.net/; - description = "Fricas CAS"; + description = "An advanced computer algebra system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index c4352c46f92e..1439d327d6ec 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; - description = "GlSurf: a program to draw implicit surfaces and curves"; + description = "A program to draw implicit surfaces and curves"; }; } diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index a93386149bd4..785c2460bb49 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran liblapack blas]; meta = { - description = "JAGS: Just Another Gibbs Sampler"; + description = "Just Another Gibbs Sampler"; license = "GPL2"; homepage = http://www-ice.iarc.fr/~martyn/software/jags/; maintainers = [stdenv.lib.maintainers.andres]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 096796a859d0..3277d94d99b6 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "Maxima computer algebra system"; + description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index db79839ba669..4c93eef2b1c0 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [wxGTK30 boost lua zlib bzip2 xylib readline gnuplot ]; meta = { - description = "Fityk -- curve fitting and peak fitting software"; + description = "Curve fitting and peak fitting software"; license = "GPL2"; homepage = http://fityk.nieto.pl/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 29a7caf769be..7656668f0564 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "SimGrid, a simulator for distributed applications in heterogeneous environments"; + description = "Simulator for distributed applications in heterogeneous environments"; longDescription = '' SimGrid is a toolkit that provides core functionalities for the diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index b9abf7b55b48..879690bc91ed 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gromacs.org"; license = "GPLv2"; - description = "The GROMACS molecular dynamics software package"; + description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 1079a153ca16..806d2f546cf5 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "Scientific PYthon Development EnviRonment (SPYDER)"; + description = "Scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index d53b38c28c32..ff5c3456e227 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,24 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, curl, extensibleExceptions, filepath, hashedStorage -, haskeline, html, HTTP, mmap, mtl, network, parsec, random -, regexCompat, tar, terminfo, text, utf8String, vector, zlib +, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec +, random, regexCompat, tar, terminfo, text, utf8String, vector +, zlib }: cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.4"; - sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz"; + version = "2.8.5"; + sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6"; isLibrary = true; isExecutable = true; + doCheck = false; buildDepends = [ extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network parsec random regexCompat tar terminfo text - utf8String vector zlib + mmap mtl network networkUri parsec random regexCompat tar terminfo + text utf8String vector zlib ]; extraLibraries = [ curl ]; - jailbreak = true; - doCheck = false; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index a4d16e460607..877c65afccf5 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation { meta = { homepage = http://git-scm.com/; - description = "Git, a popular distributed version control system"; + description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index e71d23132aca..823638669b68 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/rcs/; - description = "GNU RCS, a revision control system"; + description = "Revision control system"; longDescription = '' The GNU Revision Control System (RCS) manages multiple revisions of files. RCS automates the storing, retrieval, logging, diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 06122619066a..515e2591461f 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gnash/; - description = "GNU Gnash, a libre SWF (Flash) movie player"; + description = "A libre SWF (Flash) movie player"; longDescription = '' Gnash is a GNU Flash movie player. Flash is an animation file format diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index cb00ac813842..57c8ca574b41 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "key-mon-${version}"; - version = "1.16"; + version = "1.17"; namePrefix = ""; src = fetchurl { url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; - sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis"; + sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; propagatedBuildInputs = diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 16bd57bef34a..7dd089537b73 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { meta = { - description = "Kino is a non-linear DV editor for GNU/Linux"; + description = "Non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix new file mode 100644 index 000000000000..23a033844b38 --- /dev/null +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, pkgconfig, qt4, SDL, SDL_image, libvorbis, libtar, libxml2 +, gamin +}: + +stdenv.mkDerivation rec { + version = "0.8"; + name = "linuxstopmotion-${version}"; + + src = fetchgit { + url = "git://git.code.sf.net/p/linuxstopmotion/code"; + rev = "refs/tags/${version}"; + sha256 = "1xkkrhllgy2d7k0vrdj794ya7y3g3n7xh8c2qgnb26yrarz79dqj"; + }; + + buildInputs = [ pkgconfig qt4 SDL SDL_image libvorbis libtar libxml2 gamin ]; + + patches = [ ./linuxstopmotion-fix-wrong-isProcess-logic.patch ]; + + configurePhase = '' + qmake PREFIX="$out" + ''; + + # Installation breaks without this + preInstall = '' + mkdir -p "$out/share/stopmotion/translations/" + cp -v build/*.qm "$out/share/stopmotion/translations/" + ''; + + meta = with stdenv.lib; { + description = "Create stop-motion animation movies"; + homepage = http://linuxstopmotion.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch b/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch new file mode 100644 index 000000000000..caab48d0e2d9 --- /dev/null +++ b/pkgs/applications/video/linuxstopmotion/linuxstopmotion-fix-wrong-isProcess-logic.patch @@ -0,0 +1,33 @@ +From b23b7dab1d540b0710fcb9ded1c6256a49844906 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> +Date: Wed, 20 Aug 2014 22:22:00 +0200 +Subject: [PATCH] Fix wrong "isProcess" logic + +Stopmotion wrongly thinks that uvccapture should be run as a daemon, +even though configuration for uvccapture has no "daemon-like" command +line to be run (according to "preferences"). The result is an error +popup instead of video/image grabbing. + +This brings back the "isProcess" logic that was in stopmotion v0.7.2, +because it seems to work, while the current logic (v0.8.0) seems to +fail. +--- + src/presentation/frontends/qtfrontend/frameview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/presentation/frontends/qtfrontend/frameview.cpp b/src/presentation/frontends/qtfrontend/frameview.cpp +index e44dca7..d2c41fd 100644 +--- a/src/presentation/frontends/qtfrontend/frameview.cpp ++++ b/src/presentation/frontends/qtfrontend/frameview.cpp +@@ -270,7 +270,7 @@ bool FrameView::on() { + Preference device(QString("device%1") + .arg(activeDev).toLatin1().constData(), ""); + QString pre = QString(prepoll.get()).replace("$VIDEODEVICE", device.get()); +- bool isProcess = startDaemon.get(); ++ bool isProcess = (strcmp(startDaemon.get(), "") == 0) ? false : true; + + bool isCameraReady = true; + this->grabber = new CommandLineGrabber(capturedFile.path(), isProcess); +-- +2.0.2 + diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4eec9afdbf3d..db1ced49166e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass , lua, perl, libpthreadstubs , lua5_sockets -, python3, docutils, which +, python3, docutils, which, lib , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -20,8 +20,9 @@ # For screenshots , libpngSupport ? true, libpng ? null # for Youtube support -, quviSupport? false, libquvi ? null -, cacaSupport? false, libcaca ? null +, quviSupport ? false, libquvi ? null +, cacaSupport ? false, libcaca ? null +, vaapiSupport ? false, libva ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); @@ -57,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn"; + sha256 = "17mmc6xm8yir2p379h00q3wy7rplz2s31h6sxswmzbh72xf10g96"; }; buildInputs = with stdenv.lib; @@ -84,6 +85,7 @@ stdenv.mkDerivation rec { ++ optional quviSupport libquvi ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca + ++ optional vaapiSupport libva ; nativeBuildInputs = [ python3 lua perl ]; @@ -97,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - python3 ${waf} configure --prefix=$out + python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"} patchShebangs TOOLS ''; @@ -124,9 +126,9 @@ stdenv.mkDerivation rec { }; } -# Heavily based on mplayer2 expression +# Many thanks @matejc for this update: 0.5.0 and vaapi (experimental) # TODO: Wayland support -# TODO: investigate libquvi support +# TODO: investigate libquvi problems (related to Youtube support) # TODO: investigate caca support # TODO: investigate lua5_sockets bug diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 8bd5b7c6160a..018be742a160 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-0.8.6"; + name = "smplayer-14.3.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0"; + sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix new file mode 100644 index 000000000000..468db4625103 --- /dev/null +++ b/pkgs/applications/video/uvccapture/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, libjpeg }: + +let + debianPatches = fetchurl { + url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5-3.debian.tar.gz"; + sha256 = "0m29by13nw1r8sch366qzdxg5rsd1k766kqg1nj2pdb8f7pwjh9r"; + }; + +in + +stdenv.mkDerivation rec { + name = "uvccapture-0.5"; + + src = fetchurl { + url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz"; + sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi"; + }; + + buildInputs = [ libjpeg ]; + + patchPhase = '' + tar xvf "${debianPatches}" + for fname in debian/patches/fix_videodev_include_FTBFS.patch \ + debian/patches/warnings.patch \ + debian/patches/numbuffers.patch + do + echo "Applying patch $fname" + patch < "$fname" + done + ''; + + makeFlagsArray = [ "PREFIX=$(out)/bin/" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + # Upstream has no man page, install one from Debian + postInstall = '' + mkdir -p "$out/share/man/man1" + cp -v debian/uvccapture.1 "$out/share/man/man1/" + ''; + + meta = with stdenv.lib; { + description = "Capture image from USB webcam at a specified interval"; + homepage = http://linux-uvc.berlios.de/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 3232267fa94b..875ed48c102f 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -34,11 +34,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; stdenv.mkDerivation rec { - name = "xbmc-13.1"; + name = "xbmc-13.2"; src = fetchurl { - url = "https://github.com/xbmc/xbmc/archive/13.1-Gotham.tar.gz"; - sha256 = "0y56c5csfp8xhk088g47m3bzrri73z868yfx6b04gnrdmr760jrl"; + url = "https://github.com/xbmc/xbmc/archive/13.2-Gotham.tar.gz"; + sha256 = "11g5a3h6kxz1vmnhagfjhg9nqf11wy0wzqqf4h338jh3lgzmvgxc"; }; buildInputs = [ @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xbmc.org/; - description = "XBMC Media Center"; + description = "Media center"; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 75afcb41f808..74ce7bdfcaa6 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,34 +1,34 @@ { stdenv, fetchurl +, pkgconfig, gtk , libX11 , mesa , sdlSupport ? true, SDL ? null , termSupport ? true , ncurses ? null, readline ? null -, wxSupport ? true , gtk ? null , wxGTK ? null , pkgconfig ? null +, wxSupport ? false, wxGTK ? null , wgetSupport ? false, wget ? null , curlSupport ? false, curl ? null }: - assert sdlSupport -> (SDL != null); assert termSupport -> (ncurses != null&& readline != null); -assert wxSupport -> (gtk != null && wxGTK != null && pkgconfig != null); +assert wxSupport -> (gtk != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.2"; + version = "2.6.6"; src = fetchurl { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr"; + sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f"; }; buildInputs = with stdenv.lib; - [ libX11 mesa ] + [ pkgconfig gtk libX11 mesa ] ++ optionals sdlSupport [ SDL ] ++ optionals termSupport [ readline ncurses ] - ++ optionals wxSupport [ gtk wxGTK pkgconfig ] + ++ optionals wxSupport [ wxGTK ] ++ optionals wgetSupport [ wget ] ++ optionals curlSupport [ curl ]; @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { --enable-pnic ''; + NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/"; + meta = { description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' @@ -61,3 +63,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } +# TODO: study config.bochs.* implementation (like config.ffmpeg.* options) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4a488a381abf..f4d329221ff3 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper, -btrfsProgs, iptables, bash}: +btrfsProgs, iptables, bash, e2fsprogs}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; + sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp"; }; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ]; + buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; dontStrip = true; buildPhase = '' patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="d84a070" + export DOCKER_GITCOMMIT="fa7b24f" ./hack/make.sh dynbinary ''; installPhase = '' install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit - wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin" + wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix index c1ef20b7aa08..0023cf44f33b 100644 --- a/pkgs/applications/virtualization/nova/default.nix +++ b/pkgs/applications/virtualization/nova/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 08d53d83eedb..d4d680f05fa2 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 libvirt libxml2Python ipaddr vte diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 8e2da5c3b764..6441bb884234 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }: +{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }: with stdenv.lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 682e7159ac8f..f3e7bea3ca9a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.3.12"; # changes ./guest-additions as well + version = "4.3.14"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "93733"; + extpackRevision = "95030"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f"; + sha256 = "b965c3565e7933bc61019d2992f4da084944cfd9e809fbeaff330f4743d47537"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f"; + sha256 = "bc893adde4449a2d35d8b4d0b8b247f0f2ac62a434fd8a8f7c54f613a100855a"; }; buildInputs = diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix new file mode 100644 index 000000000000..af6545b61515 --- /dev/null +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig +, freetype, fribidi +, libXext, libXft, libXpm, libXrandr, libXrender, xextproto +, libXinerama +, imlib2 +}: + +stdenv.mkDerivation rec { + + name = "fluxbox-${version}"; + version = "1.3.5"; + + buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; + + src = fetchurl { + url = "mirror://sourceforge/fluxbox/${name}.tar.bz2"; + sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; + }; + + meta = { + description = "Full-featured, light-resource X window manager"; + longDescription = '' + Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources. + It is very light on resources and easy to handle but yet full of features to make an easy, + and extremely fast, desktop experience. It is written in C++ and licensed under MIT license. + ''; + homepage = http://fluxbox.org/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; + }; +} +# Many thanks Jack Ryan from Nix-dev mailing list! diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 65264c20db35..0eb28464e590 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; - description = "Ratpoison, a simple mouse-free tiling window manager"; + description = "Simple mouse-free tiling window manager"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' |