diff options
Diffstat (limited to 'pkgs')
35 files changed, 442 insertions, 142 deletions
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index bd35b78fbc0e..bb37cac5500e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig -, libpulseaudio }: +, libpulseaudio, CoreServices, CoreAudio, AudioUnit }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin - "-framework CoreAudio"; + "-framework CoreAudio -framework CoreServices"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 5a54c94f1f97..ead53721950b 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2, libsndfile, -ladspaH, liblrdf, liblo, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2 +, libsndfile, ladspaH, liblrdf, liblo, libsigcxx }: stdenv.mkDerivation rec { name = "non-${version}"; - version = "2016-02-07"; + version = "2016-03-06"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "1ef382fbbea598fdb56b25244a703c64ecaf8446"; - sha256 = "1mi3nm0nrrqlk36920irvqf5080lbnj1qc8vnxspgwkjjqgdc22g"; + rev = "3946d392216ee999b560d8b7cdee7c4347110e29"; + sha256 = "02vnq2mfimgdrmv3lmz80yif4h9a1lympv0wqc5dr2l0f8amj2fp"; }; - buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile + buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile ladspaH liblrdf liblo libsigcxx - ]; - configurePhase = ''python waf configure --prefix=$out''; - buildPhase = ''python waf build''; - installPhase = ''python waf install''; + ]; + configurePhase = "python waf configure --prefix=$out"; + buildPhase = "python waf build"; + installPhase = "python waf install"; meta = { description = "Lightweight and lightning fast modular Digital Audio Workstation"; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 1083f9434a94..ac42fc716424 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -19,6 +19,11 @@ pythonPackages.buildPythonApplication rec { substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; + postInstall = '' + mkdir -p $out/share/applications + cp -v data/pithos.desktop $out/share/applications + ''; + buildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix new file mode 100644 index 000000000000..a8760afc58b0 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: + +stdenv.mkDerivation (rec { + name = "ProofGeneral-HEAD"; + + src = fetchgit { + url = "https://github.com/ProofGeneral/PG.git"; + rev = "16991280fb09743ae7320aef77f6a166afb907d7"; + sha256 = "08zhfl6xbl4q7lrl7wdp72xr155k06778by0d60g28mfx59b7sqc"; + }; + + buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; + + prePatch = + '' sed -i "Makefile" \ + -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ + s|/sbin/install-info|install-info|g" + + + sed -i "bin/proofgeneral" -e's/which/type -p/g' + + # @image{ProofGeneral} fails, so remove it. + sed -i '94d' doc/PG-adapting.texi + sed -i '96d' doc/ProofGeneral.texi + ''; + + patches = [ ./pg.patch ]; + + preBuild = '' + make clean; + ''; + + installPhase = + if enableDoc + then + # Copy `texinfo.tex' in the right place so that `texi2pdf' works. + '' cp -v "${automake}/share/"automake-*/texinfo.tex doc + make install install-doc + '' + else "make install"; + + meta = { + description = "Proof General, an Emacs front-end for proof assistants"; + longDescription = '' + Proof General is a generic front-end for proof assistants (also known as + interactive theorem provers), based on the customizable text editor Emacs. + ''; + homepage = http://proofgeneral.inf.ed.ac.uk; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; # arbitrary choice + }; +}) diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix new file mode 100644 index 000000000000..79d6ff06578c --- /dev/null +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -0,0 +1,36 @@ +{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, + gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, + librsvg, gst_all_1, autoreconfHook, makeWrapper }: +stdenv.mkDerivation { + name = "ahoviewer-1.4.6"; + src = fetchFromGitHub { + owner = "ahodesuka"; + repo = "ahoviewer"; + rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa"; + sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb"; + }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 + libsecret curl unrar libzip librsvg + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + gst_all_1.gst-plugins-base ]; + postPatch = ''patchShebangs version.sh''; + postInstall = '' + wrapProgram $out/bin/ahoviewer \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + meta = { + homepage = "https://github.com/ahodesuka/ahoviewer"; + description = "A GTK2 image viewer, manga reader, and booru browser"; + maintainers = [ stdenv.lib.maintainers.skrzyp ]; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ]; + }; +} + + diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ba31d3fb3428..1ae11be3cdd3 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -8,13 +8,13 @@ in { m3d-fio = buildPlugin rec { name = "M3D-Fio-${version}"; - version = "0.29"; + version = "0.28.2"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M3D-Fio"; rev = "V${version}"; - sha256 = "1ifbq7yibq42jjvqvklnx3qzr6vk2ngsxh3xhlbdrhqrg54gky4r"; + sha256 = "1fwy6xmbid89rn7w7v779wb34gmfzc1fkggv3im1r7a7jrzph6nx"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 5e8f266930ff..7e9e41ea0bfc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell -, gstreamer, gst_plugins_base, startupnotification, gettext +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk, gtkspell, aspell +, gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext , perl, perlXMLParser, libxml2, nss, nspr, farsight2 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python, libICE, libXext, libSM @@ -22,9 +22,11 @@ stdenv.mkDerivation rec { inherit nss ncurses; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtkspell aspell - gstreamer gst_plugins_base startupnotification + gstreamer gst_plugins_base gst_plugins_good startupnotification libxml2 nss nspr farsight2 libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn @@ -54,6 +56,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/pidgin \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index fa03b8d21adc..ec188e982843 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchgit -, qtbase, qtmultimedia, qtquick1, qtquickcontrols, qtgraphicaleffects +, qtbase, qtmultimedia, qtquick1, qtquickcontrols +, qtimageformats, qtgraphicaleffects , telegram-qml, libqtelegram-aseman-edition , gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly , makeQtWrapper }: @@ -14,8 +15,9 @@ stdenv.mkDerivation rec { }; buildInputs = - [ qtbase qtmultimedia qtquick1 qtquickcontrols qtgraphicaleffects - telegram-qml libqtelegram-aseman-edition + [ qtbase qtmultimedia qtquick1 qtquickcontrols + qtimageformats qtgraphicaleffects + telegram-qml libqtelegram-aseman-edition gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ]; nativeBuildInputs = [ makeQtWrapper ]; enableParallelBuild = true; @@ -33,5 +35,3 @@ stdenv.mkDerivation rec { }; } #TODO: appindicator, for system tray plugin (by @profpatsch) - - diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index cda861497e12..54bd2b5f9797 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,76 +1,54 @@ -{ stdenv, fetchurl, gettext, pkgconfig, ruby -, boost, expat, file, flac, libebml, libmatroska, libogg, libvorbis, xdg_utils, zlib -# pugixml (not packaged) -, buildConfig ? "all" -, withGUI ? false, qt5 ? null # Disabled for now until upstream issues are resolved -, legacyGUI ? true, wxGTK ? null -# For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the -# build system doesn't install desktop entries, icons, etc... -, libiconv +{ stdenv, fetchgit, pkgconfig, autoconf, automake +, ruby, file, xdg_utils, gettext, expat, qt5, boost +, libebml, zlib, libmatroska, libogg, libvorbis, flac +, withGUI ? true }: -let - inherit (stdenv.lib) enableFeature optional; -in - assert withGUI -> qt5 != null; -assert legacyGUI -> wxGTK != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "8.4.0"; + version = "8.9.0"; - src = fetchurl { - url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0y7qm8q9vpvjiw7b69k9140pw9nhvs6ggmk56yxnmcd02inm19gn"; + src = fetchgit { + url = "https://github.com/mbunkus/mkvtoolnix.git"; + rev = "54e6b52b3dde07f89da4542997ef059e18802128"; + sha256 = "1hm9f9q60c0axmmlsalazsiil8gk3v8q6cl5qxsfa95m51i39878"; }; - patchPhase = '' - patchShebangs ./rake.d/ - patchShebangs ./Rakefile - # Force ruby encoding to use UTF-8 or else when enabling qt5 the Rakefile may - # fail with `invalid byte sequence in US-ASCII' due to UTF-8 characters - # This workaround replaces an arbitrary comment in the drake file - sed -e 's,#--,Encoding.default_external = Encoding::UTF_8,' -i ./drake - ''; - - configureFlags = [ - "--with-boost-libdir=${boost.lib}/lib" - "--without-curl" - ] ++ ( - if (withGUI || legacyGUI) then [ - "--with-mkvtoolnix-gui" - "--enable-gui" - (enableFeature withGUI "qt") - (enableFeature legacyGUI "wxwidgets") - ] else [ - "--disable-gui" - ] - ); - - nativeBuildInputs = [ gettext pkgconfig ruby ]; + nativeBuildInputs = [ gettext ruby ]; buildInputs = [ - boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib - ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ] - ++ optional withGUI qt5 - ++ optional legacyGUI wxGTK; - - enableParallelBuilding = true; + pkgconfig autoconf automake expat + file xdg_utils boost libebml zlib + libmatroska libogg libvorbis flac + (optional withGUI qt5.qtbase) + ]; - buildPhase = '' - ./drake - ''; + preConfigure = "./autogen.sh"; + buildPhase = "./drake -j $NIX_BUILD_CORES"; + installPhase = "./drake install -j $NIX_BUILD_CORES"; - installPhase = '' - ./drake install - ''; + configureFlags = [ + "--enable-magic" + "--enable-optimization" + "--with-boost-libdir=${boost.lib}/lib" + "--disable-debug" + "--disable-profiling" + "--disable-precompiled-headers" + "--disable-static-qt" + "--without-curl" + "--with-gettext" + (enableFeature withGUI "qt") + ]; meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; - homepage = http://www.bunkus.org/videotools/mkvtoolnix/; - license = licenses.gpl2; - maintainers = with maintainers; [ codyopel fuuzetsu ]; - platforms = platforms.all; + homepage = http://www.bunkus.org/videotools/mkvtoolnix/; + license = licenses.gpl2; + maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ]; + platforms = platforms.linux; }; } diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix new file mode 100644 index 000000000000..70fd2060ff1e --- /dev/null +++ b/pkgs/data/fonts/montserrat/default.nix @@ -0,0 +1,28 @@ +# Originally packaged for ArchLinux. +# +# https://aur.archlinux.org/packages/ttf-montserrat/ + +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "montserrat-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; + sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/montserrat + cp *.ttf $out/share/fonts/montserrat + ''; + + meta = with stdenv.lib; { + description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; + homepage = "http://www.fontspace.com/julieta-ulanovsky/montserrat"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb ]; + }; +} diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 260e8d66c58a..15b729173c6a 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -30,7 +30,7 @@ if disabled then throw "${name} not supported for go ${go.meta.branch}" else let args = lib.filterAttrs (name: _: name != "extraSrcs") args'; - removeReferences = [ go ]; + removeReferences = [ ] ++ lib.optional (!allowGoReference) go; removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 5c14fe788f7a..90f84d4387bc 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -28,7 +28,8 @@ self: super: # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; + inherit (self.ghc.bootPkgs) + jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; # This is the list of the Stage 1 packages that are built into a booted ghcjs installation # It can be generated with the command: diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 59020264b3c5..a4db98f2e618 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -81,7 +81,7 @@ rec { buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror"); - buildStackProject = pkgs.callPackage ../development/haskell-modules/generic-stack-builder.nix { }; + buildStackProject = pkgs.callPackage ./generic-stack-builder.nix { }; triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index d22d3849b1bf..748482b1bf08 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -28,6 +28,11 @@ let sqlite ]; + boolPatch = fetchurl { + url = "http://copr-dist-git.fedorainfracloud.org/cgit/bthomas/racket/racket.git/plain/xform-errors-converting-fix.patch"; + sha256 = "0h5g7a7w8wwj43jb8q69xldgbyxkn0y0i1na6r9fk17dd56nsm68"; + }; + in stdenv.mkDerivation rec { @@ -51,6 +56,10 @@ stdenv.mkDerivation rec { cd src/build ''; + # https://github.com/racket/racket/issues/1222 + # Fixed upstream after the release of 6.4 + patches = [ boolPatch ]; + shared = if stdenv.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3fb49c2be248..c0c4bf97b60c 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -167,6 +167,15 @@ in { }; }; + ro = buildDict { + shortName = "ro-3.3-2"; + fullName = "Romanian"; + src = fetchurl { + url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2; + sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; + }; + }; + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 818177ff49d7..3bdcfeda6a5f 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.3.1"; + name = "libebml-1.3.3"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r"; + sha256 = "16alhwd1yz5bv3765xfn5azwk37805lg1f61195gjq8rlkd49yrm"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index b4032f3c22dc..134f6b1bf270 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, libebml }: +{ stdenv, fetchurl, pkgconfig, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.1"; + name = "libmatroska-1.4.4"; src = fetchurl { url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "1dzglkl0hpimld1kahkrrp857hw5pg1r7xxbpnx7jmlj7s3j2vq8"; + sha256 = "1mvb54q3gag9dj0pkwci8w75gp6mm14gi85y0ld3ar1rdngsmvyk"; }; - configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib" - + stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++"; - propagatedBuildInputs = [ libebml ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libebml ]; meta = with stdenv.lib; { description = "A library to parse Matroska files"; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 9f9f89ec8125..a35ab14e2538 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.1.0"; name = "libsoundio-${version}"; src = fetchFromGitHub { owner = "andrewrk"; repo = "libsoundio"; rev = "${version}"; - sha256 = "0xnv0rsan57i07ky823jczylbcpbzjk6j06fw9x0md65arcgcqfy"; + sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; }; buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 5bb63c915e61..31ac49a2ce4d 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.7.0"; + version = "3.8.0"; - src = fetchurl { - url = "https://github.com/wolfSSL/wolfssl/archive/v${version}.tar.gz"; - sha256 = "1r1awivral4xjjvnna9lrfz2rh84rcbp04834rymbsz0kbyykgb6"; + src = fetchFromGitHub { + owner = "wolfSSL"; + repo = "wolfssl"; + rev = "v${version}"; + sha256 = "0vc2120a9gfxg3rv018ch1g84ia2cpplcqbpy8v6vpfb79rn1nf5"; }; - nativeBuildInputs = [ autoconf automake libtool ]; - - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 562df3ac1b60..64522e568db6 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, dosbox, unzip}: +{ lib, stdenv, fetchurl, dosbox, unzip }: stdenv.mkDerivation { name = "keen4"; @@ -15,5 +15,7 @@ stdenv.mkDerivation { meta = { description = "Commander Keen Episode 4: Secret of the Oracle"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index ab6bcfba6a1d..532ef2a45d5d 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchsvn, fetchurl, cups, zlib }: -let rev = "315"; in +{stdenv, fetchurl, cups, zlib}: + stdenv.mkDerivation rec { - name = "splix-svn-${rev}"; - src = fetchsvn { - # We build this from svn, because splix hasn't been in released in several years - # although the community has been adding some new printer models. - url = "svn://svn.code.sf.net/p/splix/code/splix"; - rev = "r${rev}"; - sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl"; + name = "splix-2.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/splix/${name}.tar.bz2"; + sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp"; }; - preBuild = '' + patches = [ ./splix-2.0.0-gcc45.patch ]; + + preBuild='' makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" ''; - buildInputs = [ cups zlib ]; + buildInputs = [cups zlib]; meta = { homepage = http://splix.sourceforge.net; diff --git a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch new file mode 100644 index 000000000000..5ccdcb2514c5 --- /dev/null +++ b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch @@ -0,0 +1,18 @@ +Fixing build with gcc 4.5 + +http://bugs.gentoo.org/show_bug.cgi?id=318581 + +downloaded from +http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch + +--- splix-old/src/ppdfile.cpp ++++ splix-new/src/ppdfile.cpp +@@ -282,7 +282,7 @@ + * Opérateur d'assignation + * Assignment operator + */ +-void PPDFile::Value::operator = (const PPDFile::Value::Value &val) ++void PPDFile::Value::operator = (const PPDFile::Value &val) + { + if (_preformatted) + delete[] _preformatted; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 5e6e73419d2e..c61947fc8f7a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1616,4 +1616,24 @@ rec { }; + lightline-vim = buildVimPluginFrom2Nix { + name = "lightline-2016-02-10"; + src = fetchgit { + url = "git://github.com/itchyny/lightline.vim"; + rev = "e6a43f98fab1ee2e373bd0b670803222607ed123"; + sha256 = "abb836d728a8f674f3aa71c4936798c9be02bb352ca0e6e5f5b262886622ac3b"; + }; + dependencies = []; + }; + + Spacegray-vim = buildVimPluginFrom2Nix { + name = "spacegray-2015-04-05"; + src = fetchgit { + url = "git://github.com/ajh17/Spacegray.vim"; + rev = "1c10d0da045609910e8fb03b33c043bbcff35d9e"; + sha256 = "bced8987539ca42f84350b90e2570a226dad66e8061b90b79a41d51f9fb4b4b5"; + }; + dependencies = []; + }; + } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 87420a7a4ca5..82b59f1ebaa8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -21,6 +21,7 @@ "ghcmod" "github:Chiel92/vim-autoformat" "github:LnL7/vim-nix" +"github:ajh17/Spacegray.vim" "github:ap/vim-css-color" "github:benekastah/neomake" "github:bitc/vim-hdevtools" @@ -34,6 +35,7 @@ "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" "github:itchyny/thumbnail.vim" +"github:itchyny/lightline.vim" "github:ivanov/vim-ipython" "github:jceb/vim-hier" "github:jeetsukumaran/vim-buffergator" diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9b0ec5c355aa..57a825ec0a09 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5-rc6"; - modDirVersion = "4.5.0-rc6"; + version = "4.5-rc7"; + modDirVersion = "4.5.0-rc7"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1cpbg6w0mzlxrc6crgqh5n4c8wxxr4yyikmk0bkpgsbr6qk3bydk"; + sha256 = "0z43s7ccikmqigv4insjvizs3bkx2lgjvzsz5rmmpcga28dz44kq"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 0f7f93a57410..490df3e1abe2 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.99.3"; + name = "upower-0.99.4"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0f6x9mi1jzgqdpycaikyhjljnw3aacsl3gxndyg0dfqkq6y9jwb9"; + sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww"; }; buildInputs = diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 71f1d62f4d80..c01e5065764c 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "6"; - versionMinor = "0.44"; - sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa"; + versionMinor = "0.45"; + sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg"; } diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix index 221feb9c30eb..b38f4353cc45 100644 --- a/pkgs/servers/http/tomcat/7.0.nix +++ b/pkgs/servers/http/tomcat/7.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "7"; - versionMinor = "0.62"; - sha256 = "0v8zvyd4h85ynnday58x0ppplw4flxyjsrmrpg78rrv3w49fm1x7"; + versionMinor = "0.68"; + sha256 = "1q5qgci5ia25zqa1k1n2xzarsgk1317ya89mfgg0fmi65x1046ic"; } diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix index a6da1198c9aa..004601796672 100644 --- a/pkgs/servers/http/tomcat/8.0.nix +++ b/pkgs/servers/http/tomcat/8.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "8"; - versionMinor = "0.23"; - sha256 = "0f0s35iqs1zpifya0qvdrk55r77jr074sc0zk5cjivxaxnhik2y9"; + versionMinor = "0.32"; + sha256 = "1f59x5z8qf4rzy49m8d5ifi4h1ghkz5r33l3i67sib414h7jc8vy"; } diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix new file mode 100644 index 000000000000..297489fd7fcb --- /dev/null +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -0,0 +1,74 @@ +# This script was inspired by the ArchLinux User Repository package: +# +# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git + + +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "oh-my-zsh-git-${version}"; + version = "2016-02-27"; + + src = fetchgit { + url = "https://github.com/robbyrussell/oh-my-zsh"; + rev = "bd6dbd1d9b1fc8a523aaf588492eb3ed4113b49d"; + sha256 = "0bn3jijxjhrd00mc3biqs7jj6in3ivhr6d02mp4566i2rdp9x2d5"; + }; + + phases = "installPhase"; + + installPhase = '' + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template + + mkdir -p $outdir + cp -r $src/* $outdir + cd $outdir + + rm MIT-LICENSE.txt + rm -rf .git* + + chmod -R +w templates + + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "2c\\ZSH=$outdir/" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template + + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF + + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi + + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi + + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF + ''; + + meta = with stdenv.lib; { + description = "A framework for managing your zsh configuration"; + longDescription = '' + Oh My Zsh is a framework for managing your zsh configuration. + + To copy the Oh My Zsh configuration file to your home directory, run + the following command: + + $ cp -v $(nix-env -q --out-path oh-my-zsh-git | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc + ''; + homepage = "http://ohmyz.sh/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb nequissimus ]; + }; +} diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index a5b01db4cd2a..3a460241daaa 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, glib, fuse }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }: stdenv.mkDerivation rec { - name = "sshfs-fuse-2.5"; + version = "2.7"; + name = "sshfs-fuse-${version}"; - src = fetchurl { - url = "mirror://sourceforge/fuse/${name}.tar.gz"; - sha256 = "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9"; + src = fetchFromGitHub { + repo = "sshfs"; + owner = "libfuse"; + rev = "sshfs-${version}"; + sha256 = "17l9b89zy5qzfcknw3krk74rfrqaa8q1r8jwdsahaqajsy09h4x4"; }; - buildInputs = [ pkgconfig glib fuse ]; + buildInputs = [ pkgconfig glib fuse autoreconfHook ]; + postInstall = '' mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix new file mode 100644 index 000000000000..66e91ed14240 --- /dev/null +++ b/pkgs/tools/misc/mimeo/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "mimeo-${version}"; + version = "2016.2"; + + src = fetchurl { + url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1"; + }; + + buildInputs = [ file desktop_file_utils ]; + + propagatedBuildInputs = [ python3Packages.pyxdg ]; + + preConfigure = '' + substituteInPlace Mimeo.py \ + --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + --replace "EXE_FILE = 'file'" \ + "EXE_FILE = '${file}/bin/file'" + ''; + + installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo"; + + meta = with stdenv.lib; { + description = "Open files by MIME-type or file name using regular expressions"; + homepage = http://xyne.archlinux.ca/projects/mimeo/; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.rycee ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 4d3ffb1257f9..4a1efbb03356 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -4,6 +4,7 @@ , withKerberos ? false , withGssapiPatches ? withKerberos , kerberos +, linkOpenssl? true }: assert withKerberos -> kerberos != null; @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. configureFlags = [ + "--sbindir=\${out}/bin" "--localstatedir=/var" "--with-pid-dir=/run" "--with-mantype=man" @@ -54,7 +56,8 @@ stdenv.mkDerivation rec { (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" ++ optional withKerberos "--with-kerberos5=${kerberos}" - ++ optional stdenv.isDarwin "--disable-libutil"; + ++ optional stdenv.isDarwin "--disable-libutil" + ++ optional (!linkOpenssl) "--without-openssl"; preConfigure = '' configureFlagsArray+=("--with-privsep-path=$out/empty") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f62ca556ce50..15b3c1266bea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2424,6 +2424,8 @@ let mgba = qt5.callPackage ../misc/emulators/mgba { }; + mimeo = callPackage ../tools/misc/mimeo { }; + minissdpd = callPackage ../tools/networking/minissdpd { }; miniupnpc = callPackage ../tools/networking/miniupnpc { }; @@ -2673,6 +2675,8 @@ let inherit (pythonPackages) sqlite3; }; + oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -8146,9 +8150,6 @@ let mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; - qt5 = null; - legacyGUI = false; - wxGTK = null; }; mlt-qt4 = callPackage ../development/libraries/mlt { @@ -11218,6 +11219,8 @@ let mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + montserrat = callPackage ../data/fonts/montserrat { }; + mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { }; @@ -11401,6 +11404,8 @@ let gtk = gtk2; }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { }; + alchemy = callPackage ../applications/graphics/alchemy { }; alock = callPackage ../misc/screensavers/alock { }; @@ -11998,6 +12003,10 @@ let texinfo = texinfo4 ; texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; }; + proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix { + texinfo = texinfo4 ; + texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; + }; proofgeneral = self.proofgeneral_4_2; quack = callPackage ../applications/editors/emacs-modes/quack { }; @@ -12110,7 +12119,9 @@ let fldigi = callPackage ../applications/audio/fldigi { }; - fluidsynth = callPackage ../applications/audio/fluidsynth { }; + fluidsynth = callPackage ../applications/audio/fluidsynth { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit; + }; fmit = qt5.callPackage ../applications/audio/fmit { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index dd9a9dde7bb3..888ffe474f2c 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3767,12 +3767,22 @@ let }; go2nix = buildFromGitHub rec { - rev = "dd513f1f1336a3cdceb9dd4be0f3c47a09929651"; + rev = "4c552dadd855e3694ed3499feb46dca9cd855f60"; owner = "kamilchm"; repo = "go2nix"; - sha256 = "1ad7zcab5vjbw7a8ns0aspkblqqz0z96b7ak3zdx409rq7rlqdsj"; - buildInputs = [ go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ]; + sha256 = "1pwnm1vrjxvgl17pk9n1k5chmhgwxkrwp2s1bzi64xf12anibj63"; + + buildInputs = [ pkgs.makeWrapper go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ]; + preBuild = ''go generate ./...''; + + postInstall = '' + wrapProgram $bin/bin/go2nix \ + --prefix PATH : ${pkgs.nix-prefetch-git}/bin \ + --prefix PATH : ${pkgs.git}/bin + ''; + + allowGoReference = true; }; godotenv = buildFromGitHub rec { |