diff options
Diffstat (limited to 'pkgs')
143 files changed, 2448 insertions, 2034 deletions
diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix new file mode 100644 index 000000000000..69cc798ec0f9 --- /dev/null +++ b/pkgs/applications/audio/aacgain/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "aacgain-1.9.0"; + src = fetchFromGitHub { + owner = "mulx"; + repo = "aacgain"; + rev = "7c29dccd878ade1301710959aeebe87a8f0828f5"; + sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0"; + }; + + configurePhase = '' + cd mp4v2 + ./configure + + cd ../faad2 + ./configure + + cd .. + ./configure + ''; + + buildPhase = '' + cd mp4v2 + make libmp4v2.la + + cd ../faad2 + make LDFLAGS=-static + + cd .. + make + ''; + + installPhase = '' + strip -s aacgain/aacgain + install -vD aacgain/aacgain "$out/bin/aacgain" + ''; + + meta = { + description = "ReplayGain for AAC files"; + homepage = https://github.com/mulx/aacgain; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.robbinch ]; + }; +} diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 7cc8aeda3677..4da235dd8a9c 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique -, libSM, libICE, sqlite +, libSM, libICE, sqlite, hicolor_icon_theme }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup - libunique libmpd gob2 vala libSM libICE sqlite + libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix new file mode 100644 index 000000000000..e9ab932a88e4 --- /dev/null +++ b/pkgs/applications/audio/ladspa-plugins/git.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }: + +stdenv.mkDerivation { + name = "swh-plugins-git-2015-03-04"; + + src = fetchgit { + url = https://github.com/swh/ladspa.git; + rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686"; + sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e"; + }; + + buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ]; + + patchPhase = '' + patchShebangs . + patchShebangs ./metadata/ + cp ${automake}/share/automake-*/mkinstalldirs . + ''; + + configurePhase = '' + autoreconf -i + ./configure --prefix=$out + ''; + + meta = with stdenv.lib; { + homepage = http://plugin.org.uk/; + description = "LADSPA format audio plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 3edb7ae6793b..eb1f8f4faa87 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: -stdenv.mkDerivation { - name = "mpg123-1.19.0"; +stdenv.mkDerivation rec { + name = "mpg123-1.22.2"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.19.0.tar.bz2; - sha256 = "06xhd68mj9yp0r6l771aq0d7xgnl402a3wm2mvhxmd3w3ph29446"; + url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; + sha256 = "0i1phi6fdjas37y00h3j8rb0b8ngr9az6hy5ff5bl53ify3j87kd"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; @@ -16,8 +16,9 @@ stdenv.mkDerivation { }; meta = { - description = "Command-line MP3 player"; - homepage = http://mpg123.sourceforge.net/; - license = "LGPL"; + description = "Fast console MPEG Audio Player and decoder library"; + homepage = http://mpg123.org; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/pkgs/applications/editors/emacs-modes/monky/default.nix new file mode 100644 index 000000000000..8e35a4e2b571 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/monky/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, emacs, unzip }: + +stdenv.mkDerivation { + name = "emacs-monky-20150404"; + + src = fetchurl { + url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip"; + sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj"; + }; + + buildInputs = [ emacs unzip ]; + + buildPhase = "emacs -L . --batch -f batch-byte-compile *.el"; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + ''; +} diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 1cf6d76b8920..574b73f56726 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version = "0.4.14"; + version = "0.4.15"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9"; + sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52"; }; buildInputs = [ qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1f6c272aceb2..d3a0c86daf4c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ninja, which # default dependencies -, bzip2, flac, speex, icu, libopus +, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, libcap , xdg_utils, yasm, minizip, libwebp @@ -84,7 +84,7 @@ let }; defaultDependencies = [ - bzip2 flac speex icu opusWithCustomModes + bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libpng libxml2 libxslt libcap xdg_utils yasm minizip libwebp @@ -113,7 +113,7 @@ let glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2 + pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux @@ -124,15 +124,10 @@ let # be fixed, then try again to unbundle everything into separate # derivations. prePatch = '' - cp -dsr --no-preserve=mode "${source.main}"/* . - cp -dsr --no-preserve=mode "${source.sandbox}" sandbox + cp -dr --no-preserve=mode "${source.main}"/* . + cp -dr --no-preserve=mode "${source.sandbox}" sandbox cp -dr "${source.bundled}" third_party chmod -R u+w third_party - - # Hardcode source tree root in all gyp files - find -iname '*.gyp*' \( -type f -o -type l \) \ - -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ - -exec chmod u+w {} + ''; postPatch = optionalString (versionOlder version "42.0.0.0") '' @@ -200,7 +195,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} - python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} + python build/gyp_chromium -f ninja --depth . ${gypFlags} ''; buildPhase = let diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 54430bb5be9f..a3a466314845 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -18,7 +18,7 @@ let "s,^/,," ]); - pre42 = versionOlder version "42.0.0.0"; + pre44 = versionOlder version "44.0.0.0"; in stdenv.mkDerivation { name = "chromium-source-${version}"; @@ -47,10 +47,10 @@ in stdenv.mkDerivation { done ''; - patches = if pre42 then [ - ./sandbox_userns_36.patch ./nix_plugin_paths.patch - ] else [ + patches = if pre44 then [ ./nix_plugin_paths_42.patch + ] else [ + ./nix_plugin_paths_44.patch ]; patchPhase = let @@ -73,11 +73,10 @@ in stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi" - '' + optionalString useOpenSSL '' - cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" - '' + optionalString (!pre42) '' sed -i -e '/LOG.*no_suid_error/d' \ "$main/content/browser/browser_main_loop.cc" + '' + optionalString useOpenSSL '' + cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl" ''; preferLocalBuild = true; diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch index 0220d0429413..326da7f420a5 100644 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch +++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch @@ -55,21 +55,6 @@ index 8a205a6..d5c24e1 100644 return false; cur = cur.Append(kInternalFlashPluginFileName); break; -@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(chrome::kPepperFlashPluginFilename); - break; - case chrome::FILE_PDF_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PDF")) - return false; - cur = cur.Append(kInternalPDFPluginFileName); - break; - case chrome::FILE_EFFECTS_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) - return false; - cur = cur.Append(kEffectsPluginFileName); - break; @@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { // We currently need a path here to look up whether the plugin is disabled // and what its permissions are. diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index e1144a44afb2..3adbbab8392b 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 = "43.0.2327.5"; - sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n"; - sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6"; - sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb"; + version = "45.0.2421.0"; + sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk"; + sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89"; + sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598"; }; beta = { - version = "42.0.2311.39"; - sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0"; - sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v"; - sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx"; + version = "44.0.2403.39"; + sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n"; + sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn"; + sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c"; }; stable = { - version = "41.0.2272.89"; - sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk"; - sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4"; - sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv"; + version = "43.0.2357.124"; + sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92"; + sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p"; + sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix index 27af85de5465..e639cdb087bc 100644 --- a/pkgs/applications/networking/browsers/chromium/source/update.nix +++ b/pkgs/applications/networking/browsers/chromium/source/update.nix @@ -9,7 +9,7 @@ let then import ./sources.nix else null; - bucketURL = "http://commondatastorage.googleapis.com/" + bucketURL = "https://commondatastorage.googleapis.com/" + "chromium-browser-official"; debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix new file mode 100644 index 000000000000..e4253f5bff57 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -0,0 +1,46 @@ +{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages +, gdk_pixbuf, libnotify, gst_all_1 +, libgnome_keyring3 ? null, networkmanager ? null +}: + +buildPythonPackage rec { + name = "mailnag-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; + sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r"; + }; + + # Sometimes the generated output isn't identical. It seems like there's a + # race condtion while patching the Mailnag/commons/dist_cfg.py file. This is + # a small workaround to produce deterministic builds. + # For more information see https://github.com/NixOS/nixpkgs/pull/8279 + setupPyBuildFlags = [ "--build-base=$PWD" ]; + + buildInputs = [ + gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus + pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager + ]; + + preFixup = '' + for script in mailnag mailnag-config; do + wrapProgram $out/bin/$script \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = with stdenv.lib; { + description = "An extensible mail notification daemon"; + homepage = https://github.com/pulb/mailnag; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix index cd1833261f49..4b919d36fb62 100644 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ b/pkgs/applications/networking/remote/teamviewer/10.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf, config }: +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, +wineUnstable, makeWrapper, libXau , bash, patchelf, config, +acceptLicense ? false }: + +with stdenv.lib; let topath = "${wineUnstable}/bin"; @@ -37,11 +40,18 @@ stdenv.mkDerivation { patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/ + ${optionalString acceptLicense " + cat > $out/share/teamviewer/config/global.conf << EOF + [int32] EulaAccepted = 1 + [int32] EulaAcceptedRevision = 6 + EOF + "} ''; meta = { homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; + maintainers = with maintainers; [ jagajaga ]; }; } diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 174dfe8f2b26..236045fa3358 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "abc-verifier-${version}"; - version = "20150406"; + version = "20150614"; src = fetchhg { url = "https://bitbucket.org/alanmi/abc"; - rev = "7d9c50a17d8676ad0c9792bb87102d7cb4b10667"; - sha256 = "1gg5jjfjjnv0fl7jsz37hzd9dpv58r8p0q8qvms0r289fcdxalcx"; + rev = "38661894bc1287cad9bd35978bd252dbfe3e6c56"; + sha256 = "04v0hkvj501r10pj3yrqrk2463d1d7lhl8dzfjwkmlbmlmpjlvvv"; }; buildInputs = [ readline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Sequential Logic Synthesis and Formal Verification"; + description = "A tool for squential logic synthesis and ormal verification"; homepage = "www.eecs.berkeley.edu/~alanmi/abc/abc.htm"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 5b2e9c54d6f8..769f86d5d77a 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,23 +1,23 @@ -{stdenv, fetchurl, gmp, libantlr3c, boost}: +{ stdenv, fetchurl, gmp, libantlr3c, boost, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "cvc4-${version}"; + version = "1.4"; -stdenv.mkDerivation { - name = "cvc4-1.4"; src = fetchurl { - url = http://cvc4.cs.nyu.edu/builds/src/cvc4-1.4.tar.gz; + url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz"; sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn"; }; - buildInputs = [ gmp libantlr3c boost ]; - + buildInputs = [ gmp libantlr3c boost autoreconfHook ]; preConfigure = "patchShebangs ./src/"; - doChecks = true; meta = with stdenv.lib; { - description = "An efficient open-source automatic theorem prover for satisfiability modulo theories (SMT) problems"; - homepage = http://cvc4.cs.nyu.edu/web/; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ vbgl ]; + description = "A high-performance theorem prover and SMT solver"; + homepage = http://cvc4.cs.nyu.edu/web/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 6c2cce0ea4b1..fb5acc64c4dc 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -1,41 +1,33 @@ -{stdenv, fetchurl }: - -let - version = "936"; - pname = "picosat"; - -in +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "picosat-${version}"; + version = "960"; src = fetchurl { url = "http://fmv.jku.at/picosat/${name}.tar.gz"; - sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n"; + sha256 = "05z8cfjk84mkna5ryqlq2jiksjifg3jhlgbijaq36sbn0i51iczd"; }; dontAddPrefix = true; - - # configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :( - patchPhase = '' - sed -e 's/^shared=no/shared=yes/' -i configure - ''; + configureFlags = "--shared"; installPhase = '' - mkdir -p "$out"/bin + mkdir -p $out/bin $out/lib $out/include/picosat cp picomus "$out"/bin cp picosat "$out"/bin - mkdir -p "$out"/lib + cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib - mkdir -p "$out"/include/picosat + cp picosat.h "$out"/include/picosat ''; meta = { - homepage = http://fmv.jku.at/picosat/; description = "SAT solver with proof and core support"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + homepage = http://fmv.jku.at/picosat/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 4e3b9b2a76b1..5daaa444c127 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,36 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gmp, gperf, autoreconfHook }: -assert stdenv.isLinux; - -let - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; -in stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.2.1"; - - src = - if stdenv.system == "i686-linux" - then fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-i686-pc-linux-gnu-static-gmp.tar.gz&accept=I+accept"; - name = "yices-${version}-i686.tar.gz"; - sha256 = "12jzk3kqlbqa5x6rl92cpzj7dch7gm7fnbj72wifvwgdj4zyhrra"; - } - else fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-x86_64-unknown-linux-gnu-static-gmp.tar.gz&accept=I+accept"; - name = "yices-${version}-x86_64.tar.gz"; - sha256 = "0fpmihf6ykcg4qbsimkamgcwp4sl1xyxmz7q28ily91rd905ijaj"; - }; + version = "2.3.1"; - buildPhase = false; - installPhase = '' - mkdir -p $out/bin $out/lib $out/include - cd bin && mv * $out/bin && cd .. - cd lib && mv * $out/lib && cd .. - cd include && mv * $out/include && cd .. + src = fetchurl { + url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree"; + name = "yices-${version}-src.tar.gz"; + sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs"; + }; - patchelf --set-rpath ${libPath} $out/lib/libyices.so.${version} - ''; + configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a" + "--with-static-gmp-include-dir=${gmp}/include" + ]; + buildInputs = [ gmp gperf autoreconfHook ]; meta = { description = "A high-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 2296a28444b4..fb3fb959ae63 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.3.2"; + version = "4.4.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3"; - sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci"; + rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; + sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; }; buildInputs = [ python ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d0adb3382079..72de0677e73a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt +{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison -, imake, which, jdk, atlas +, imake, which, jdk, openblas , withRecommendedPackages ? true }: @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm"; }; - buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt + buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake - which jdk atlas + which jdk openblas ]; patches = [ ./no-usr-local-search-paths.patch ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${atlas}/lib -lf77blas -latlas" - --with-lapack="-L${liblapack}/lib -llapack" + --with-blas="-L${openblas}/lib -lopenblas" + --with-lapack="-L${openblas}/lib -lopenblas" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 785c2460bb49..9d70d2686911 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, liblapack, blas}: +{stdenv, fetchurl, gfortran, openblas}: stdenv.mkDerivation rec { name = "JAGS-3.4.0"; @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib"; }; - buildInputs = [gfortran liblapack blas]; + buildInputs = [gfortran openblas]; + configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; meta = { description = "Just Another Gibbs Sampler"; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 63a0be47c474..bf6eabef909e 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="golly"; - version="2.6"; + version="2.7"; name="${baseName}-${version}"; - hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz"; - url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz"; - sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz"; + hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f"; + url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz"; + sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f"; }; buildInputs = [ wxGTK perl python zlib diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index d52802e42f1d..68bef621bc28 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "1.20141024"; + version = "1.20150503"; name = "mr-${version}"; src = fetchurl { url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz"; - sha256 = "7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a"; + sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf"; }; buildInputs = [ perl ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 583c800a8b4a..7d604101f4b1 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.9.2"; + ver = "1.9.4"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "0hjby7imja9sg2h68al81n4zl72mc3y3fqmf61sf1sad4njs9bkj"; + sha256 = "0xr5bfbpzd1s9fyxbwj0crpgi57hm4wrm1dybx13lv4n6xdj2ww0"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "074scfz835jynzmb28i8q44hc6ixvfg3crgirmy02bbpxakyp1v6"; + sha256 = "0gpmyp2g44piaj47a52ik5i3sk5flbs8kqlqmjxnqkv16s01vfra"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 803db27c9d56..95bb7b7cd8da 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -18,7 +18,7 @@ attrs @ buildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; preInstall = '' function traverseRename () { diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 0e2a6e756f6a..2a3dbb40a2b8 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -151,10 +151,9 @@ rec { # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php. imagemagick = [ - ftp://ftp.nluug.nl/pub/ImageMagick/ + http://www.imagemagick.org/download/ + ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors ftp://ftp.imagemagick.org/pub/ImageMagick/ - ftp://ftp.imagemagick.net/pub/ImageMagick/ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ ]; # CPAN mirrors. diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 53a013654357..c4fefe4d5019 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1710,22 +1710,22 @@ rec { }; debian8i386 = { - name = "debian-8.0-jessie-i386"; - fullName = "Debian 8.0 Jessie (i386)"; + name = "debian-8.1-jessie-i386"; + fullName = "Debian 8.1 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d"; + sha256 = "e658c2aebc3c0bc529e89de3ad916a71372f0a80161111d86a7dab1026644507"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.0-jessie-amd64"; - fullName = "Debian 8.0 Jessie (amd64)"; + name = "debian-8.1-jessie-amd64"; + fullName = "Debian 8.1 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4"; + sha256 = "265907f3cb05aff5f653907e9babd4704902f78cd5e355d4cd4ae590e4d5b043"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 8143d2841206..562aa8be4eff 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,59 +1,31 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - url="http://www.i18nguy.com/unicode/andagii.zip"; - name="andagii"; - version="1.0.2"; - hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "andagii-${version}"; + version = "1.0.2"; + + src = fetchzip { + url = http://www.i18nguy.com/unicode/andagii.zip; + sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k"; + stripRoot = false; curlOpts = "--user-agent 'Mozilla/5.0'"; - sha256 = sourceInfo.hash; }; - name = "${sourceInfo.name}-${sourceInfo.version}"; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doInstall"]; + phases = [ "unpackPhase" "installPhase" ]; - doUnpack = a.fullDepEntry '' - unzip "${src}" - '' ["addInputs"]; + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf + ''; - doInstall = a.fullDepEntry ('' - mkdir -p "$out"/share/fonts/ttf/ - cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf - '') ["defEnsureDir" "minInit"]; - - meta = { + # There are multiple claims that the font is GPL, so I include the + # package; but I cannot find the original source, so use it on your + # own risk Debian claims it is GPL - good enough for me. + meta = with stdenv.lib; { + homepage = http://www.i18nguy.com/unicode/unicode-font.HTML; description = "Unicode Plane 1 Osmanya script font"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - hydraPlatforms = []; - # There are multiple claims that the font is GPL, - # so I include the package; but I cannot find the - # original source, so use it on your own risk - # Debian claims it is GPL - good enough for me. + maintainers = with maintainers; [ raskin rycee ]; + license = "unknown"; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.i18nguy.com/unicode/unicode-font.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 5b51ee36c5c7..da34a2f43aa6 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,50 +1,36 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, unzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version = "1.002"; - name="anonymousPro"; - url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip"; +stdenv.mkDerivation rec { + name = "anonymousPro-${version}"; + version = "1.002"; + + src = fetchurl { + url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.sha256; - }; - name = "${sourceInfo.name}-${sourceInfo.version}"; - inherit buildInputs; + nativeBuildInputs = [ unzip ]; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \; + find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + ''; - doUnpack = a.fullDepEntry ('' - unzip ${src} - cd AnonymousPro*/ - '') ["addInputs"]; - - meta = { + meta = with stdenv.lib; { + homepage = http://www.marksimonson.com/fonts/view/anonymous-pro; description = "TrueType font set intended for source code"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; - license = with a.lib.licenses; ofl; - hydraPlatforms = []; - homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro"; - downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html"; - inherit (sourceInfo) version; + longDescription = '' + Anonymous Pro (2009) is a family of four fixed-width fonts + designed with coding in mind. Anonymous Pro features an + international, Unicode-based character set, with support for + most Western and Central European Latin-based languages, plus + Greek and Cyrillic. It is designed by Mark Simonson. + ''; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; -}) x - +} diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index d8f6f7f83517..ed7ce93e1896 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -1,40 +1,28 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version = "0.7.0"; - baseName="cm-unicode"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}/${baseName}/${version}/${name}-otf.tar.xz"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "cm-unicode-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v *.otf $out/share/fonts/opentype/ + cp -v README FontLog.txt $out/share/doc/${name} + ''; - meta = { - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; - downloadPage = "http://sourceforge.net/projects/cm-unicode/files/cm-unicode/"; - inherit version; + meta = with stdenv.lib; { + homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; + description = "Computer Modern Unicode fonts"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; -}) x - +} diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 99c9b53217e5..0956250e36ce 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,50 +1,28 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="0.016"; - name="EBGaramond"; - url="https://bitbucket.org/georgd/eb-garamond/downloads/${name}-${version}.zip"; - hash="0y630khn5zh70al3mm84fs767ac94ffyz1w70zzhrhambx07pdx0"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; +stdenv.mkDerivation rec { + name = "eb-garamond-${version}"; + version = "0.016"; - name = "eb-garamond-${sourceInfo.version}"; - inherit buildInputs; + src = fetchzip { + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z"; + }; - phaseNames = ["doUnpack" "installFonts"]; + phases = [ "unpackPhase" "installPhase" ]; - # This will clean up if/when 8263996 lands. - doUnpack = a.fullDepEntry ('' - unzip ${src} - cd ${sourceInfo.name}* - mv {ttf,otf}/* . - '') ["addInputs"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "otf/"*.otf $out/share/fonts/opentype/ + cp -v Changes README.markdown README.xelualatex $out/share/doc/${name} + ''; - meta = with a.lib; { + meta = with stdenv.lib; { + homepage = http://www.georgduffner.at/ebgaramond/; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; - maintainers = with maintainers; [ relrod ]; - platforms = platforms.all; + maintainers = with maintainers; [ relrod rycee ]; license = licenses.ofl; - homepage = http://www.georgduffner.at/ebgaramond/; - }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/georgd/EB-Garamond/releases"; - }; + platforms = platforms.all; }; -}) x - +} diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index a4e8099db963..d0af6ce0eb01 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,46 +1,29 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="1.504"; - baseName="GentiumPlus"; - name="${baseName}-${version}"; - url="http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${name}.zip&filename=${name}"; - hash="04kslaqbscpfrc6igkifcv1nkrclrm35hqpapjhw9102wpq12fpr"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - name = "${sourceInfo.name}.zip"; +stdenv.mkDerivation rec { + name = "gentium-${version}"; + version = "1.504"; + + src = fetchzip { + name = "${name}.zip"; + url = "http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlus-${version}.zip&filename=${name}.zip"; + sha256 = "1xdx80dfal0b8rkrp1janybx2hki7algnvkx4hyghgikpjcjkdh7"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["addInputs" "doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name} + ''; - meta = { - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + meta = with stdenv.lib; { + homepage = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=Gentium"; + description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_download"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 887f37c241b6..caa67256a1fe 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,51 +1,26 @@ -x@{builderDefsPackage - , fontforge - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - name="inconsolata"; - url="http://www.levien.com/type/myfonts/Inconsolata.sfd"; - hash="1cd29c8396adb18bfeddb1abf5bdb98b677649bb9b09f126d1335b123a4cfddb"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; +stdenv.mkDerivation rec { + name = "inconsolata-${version}"; + version = "1.010"; - inherit (sourceInfo) name; - inherit buildInputs; + src = fetchurl { + url = "http://www.levien.com/type/myfonts/Inconsolata.otf"; + sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m"; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["copySrc" "generateFontsFromSFD" "installFonts"]; - - copySrc = a.fullDepEntry ('' - cp ${src} inconsolata.sfd - '') ["minInit"]; + phases = [ "installPhase" ]; - generateFontsFromSFD = a.generateFontsFromSFD // {deps=["addInputs"];}; + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -v $src $out/share/fonts/opentype/inconsolata.otf + ''; - meta = { + meta = with stdenv.lib; { + homepage = http://www.levien.com/type/myfonts/inconsolata.html; description = "A monospace font for both screen and print"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.levien.com/type/myfonts/inconsolata.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index ad25ac7fd954..125a4b636a99 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -1,50 +1,29 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="2.2"; - baseName="oldstandard"; - name="${baseName}-${version}"; - url="http://www.thessalonica.org.ru/downloads/${name}.otf.zip"; - hash="0xhbksrh9mv1cs6dl2mc8l6sypialy9wirkjr54nf7s9bcynv1h6"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "oldstandard-${version}"; + version = "2.2"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip"; + sha256 = "1hl78jw5szdjq9dhbcv2ln75wpp2lzcxrnfc36z35v5wk4l7jc3h"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v *.otf $out/share/fonts/opentype/ + cp -v FONTLOG.txt $out/share/doc/${name} + ''; - doUnpack = a.fullDepEntry '' - unzip ${src} - '' ["addInputs"]; - - meta = { - description = "An old-style font"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + meta = with stdenv.lib; { + homepage = https://github.com/akryukov/oldstand; + description = "An attempt to revive a specific type of Modern style of serif typefaces"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index ca560c72a8ec..c385c3d40a92 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,50 +1,29 @@ -x@{builderDefsPackage - , unzip - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchzip }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="2.0"; - baseName="theano"; - name="${baseName}-${version}"; - url="http://www.thessalonica.org.ru/downloads/${name}.otf.zip"; - hash="1xiykqbbiawvfk33639awmgdn25b8s2k7vpwncl17bzlk887b4z6"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "theano-${version}"; + version = "2.0"; + + src = fetchzip { + stripRoot = false; + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; + sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + phases = [ "unpackPhase" "installPhase" ]; - phaseNames = ["doUnpack" "installFonts"]; + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \; + ''; - doUnpack = a.fullDepEntry '' - unzip ${src} - '' ["addInputs"]; - - meta = { - description = "An old-style font"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - all; + meta = with stdenv.lib; { + homepage = https://github.com/akryukov/theano; + description = "An old-style font designed from historic samples"; + maintainers = with maintainers; [ raskin rycee ]; + license = licenses.ofl; + platforms = platforms.all; }; - passthru = { - updateInfo = { - downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html"; - }; - }; -}) x - +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index a34c10630aad..b6cc2a25266f 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-06-03"; + version = "2015-06-15"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" - "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4"; + "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs"; diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index 99f3e8b1177b..b35a96fff82f 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "nixos-artwork-2015-02-27"; # Remember to check the default lightdm wallpaper when updating - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixos-artwork"; - rev = "e71b6846023919136795ede22b16d73b2cf1693d"; - sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + GnomeDark = fetchurl { + url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png; + sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7"; }; + unpackPhase = "true"; + installPhase = '' - mkdir -p $out/share/artwork - cp -r * $out/share/artwork - find $out -name \*.xcf -exec rm {} \; + mkdir -p $out/share/artwork/gnome + ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png ''; meta = with stdenv.lib; { - homepage = "https://github.com/NixOS/nixos-artwork"; + homepage = https://github.com/NixOS/nixos-artwork; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 0ed99bfdb163..6d10fe68a099 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2015d"; in +let version = "2015e"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "0cfmjvr753b3wjnr1njv268xcs31yl9pifkxx58y42bz4w4517wb"; + sha256 = "0vxs6j1i429vxz4a1lbwjz81k236lxdggqvrlix2ga5xib9vbjgz"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "0a3i65b6lracfx18s8j69k0x30x8aq9gx7qm040sybn4qm7ga6i2"; + sha256 = "185db6789kygcpcl48y1dh6m4fkgqcwqjwx7f3s5dys7b2sig8mm"; }) ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index bf09bd93eebc..97bad111ca74 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf +, pangox_compat, libXmu +}: stdenv.mkDerivation rec { name = "gtkglextmm-${minVer}.0"; @@ -9,7 +11,16 @@ stdenv.mkDerivation rec { sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea"; }; - patches = [ ./gdk.patch ]; + patches = [ + ./gdk.patch + + # From debian, fixes build with newer gtk "[...] by switching #includes + # around so that the G_DISABLE_DEPRECATED trick in glibmm still works". + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356 + ./fix_ftbfs_gtk_2_36.patch + ]; + + buildInputs = [ pangox_compat libXmu ]; nativeBuildInputs = [pkgconfig]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch new file mode 100644 index 000000000000..88e271e3eb7b --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch @@ -0,0 +1,121 @@ +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -1,15 +1,8 @@ +- +-#include <glib.h> +- + // Disable the 'const' function attribute of the get_type() functions. + // GCC would optimize them out because we don't use the return value. + #undef G_GNUC_CONST + #define G_GNUC_CONST /* empty */ + +-#include <gdkmm/gl/wrap_init.h> +-#include <glibmm/error.h> +-#include <glibmm/object.h> +- + // #include the widget headers so that we can call the get_type() static methods: + + #include "tokens.h" +@@ -19,6 +12,12 @@ + #include "pixmap.h" + #include "window.h" + ++#include <glib.h> ++ ++#include <gdkmm/gl/wrap_init.h> ++#include <glibmm/error.h> ++#include <glibmm/object.h> ++ + extern "C" + { + +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gdk/gdkglquery.h> +- + #include "query.h" + ++#include <gdk/gdkglquery.h> ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,11 +17,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include "pixmapext.h" ++ + #include <gdk/gdkgldrawable.h> + #include <gdk/gdkglpixmap.h> + +-#include "pixmapext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200 +@@ -17,11 +17,11 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + ++#include "windowext.h" ++ + #include <gdk/gdkgldrawable.h> + #include <gdk/gdkglwindow.h> + +-#include "windowext.h" +- + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200 +@@ -17,10 +17,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-#include <gdk/gdkglfont.h> +- + #include "font.h" + ++#include <gdk/gdkglfont.h> ++ + namespace Gdk + { + namespace GL +Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc +=================================================================== +--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100 ++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200 +@@ -19,11 +19,11 @@ + + #include <cstdlib> + +-#include <gdk/gdkglinit.h> +- + #include "wrap_init.h" + #include "init.h" + ++#include <gdk/gdkglinit.h> ++ + namespace Gdk + { + namespace GL diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix index 06c01d305f84..e69bcd390329 100644 --- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88"; }; - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; preFixup = '' wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix index ab8f380f672a..5b7d7c19d296 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gnome3, pkgconfig, intltool, glib -, udev, itstool, libxml2 }: +, udev, itstool, libxml2, makeWrapper }: stdenv.mkDerivation rec { name = "gnome-bluetooth-${gnome3.version}.1"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz"; }; - buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 - gsettings_desktop_schemas itstool ]; + buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme + makeWrapper gsettings_desktop_schemas itstool ]; + + preFixup = '' + wrapProgram "$out/bin/bluetooth-sendto" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index be60a58db263..2dee0cefd929 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -1,6 +1,18 @@ -{ callPackage, pkgs, self }: +{ pkgs }: + +let + + pkgsFun = overrides: + let + self = self_ // overrides; + self_ = with self; { + + overridePackages = f: + let newself = pkgsFun (f newself self); + in newself; + + callPackage = pkgs.newScope self; -rec { corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus pkgs.shared_mime_info # for update-mime-database @@ -293,4 +305,7 @@ rec { gtkhtml = callPackage ./misc/gtkhtml { }; -} + }; + in self; # pkgsFun + +in pkgsFun {} diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index c4fb624a3771..39ccb4e3c304 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -12,7 +12,7 @@ # make a copy of this directory first. After copying, be sure to delete ./tmp # if it exists. Then follow the minor update instructions. -{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }: +{ autonix, kf5, kdeApps, pkgs, qt5, stdenv, debug ? false }: with stdenv.lib; with autonix; @@ -143,19 +143,19 @@ let }; plasma-workspace = with pkgs; super.plasma-workspace // { - patches = [ - (substituteAll { - src = ./plasma-workspace/0001-startkde-NixOS-patches.patch; - inherit (pkgs) bash gnused gnugrep socat; - inherit (kf5) kconfig kinit kservice; - inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; - qt5tools = qt5.tools; - dbus_tools = pkgs.dbus.tools; - }) - ]; + patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; buildInputs = with xlibs; super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ]; + + inherit (pkgs) bash gnused gnugrep socat; + inherit (kf5) kconfig kinit kservice; + inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot; + kde_workspace = kdeApps.kde-workspace; + qt5tools = qt5.tools; + dbus_tools = pkgs.dbus.tools; + postPatch = '' + substituteAllInPlace startkde/startkde.cmake substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ --replace kdostartupconfig5 $out/bin/kdostartupconfig5 ''; diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch index a542fb7b87d3..86c6dd857be5 100644 --- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch @@ -1,14 +1,14 @@ -From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001 +From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Tue, 2 Jun 2015 11:21:43 -0500 Subject: [PATCH] startkde: NixOS patches --- - startkde/startkde.cmake | 214 ++++++++++++++++++++---------------------------- - 1 file changed, 87 insertions(+), 127 deletions(-) + startkde/startkde.cmake | 218 ++++++++++++++++++++---------------------------- + 1 file changed, 89 insertions(+), 129 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 24e5c1b..787d719 100644 +index 24e5c1b..e7bdd32 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -93,7 +93,7 @@ index 24e5c1b..787d719 100644 #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <<EOF -@@ -106,53 +111,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0 +@@ -106,55 +111,21 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0 EOF } @@ -148,9 +148,12 @@ index 24e5c1b..787d719 100644 if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then - @EXPORT_XCURSOR_PATH@ - kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" +- kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" ++ @kde_workspace@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" if test $? -eq 10; then -@@ -168,15 +139,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" + XCURSOR_THEME=breeze_cursors + export XCURSOR_THEME +@@ -168,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" fi fi @@ -175,7 +178,7 @@ index 24e5c1b..787d719 100644 +# Make sure that D-Bus is running +# D-Bus autolaunch is broken +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then -+ eval `@dbus_tools@/dbus-launch --sh-syntax --exit-with-session` ++ eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session` +fi +if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then + : # ok @@ -189,6 +192,13 @@ index 24e5c1b..787d719 100644 ksplash_pid= if test -z "$dl"; then # the splashscreen and progress indicator + case "$ksplashrc_ksplash_engine" in + KSplashQML) +- ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` ++ ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid` + ;; + None) + ;; @@ -205,8 +194,7 @@ fi # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. diff --git a/pkgs/development/compilers/julia/0.2.nix b/pkgs/development/compilers/julia/0.2.nix index cc1be3db8a5b..9d585e07fe1a 100644 --- a/pkgs/development/compilers/julia/0.2.nix +++ b/pkgs/development/compilers/julia/0.2.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , ncurses, libunistring, lighttpd, patchelf, openblas , tcl, tk, xproto, libX11, git, mpfr } : let @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 git mpfr + openblas tcl tk xproto libX11 git mpfr ]; configurePhase = '' @@ -91,14 +91,13 @@ stdenv.mkDerivation rec { copy_kill_hash "${dsfmt_src}" deps/random ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -lopenblas -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" export GLPK_PREFIX="${glpk}/include" - mkdir -p "$out/lib" sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile @@ -111,9 +110,12 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p usr/lib - - echo "$out" + mkdir -p "$out/lib" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so" + + echo "$out" ( cd "$(mktemp -d)" for i in "${suitesparse}"/lib/lib*.a; do diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 9f216c7207fc..4566752340f5 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,142 +1,134 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib - , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, patchelf, openblas, liblapack - , tcl, tk, xproto, libX11, git, mpfr, which, wget - } : +{ stdenv, fetchgit, fetchurl +# build tools +, gfortran, git, m4, patchelf, perl, which +# libjulia dependencies +, libunwind, llvm, readline, utf8proc, zlib +# standard library dependencies +, double_conversion, fftwSinglePrec, fftw, glpk, gmp, mpfr, pcre +, openblas, arpack, suitesparse +}: + +with stdenv.lib; -assert stdenv.isLinux; - -let - realGcc = stdenv.cc.cc; -in stdenv.mkDerivation rec { pname = "julia"; - version = "0.3.6"; + version = "0.3.9"; name = "${pname}-${version}"; - dsfmt_ver = "2.2"; - grisu_ver = "1.1.1"; - openblas_ver = "v0.2.13"; - lapack_ver = "3.5.0"; - arpack_ver = "3.1.5"; - patchelf_ver = "0.8"; - pcre_ver = "8.36"; - utf8proc_ver = "1.1.6"; - - dsfmt_src = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; - name = "dsfmt-${dsfmt_ver}.tar.gz"; - md5 = "cb61be3be7254eae39684612c524740d"; - }; - grisu_src = fetchurl { - url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - md5 = "29b533ed4311161267bff1a9a97e2953"; - }; - openblas_src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; - name = "openblas-${openblas_ver}.tar.gz"; - md5 = "74adf4c0d0d82bff4774be5bf2134183"; - }; - arpack_src = fetchurl rec { - url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz"; - md5 = "d84e1b6108d9ee67c0d21aba7099e953"; - name = "arpack-ng-${arpack_ver}.tar.gz"; - }; - lapack_src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; - name = "lapack-${lapack_ver}.tgz"; - md5 = "b1d3e3e425b2e44a06760ff173104bdf"; - }; - patchelf_src = fetchurl { - url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; - md5 = "5087261514b4b5814a39c3d3a36eb6ef"; - }; - pcre_src = fetchurl { - url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; - md5 = "b767bc9af0c20bc9c1fe403b0d41ad97"; - }; - utf8proc_src = fetchurl { - url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; - md5 = "2462346301fac2994c34f5574d6c3ca7"; - }; - src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; rev = "refs/tags/v${version}"; - md5 = "d28e8f428485219f756d80c011d5dd32"; + sha256 = "ad0820affefd04eb6fba7deb2603756974711846a251900a9202b8d2665a37cf"; name = "julia-git-v${version}"; }; - buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib - fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 git mpfr which wget - ]; + patches = [ ./0001-work-around-buggy-wcwidth.patch ]; - configurePhase = '' - for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR; - do - makeFlags="$makeFlags USE_SYSTEM_$i=1 " - done - makeFlags="$makeFlags JULIA_CPU_TARGET=core2"; + extraSrcs = + let + dsfmt_ver = "2.2"; + dsfmt_src = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; + name = "dsfmt-${dsfmt_ver}.tar.gz"; + md5 = "cb61be3be7254eae39684612c524740d"; + }; + in [ dsfmt_src ]; + + prePatch = '' copy_kill_hash(){ cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" } - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \ - "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do + for i in $extraSrcs; do copy_kill_hash "$i" deps done + ''; - ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''} - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " - - export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" - - export GLPK_PREFIX="${glpk}/include" - - mkdir -p "$out/lib" - sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile - sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - - export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out" - - export dontPatchELF=1 - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" + postPatch = '' + sed -i deps/Makefile \ + -e "s@/usr/local/lib@$out/lib@g" \ + -e "s@/usr/lib@$out/lib@g" \ + -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g" patchShebangs . contrib - export PATH="$PATH:${stdenv.cc.libc}/sbin" - # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache # is probably not what we want anyway on non-NixOS sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* - - ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" ''; - preBuild = '' - mkdir -p usr/lib - - echo "$out" - mkdir -p "$out/lib" - ( - cd "$(mktemp -d)" - for i in "${suitesparse}"/lib/lib*.a; do - ar -x $i - done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" - ) - cp "$out/lib/libsuitesparse.so" usr/lib - for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out"/lib/lib$i.so; - ln -s libsuitesparse.so "usr"/lib/lib$i.so; - done - ''; + buildInputs = + [ libunwind llvm readline utf8proc zlib + double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre + openblas arpack suitesparse + ]; + + nativeBuildInputs = [ gfortran git m4 patchelf perl which ]; + + makeFlags = + let + arch = head (splitString "-" stdenv.system); + march = + { "x86_64-linux" = "x86-64"; + "x86_64-darwin" = "x86-64"; + "i686-linux" = "i686"; + }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${march}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "LIBBLAS=-lopenblas" + "LIBBLASNAME=libopenblas" + + "USE_SYSTEM_LAPACK=1" + "LIBLAPACK=-lopenblas" + "LIBLAPACKNAME=libopenblas" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GLPK=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_GRISU=1" + "USE_SYSTEM_LIBUNWIND=1" + "USE_SYSTEM_LLVM=1" + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_SUITESPARSE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + ]; + + GLPK_PREFIX = "${glpk}/include"; + + NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + + # Julia tries to load these libraries dynamically at runtime, but they can't be found. + # Easier by far to link against them as usual. + # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS, + # where they would also be used for all the private libraries Julia builds. + LDFLAGS = [ + "-larpack" + "-lfftw3_threads" + "-lfftw3f_threads" + "-lglpk" + "-lgmp" + "-lmpfr" + "-lopenblas" + "-lpcre" + "-lsuitesparse" + "-lz" + ]; dontStrip = true; + dontPatchELF = true; enableParallelBuilding = true; @@ -147,8 +139,8 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "http://julialang.org/"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = false; }; } diff --git a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch new file mode 100644 index 000000000000..7c4870fb2a89 --- /dev/null +++ b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch @@ -0,0 +1,24 @@ +From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Thu, 4 Jun 2015 12:03:32 -0500 +Subject: [PATCH] work around buggy wcwidth + +--- + test/unicode.jl | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/unicode.jl b/test/unicode.jl +index 52c3e6a..f1ef698 100644 +--- a/test/unicode.jl ++++ b/test/unicode.jl +@@ -103,5 +103,6 @@ end + + # handling of embedded NUL chars (#10958) + @test length("\0w") == length("\0α") == 2 +-@test strwidth("\0w") == strwidth("\0α") == 1 ++@test strwidth("\0w") == charwidth('\0') + charwidth('w') ++@test strwidth("\0α") == charwidth('\0') + charwidth('α') + @test normalize_string("\0W", casefold=true) == "\0w" +-- +2.4.1 + diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 64d51f971b9b..1dbfb039f909 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -2,13 +2,17 @@ let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.9.1"; + # Important: + # The commits "Fixate/tag v..." are the released versions. + # Ignore the "bumped version to ...." commits, they do not + # correspond to releases. + version = "1.1.9.1.20150611"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b"; - sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3"; + rev = "b80098e07d12900f098ea964b1d2b3f38e5c9900"; + sha256 = "14qg1fd9pgbczcmn5ggkd9674qadx1izmz8363ps7c207dg94f9x"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7835ed7d96f8..d42c05fad286 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -119,6 +119,22 @@ self: super: { # Help libconfig find it's C language counterpart. libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; }; + hmatrix = overrideCabal super.hmatrix (drv: { + configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ]; + extraLibraries = [ pkgs.openblasCompat ]; + preConfigure = '' + sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@' + ''; + }); + + bindings-levmar = overrideCabal super.bindings-levmar (drv: { + preConfigure = '' + sed -i bindings-levmar.cabal \ + -e 's,extra-libraries: lapack blas,extra-libraries: openblas,' + ''; + extraLibraries = [ pkgs.openblas ]; + }); + # The Haddock phase fails for one reason or another. attoparsec-conduit = dontHaddock super.attoparsec-conduit; base-noprelude = dontHaddock super.base-noprelude; @@ -150,6 +166,7 @@ self: super: { types-compat = dontHaddock super.types-compat; # https://github.com/philopon/apiary/issues/15 wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; + record = dontHaddock super.record; # https://github.com/nikita-volkov/record/issues/22 # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. darcs = (overrideCabal super.darcs (drv: { @@ -760,7 +777,7 @@ self: super: { dyre = appendPatch super.dyre ./dyre-nix.patch; # https://github.com/gwern/mueval/issues/9 - mueval = markBrokenVersion "0.9.1.1" super.mueval; + mueval = appendPatch (appendPatch super.mueval ./mueval-fix.patch) ./mueval-nix.patch; # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 335b133f555a..f2e0fb056e71 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -116,11 +116,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - # Until the changes have been pushed to Hackage - mueval = appendPatch super.mueval (pkgs.fetchpatch { - url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch"; - sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg"; - }); present = appendPatch super.present (pkgs.fetchpatch { url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch"; sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8"; @@ -230,7 +225,6 @@ self: super: { cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; containers_0_4_2_1 = markBroken super.containers_0_4_2_1; control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3; - equivalence_0_2_5 = markBroken super.equivalence_0_2_5; haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2; optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0; QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 4fbb5056837e..9696ccddcc59 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -59,7 +59,6 @@ self: super: { # Newer versions require mtl 2.2.x. mtl-prelude = self.mtl-prelude_1_0_3; - equivalence = super.equivalence_0_2_5; # required by Agda # purescript requires mtl 2.2.x. purescript = overrideCabal (super.purescript.overrideScope (self: super: { diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4794ec73879f..75d61b83d968 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17727,8 +17727,8 @@ self: { }: mkDerivation { pname = "agentx"; - version = "0.1.0.5"; - sha256 = "0a6zzn4zv5f1zl10vz1p4iw32s9jd605px4ziy5v24fmjm5xnbzb"; + version = "0.2.0.0"; + sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17891,8 +17891,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "3.1"; - sha256 = "19x4y060r9cgkfffyxdgilmrrjv4ycpxv6w8gclkfrxj1ywwkwx4"; + version = "4.0.3"; + sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv"; buildDepends = [ aivika base containers directory filepath mtl network-uri parallel-io split @@ -17925,8 +17925,8 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "3.1"; - sha256 = "17bp7bp3x7z3xlzd6922mjm44v8jlkw1ak3zfr31146hlifgfhyw"; + version = "4.0.3"; + sha256 = "1c5xzp0n67fg799cdf6aqc7sxbv3dy6nkiilyc5hlr8bg3r20bpd"; buildDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split @@ -19370,8 +19370,8 @@ self: { }: mkDerivation { pname = "angel"; - version = "0.5.2"; - sha256 = "0h2nyxv56cshkxlbq5j54220w7x2y0m1aaqzqz6dhipff29pmr39"; + version = "0.6.1"; + sha256 = "1wkllv4ziggj3smhghdk5qsgccds9d69rhx1gi079ph7z533w2dc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -19785,7 +19785,9 @@ self: { mkDerivation { pname = "apiary"; version = "1.4.3"; + revision = "1"; sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc"; + editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19798,7 +19800,6 @@ self: { base bytestring http-types HUnit mtl tasty tasty-hunit tasty-quickcheck wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -19853,14 +19854,13 @@ self: { mkDerivation { pname = "apiary-cookie"; version = "1.4.0"; - revision = "1"; + revision = "2"; sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; - editedCabalFile = "50b9adcb346e7233cb73eef7e7d00902a7b43454ab998f76923582bada569e32"; + editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771"; buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -19909,15 +19909,14 @@ self: { mkDerivation { pname = "apiary-logger"; version = "1.4.0"; - revision = "1"; + revision = "2"; sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; - editedCabalFile = "cb2677faabb41ccf7a4990179990f55c14d5bcd517591ccd086b84c68362c93c"; + editedCabalFile = "ce71ccd5e0a1f20777b17efdc536aab8f43a3468f54fa14609c635aa731ce944"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base types-compat ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -21693,6 +21692,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "attoparsec-trans" = callPackage + ({ mkDerivation, attoparsec, base, transformers }: + mkDerivation { + pname = "attoparsec-trans"; + version = "0.1.0.3"; + sha256 = "11a743qgh9rwjyf1hng5jg139xr11dsjj1bisqaaayb17addd2xx"; + buildDepends = [ attoparsec base transformers ]; + homepage = "https://github.com/srijs/haskell-attoparsec-trans"; + description = "Interleaved effects for attoparsec parsers"; + license = stdenv.lib.licenses.mit; + }) {}; + "attosplit" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -22178,6 +22189,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "aws-dynamodb-conduit" = callPackage + ({ mkDerivation, aeson, attoparsec-trans, aws, base, bytestring + , conduit, http-conduit, http-types, json-togo, resourcet, text + , transformers + }: + mkDerivation { + pname = "aws-dynamodb-conduit"; + version = "0.1.0.2"; + sha256 = "02q49anmairvjwzvgn8kqx27965n71xbyi86wwlmrs4w0dkbsd41"; + buildDepends = [ + aeson attoparsec-trans aws base bytestring conduit http-conduit + http-types json-togo resourcet text transformers + ]; + homepage = "https://github.com/srijs/haskell-aws-dynamodb-query"; + description = "Conduit-based interface for AWS DynamoDB"; + license = stdenv.lib.licenses.mit; + }) {}; + "aws-dynamodb-streams" = callPackage ({ mkDerivation, aeson, attoparsec, aws, aws-general, base , base-unicode-symbols, base16-bytestring, base64-bytestring @@ -23348,8 +23377,8 @@ self: { }: mkDerivation { pname = "basic-prelude"; - version = "0.4.1"; - sha256 = "041wnym7b8p70kcbkxxbgszmi2y88xs0ww357jrn0v6cc21h60j9"; + version = "0.5.0"; + sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi"; buildDepends = [ base bytestring containers filepath hashable lifted-base ReadArgs safe text transformers unordered-containers vector @@ -23781,8 +23810,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "between"; - version = "0.9.0.2"; - sha256 = "0n3nx077hv10rwv2kl3n1a3v40sr1qzfj9jwb6cvd1l0zx42igw8"; + version = "0.10.0.0"; + sha256 = "10bj4v2451c9dri3r9c825xnr4lb8jhihr05nhc6m8fdvqnyqvsi"; buildDepends = [ base ]; homepage = "https://github.com/trskop/between"; description = "Function combinator \"between\" and derived combinators"; @@ -26879,6 +26908,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "break" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "break"; + version = "1.0.0"; + sha256 = "15fqdha71i4ziv0ra8v2mfp0fviwgs27xlsvc0chb8icqf33y22m"; + buildDepends = [ base mtl transformers ]; + description = "Break from a loop"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "breakout" = callPackage ({ mkDerivation, base, haskgame, mtl, SDL }: mkDerivation { @@ -27723,8 +27763,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.3.0"; - sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; + version = "0.3.1"; + sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; jailbreak = true; @@ -28020,8 +28060,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "0.9.3"; - sha256 = "0r8ayxsfx7z4hivknshj2sybssn3hjwprxpyqw4yv3w26gv7d82j"; + version = "0.9.4"; + sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -31615,8 +31655,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "0.12.0"; - sha256 = "0g72084wnfqam0djpck76bb7dmphpjs1h32w361cqyvgxkyy1prw"; + version = "0.12.0.1"; + sha256 = "0ny5cxkzbjhhsmypsp4sjm7nm0jv2l2kysgcphm6j1l3dr0ck6il"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base @@ -34181,8 +34221,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.0"; - sha256 = "1ibbj3ipkys26np9d791ynpfzgrw3miclcj02bb0ipmvqngm90hv"; + version = "1.0.1"; + sha256 = "014n3qhn9flwj43zjp62vagp5df9ll6nkjk1x9qpagni1vf9cbqq"; buildDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -34555,13 +34595,12 @@ self: { }: mkDerivation { pname = "connection-pool"; - version = "0.1.1.0"; - sha256 = "08mfl5gwbxzkf6dvqvshmzpjy02f46avimw8ss66br2397bi0qj7"; + version = "0.1.2.0"; + sha256 = "12nr9vl884yj4yq9dyfc725zi6dw0amp65xlm9hjm7wffz6mc5az"; buildDepends = [ base between data-default-class monad-control network resource-pool streaming-commons time transformers-base ]; - jailbreak = true; homepage = "https://github.com/trskop/connection-pool"; description = "Connection pool built on top of resource-pool and streaming-commons"; license = stdenv.lib.licenses.bsd3; @@ -35752,21 +35791,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs_1_18_9" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.18.9"; - sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6"; - isLibrary = true; - isExecutable = true; - buildDepends = [ base directory old-locale old-time polyparse ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - }) {}; - "cpphs" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: @@ -36413,17 +36437,19 @@ self: { "cron" = callPackage ({ mkDerivation, attoparsec, base, derive, hspec - , hspec-expectations, mtl, old-locale, QuickCheck, text, time - , transformers + , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text + , time, transformers-compat }: mkDerivation { pname = "cron"; - version = "0.2.6"; - sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg"; - buildDepends = [ attoparsec base mtl old-locale text time ]; + version = "0.3.0"; + sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k"; + buildDepends = [ + attoparsec base mtl mtl-compat old-locale text time + ]; testDepends = [ attoparsec base derive hspec hspec-expectations QuickCheck text - time transformers + time transformers-compat ]; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; @@ -39925,8 +39951,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.7.1.0"; - sha256 = "0hzvv6aazpf7r75yygcqy1ldz3j9shs6spv71nzn040rny67cdll"; + version = "0.7.1.1"; + sha256 = "0r2f14h0bpbq861jfa0rgp0y87nq142f80dyjzyzzrdwc8szj120"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40386,6 +40412,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "delta" = callPackage + ({ mkDerivation, base, containers, directory, filepath, fs-events + , sodium, time + }: + mkDerivation { + pname = "delta"; + version = "0.1.0.1"; + sha256 = "0kjii2hqwzzsb8i09547y0qxrdak3xkhgv7dqahbpypzh8hldgzf"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base containers directory filepath fs-events sodium time + ]; + homepage = "https://github.com/kryoxide/delta"; + description = "A library for detecting file changes"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "delta-h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, monad-atom , nlp-scores, text @@ -43249,6 +43293,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "dozens" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default-class + , http-client, http-types, reflection, scientific, text + , transformers + }: + mkDerivation { + pname = "dozens"; + version = "0.1.1"; + sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky"; + buildDepends = [ + aeson base bytestring data-default-class http-client http-types + reflection scientific text transformers + ]; + homepage = "https://github.com/philopon/apiary"; + description = "dozens api library"; + license = stdenv.lib.licenses.mit; + }) {}; + "dph-base" = callPackage ({ mkDerivation, array, base, ghc-prim, pretty, random, vector }: mkDerivation { @@ -45574,10 +45636,9 @@ self: { ({ mkDerivation, base, between, transformers }: mkDerivation { pname = "endo"; - version = "0.1.0.2"; - sha256 = "1wqg0mcaf55wa70wjgd6n0gw56rghz6p76lc6kw4aki969h12xrl"; + version = "0.2.0.0"; + sha256 = "1gqw14nadw1cb49m251swly35gjkb2xhqi0cqhm17ww8r13mzp31"; buildDepends = [ base between transformers ]; - jailbreak = true; homepage = "https://github.com/trskop/endo"; description = "Endomorphism utilities"; license = stdenv.lib.licenses.bsd3; @@ -46041,24 +46102,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "equivalence_0_2_5" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "equivalence"; - version = "0.2.5"; - sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3"; - buildDepends = [ base containers mtl STMonadTrans ]; - testDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell - test-framework test-framework-quickcheck2 - ]; - homepage = "https://bitbucket.org/paba/equivalence/"; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "equivalence" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, test-framework, test-framework-quickcheck2 @@ -46489,6 +46532,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ether" = callPackage + ({ mkDerivation, base, mtl, newtype-generics, QuickCheck, tasty + , tasty-quickcheck, template-haskell, transformers + }: + mkDerivation { + pname = "ether"; + version = "0.2.1.0"; + sha256 = "1iwi3whaxnpwfdghw1rli9dxqh1c28hhxkdvl4wslj0vc014h3di"; + buildDepends = [ + base mtl newtype-generics template-haskell transformers + ]; + testDepends = [ + base mtl QuickCheck tasty tasty-quickcheck transformers + ]; + homepage = "https://int-index.github.io/ether/"; + description = "Monad transformers and classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ethereum-client-haskell" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, data-default @@ -48255,17 +48317,25 @@ self: { }) {}; "feldspar-signal" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, base-compat, feldspar-compiler + , feldspar-compiler-shim, feldspar-language, imperative-edsl + , mainland-pretty, monadic-edsl-priv + }: mkDerivation { pname = "feldspar-signal"; - version = "0.0.0.1"; - sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx"; - buildDepends = [ base ]; + version = "0.0.1.0"; + sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd"; + buildDepends = [ + base base-compat feldspar-compiler feldspar-compiler-shim + feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv + ]; jailbreak = true; homepage = "https://github.com/markus-git/feldspar-signal"; description = "Signal Processing extension for Feldspar"; license = stdenv.lib.licenses.bsd3; - }) {}; + broken = true; + }) { feldspar-compiler-shim = null; imperative-edsl = null; + monadic-edsl-priv = null;}; "fen2s" = callPackage ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode @@ -48341,19 +48411,19 @@ self: { }) {}; "fficxx" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , either, errors, filepath, hashable, HStringTemplate, lens, mtl - , process, pureMD5, split, template-haskell, transformers - , unordered-containers + ({ mkDerivation, base, bytestring, Cabal, containers, data-default + , directory, either, errors, filepath, hashable, HStringTemplate + , lens, mtl, process, pureMD5, split, template-haskell + , transformers, unordered-containers }: mkDerivation { pname = "fficxx"; - version = "0.2"; - sha256 = "0512v9xhli6qdz46gvn8lj15rp30919pf982fjcgklw22qmci69q"; + version = "0.2.1"; + sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d"; buildDepends = [ - base bytestring Cabal containers directory either errors filepath - hashable HStringTemplate lens mtl process pureMD5 split - template-haskell transformers unordered-containers + base bytestring Cabal containers data-default directory either + errors filepath hashable HStringTemplate lens mtl process pureMD5 + split template-haskell transformers unordered-containers ]; description = "automatic C++ binding generation"; license = stdenv.lib.licenses.bsd3; @@ -48364,8 +48434,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fficxx-runtime"; - version = "0.2"; - sha256 = "0czh7in30369c8c4ls3m3r61w6zb1p0p0jy2yi5j9521f61q588a"; + version = "0.2.1"; + sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk"; buildDepends = [ base ]; description = "Runtime for fficxx-generated library"; license = stdenv.lib.licenses.bsd3; @@ -52312,11 +52382,10 @@ self: { ({ mkDerivation, base, ieee754, QuickCheck }: mkDerivation { pname = "geom2d"; - version = "0.1.2.1"; - sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj"; + version = "0.1.3.1"; + sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5"; buildDepends = [ base ieee754 QuickCheck ]; testDepends = [ base ieee754 QuickCheck ]; - jailbreak = true; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -52850,12 +52919,12 @@ self: { }) {}; "ghc-simple" = callPackage - ({ mkDerivation, base, data-default, ghc, ghc-paths }: + ({ mkDerivation, base, ghc, ghc-paths }: mkDerivation { pname = "ghc-simple"; - version = "0.1.0.0"; - sha256 = "0a8xla80al1glxpf0dsbzdgwbzwxmk9cr6xwfmmz237q7dv4pjhf"; - buildDepends = [ base data-default ghc ghc-paths ]; + version = "0.1.2.0"; + sha256 = "0cwirw9j52khkl8fsgw22136nb3nwlbiahvfcds8hryvr64x9vql"; + buildDepends = [ base ghc ghc-paths ]; homepage = "https://github.com/valderman/ghc-simple"; description = "Simplified interface to the GHC API"; license = stdenv.lib.licenses.mit; @@ -53294,7 +53363,7 @@ self: { , clientsession, conduit, conduit-extra, containers, crypto-api , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath - , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client + , git, gnupg, gnutls, hamlet, hinotify, hslogger, http-client , http-conduit, http-types, IfElse, json, lsof, MissingH , monad-control, monad-logger, mtl, network, network-info , network-multicast, network-protocol-xmpp, network-uri, openssh @@ -53330,7 +53399,7 @@ self: { yesod-static ]; buildTools = [ - bup curl git gnupg1 lsof openssh perl rsync wget which + bup curl git gnupg lsof openssh perl rsync wget which ]; configureFlags = [ "-fassistant" "-fproduction" ]; preConfigure = "export HOME=$TEMPDIR"; @@ -53342,7 +53411,7 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; }) { inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg1; inherit (pkgs) lsof; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; @@ -62027,6 +62096,7 @@ self: { base basic-prelude containers errors mtl random-shuffle tasty tasty-hunit tasty-quickcheck text ]; + jailbreak = true; description = "Implementation of the rules of Love Letter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -64604,7 +64674,9 @@ self: { mkDerivation { pname = "highlighting-kate"; version = "0.6"; + revision = "1"; sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk"; + editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -64925,7 +64997,9 @@ self: { mkDerivation { pname = "hipbot"; version = "0.5"; + revision = "1"; sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs"; + editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri @@ -64933,7 +65007,6 @@ self: { unordered-containers utf8-string wai wai-lens webcrank webcrank-wai wreq ]; - jailbreak = true; homepage = "https://github.com/purefn/hipbot"; description = "A library for building HipChat Bots"; license = stdenv.lib.licenses.bsd3; @@ -65870,8 +65943,8 @@ self: { ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.3.0.2"; - sha256 = "1n0p7pg9rsdckcysczg7l8rqfm3xw1rc2jzp0khb1i33nhbr7bzn"; + version = "0.3.0.3"; + sha256 = "0zrh3knwqkaqlgajza22jfg3xhsxhiaf8qmiwnd9qjbasnm5a1lp"; buildDepends = [ base binary hmatrix storable-complex ]; pkgconfigDepends = [ gsl ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; @@ -67451,8 +67524,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.3.0"; - sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25"; + version = "0.3.1"; + sha256 = "178pdk9rhqiyzjpdvkfvjs4gfc27k1limi7qpnpqyxzlcrcsplvb"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -68328,9 +68401,10 @@ self: { mkDerivation { pname = "hs-pkg-config"; version = "0.2.1.0"; + revision = "1"; sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh"; + editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784"; buildDepends = [ base data-default-class text ]; - jailbreak = true; homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; license = stdenv.lib.licenses.bsd3; @@ -69710,9 +69784,9 @@ self: { mkDerivation { pname = "hslua"; version = "0.4.0"; - revision = "1"; + revision = "2"; sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p"; - editedCabalFile = "a2019a0881b90b842dfa9c88e452a45bbadb25d9461d0549ab8fd328a82757ee"; + editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec hspec-contrib HUnit text ]; extraLibraries = [ lua ]; @@ -71698,9 +71772,9 @@ self: { mkDerivation { pname = "http-encodings"; version = "0.9.3"; - revision = "1"; + revision = "2"; sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn"; - editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7"; + editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76"; buildDepends = [ base bytestring HTTP iconv mime mtl parsec text utf8-string zlib ]; @@ -71916,8 +71990,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.3.2"; - sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk"; + version = "0.8.3.3"; + sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -75454,12 +75528,13 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, base, contravariant }: + ({ mkDerivation, base, contravariant, hspec, QuickCheck }: mkDerivation { pname = "invariant"; - version = "0.1.1"; - sha256 = "077jhn2fspnjkr8p3sh6draidqpk6wpism73rz8172acd4jjg4fz"; + version = "0.1.2"; + sha256 = "02p114wnpxbqxik4sz87bd9rcqfs9klgsxi9pc4v1qwyb64mb92b"; buildDepends = [ base contravariant ]; + testDepends = [ base hspec QuickCheck ]; description = "Haskell 98 invariant functors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76998,19 +77073,19 @@ self: { ({ mkDerivation, arrows, base, bytestring, cmdargs , data-default-class, data-default-instances-base, Diff, directory , filepath, HTTP, http-encodings, hxt, hxt-tagsoup - , language-ecmascript, network, random, tasty, tasty-golden - , transformers + , language-ecmascript, network, network-uri, random, tasty + , tasty-golden, transformers }: mkDerivation { pname = "jespresso"; - version = "1.0.1"; - sha256 = "0rl4k1vn5q23rjylpyya6dmp6pwdbdvrlxgkczxwy84j9xm665zg"; + version = "1.0.1.1"; + sha256 = "0lxkn0zd4y7b36y42hxpfan5jcy910ksl044yvmrk634p7s3996h"; isLibrary = true; isExecutable = true; buildDepends = [ arrows base bytestring cmdargs data-default-class data-default-instances-base HTTP http-encodings hxt hxt-tagsoup - language-ecmascript network random + language-ecmascript network network-uri random ]; testDepends = [ arrows base Diff directory filepath hxt tasty tasty-golden @@ -77691,6 +77766,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "json-togo" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base + , bytestring, scientific, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "json-togo"; + version = "0.1.0.1"; + sha256 = "05g8k8qsxjwqrdwqf24g90hx5jlrwjpa4vsjf0ddrw0whnva3gbz"; + buildDepends = [ + aeson attoparsec attoparsec-trans base bytestring scientific text + transformers unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/srijs/haskell-json-togo"; + description = "Effectful parsing of JSON documents"; + license = stdenv.lib.licenses.mit; + }) {}; + "json-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , process, tar, text, unordered-containers, vector @@ -80459,8 +80553,8 @@ self: { ({ mkDerivation, base, mtl, parsers, text, trifecta }: mkDerivation { pname = "language-thrift"; - version = "0.1.0.1"; - sha256 = "11z8lkny9bhbbgchpy3jz1nn867ygqi4rq5vffxqpbj6qq2a8bxk"; + version = "0.2.0.0"; + sha256 = "01wvpm4aa222ic8z6wg0wdjyfnkd8gh2kqsda7qfckcyxs9679qw"; buildDepends = [ base mtl parsers text trifecta ]; homepage = "https://github.com/abhinav/language-thrift"; description = "Parser for the Thrift IDL format"; @@ -80983,8 +81077,8 @@ self: { }: mkDerivation { pname = "leksah"; - version = "0.15.0.1"; - sha256 = "169vrqdxcx8xkilrw3dh5zmdsb876fny4n0k5gzvi8fian0dl8nh"; + version = "0.15.0.3"; + sha256 = "11b4kp1bbw35gsrdcr5kjyjrfiqrqfy645nbpngjz7rzivjl6n4s"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81018,8 +81112,8 @@ self: { }: mkDerivation { pname = "leksah-server"; - version = "0.15.0.1"; - sha256 = "04sxfzl8p9fk8qkzmwnm7fkg5sgrzjx0992kivgbrnyx7wh06xsp"; + version = "0.15.0.2"; + sha256 = "090nz2kvsf83jdp2lhng5x87a96xzxknsr4vx2jc2r2vs60841lx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81198,14 +81292,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-regex" = callPackage + ({ mkDerivation, array, base, directory, doctest, filepath, lens + , regex-base, regex-posix, template-haskell + }: + mkDerivation { + pname = "lens-regex"; + version = "0.1.0"; + sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29"; + isLibrary = true; + isExecutable = true; + buildDepends = [ array base lens regex-base template-haskell ]; + testDepends = [ base directory doctest filepath regex-posix ]; + homepage = "https://github.com/himura/lens-regex"; + description = "Lens powered regular expression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core , lens-family-th, transformers }: mkDerivation { pname = "lens-simple"; - version = "0.1.0.4"; - sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3"; + version = "0.1.0.5"; + sha256 = "1hn2g9xswfn94m5hxi39jpmdaxm51l231cvqn2a62pr8j6b34839"; buildDepends = [ base lens-family lens-family-core lens-family-th transformers ]; @@ -81283,10 +81394,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "0.1.0.2"; - revision = "2"; - sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v"; - editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c"; + version = "0.1.1.2"; + sha256 = "06k0vvxp8vd43bbslm78lmmmc89q3b9ghwfj0chvaw32m0hd8l0z"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -82405,7 +82514,9 @@ self: { mkDerivation { pname = "linear"; version = "1.18.1.1"; + revision = "2"; sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p"; + editedCabalFile = "8c57bd840e0c9ab84b032d65a2a48ed6d20da4fb780f0d89d8c53adccc632ba4"; buildDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -82455,13 +82566,13 @@ self: { }) {}; "linear-grammar" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }: + ({ mkDerivation, base, containers, hspec, QuickCheck }: mkDerivation { pname = "linear-grammar"; - version = "0.0.0.5"; - sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry"; - buildDepends = [ base ]; - testDepends = [ base hspec QuickCheck quickcheck-instances ]; + version = "0.0.2.1"; + sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97"; + buildDepends = [ base containers QuickCheck ]; + testDepends = [ base containers hspec QuickCheck ]; description = "A simple grammar for building linear equations and inclusive inequalities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -83774,8 +83885,8 @@ self: { }: mkDerivation { pname = "lock-file"; - version = "0.5.0.1"; - sha256 = "0x1pis244pg5k91y3p40m2pc483vx49gcdqa95f7q0gjsnvb9yi9"; + version = "0.5.0.2"; + sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7"; buildDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -83785,7 +83896,6 @@ self: { tagged-exception-core test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; @@ -87952,14 +88062,19 @@ self: { }) {}; "mockery" = callPackage - ({ mkDerivation, base, directory, hspec, logging-facade, temporary + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , logging-facade, temporary }: mkDerivation { pname = "mockery"; - version = "0.2.0"; - sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj"; - buildDepends = [ base directory logging-facade temporary ]; - testDepends = [ base directory hspec logging-facade temporary ]; + version = "0.3.0"; + sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x"; + buildDepends = [ + base bytestring directory filepath logging-facade temporary + ]; + testDepends = [ + base bytestring directory filepath hspec logging-facade temporary + ]; description = "Support functions for automated testing"; license = stdenv.lib.licenses.mit; }) {}; @@ -89230,10 +89345,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.9.1"; - revision = "1"; - sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; - editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf"; + version = "0.9.2"; + sha256 = "1cw8bsf6ayalsx0l0xwb2f2j2rg6zpfsvci174fr4xiyr646mpd6"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -90102,13 +90215,16 @@ self: { mkDerivation { pname = "mueval"; version = "0.9.1.1"; + revision = "2"; sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz"; + editedCabalFile = "26147e2bbac6b9afea949ab81c6072fc89bbff6b7e6678f3ce57c77d26264832"; isLibrary = true; isExecutable = true; buildDepends = [ base Cabal containers directory extensible-exceptions filepath hint mtl process show simple-reflect unix utf8-string ]; + jailbreak = true; homepage = "https://github.com/gwern/mueval"; description = "Safely evaluate pure Haskell expressions"; license = stdenv.lib.licenses.bsd3; @@ -90341,12 +90457,12 @@ self: { }) {}; "multiset-comb" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "multiset-comb"; - version = "0.2.3"; - sha256 = "0qkl6csnl1g6wbsyxirdq8hdbbbkp3dfsjix76yx242wdyh1j6pq"; - buildDepends = [ base ]; + version = "0.2.4"; + sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99"; + buildDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90431,6 +90547,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "murmur3" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "murmur3"; + version = "1.0.0"; + sha256 = "1rdnfy37dmmrqpapdv9h22ki94mxrz1xdk5ibcj833q35868kjmq"; + buildDepends = [ base binary bytestring ]; + testDepends = [ + base base16-bytestring bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/plaprade/murmur3"; + description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "murmurhash3" = callPackage ({ mkDerivation, haskell2010 }: mkDerivation { @@ -91174,6 +91309,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "namelist" = callPackage + ({ mkDerivation, base, case-insensitive, data-default-class, parsec + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "namelist"; + version = "0.1.0"; + sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s"; + buildDepends = [ base case-insensitive data-default-class parsec ]; + testDepends = [ + base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/philopon/namelist-hs"; + description = "fortran90 namelist parser/pretty printer"; + license = stdenv.lib.licenses.mit; + }) {}; + "names" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -94305,8 +94457,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "old-version"; - version = "1.0.1"; - sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv"; + version = "1.1.0"; + sha256 = "1vlh6wz9khcamlb5pv5gy5bss7bws7b92j8kkyqf6cp22x4dxdlc"; buildDepends = [ base ]; jailbreak = true; description = "Basic versioning library"; @@ -95178,6 +95330,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optional-args" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "optional-args"; + version = "1.0.0"; + sha256 = "0j49cp5y7gp9acvhw315lq92mgr35fwaw90vpxy0n9g541ls350z"; + buildDepends = [ base ]; + description = "Optional function arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "options" = callPackage ({ mkDerivation, base, chell, chell-quickcheck, containers , monads-tf, transformers @@ -95442,8 +95605,8 @@ self: { }: mkDerivation { pname = "orgmode-parse"; - version = "0.1.1.1"; - sha256 = "17slf2i7k8bk1d47l165awn38dlpq2rdw6glzvp8if1dir2l2jl7"; + version = "0.1.1.2"; + sha256 = "1ys9gcydipjxn5ba7ndmz70ri218d6wivxrd7xvcsf4kncfks3xi"; buildDepends = [ aeson attoparsec base bytestring containers free hashable old-locale text thyme unordered-containers @@ -95846,6 +96009,22 @@ self: { license = "unknown"; }) {}; + "pagure-hook-receiver" = callPackage + ({ mkDerivation, base, containers, scotty, shelly, text + , transformers, unix + }: + mkDerivation { + pname = "pagure-hook-receiver"; + version = "0.1.0.0"; + sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl"; + buildDepends = [ + base containers scotty shelly text transformers unix + ]; + homepage = "https://pagure.io/pagure-hook-receiver"; + description = "Receive hooks from pagure and do things with them"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -97954,8 +98133,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.3.3"; - sha256 = "1p9vndchcd06ajqmqmf3pw5ql9r6jqbs9xl5jxv1x0pjvbq6yjy5"; + version = "2.1.3.4"; + sha256 = "0wi1mrcilz66jnlgz16crqlh4bibb03mj460bgg3af4f8zpwja2g"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -97964,7 +98143,6 @@ self: { testDepends = [ aeson base bytestring hspec persistent QuickCheck text transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; @@ -103299,8 +103477,8 @@ self: { }: mkDerivation { pname = "quantfin"; - version = "0.1.0.2"; - sha256 = "1m6208c8gxbm95a99kk0chh62bk2zb1fmwrdd7fwl7zpwzr8iany"; + version = "0.2.0.0"; + sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103613,6 +103791,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "quickcheck-simple"; + version = "0.1.0.0"; + sha256 = "0vnxyb3qz8i1rpmkga6151cld1jr3kiyv3xrhg814mhf1fmhb8xl"; + buildDepends = [ base QuickCheck ]; + description = "Test properties and default-mains for QuickCheck"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -104225,14 +104414,14 @@ self: { }: mkDerivation { pname = "range"; - version = "0.1.0.1"; - sha256 = "04nzxjgjnql6bq30pkkmlxcj0cxmw3hlzb6y1fhb052rxmpaq8mk"; + version = "0.1.1.0"; + sha256 = "1cqy6lz7mr0n2zrrn9qxvgp8q7yj0drri1885m1crmvx4xd1dfp2"; buildDepends = [ base parsec ]; testDepends = [ base Cabal QuickCheck random test-framework test-framework-quickcheck2 ]; - jailbreak = true; + homepage = "https://bitbucket.org/robertmassaioli/range"; description = "This has a bunch of code for specifying and managing ranges in your code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -104942,20 +105131,18 @@ self: { }) {}; "record" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest - , filepath, template-haskell, text, transformers + ({ mkDerivation, base, base-prelude, basic-lens, template-haskell + , transformers }: mkDerivation { pname = "record"; - version = "0.3.1.2"; - sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp"; + version = "0.4.0.2"; + sha256 = "18j30j7dppm0lqf9p345bfz65cls15ka6jyflamwgig5h0dzz5mw"; buildDepends = [ - attoparsec base base-prelude template-haskell text transformers + base base-prelude basic-lens template-haskell transformers ]; - testDepends = [ base base-prelude directory doctest filepath ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record"; - description = "First class records implemented with quasi-quotation"; + description = "Anonymous records"; license = stdenv.lib.licenses.mit; }) {}; @@ -104998,6 +105185,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-preprocessor" = callPackage + ({ mkDerivation, base, base-prelude, conversion, conversion-text + , record-syntax, text + }: + mkDerivation { + pname = "record-preprocessor"; + version = "0.1.0.0"; + sha256 = "0ign3zvpnz4zrzfqglf34xbcrb21dq8hyzwkzlq9y26r9g3nmbd5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base base-prelude conversion conversion-text record-syntax text + ]; + homepage = "https://github.com/nikita-volkov/record-preprocessor"; + description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; + license = stdenv.lib.licenses.mit; + }) {}; + + "record-syntax" = callPackage + ({ mkDerivation, base, base-prelude, conversion, conversion-text + , directory, doctest, filepath, haskell-src-exts, hspec, parsec + , record, template-haskell, text, transformers + }: + mkDerivation { + pname = "record-syntax"; + version = "0.1.0.0"; + sha256 = "115z96ific9n3612yzkfmj7hxnbjc8xjz5nmfiddklx9zjih7h40"; + buildDepends = [ + base base-prelude conversion conversion-text haskell-src-exts + parsec record template-haskell text transformers + ]; + testDepends = [ + base base-prelude directory doctest filepath hspec record + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/record-syntax"; + description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; + license = stdenv.lib.licenses.mit; + }) {}; + "records" = callPackage ({ mkDerivation, base, kinds, type-functions }: mkDerivation { @@ -105717,7 +105944,9 @@ self: { mkDerivation { pname = "regex-tdfa"; version = "1.2.0"; + revision = "1"; sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw"; + editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e"; buildDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -107630,6 +107859,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "riemann" = callPackage + ({ mkDerivation, base, cereal, containers, data-default, either + , errors, HUnit, lens, network, protobuf, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers + }: + mkDerivation { + pname = "riemann"; + version = "0.1.0.1"; + sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa"; + buildDepends = [ + base cereal containers data-default either errors lens network + protobuf text time transformers + ]; + testDepends = [ + base either errors HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 transformers + ]; + jailbreak = true; + homepage = "https://github.com/telser/riemann-hs"; + description = "A Riemann client for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "riff" = callPackage ({ mkDerivation, base, binary, bytestring, either, filepath , transformers @@ -110562,8 +110815,8 @@ self: { }: mkDerivation { pname = "second-transfer"; - version = "0.5.3.1"; - sha256 = "1ng3a384y3hsm6xgw8mhchkgz8xdgrk35b44lbifdfilcmmq7nrv"; + version = "0.5.3.2"; + sha256 = "0qc6xm7c37n2r9xnqc6njkm2d8lkwmripcr3q1q4m7q97qsvjbdl"; buildDepends = [ attoparsec base base16-bytestring binary bytestring conduit containers exceptions hashable hashtables hslogger http2 lens @@ -112310,8 +112563,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.3"; - sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v"; + version = "0.6.4"; + sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; buildDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -113124,8 +113377,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.20"; - sha256 = "0fzxlj3nmlj9nyzl4ygn6q2rgwvcgjpkypp6cpka64bhqfrgqyb3"; + version = "0.2.21"; + sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1"; buildDepends = [ base bytestring network unix ]; testDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -113403,6 +113656,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "simplex-basic" = callPackage + ({ mkDerivation, base, bifunctors, containers, hspec + , linear-grammar, mtl, QuickCheck, transformers + }: + mkDerivation { + pname = "simplex-basic"; + version = "0.0.0.1"; + sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq"; + buildDepends = [ + base bifunctors linear-grammar mtl QuickCheck transformers + ]; + testDepends = [ + base bifunctors containers hspec linear-grammar mtl QuickCheck + transformers + ]; + description = "Very basic simplex implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -115141,8 +115413,8 @@ self: { }: mkDerivation { pname = "snaplet-sass"; - version = "0.1.0.0"; - sha256 = "0wv9a7pa6r7nzgppbywasqy38zk79ann2ivwyyh2b9dny95mx5yd"; + version = "0.1.1.0"; + sha256 = "05vif2rz0dj2b3vm0yh0bwj234xjnjpiaf2fk8vlv00jirgrdr40"; buildDepends = [ base bytestring configurator directory filepath mtl process snap snap-core transformers @@ -115198,10 +115470,10 @@ self: { }: mkDerivation { pname = "snaplet-sqlite-simple"; - version = "0.4.8.2"; - sha256 = "00a92wymniaw0si4xpkx1442prmcjimwrjjqiqnkj6k8bxs7p2jm"; + version = "0.4.8.3"; + sha256 = "0nc0kv9s3c4wc3xb6jggx9v4p141c3af07x8vda18c7qlfif5nx3"; buildDepends = [ - aeson base bytestring clientsession configurator direct-sqlite + aeson base bytestring clientsession configurator direct-sqlite lens MonadCatchIO-transformers mtl snap sqlite-simple text transformers unordered-containers ]; @@ -115211,7 +115483,6 @@ self: { SafeSemaphore snap snap-core sqlite-simple stm test-framework test-framework-hunit text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -115422,8 +115693,8 @@ self: { }: mkDerivation { pname = "snmp"; - version = "0.1.0.3"; - sha256 = "1zncgn3i6xbvxrwdf6s6vhbmsf6sqncf2rbllx26dz1bmxh4gr33"; + version = "0.2.0.0"; + sha256 = "0vjbpjsa4ivsjzvfc9sr457pms2rw1zpb92d971n0yccl0bxmf67"; buildDepends = [ asn1-encoding asn1-parse asn1-types async base binary bytestring cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl @@ -116234,8 +116505,8 @@ self: { }: mkDerivation { pname = "species"; - version = "0.3.2.4"; - sha256 = "1ka5pd876iddaah9ay2ihcifhfh0f5rd19bn6yh42wlx6mdarfbq"; + version = "0.3.3"; + sha256 = "0cy6l4gvzydl9k2ijxkxhr6jqjbf85z71v6zrvbdajc3xip99w6i"; buildDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -117177,44 +117448,44 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring - , bifunctors, binary, bytestring, Cabal, conduit, conduit-extra - , containers, cpphs, cryptohash, cryptohash-conduit, deepseq - , directory, either, enclosed-exceptions, exceptions, fast-logger - , filepath, hashable, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-base, monad-control - , monad-logger, monad-loops, mtl, old-locale, optparse-applicative - , optparse-simple, path, persistent, persistent-sqlite - , persistent-template, pretty, process, resourcet, safe, split, stm - , streaming-commons, tar, template-haskell, temporary, text, time - , transformers, transformers-base, unix, unordered-containers - , vector, vector-binary-instances, void, yaml, zlib + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , base64-bytestring, bifunctors, binary, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, containers, cryptohash + , cryptohash-conduit, deepseq, directory, either + , enclosed-exceptions, exceptions, fast-logger, filepath, hashable + , hspec, http-client, http-client-tls, http-conduit, http-types + , lifted-base, monad-control, monad-logger, monad-loops, mtl + , old-locale, optparse-applicative, optparse-simple, path + , persistent, persistent-sqlite, persistent-template, pretty + , process, resourcet, safe, split, stm, streaming-commons, tar + , template-haskell, temporary, text, time, transformers + , transformers-base, unix, unordered-containers, vector + , vector-binary-instances, void, yaml, zlib }: mkDerivation { pname = "stack"; - version = "0.0.1"; - sha256 = "04bb0wih2nzqrq8si48w1p6zc4b7nzrgrg4cbnly63hgx64vyhq3"; + version = "0.0.2.1"; + sha256 = "1gv2cbjnr93s4cyhybpd8nsqa8gqd9hpm9wyrh19fl82p8db46x6"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson async attoparsec base base64-bytestring bifunctors binary - bytestring Cabal conduit conduit-extra containers cryptohash - cryptohash-conduit deepseq directory either enclosed-exceptions - exceptions fast-logger filepath hashable http-client - http-client-tls http-conduit http-types lifted-base monad-control - monad-logger monad-loops mtl old-locale optparse-applicative - optparse-simple path persistent persistent-sqlite - persistent-template pretty process resourcet safe split stm - streaming-commons tar template-haskell temporary text time - transformers transformers-base unix unordered-containers vector - vector-binary-instances void yaml zlib + aeson async attoparsec base base16-bytestring base64-bytestring + bifunctors binary bytestring Cabal conduit conduit-combinators + conduit-extra containers cryptohash cryptohash-conduit deepseq + directory either enclosed-exceptions exceptions fast-logger + filepath hashable http-client http-client-tls http-conduit + http-types lifted-base monad-control monad-logger monad-loops mtl + old-locale optparse-applicative optparse-simple path persistent + persistent-sqlite persistent-template pretty process resourcet safe + split stm streaming-commons tar template-haskell temporary text + time transformers transformers-base unix unordered-containers + vector vector-binary-instances void yaml zlib ]; testDepends = [ base Cabal conduit conduit-extra containers cryptohash directory exceptions filepath hspec http-conduit monad-logger path resourcet temporary transformers ]; - buildTools = [ cpphs ]; homepage = "https://github.com/commercialhaskell/stack test/package-dump/ghc-7.8.txt test/package-dump/ghc-7.10.txt"; @@ -120827,17 +121098,14 @@ test/package-dump/ghc-7.10.txt"; }) {}; "tagged-exception-core" = callPackage - ({ mkDerivation, base, exceptions, extensible-exceptions, mmorph - , transformers - }: + ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }: mkDerivation { pname = "tagged-exception-core"; - version = "2.0.0.0"; - sha256 = "02ny4yz9afaazw2pxpkpalffx8i5nhi3x9561blrd0pdrqq8qnib"; - buildDepends = [ - base exceptions extensible-exceptions mmorph transformers - ]; - jailbreak = true; + version = "2.1.0.0"; + revision = "1"; + sha256 = "1w4020qb6f5vnym13a4jrha62vj7rqz3nfsrsxa34dl04y63jcax"; + editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689"; + buildDepends = [ base exceptions mmorph mtl transformers ]; homepage = "https://github.com/trskop/tagged-exception"; description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; @@ -123937,8 +124205,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "thumbnail-plus"; - version = "1.0.4"; - sha256 = "110vfk5ri394awzmmq82r87gc9pmvy3500i836602syvd5zfa92x"; + version = "1.0.5"; + sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441"; buildDepends = [ base bytestring conduit conduit-extra data-default directory either gd imagesize-conduit resourcet temporary transformers @@ -124359,13 +124627,14 @@ test/package-dump/ghc-7.10.txt"; mkDerivation { pname = "time-recurrence"; version = "0.9.2"; + revision = "1"; sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm"; + editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427"; buildDepends = [ base data-ordlist mtl time ]; testDepends = [ base data-ordlist HUnit mtl old-locale test-framework test-framework-hunit time ]; - jailbreak = true; homepage = "http://github.com/hellertime/time-recurrence"; description = "Generate recurring dates"; license = stdenv.lib.licenses.gpl3; @@ -124752,8 +125021,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "tip-lib"; - version = "0.1.1"; - sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi"; + version = "0.1.2"; + sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125898,22 +126167,21 @@ test/package-dump/ghc-7.10.txt"; }) {}; "trurl" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hastache - , http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, directory, filemanip + , hastache, http-conduit, MissingH, scientific, tar, tasty + , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "trurl"; - version = "0.1.0.0"; - sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5"; + version = "0.2.2.0"; + sha256 = "139c97c63fhgq9lisic5wyfn872j120xsj3i72fs5s0aa9m59w81"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring directory hastache http-conduit MissingH - scientific tar text unordered-containers + aeson base bytestring directory filemanip hastache http-conduit + MissingH scientific tar text unordered-containers ]; testDepends = [ base hastache tasty tasty-hunit ]; - jailbreak = true; homepage = "http://github.com/dbushenko/trurl"; description = "Haskell template code generator"; license = stdenv.lib.licenses.bsd3; @@ -126062,12 +126330,12 @@ test/package-dump/ghc-7.10.txt"; }) {}; "tubes" = callPackage - ({ mkDerivation, base, free, mtl, transformers }: + ({ mkDerivation, base, comonad, free, mtl, transformers }: mkDerivation { pname = "tubes"; - version = "0.1.0.0"; - sha256 = "0xfpvffwp9nqkgc0j6qx6fkliaynhr8zvwzgg02y791hkjbn629k"; - buildDepends = [ base free mtl transformers ]; + version = "0.2.1.0"; + sha256 = "1j1pzsmr4djjvhmix6ffsapm30lv4iim1jvcq454r1kxi0yid76z"; + buildDepends = [ base comonad free mtl transformers ]; homepage = "https://github.com/gatlin/tubes"; description = "Effectful, iteratee-inspired stream processing based on a free monad"; license = stdenv.lib.licenses.gpl3; @@ -127573,7 +127841,9 @@ test/package-dump/ghc-7.10.txt"; mkDerivation { pname = "uhc-light"; version = "1.1.9.0"; + revision = "1"; sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj"; + editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -127581,7 +127851,6 @@ test/package-dump/ghc-7.10.txt"; hashable mtl network old-locale primitive process syb transformers uhc-util uulib vector ]; - jailbreak = true; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; license = stdenv.lib.licenses.bsd3; @@ -128827,8 +129096,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.4"; - sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv"; + version = "0.1.5"; + sha256 = "0pl00n40b1nc3rnvayk8jz9lgv0s1lp33czyg962jdbffwhqgszj"; buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ attoparsec base blaze-builder bytestring derive HUnit lens @@ -131599,8 +131868,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "wai-middleware-crowd"; - version = "0.1.1.1"; - sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj"; + version = "0.1.1.2"; + sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -131708,6 +131977,26 @@ test/package-dump/ghc-7.10.txt"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-metrics" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck + , scotty, tasty, tasty-hunit, tasty-quickcheck, time, transformers + , wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-metrics"; + version = "0.2.1"; + sha256 = "0aiig72r72vykd1f1871458d4glnqsrs7rr402jv5ka05d1rg6y0"; + buildDepends = [ base ekg-core http-types time wai ]; + testDepends = [ + base bytestring ekg-core http-types QuickCheck scotty tasty + tasty-hunit tasty-quickcheck time transformers wai wai-extra + ]; + jailbreak = true; + homepage = "https://github.com/Helkafen/wai-middleware-metrics"; + description = "A WAI middleware to collect EKG request metrics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-preprocessor" = callPackage ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai , wai-middleware-static, warp @@ -132673,7 +132962,9 @@ test/package-dump/ghc-7.10.txt"; mkDerivation { pname = "webcrank"; version = "0.2.2"; + revision = "1"; sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj"; + editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -132684,7 +132975,6 @@ test/package-dump/ghc-7.10.txt"; http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck unordered-containers ]; - jailbreak = true; homepage = "https://github.com/webcrank/webcrank.hs"; description = "Webmachine inspired toolkit for building http applications and services"; license = stdenv.lib.licenses.bsd3; @@ -136336,8 +136626,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "yesod-auth"; - version = "1.4.5"; - sha256 = "0agddsicjqcvraa3lcbxwwnk4mapjjd1y4pdp5kg111kaww6nkdn"; + version = "1.4.5.1"; + sha256 = "161gij0r82raih9lvdws4vsknpm36m00ikd17vhhlzz01q9z7l64"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -136347,7 +136637,6 @@ test/package-dump/ghc-7.10.txt"; resourcet safe shakespeare template-haskell text time transformers unordered-containers wai yesod-core yesod-form yesod-persistent ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; @@ -136642,8 +136931,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "yesod-bin"; - version = "1.4.9.2"; - sha256 = "0bbr9bjgj75jh8q9jzv9h1ivz87svz3j02hwphq32487f3682gd0"; + version = "1.4.10"; + sha256 = "1h55155l7ca664zdwq1x0c6p43gy35p1vvghpgd0ajzip8lsyfq1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -137160,8 +137449,8 @@ test/package-dump/ghc-7.10.txt"; }: mkDerivation { pname = "yesod-persistent"; - version = "1.4.0.2"; - sha256 = "06qzgq0mb7k0h8q6lh47l0mzx91xn4ba07nmn22vsfvjfdji6lib"; + version = "1.4.0.3"; + sha256 = "0prvrz52c2pr4qsanjzndviyq4f6zc49in69xz5153h2vagbfmb4"; buildDepends = [ base blaze-builder conduit persistent persistent-template resource-pool resourcet transformers yesod-core @@ -137170,7 +137459,6 @@ test/package-dump/ghc-7.10.txt"; base blaze-builder conduit hspec persistent persistent-sqlite text wai-extra yesod-core ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/haskell-modules/mueval-fix.patch b/pkgs/development/haskell-modules/mueval-fix.patch new file mode 100644 index 000000000000..62a8f8f61e24 --- /dev/null +++ b/pkgs/development/haskell-modules/mueval-fix.patch @@ -0,0 +1,90 @@ +diff --git a/Mueval/ArgsParse.hs b/Mueval/ArgsParse.hs +index 05c8fd9..0c32e27 100644 +--- a/Mueval/ArgsParse.hs ++++ b/Mueval/ArgsParse.hs +@@ -1,10 +1,9 @@ ++{-# LANGUAGE CPP #-} + module Mueval.ArgsParse (Options(..), interpreterOpts, getOptions) where + + import Control.Monad (liftM) + import System.Console.GetOpt + +-import qualified Codec.Binary.UTF8.String as Codec (decodeString) +- + import Mueval.Context (defaultModules, defaultPackages) + + -- | See the results of --help for information on what each option means. +@@ -98,4 +97,11 @@ header = "Usage: mueval [OPTION...] --expression EXPRESSION..." + -- | Just give us the end result options; this parsing for + -- us. Bonus points for handling UTF. + getOptions :: [String] -> Either (Bool, String) Options +-getOptions = interpreterOpts . map Codec.decodeString +\ No newline at end of file ++getOptions = interpreterOpts . map decodeString ++ ++decodeString :: String -> String ++#if __GLASGOW_HASKELL__ >= 702 ++decodeString = id ++#else ++decodeString = Codec.decodeString ++#endif +diff --git a/Mueval/Context.hs b/Mueval/Context.hs +index 78925cf..548514c 100644 +--- a/Mueval/Context.hs ++++ b/Mueval/Context.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + module Mueval.Context ( + cleanModules, + defaultModules, +@@ -32,7 +33,9 @@ defaultModules = ["Prelude", + "Control.Monad.Error", + "Control.Monad.Fix", + "Control.Monad.Identity", ++#if !MIN_VERSION_base(4,7,0) + "Control.Monad.Instances", ++#endif + "Control.Monad.RWS", + "Control.Monad.Reader", + "Control.Monad.State", +diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs +index 29b771f..6c39482 100644 +--- a/Mueval/Interpreter.hs ++++ b/Mueval/Interpreter.hs +@@ -1,4 +1,5 @@ + {-# LANGUAGE PatternGuards #-} ++{-# LANGUAGE FlexibleContexts #-} + -- TODO: suggest the convenience functions be put into Hint proper? + module Mueval.Interpreter where + +@@ -12,8 +13,6 @@ import System.Exit (exitFailure) + import System.FilePath.Posix (takeFileName) + import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..)) + +-import qualified System.IO.UTF8 as UTF (putStrLn) +- + import Language.Haskell.Interpreter (eval, set, reset, setImportsQ, loadModules, liftIO, + installedModulesInScope, languageExtensions, + typeOf, setTopLevelModules, runInterpreter, glasgowExtensions, +@@ -100,7 +99,7 @@ mvload lfl = do canonfile <- makeRelativeToCurrentDirectory lfl + -- flooding. Lambdabot has a similar limit. + sayIO :: String -> IO () + sayIO str = do (out,b) <- render 1024 str +- UTF.putStrLn out ++ putStrLn out + when b exitFailure + + -- | Oh no, something has gone wrong. If it's a compilation error pretty print +diff --git a/mueval.cabal b/mueval.cabal +index 3f9406d..b86d796 100644 +--- a/mueval.cabal ++++ b/mueval.cabal +@@ -32,7 +32,7 @@ library + exposed-modules: Mueval.Parallel, Mueval.Context, Mueval.Interpreter, + Mueval.ArgsParse, Mueval.Resources + build-depends: base>=4 && < 5, containers, directory, mtl>2, filepath, unix, process, +- hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions, simple-reflect ++ hint>=0.3.1, show>=0.3, Cabal, extensible-exceptions, simple-reflect + ghc-options: -Wall -static + + executable mueval-core diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 687b7319cf48..444621614071 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }: +{ stdenv, fetchurl, readline, gettext, ncurses }: stdenv.mkDerivation rec { name = "gnu-apl-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1"; }; - buildInputs = [ liblapack readline gettext ncurses ]; + buildInputs = [ readline gettext ncurses ]; postInstall = '' cp -r support-files/ $out/share/doc/ diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 9ad8c2790da6..bdf6f7752777 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,10 +1,22 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk -, fftw, fftwSinglePrec, zlib, curl, qrupdate +, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null }: +let + suitesparseOrig = suitesparse; + qrupdateOrig = qrupdate; +in +# integer width is determined by openblas, so all dependencies must be built +# with exactly the same openblas +let + suitesparse = + if suitesparseOrig != null then suitesparseOrig.override { inherit openblas; } else null; + qrupdate = if qrupdateOrig != null then qrupdateOrig.override { inherit openblas; } else null; +in + stdenv.mkDerivation rec { version = "4.0.0"; name = "octave-${version}"; @@ -14,7 +26,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl + graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas fftw fftwSinglePrec qrupdate ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) @@ -34,7 +46,13 @@ stdenv.mkDerivation rec { # problems on Hydra enableParallelBuilding = false; - configureFlags = [ "--enable-readline" "--enable-dl" ]; + configureFlags = + [ "--enable-readline" + "--enable-dl" + "--with-blas=openblas" + "--with-lapack=openblas" + ] + ++ stdenv.lib.optional openblas.blas64 "--enable-64"; # Keep a copy of the octave tests detailed results in the output # derivation, because someone may care diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c10425631b3c..c1ba35a91343 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.4.41"; - sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v"; + phpVersion = "5.4.42"; + sha = "1yg03b6a88i7hg593m9zmmcm4kr59wdrhz9xk1frx9ps9gkb51b2"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 425f51ce5c66..e05f1ae10bd8 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -1,6 +1,6 @@ { callPackage, apacheHttpd }: callPackage ./generic.nix { - phpVersion = "5.6.9"; - sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr"; + phpVersion = "5.6.10"; + sha = "0iccgibmbc659z6dh6c58l1b7vnqly7al37fbs0l3si4qy0rqmqa"; apacheHttpd = apacheHttpd; } diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index e67c26829984..4ad4679bd6ea 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, self, callPackage -, bzip2, openssl +, bzip2, openssl, gettext , includeModules ? false , db, gdbm, ncurses, sqlite, readline -, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true +, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin , zlib ? null, zlibSupport ? true , expat, libffi }: @@ -224,7 +224,7 @@ let gdbm = buildInternalPythonModule { moduleName = "gdbm"; internalName = "gdbm"; - deps = [ gdbm ]; + deps = [ gdbm ] ++ stdenv.lib.optional stdenv.isCygwin gettext; }; sqlite3 = buildInternalPythonModule { diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 0f21af94c64c..bceb10e33555 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl , bdbSupport ? false, db -, ldapSupport ? true, openldap +, ldapSupport ? !stdenv.isCygwin, openldap , libiconv }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = '' --with-apr=${apr} --with-expat=${expat} - --with-crypto + ${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"} ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"} ${stdenv.lib.optionalString ldapSupport "--with-ldap"} diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix index 4423f9c157d6..f4c98c7da33d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix @@ -178,7 +178,7 @@ let + " -I${ilmbase}/include/OpenEXR"; }; - kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; }; + kinit = super.kinit // { patches = [ ./kinit/0001-kinit-libpath.patch ]; }; kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch index a6ccb2085d32..9c76079a382a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch @@ -1,8 +1,17 @@ +From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sat, 13 Jun 2015 08:57:55 -0500 +Subject: [PATCH] kinit libpath + +--- + src/kdeinit/kinit.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp -index 3c3c913..f510620 100644 +index 9e775b6..0ac5646 100644 --- a/src/kdeinit/kinit.cpp +++ b/src/kdeinit/kinit.cpp -@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args, +@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args, if (!libpath.isEmpty()) { if (!l.load()) { if (libpath_relative) { @@ -15,10 +24,10 @@ index 3c3c913..f510620 100644 - libpath = install_lib_dir + libpath; - l.setFileName(libpath); + // Use QT_PLUGIN_PATH to find shared library directories -+ // For KF5, the plugin path is /lib/plugins, so the kdeinit5 -+ // shared libraries should be in /lib/plugins/../ ++ // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5 ++ // shared libraries should be in /lib/qt5/plugins/../../ + const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]")); -+ const QString up = QString::fromLocal8Bit("/../"); ++ const QString up = QString::fromLocal8Bit("/../../"); + const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts); + Q_FOREACH (const QString &path, paths) { + l.setFileName(path + up + libpath); @@ -28,3 +37,6 @@ index 3c3c913..f510620 100644 } } if (!l.isLoaded()) { +-- +2.4.2 + diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix new file mode 100644 index 000000000000..e11e2b1db855 --- /dev/null +++ b/pkgs/development/libraries/libebur128/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.0.2"; + name = "libebur128-${version}"; + + src = fetchFromGitHub { + owner = "jiixyj"; + repo = "libebur128"; + rev = "v${version}"; + sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; + }; + + buildInputs = [ cmake speexdsp pkgconfig ]; + + meta = with stdenv.lib; { + description = "Implementation of the EBU R128 loudness standard"; + homepage = https://github.com/jiixyj/libebur128; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/pkgs/development/libraries/libedit/01-cygwin.patch new file mode 100644 index 000000000000..33bd39ed61e5 --- /dev/null +++ b/pkgs/development/libraries/libedit/01-cygwin.patch @@ -0,0 +1,25 @@ +--- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100 ++++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200 +@@ -56,9 +56,11 @@ + /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it... + * ref: ISO/IEC DTR 19769 + */ ++#ifndef __CYGWIN__ + #if WCHAR_MAX < INT32_MAX + #warning Build environment does not support non-BMP characters + #endif ++#endif + + #ifndef HAVE_WCSDUP + wchar_t *wcsdup(const wchar_t *s); +--- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100 ++++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200 +@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; + + #ifndef CTRL + #include <sys/ioctl.h> +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__) + #include <sys/ttydefaults.h> + #endif + #ifndef CTRL diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 61bb15dde7da..dc2f5842b285 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = "${groff}/bin/nroff"; + patches = if stdenv.isCygwin then [ + ./01-cygwin.patch + ] else null; + postInstall = '' sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 74524164dd09..19878a24e956 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, python }: +{ stdenv, fetchFromGitHub, autoreconfHook, python, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ python ]; + buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; patchPhase = '' patchShebangs event_rpcgen.py diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index b78e583fa640..1b981edcdcd1 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -1,13 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libmspack-0.4alpha"; + name = "libmspack-0.5alpha"; src = fetchurl { - # upstream url: "curl: (22) The requested URL returned error: 406 Not Acceptable" - #url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz; - url = "http://pkgs.fedoraproject.org/lookaside/pkgs/libmspack/" - + "libmspack-0.4alpha.tar.gz/1ab10b507259993c74b4c41a88103b59/libmspack-0.4alpha.tar.gz"; - sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp"; + url = "http://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz"; + sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9"; }; meta = { @@ -15,5 +12,4 @@ stdenv.mkDerivation { homepage = http://www.cabextract.org.uk/libmspack; license = stdenv.lib.licenses.lgpl2; }; - } diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 09cc623cbb19..011e936548a8 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -12,13 +12,13 @@ rec { inherit buildInputs; phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"]; - patches = [./constants.patch]; + patches = [./constants.patch ./non-x86.patch]; # using BACKEND=x86emu on 64bit systems fixes: # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$out" - ] ++ a.stdenv.lib.optionals ( a.stdenv.system == "x86_64-linux" ) [ "BACKEND=x86emu" ]; + ] ++ a.stdenv.lib.optionals ( a.stdenv.isx86_64 || a.stdenv.isArm ) [ "BACKEND=x86emu" ]; fixX86Def = a.fullDepEntry ('' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch new file mode 100644 index 000000000000..0d41cd737f01 --- /dev/null +++ b/pkgs/development/libraries/libx86/non-x86.patch @@ -0,0 +1,38 @@ +diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile +--- libx86-1.1+ds1.orig/Makefile 2008-05-19 12:28:59.000000000 +0300 ++++ libx86-1.1+ds1/Makefile 2012-02-20 01:32:03.750068423 +0200 +@@ -5,6 +5,7 @@ + ifeq ($(BACKEND),x86emu) + OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ + x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o ++ CFLAGS += -DX86EMU + else + OBJECTS += lrmi.o + endif +diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c +--- libx86-1.1+ds1.orig/thunk.c 2008-04-03 03:48:00.000000000 +0300 ++++ libx86-1.1+ds1/thunk.c 2012-02-20 01:12:56.468820192 +0200 +@@ -32,6 +32,7 @@ + #define TRUE 1 + #define FALSE 0 + ++#ifndef X86EMU + #define __BUILDIO(bwl,bw,type) \ + static inline void out##bwl##_local(unsigned long port, unsigned type value) { __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \ + }\ +@@ -44,6 +45,15 @@ + __BUILDIO(b,b,char) + __BUILDIO(w,w,short) + __BUILDIO(l,,int) ++#else ++/* use libc functions */ ++#define inb_local inb ++#define inw_local inw ++#define inl_local inl ++#define outb_local outb ++#define outw_local outw ++#define outl_local outl ++#endif /* X86EMU */ + + + char *mmap_addr = SHMERRORPTR; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 465ec7eebb2b..aaa9ab8a61ad 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,29 +1,34 @@ { stdenv , fetchurl , gfortran -, liblapack +, openblas }: stdenv.mkDerivation { name = "qrupdate-1.1.2"; src = fetchurl { url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ; - sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; + sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; - - configurePhase = '' - export PREFIX=$out - sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \ - -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \ - Makeconf - ''; + + configurePhase = + '' + export PREFIX=$out + sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \ + -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \ + Makeconf + '' + + stdenv.lib.optionalString openblas.blas64 + '' + sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' + ''; doCheck = true; checkTarget = "test"; - buildTarget = "lib"; + buildFlags = [ "lib" "solib" ]; + + installTargets = "install"; - installTarget = "install-staticlib"; - - buildInputs = [ gfortran liblapack ]; + buildInputs = [ gfortran openblas ]; } diff --git a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch new file mode 100644 index 000000000000..4607274de74c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch @@ -0,0 +1,13 @@ +diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +index 8833e3f..c56d381 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -47,7 +47,7 @@ + ****************************************************************************/ + + //#define QSSLSOCKET_DEBUG +-//#define QT_DECRYPT_SSL_TRAFFIC ++#define QT_DECRYPT_SSL_TRAFFIC + + #include "qssl_p.h" + #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index c7e3a5c6123d..139bba2db89e 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -20,6 +20,7 @@ # options , developerBuild ? false +, decryptSslTraffic ? false }: with autonix; @@ -61,7 +62,7 @@ let # GNOME dependencies are not used unless gtkStyle == true inherit (gnome) libgnomeui GConf gnome_vfs; bison = bison2; # error: too few arguments to function 'int yylex(... - inherit developerBuild srcs version; + inherit developerBuild srcs version decryptSslTraffic; }; connectivity = callPackage diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 9e11dcdde868..7ef39a408603 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -20,6 +20,7 @@ , buildTests ? false , developerBuild ? false , gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, decryptSslTraffic ? false }: with stdenv.lib; @@ -68,7 +69,8 @@ stdenv.mkDerivation { (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) ./0013-xdg_config_dirs.patch - ]; + ] + ++ (optional decryptSslTraffic ./0100-ssl.patch); preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 01bb3371f5e2..c896ecca4728 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gfortran, atlasWithLapack }: +{ stdenv, fetchurl, gfortran, openblas }: + +with stdenv.lib; let version = "3.2.0"; @@ -10,10 +12,15 @@ stdenv.mkDerivation { sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff"; }; - buildInputs = [ gfortran atlasWithLapack ]; + buildInputs = [ gfortran openblas ]; # Auto-detection fails because gfortran brings in BLAS by default - configureFlags="--with-blas=-latlas --with-lapack=-latlas"; + configureFlags = [ + "--with-blas=-lopenblas" + "--with-lapack=-lopenblas" + ]; + + FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; meta = { homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 4dd1ca46e956..89d2a242f963 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }: +{ stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { version = "3.12.3"; @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO" ''; + configureFlags = [ + "--with-blas-lib=-lopenblas" + "--with-lapack-lib=-lopenblas" + ]; + nativeBuildInputs = [ unzip ]; - buildInputs = [ gfortran blas liblapack ]; + buildInputs = [ gfortran openblas ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix deleted file mode 100644 index ec4422ce8951..000000000000 --- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config }: - -let local = config.openblas.preferLocalBuild or false; - localTarget = config.openblas.target or ""; -in -stdenv.mkDerivation rec { - version = "0.2.10"; - - name = "openblas-${version}"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; - name = "openblas-${version}.tar.gz"; - }; - - preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; - - buildInputs = [gfortran perl]; - - cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); - - target = if local then localTarget else - if cpu == "i686" then "P2" else - if cpu == "x86_64" then "CORE2" else - # allow autodetect - ""; - - makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; - - meta = with stdenv.lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix deleted file mode 100644 index c476dac955ad..000000000000 --- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config }: - -let local = config.openblas.preferLocalBuild or false; - localTarget = config.openblas.target or ""; -in -stdenv.mkDerivation rec { - version = "0.2.2"; - - name = "openblas-${version}"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; - sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr"; - name = "openblas-${version}.tar.gz"; - }; - - preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; - - buildInputs = [gfortran perl]; - - cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); - - target = if local then localTarget else - if cpu == "i686" then "P2" else - if cpu == "x86_64" then "CORE2" else - # allow autodetect - ""; - - makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\""; - - meta = with stdenv.lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 67d95f97e074..a4bf1efbb731 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }: +{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils +# Most packages depending on openblas expect integer width to match pointer width, +# but some expect to use 32-bit integers always (for compatibility with reference BLAS). +, blas64 ? null +}: with stdenv.lib; let local = config.openblas.preferLocalBuild or false; binary = - { - i686-linux = "32"; + { i686-linux = "32"; x86_64-linux = "64"; x86_64-darwin = "64"; }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); genericFlags = - [ - "DYNAMIC_ARCH=1" + [ "DYNAMIC_ARCH=1" "NUM_THREADS=64" - "BINARY=${binary}" ]; localFlags = config.openblas.flags or optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; + blas64Orig = blas64; in stdenv.mkDerivation rec { version = "0.2.14"; @@ -43,9 +45,13 @@ stdenv.mkDerivation rec { # thus is not an explicit dependency. "CC=${if stdenv.isDarwin then "clang" else "gcc"}" ''PREFIX="''$(out)"'' - "INTERFACE64=1" + "BINARY=${binary}" + "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" + "INTERFACE64=${if blas64 then "1" else "0"}" ]; + blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system; + meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch deleted file mode 100644 index b0f7715f755d..000000000000 --- a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 456b26d0c9101adaa5876954baac0ca0e872dab6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 15 Dec 2014 10:18:01 -0600 -Subject: [PATCH 1/3] disable metis - ---- - SuiteSparse_config/SuiteSparse_config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index ba2da23..e1514bf 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -212,8 +212,8 @@ XERBLA = - # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. - # You may wish to use an absolute path. METIS is optional. Compile - # CHOLMOD with -DNPARTITION if you do not wish to use METIS. --METIS_PATH = ../../metis-4.0 --METIS = ../../metis-4.0/libmetis.a -+# METIS_PATH = ../../metis-4.0 -+# METIS = ../../metis-4.0/libmetis.a - - #------------------------------------------------------------------------------ - # UMFPACK configuration: -@@ -273,7 +273,7 @@ UMFPACK_CONFIG = - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - --CHOLMOD_CONFIG = $(GPU_CONFIG) -+CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION - - # uncomment this line to compile CHOLMOD without METIS: - # CHOLMOD_CONFIG = -DNPARTITION --- -2.1.3 - diff --git a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch b/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch deleted file mode 100644 index ef861f68091a..000000000000 --- a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e0fee492a315ce1ef8697b056af210beb1465334 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 15 Dec 2014 10:18:12 -0600 -Subject: [PATCH 2/3] set install dir - ---- - SuiteSparse_config/SuiteSparse_config.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index e1514bf..f1046a6 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -95,8 +95,8 @@ F77LIB = - # LIB = -lm - - # For "make install" --INSTALL_LIB = /usr/local/lib --INSTALL_INCLUDE = /usr/local/include -+INSTALL_LIB = @out@/lib -+INSTALL_INCLUDE = @out@/include - - # Which version of MAKE you are using (default is "make") - # MAKE = make --- -2.1.3 - diff --git a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch b/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch deleted file mode 100644 index db0b1c456558..000000000000 --- a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a99cca30cfd965683564ae024e8ecc615c61697a Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Mon, 15 Dec 2014 10:24:08 -0600 -Subject: [PATCH 3/3] blas lapack flags - ---- - SuiteSparse_config/SuiteSparse_config.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk -index f1046a6..1710162 100644 ---- a/SuiteSparse_config/SuiteSparse_config.mk -+++ b/SuiteSparse_config/SuiteSparse_config.mk -@@ -119,8 +119,8 @@ INSTALL_INCLUDE = @out@/include - # naming the BLAS and LAPACK library (*.a or *.so) files. - - # This is probably slow ... it might connect to the Standard Reference BLAS: -- BLAS = -lblas -lgfortran -- LAPACK = -llapack -+ BLAS = @blasFlags@ -+ LAPACK = @lapackFlags@ - - # MKL - # BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm --- -2.1.3 - diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 4d27701b135a..16174a80212f 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,22 +1,44 @@ -{ stdenv, fetchurl, blas, liblapack, gfortran } : +{ stdenv, fetchurl, gfortran, openblas }: + +let + int_t = if openblas.blas64 then "int64_t" else "int32_t"; +in stdenv.mkDerivation rec { version = "4.2.1"; name = "suitesparse-${version}"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; - sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; + sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; }; - buildInputs = [blas liblapack gfortran] ; - patches = [./disable-metis.patch]; + + nativeBuildInputs = [ gfortran ]; + buildInputs = [ openblas ]; preConfigure = '' - export PREFIX=$out mkdir -p $out/lib mkdir -p $out/include + + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's/METIS .*$/METIS =/' \ + -e 's/METIS_PATH .*$/METIS_PATH =/' \ + -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ + -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' ''; - makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include''; + makeFlags = [ + "PREFIX=\"$(out)\"" + "INSTALL_LIB=$(out)/lib" + "INSTALL_INCLUDE=$(out)/include" + "BLAS=-lopenblas" + "LAPACK=" + ]; NIX_CFLAGS = "-fPIC"; + meta = with stdenv.lib; { + homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; + description = "A suite of sparse matrix algorithms"; + license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; + maintainers = with maintainers; [ ttuegel ]; + }; } diff --git a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk b/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk deleted file mode 100644 index 157a20d7b5aa..000000000000 --- a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk +++ /dev/null @@ -1,452 +0,0 @@ -#=============================================================================== -# SuiteSparse_config.mk: common configuration file for the SuiteSparse -#=============================================================================== - -# This file contains all configuration settings for all packages authored or -# co-authored by Tim Davis: -# -# Package Version Description -# ------- ------- ----------- -# AMD 1.2 or later approximate minimum degree ordering -# COLAMD 2.4 or later column approximate minimum degree ordering -# CCOLAMD 1.0 or later constrained column approximate minimum degree ordering -# CAMD any constrained approximate minimum degree ordering -# UMFPACK 4.5 or later sparse LU factorization, with the BLAS -# CHOLMOD any sparse Cholesky factorization, update/downdate -# KLU 0.8 or later sparse LU factorization, BLAS-free -# BTF 0.8 or later permutation to block triangular form -# LDL 1.2 or later concise sparse LDL' -# CXSparse any extended version of CSparse (int/long, real/complex) -# SuiteSparseQR any sparse QR factorization -# RBio 2.0 or later read/write sparse matrices in Rutherford-Boeing format -# -# By design, this file is NOT included in the CSparse makefile. -# That package is fully stand-alone. CSparse is primarily for teaching; -# production code should use CXSparse. -# -# The SuiteSparse_config directory and the above packages should all appear in -# a single directory, in order for the Makefile's within each package to find -# this file. -# -# To enable an option of the form "# OPTION = ...", edit this file and -# delete the "#" in the first column of the option you wish to use. -# -# The use of METIS 4.0.1 is optional. To exclude METIS, you must compile with -# CHOLMOD_CONFIG set to -DNPARTITION. See below for details. However, if you -# do not have a metis-4.0 directory inside the SuiteSparse directory, the -# */Makefile's that optionally rely on METIS will automatically detect this -# and compile without METIS. - -#------------------------------------------------------------------------------ -# Generic configuration -#------------------------------------------------------------------------------ - -# Using standard definitions from the make environment, typically: -# -# CC cc C compiler -# CXX g++ C++ compiler -# CFLAGS [ ] flags for C and C++ compiler -# CPPFLAGS [ ] flags for C and C++ compiler -# TARGET_ARCH [ ] target architecture -# FFLAGS [ ] flags for Fortran compiler -# RM rm -f delete a file -# AR ar create a static *.a library archive -# ARFLAGS rv flags for ar -# MAKE make make itself (sometimes called gmake) -# -# You can redefine them here, but by default they are used from the -# default make environment. - -# To use OpenMP add -openmp to the CFLAGS -# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS -# as the number of cores per socket on the machine being used to maximize -# memory performance - CFLAGS = -# CFLAGS = -g -# for the icc compiler and OpenMP: -# CFLAGS = -openmp - -# C and C++ compiler flags. The first three are standard for *.c and *.cpp -# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required). -# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER - CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -# for the MKL BLAS: -# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE -# with no optimization: -# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fexceptions -fPIC - -# ranlib, and ar, for generating libraries. If you don't need ranlib, -# just change it to RANLAB = echo -RANLIB = ranlib -ARCHIVE = $(AR) $(ARFLAGS) - -# copy and delete a file -CP = cp -f -MV = mv -f - -# Fortran compiler (not required for 'make' or 'make library') -F77 = gfortran -F77FLAGS = $(FFLAGS) -O -F77LIB = - -# C and Fortran libraries. Remove -lrt if you don't have it. - LIB = -lm -lrt -# Using the following requires CF = ... -DNTIMER on POSIX C systems. -# LIB = -lm - -# For "make install" -INSTALL_LIB = @out@/lib -INSTALL_INCLUDE = @out@/include - -# Which version of MAKE you are using (default is "make") -# MAKE = make -# MAKE = gmake - -#------------------------------------------------------------------------------ -# BLAS and LAPACK configuration: -#------------------------------------------------------------------------------ - -# UMFPACK and CHOLMOD both require the BLAS. CHOLMOD also requires LAPACK. -# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or -# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD. -# LAPACK is at http://www.netlib.org/lapack/ . You can use the standard -# Fortran LAPACK along with Goto's BLAS to obtain very good performance. -# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz -# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops -# on a 2.5Ghz dual-core AMD Opteron. - -# These settings will probably not work, since there is no fixed convention for -# naming the BLAS and LAPACK library (*.a or *.so) files. - -# This is probably slow ... it might connect to the Standard Reference BLAS: - BLAS = -lf77blas -latlas -lcblas -lgfortran - LAPACK = -llapack -latlas -lcblas - -# MKL -# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm -# LAPACK = - -# ACML -# BLAS = -lacml -lgfortran -# LAPACK = - -# OpenBLAS -# BLAS = -lopenblas -# LAPACK = - -# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto" -# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto. -# Using the Goto BLAS: -# BLAS = -lgoto -lgfortran -lgfortranbegin -# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread - -# Using non-optimized versions: -# BLAS = -lblas_plain -lgfortran -lgfortranbegin -# LAPACK = -llapack_plain - -# BLAS = -lblas_plain -lgfortran -lgfortranbegin -# LAPACK = -llapack - -# The BLAS might not contain xerbla, an error-handling routine for LAPACK and -# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and -# stops the application program if an error occurs. A C version of xerbla -# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a) -# includes a Fortran-callable xerbla routine that prints nothing and does not -# stop the application program. This is optional. - -# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a - -# If you wish to use the XERBLA in LAPACK and/or the BLAS instead, -# use this option: -XERBLA = - -# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead, -# use this: - -# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a - -#------------------------------------------------------------------------------ -# GPU configuration for CHOLMOD and SPQR -#------------------------------------------------------------------------------ - -# no cuda - CUDA_ROOT = - GPU_BLAS_PATH = - GPU_CONFIG = - CUDA_PATH = - CUDART_LIB = - CUBLAS_LIB = - CUDA_INC_PATH = - NV20 = - NV30 = - NV35 = - NVCC = echo - NVCCFLAGS = - -# with cuda for CHOLMOD -# CUDA_ROOT = /usr/local/cuda -# GPU_BLAS_PATH = $(CUDA_ROOT) -# with 4 cores (default): -# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -# with 10 cores: -# GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10 -# CUDA_PATH = $(CUDA_ROOT) -# CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so -# CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so -# CUDA_INC_PATH = $(CUDA_ROOT)/include/ -# NV20 = -arch=sm_20 -Xcompiler -fPIC -# NV30 = -arch=sm_30 -Xcompiler -fPIC -# NV35 = -arch=sm_35 -Xcompiler -fPIC -# NVCC = $(CUDA_ROOT)/bin/nvcc -# NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 - -# was NVCC = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20) - -#------------------------------------------------------------------------------ -# METIS, optionally used by CHOLMOD -#------------------------------------------------------------------------------ - -# If you do not have METIS, or do not wish to use it in CHOLMOD, you must -# compile CHOLMOD with the -DNPARTITION flag. - -# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. -# You may wish to use an absolute path. METIS is optional. Compile -# CHOLMOD with -DNPARTITION if you do not wish to use METIS. -# METIS_PATH = ../../metis-4.0 -# METIS = ../../metis-4.0/libmetis.a - -#------------------------------------------------------------------------------ -# UMFPACK configuration: -#------------------------------------------------------------------------------ - -# Configuration flags for UMFPACK. See UMFPACK/Source/umf_config.h for details. -# -# -DNBLAS do not use the BLAS. UMFPACK will be very slow. -# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by -# LAPACK and the BLAS (defaults to 'int') -# -DNSUNPERF do not use the Sun Perf. Library (default is use it on Solaris) -# -DNRECIPROCAL do not multiply by the reciprocal -# -DNO_DIVIDE_BY_ZERO do not divide by zero -# -DNCHOLMOD do not use CHOLMOD as a ordering method. If -DNCHOLMOD is -# included in UMFPACK_CONFIG, then UMFPACK does not rely on -# CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS. - -UMFPACK_CONFIG = - -# uncomment this line to compile UMFPACK without CHOLMOD: -# UMFPACK_CONFIG = -DNCHOLMOD - -#------------------------------------------------------------------------------ -# CHOLMOD configuration -#------------------------------------------------------------------------------ - -# CHOLMOD Library Modules, which appear in libcholmod.a: -# Core requires: none -# Check requires: Core -# Cholesky requires: Core, AMD, COLAMD. optional: Partition, Supernodal -# MatrixOps requires: Core -# Modify requires: Core -# Partition requires: Core, CCOLAMD, METIS. optional: Cholesky -# Supernodal requires: Core, BLAS, LAPACK -# -# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a): -# Tcov requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal -# optional: Partition -# Valgrind same as Tcov -# Demo requires: Core, Check, Cholesky, MatrixOps, Supernodal -# optional: Partition -# -# Configuration flags: -# -DNCHECK do not include the Check module. License GNU LGPL -# -DNCHOLESKY do not include the Cholesky module. License GNU LGPL -# -DNPARTITION do not include the Partition module. License GNU LGPL -# also do not include METIS. -# -DNCAMD do not use CAMD, etc from Partition module. GNU LGPL -# -DNGPL do not include any GNU GPL Modules in the CHOLMOD library: -# -DNMATRIXOPS do not include the MatrixOps module. License GNU GPL -# -DNMODIFY do not include the Modify module. License GNU GPL -# -DNSUPERNODAL do not include the Supernodal module. License GNU GPL -# -# -DNPRINT do not print anything. -# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by -# LAPACK and the BLAS (defaults to 'int') -# -DNSUNPERF for Solaris only. If defined, do not use the Sun -# Performance Library - -CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION - -# uncomment this line to compile CHOLMOD without METIS: -# CHOLMOD_CONFIG = -DNPARTITION - -#------------------------------------------------------------------------------ -# SuiteSparseQR configuration: -#------------------------------------------------------------------------------ - -# The SuiteSparseQR library can be compiled with the following options: -# -# -DNPARTITION do not include the CHOLMOD partition module -# -DNEXPERT do not include the functions in SuiteSparseQR_expert.cpp -# -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - -# default, without timing, without TBB: -SPQR_CONFIG = $(GPU_CONFIG) -# with TBB: -# SPQR_CONFIG = -DHAVE_TBB - -# This is needed for IBM AIX: (but not for and C codes, just C++) -# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE - -# with TBB, you must select this: -# TBB = -ltbb -# without TBB: -TBB = - -#------------------------------------------------------------------------------ -# code formatting -#------------------------------------------------------------------------------ - -# Use "grep" only, if you do not have "indent" -# PRETTY = grep -v "^\#" -# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120 - PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120 - -#------------------------------------------------------------------------------ -# Linux -#------------------------------------------------------------------------------ - -# Using default compilers: -# CC = gcc -# CF = $(CFLAGS) -O3 -fexceptions - -# alternatives: -# CF = $(CFLAGS) -g -fexceptions \ -# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \ -# -funit-at-a-time -# CF = $(CFLAGS) -O3 -fexceptions \ -# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi -# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -# CF = $(CFLAGS) -O3 -# CF = $(CFLAGS) -O3 -g -fexceptions -# CF = $(CFLAGS) -g -fexceptions \ -# -Wall -W -Wshadow \ -# -Wredundant-decls -Wdisabled-optimization -ansi - -# consider: -# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering -# -frename-registers -ffast-math -funroll-loops - -# Using the Goto BLAS: -# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread - -# Using Intel's icc and ifort compilers: -# (does not work for mexFunctions unless you add a mexopts.sh file) -# F77 = ifort -# CC = icc -# CF = $(CFLAGS) -O3 -xN -vec_report=0 -# CF = $(CFLAGS) -g - -# 64bit: -# F77FLAGS = -O -m64 -# CF = $(CFLAGS) -O3 -fexceptions -m64 -# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA) -# LAPACK = -llapack64 - -# SUSE Linux 10.1, AMD Opteron, with GOTO Blas -# F77 = gfortran -# BLAS = -lgoto_opteron64 -lgfortran - -# SUSE Linux 10.1, Intel Pentium, with GOTO Blas -# F77 = gfortran -# BLAS = -lgoto -lgfortran - -#------------------------------------------------------------------------------ -# Mac -#------------------------------------------------------------------------------ - -# As recommended by macports, http://suitesparse.darwinports.com/ -# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard), -# on my MacBook Air, and they work fine. - -# F77 = gfortran -# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER -# BLAS = -framework Accelerate -# LAPACK = -framework Accelerate -# LIB = -lm - -#------------------------------------------------------------------------------ -# Solaris -#------------------------------------------------------------------------------ - -# 32-bit -# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32 - -# 64-bit -# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc - -# FFLAGS = -fast -KPIC -dalign -xlibmil -m64 - -# The Sun Performance Library includes both LAPACK and the BLAS: -# BLAS = -xlic_lib=sunperf -# LAPACK = - - -#------------------------------------------------------------------------------ -# Compaq Alpha -#------------------------------------------------------------------------------ - -# 64-bit mode only -# CF = $(CFLAGS) -O2 -std1 -# BLAS = -ldxml -# LAPACK = - -#------------------------------------------------------------------------------ -# IBM RS 6000 -#------------------------------------------------------------------------------ - -# BLAS = -lessl -# LAPACK = - -# 32-bit mode: -# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto -# F77FLAGS = -O4 -qipa -qmaxmem=16384 - -# 64-bit mode: -# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto -# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64 - -#------------------------------------------------------------------------------ -# SGI IRIX -#------------------------------------------------------------------------------ - -# BLAS = -lscsl -# LAPACK = - -# 32-bit mode -# CF = $(CFLAGS) -O - -# 64-bit mode (32 bit int's and 64-bit long's): -# CF = $(CFLAGS) -64 -# F77FLAGS = -64 - -# SGI doesn't have ranlib -# RANLIB = echo - -#------------------------------------------------------------------------------ -# AMD Opteron (64 bit) -#------------------------------------------------------------------------------ - -# BLAS = -lgoto_opteron64 -lg2c -# LAPACK = -llapack_opteron64 - -# SUSE Linux 10.1, AMD Opteron -# F77 = gfortran -# BLAS = -lgoto_opteron64 -lgfortran -# LAPACK = -llapack_opteron64 - -#------------------------------------------------------------------------------ -# remove object files and profile output -#------------------------------------------------------------------------------ - -CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index add4ca9a08f4..f30db472b0de 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,34 +1,53 @@ -{ stdenv, fetchurl, substituteAll -, atlasWithLapack, gfortran }: +{ stdenv, fetchurl, gfortran, openblas }: let - name = "suitesparse-4.4.1"; + version = "4.4.4"; + name = "suitesparse-${version}"; + + int_t = if openblas.blas64 then "int64_t" else "int32_t"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.1.tar.gz"; - sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n"; + url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; + sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj"; }; - patches = [ - ./0001-disable-metis.patch - ./0002-set-install-dir.patch - (substituteAll { - src = ./0003-blas-lapack-flags.patch; - blasFlags = "-lf77blas -latlas -lcblas -lgfortran"; - lapackFlags= "-llapack -latlas -lcblas"; - }) - ]; - preConfigure = '' - substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk mkdir -p $out/lib mkdir -p $out/include + + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's/METIS .*$/METIS =/' \ + -e 's/METIS_PATH .*$/METIS_PATH =/' \ + -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ + -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' ''; + makeFlags = [ + "PREFIX=\"$(out)\"" + "INSTALL_LIB=$(out)/lib" + "INSTALL_INCLUDE=$(out)/include" + "BLAS=-lopenblas" + "LAPACK=" + ]; + + NIX_CFLAGS = "-fPIC"; + postInstall = '' + # Build and install shared library + ( + cd "$(mktemp -d)" + for i in "$out"/lib/lib*.a; do + ar -x $i + done + gcc *.o --shared -o "$out/lib/libsuitesparse.so" + ) + for i in umfpack cholmod amd camd colamd spqr; do + ln -s libsuitesparse.so "$out"/lib/lib$i.so; + done + # Install documentation outdoc=$out/share/doc/${name} mkdir -p $outdoc @@ -47,7 +66,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gfortran ]; - buildInputs = [ atlasWithLapack ]; + buildInputs = [ openblas ]; meta = with stdenv.lib; { homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; diff --git a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch deleted file mode 100644 index 5b735eb7d3c9..000000000000 --- a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile -*** SuiteSparse/UMFPACK/Demo/Makefile 2009-11-11 21:09:45.000000000 +0100 ---- SuiteSparse-new/UMFPACK/Demo/Makefile 2010-08-02 12:53:16.000000000 +0200 -*************** -*** 40,46 **** - ../../CAMD/Lib/libcamd.a: - ( cd ../../CAMD ; $(MAKE) library ) - -- $(METIS): -- ( cd $(METIS_PATH) && $(MAKE) ) - - UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ ---- 40,44 ---- - ../../CAMD/Lib/libcamd.a: - ( cd ../../CAMD ; $(MAKE) library ) - - - UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index df8749622bea..580460d5fc09 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c"; }; - buildInputs = [ apr scons openssl aprutil zlib kerberos pkgconfig ]; + buildInputs = [ apr scons openssl aprutil zlib ] + ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos + ++ [ pkgconfig ]; configurePhase = '' ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { APU="$(echo "${aprutil}"/bin/*-config)" CC="${ if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc" }" ${ - if stdenv.isDarwin then "" else "GSSAPI=\"${kerberos}\"" + if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" } ''; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ee8aec79af15..963566e27fa7 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.10.1"; + name = "sqlite-3.8.10.2"; src = fetchurl { - url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz"; - sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0"; + url = "http://sqlite.org/2015/sqlite-autoconf-3081002.tar.gz"; + sha1 = "c2f2c17d3dc4c4e179d35cc04e4420636d48a152"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 63de08b46dd7..c8a2fd6a4e99 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf"; }; - installPhase = '' - make install prefix=$out - ''; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index b8a09492eab7..8fa1bc126465 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2014.11.29-2"; + version = "2015.04.30"; name = "pharo-vm-core-i386-${version}"; system = "x86_32-linux"; src = fetchurl { url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2"; - md5 = "529cff4639cee313ddf55fd377bd6fb3"; + sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv"; }; sources10Zip = fetchurl { diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix index 22be22633c20..915b27cb4cd3 100644 --- a/pkgs/development/python-modules/numpy-scipy-support.nix +++ b/pkgs/development/python-modules/numpy-scipy-support.nix @@ -3,14 +3,14 @@ python, # Name of package (e.g. numpy or scipy) pkgName, - # Atlas math library - atlas + # OpenBLAS math library + openblas }: { - # Re-export atlas here so that it can be sure that the same one will be used + # Re-export openblas here so that it can be sure that the same one will be used # in the propagatedBuildInputs. - inherit atlas; + inherit openblas; # First "install" the package, then import what was installed, and call the # .test() function, which will run the test suite. @@ -48,9 +48,9 @@ preBuild = '' echo "Creating site.cfg file..." cat << EOF > site.cfg - [atlas] - include_dirs = ${atlas}/include - library_dirs = ${atlas}/lib + [openblas] + include_dirs = ${openblas}/include + library_dirs = ${openblas}/lib EOF ''; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 11d7193edee7..2f8c22fe8658 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -997,7 +997,7 @@ let }); Mposterior = old.Mposterior.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); qtbase = old.qtbase.overrideDerivation (attrs: { @@ -1037,11 +1037,11 @@ let }); slfm = old.slfm.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas"; + PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); gputools = old.gputools.overrideDerivation (attrs: { @@ -1087,6 +1087,7 @@ let BayesLogit = old.BayesLogit.overrideDerivation (attrs: { patches = [ ./patches/BayesLogit.patch ]; + buildInputs = (attrs.buildInputs or []) ++ [ pkgs.openblasCompat ]; }); BayesBridge = old.BayesBridge.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch index 4c8778c46976..ef776f3531da 100644 --- a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch +++ b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch @@ -6,7 +6,7 @@ diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \ PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o -PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -llapack -lf77blas -lcblas -latlas -lgfortran ++PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lopenblas # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW diff --git a/pkgs/development/tools/analysis/infer/default.nix b/pkgs/development/tools/analysis/infer/default.nix new file mode 100644 index 000000000000..35dbd08a870e --- /dev/null +++ b/pkgs/development/tools/analysis/infer/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "infer-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz"; + sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m"; + }; + + buildInputs = [ python ]; + buildPhase = "true"; + installPhase = '' + mkdir -p $out/libexec $out/bin; + cp -R facebook-clang-plugin $out/libexec + cp -R infer $out/libexec + for x in `ls $out/libexec/infer/infer/bin`; do + ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x; + done + ''; + fixupPhase = '' + patchShebangs $out + ''; + + meta = { + description = "Scalable static analyzer for Java, C and Objective-C"; + homepage = http://fbinfer.com; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch new file mode 100644 index 000000000000..982aba17e874 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch @@ -0,0 +1,274 @@ +--- cmake-3.2.2/Source/cmFileCommand.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/ccmFileCommand.cxx 2015-06-10 11:02:27.345598700 +0200 +@@ -1179,7 +1179,7 @@ + MatchProperties CollectMatchProperties(const char* file) + { + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string lower = cmSystemTools::LowerCase(file); + const char* file_to_match = lower.c_str(); + #else +--- cmake-3.2.2/Source/cmInstallCommand.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/cmInstallCommand.cxx 2015-06-10 11:04:19.257935200 +0200 +@@ -1138,7 +1138,7 @@ + { + literal_args += " REGEX \""; + // Match rules are case-insensitive on some platforms. +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + std::string regex = cmSystemTools::LowerCase(args[i]); + #else + std::string regex = args[i]; +--- cmake-3.2.2/Source/kwsys/Glob.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/Glob.cxx 2015-06-10 11:05:51.602674000 +0200 +@@ -37,7 +37,7 @@ + #include <string.h> + namespace KWSYS_NAMESPACE + { +-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__APPLE__) + // On Windows and apple, no difference between lower and upper case + # define KWSYS_GLOB_CASE_INDEPENDENT + #endif +--- cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-06-10 11:13:00.308303500 +0200 +@@ -911,7 +911,7 @@ + // Hide implementation details in an anonymous namespace. + namespace { + // ***************************************************************************** +-#if defined(__linux) || defined(__APPLE__) ++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + int LoadLines( + FILE *file, + kwsys_stl::vector<kwsys_stl::string> &lines) +@@ -947,7 +947,7 @@ + return nRead; + } + +-# if defined(__linux) ++# if defined(__linux) || defined(__CYGWIN__) + // ***************************************************************************** + int LoadLines( + const char *fileName, +@@ -986,7 +986,7 @@ + } + #endif + +-#if defined(__linux) ++#if defined(__linux) || defined(__CYGWIN__) + // **************************************************************************** + template<typename T> + int GetFieldsFromFile( +@@ -3132,7 +3132,6 @@ + pos = buffer.find("processor\t",pos+1); + } + +-#ifdef __linux + // Find the largest physical id. + int maxId = -1; + kwsys_stl::string idc = +@@ -3165,14 +3164,6 @@ + atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str()); + } + +-#else // __CYGWIN__ +- // does not have "physical id" entries, neither "cpu cores" +- // this has to be fixed for hyper-threading. +- kwsys_stl::string cpucount = +- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); +- this->NumberOfPhysicalCPU= +- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); +-#endif + // gotta have one, and if this is 0 then we get a / by 0n + // better to have a bad answer than a crash + if(this->NumberOfPhysicalCPU <= 0) +@@ -3370,7 +3361,7 @@ + GlobalMemoryStatusEx(&statex); + return statex.ullTotalPhys/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memTotal=0; + int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); + if (ierr) +@@ -3501,7 +3492,7 @@ + GlobalMemoryStatusEx(&statex); + return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; + # endif +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + const char *names[3]={"MemTotal:","MemFree:",NULL}; + SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; + int ierr=GetFieldsFromFile("/proc/meminfo",names,values); +@@ -3560,7 +3551,7 @@ + return -2; + } + return pmc.WorkingSetSize/1024; +-#elif defined(__linux) ++#elif defined(__linux) || defined(__CYGWIN__) + SystemInformation::LongLong memUsed=0; + int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); + if (ierr) +@@ -3612,7 +3603,7 @@ + { + #if defined(_WIN32) + return GetCurrentProcessId(); +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) + return getpid(); + #else + return -1; +--- cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-06-10 11:21:58.980443200 +0200 +@@ -93,19 +93,12 @@ + # if defined(_MSC_VER) && _MSC_VER >= 1800 + # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx + # endif +-#elif defined (__CYGWIN__) +-# include <windows.h> +-# undef _WIN32 + #endif + + #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H + extern char **environ; + #endif + +-#ifdef __CYGWIN__ +-# include <sys/cygwin.h> +-#endif +- + // getpwnam doesn't exist on Windows and Cray Xt3/Catamount + // same for TIOCGWINSZ + #if defined(_WIN32) || defined (__LIBCATAMOUNT__) +@@ -1148,15 +1141,7 @@ + { + return false; + } +-#if defined(__CYGWIN__) +- // Convert filename to native windows path if possible. +- char winpath[MAX_PATH]; +- if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath)) +- { +- return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES); +- } +- return access(filename.c_str(), R_OK) == 0; +-#elif defined(_WIN32) ++#if defined(_WIN32) + return (GetFileAttributesW( + SystemTools::ConvertToWindowsExtendedPath(filename).c_str()) + != INVALID_FILE_ATTRIBUTES); +@@ -1190,28 +1175,6 @@ + } + + //---------------------------------------------------------------------------- +-#ifdef __CYGWIN__ +-bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) +-{ +- SystemToolsTranslationMap::iterator i = +- SystemTools::Cyg2Win32Map->find(path); +- +- if (i != SystemTools::Cyg2Win32Map->end()) +- { +- strncpy(win32_path, i->second.c_str(), MAX_PATH); +- } +- else +- { +- if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0) +- { +- win32_path[0] = 0; +- } +- SystemToolsTranslationMap::value_type entry(path, win32_path); +- SystemTools::Cyg2Win32Map->insert(entry); +- } +- return win32_path[0] != 0; +-} +-#endif + + bool SystemTools::Touch(const kwsys_stl::string& filename, bool create) + { +@@ -4307,7 +4270,7 @@ + + bool SystemTools::FileIsFullPath(const char* in_name, size_t len) + { +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + // On Windows, the name must be at least two characters long. + if(len < 2) + { +@@ -5078,9 +5041,6 @@ + static unsigned int SystemToolsManagerCount; + SystemToolsTranslationMap *SystemTools::TranslationMap; + SystemToolsTranslationMap *SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; +-#endif + + // SystemToolsManager manages the SystemTools singleton. + // SystemToolsManager should be included in any translation unit +@@ -5126,9 +5086,6 @@ + // Allocate the translation map first. + SystemTools::TranslationMap = new SystemToolsTranslationMap; + SystemTools::LongPathMap = new SystemToolsTranslationMap; +-#ifdef __CYGWIN__ +- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; +-#endif + + // Add some special translation paths for unix. These are not added + // for windows because drive letters need to be maintained. Also, +@@ -5183,9 +5140,6 @@ + { + delete SystemTools::TranslationMap; + delete SystemTools::LongPathMap; +-#ifdef __CYGWIN__ +- delete SystemTools::Cyg2Win32Map; +-#endif + } + + +--- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-06-10 11:24:24.271286600 +0200 +@@ -298,15 +298,6 @@ + static bool FileExists(const kwsys_stl::string& filename); + + /** +- * Converts Cygwin path to Win32 path. Uses dictionary container for +- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll +- * for actual translation. Returns true on success, else false. +- */ +-#ifdef __CYGWIN__ +- static bool PathCygwinToWin32(const char *path, char *win32_path); +-#endif +- +- /** + * Return file length + */ + static unsigned long FileLength(const kwsys_stl::string& filename); +@@ -942,9 +933,6 @@ + */ + static SystemToolsTranslationMap *TranslationMap; + static SystemToolsTranslationMap *LongPathMap; +-#ifdef __CYGWIN__ +- static SystemToolsTranslationMap *Cyg2Win32Map; +-#endif + friend class SystemToolsManager; + }; + +--- cmake-3.2.2/Modules/FindCurses.cmake 2015-04-13 19:09:00.000000000 +0200 ++++ cmake-3.2.2/Modules/FindCurses.cmake 2015-06-10 12:10:19.682030300 +0200 +@@ -60,15 +60,6 @@ + if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) + set(CURSES_USE_NCURSES TRUE) + endif() +-# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html +-# cygwin ncurses stopped providing curses.h symlinks see above +-# message. Cygwin is an ncurses package, so force ncurses on +-# cygwin if the curses.h is missing +-if(CYGWIN) +- if(NOT EXISTS /usr/include/curses.h) +- set(CURSES_USE_NCURSES TRUE) +- endif() +-endif() + + + # Not sure the logic is correct here. diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9f2ed0a73524..8cdf231729f4 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch; + }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; buildInputs = [ bzip2 curl expat libarchive xz zlib ] - ++ optional (jsoncpp != null) jsoncpp + ++ optional (jsoncpp != null && !stdenv.isCygwin) jsoncpp ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--mandir=/share/man" ] ++ optional (!stdenv.isCygwin) "--system-libs" - ++ optional (jsoncpp == null) "--no-system-jsoncpp" + ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp" ++ optional useQt4 "--qt-gui" ++ ["--"] ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 035ad738a824..c00f46577a80 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -7,7 +7,7 @@ let self.ihaskell-display ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' - #!/bin/sh + #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin" ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 755e8001e881..40c4085adab4 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.1.3.1"; + version="4.1.3.3"; name="${baseName}-${version}"; - hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz"; - sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z"; + hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz"; + sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl"; }; buildInputs = [ ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch deleted file mode 100644 index 8285867d8eda..000000000000 --- a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 18 Mar 2015 08:36:37 +0000 -Subject: lib/batch: Trivial compile fix for 32-bit builds - -intel_batchbuffer.c: In function 'fill_object': -intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - obj->relocs_ptr = (uint64_t)relocs; - ^ -intel_batchbuffer.c: In function 'exec_blit': -intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - exec.buffers_ptr = (uint64_t)objs; - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> - -diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c -index 666c323..c1c27a6 100644 ---- a/lib/intel_batchbuffer.c -+++ b/lib/intel_batchbuffer.c -@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, - memset(obj, 0, sizeof(*obj)); - obj->handle = gem_handle; - obj->relocation_count = count; -- obj->relocs_ptr = (uint64_t)relocs; -+ obj->relocs_ptr = (uintptr_t)relocs; - } - - static void exec_blit(int fd, -@@ -557,7 +557,7 @@ static void exec_blit(int fd, - { - struct drm_i915_gem_execbuffer2 exec; - -- exec.buffers_ptr = (uint64_t)objs; -+ exec.buffers_ptr = (uintptr_t)objs; - exec.buffer_count = count; - exec.batch_start_offset = 0; - exec.batch_len = batch_len * 4; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 997f1bfc0120..b675565d0539 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: +{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev +, libX11, libXext, libXv, libXrandr, glib, bison, libunwind }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.10"; + name = "intel-gpu-tools-1.11"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd"; + sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8"; }; - buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; - - patches = [ ./compile-fix.patch ]; + buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 + libXext libXv libXrandr glib bison libunwind ]; meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index c4fcd3158457..e10fd25d046f 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; - doCheck = true; + doCheck = !stdenv.isCygwin; # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 7c6cf82d741f..a35816e2511c 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.5"; + version="0.9.6"; name="${baseName}-${version}"; - hash="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s"; - url="http://download.slimerjs.org/releases/0.9.5/slimerjs-0.9.5.zip"; - sha256="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s"; + hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; + url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; + sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; }; buildInputs = [ unzip zip diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix new file mode 100644 index 000000000000..8ff82767cb7a --- /dev/null +++ b/pkgs/games/tome4/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, openal, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf}: + +stdenv.mkDerivation rec { + version = "1.3.1"; + name = "tome4-${version}"; + src = fetchurl { + url = "http://te4.org/dl/t-engine/t-engine4-src-1.3.1.tar.bz2"; + sha256 = "9b6658e29ad3be9f8469a61e724350f4dfec676777e471f633d616443dfbc7e7"; + }; + buildInputs = [ mesa_glu openal libvorbis SDL2 SDL2_ttf SDL2_image premake4 ]; + preConfigure = '' + sed -e "s@/opt/SDL-2.0/include/SDL2@${SDL2}/include/SDL2@g" -e "s@/usr/include/GL@/run/opengl-driver/include@g" -i premake4.lua + premake4 gmake + ''; + makeFlags = [ "config=release" ]; + installPhase = '' + install -Dm755 t-engine $out/opt/tome4/t-engine + echo "cd $out/opt/tome4" >> tome4 + echo "./t-engine &" >> tome4 + install -Dm755 tome4 $out/bin/tome4 + cp -r bootstrap $out/opt/tome4 + cp -r game $out/opt/tome4 + ''; + meta = { + homepage = "http://te4.org/"; + description = "Tales of Maj'eyal (rogue-like game)"; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 8558d1f7deee..09fa67d7dcd1 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,11 +6,11 @@ let - name = "hplip-3.15.4"; + name = "hplip-3.15.6"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3"; + sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h"; }; hplip_state = @@ -31,7 +31,7 @@ let plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392"; + sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx"; }; in diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index e2bcf9837e7a..de8ad00acc81 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.0"; + version = "3.1.1"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "0afva1vh3lwhw9bryh41dxg82kfnxj1ifa91p3gjwffc2fpqmnvl"; + sha256 = "1r1jbk1fwc4wl0ifm7xzkb2vjd8w1a39hx6mmy4pp4fl2gvcg86k"; }; buildInputs = [ glib pkgconfig gperf utillinux diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix new file mode 100644 index 000000000000..5cac6069e727 --- /dev/null +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, perl, read-edid }: + +stdenv.mkDerivation rec { + name = "i2c-tools-${version}"; + version = "3.1.1"; + + src = fetchurl { + url = "http://dl.lm-sensors.org/i2c-tools/releases/${name}.tar.bz2"; + sha256 = "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + substituteInPlace eeprom/decode-edid --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid" + substituteInPlace stub/i2c-stub-from-dump --replace "/sbin/" "" + ''; + + installPhase = '' + make install prefix=$out + rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers + ''; + + meta = with stdenv.lib; { + description = "Set of I2C tools for Linux"; + homepage = http://www.lm-sensors.org/wiki/I2CTools; + license = licenses.gpl2; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 1706b8b87faa..63bab2ddd76c 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "119"; in +let version = "120"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp"; + sha256 = "1x50g0vrarcv31x4xszcxkpwklkq6mrv2xr1dxbbds26qz8jk11l"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index a7965a70b1c7..042c2225ff3a 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ groff ]; + # Attempt removing if building with gcc5 when updating + NIX_CFLAGS_COMPILE = "-std=gnu89"; + preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile"; # Force mdadm to use /var/run/mdadm.map for its map file (or diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix new file mode 100644 index 000000000000..fdf2c4c9f12b --- /dev/null +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, libx86 }: + +stdenv.mkDerivation rec { + name = "read-edid-${version}"; + version = "3.0.2"; + + src = fetchurl { + url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz"; + sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; + }; + + buildInputs = [ cmake libx86 ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' + ''; + + meta = with stdenv.lib; { + description = "Tool for reading and parsing EDID data from monitors"; + homepage = http://www.polypux.org/projects/read-edid/; + license = licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like." + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 5a7d07000046..9478e07468ee 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, cmake, luajit, kernel, zlib}: +{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}: let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.99"; + version = "0.1.101"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "02faw8s07i7jjydqzqfs0r9lc2qmny3sn26741bz0hmazs9h9w76"; + sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9"; }; buildInputs = [ - cmake zlib luajit + cmake zlib luajit ncurses ]; in stdenv.mkDerivation { @@ -22,6 +22,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DUSE_BUNDLED_LUAJIT=OFF" "-DUSE_BUNDLED_ZLIB=OFF" + "-DUSE_BUNDLED_NCURSES=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; preConfigure = '' export INSTALL_MOD_PATH="$out" diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 0e908acd74b3..90d0fb899c31 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - name = "tomcat-connectors-1.2.40"; + name = "tomcat-connectors-1.2.41-dev-1613051"; src = fetchurl { - url = "http://www.apache.si/tomcat/tomcat-connectors/jk/${name}-src.tar.gz"; - sha256 = "0pbh6s19ba5k2kahiiqgx8lz8v4fjllzn0w6hjd08x7z9my38pl9"; + url = "http://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz"; + sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index d9d9857e33b8..ae8e2785d5fd 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.9.0"; + version = "1.9.1"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1"; + sha256 = "1b8xikrr19p07n28xnar8p8l0vgm7795lmrb2x7r9h4lwvx5bx89"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 79343b044836..2f47d542d00e 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.0.0-1"; + version = "2.0.3"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "0fbxs6gmlmgkbfrmi0f4xyr3vqwylr6i7fa4p68y12qy6kv7q9pc"; + sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd"; }; preConfigure = '' diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index f1abfa3fb0fe..ef7e5d3797fe 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.0.20"; in +let version = "9.0.22"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02"; + sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 93bf5e1e7164..7616f92ca624 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.1.16"; in +let version = "9.1.18"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b"; + sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7"; }; buildInputs = [ zlib readline openssl ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index e04309fc4664..51a265da7854 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline, openssl }: -let version = "9.2.11"; in +let version = "9.2.13"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; + sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx"; }; buildInputs = [ zlib readline openssl ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; - configureFlags = [ "--with-openssl" ]; + configureFlags = stdenv.lib.optionals (!stdenv.isCygwin) [ "--with-openssl" ]; patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 71f3d7a826f7..3e0b7d4a76ef 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.7"; in +let version = "9.3.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b"; + sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp"; }; buildInputs = [ zlib readline openssl ] diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index f1834d301def..5c795329b2d4 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.4.2"; in +let version = "9.4.4"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; + sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk"; }; buildInputs = [ zlib readline openssl ] diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix new file mode 100644 index 000000000000..19e5fe69da5b --- /dev/null +++ b/pkgs/tools/X11/ratmen/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, perl, xproto, libX11}: +let + s = # Generated upstream information + rec { + baseName="ratmen"; + version="2.2.3"; + name="${baseName}-${version}"; + hash="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6"; + url="http://www.update.uu.se/~zrajm/programs/ratmen/ratmen-2.2.3.tar.gz"; + sha256="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6"; + }; + buildInputs = [ + perl xproto libX11 + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + makeFlags = [ + "PREFIX=$(out)" + ]; + meta = { + inherit (s) version; + description = ''A minimalistic X11 menu creator''; + license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://www.update.uu.se/~zrajm/programs/"; + downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/"; + updateWalker = true; + }; +} diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix new file mode 100644 index 000000000000..b3e9ad759f19 --- /dev/null +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, xproto, libX11, libXft, libXcomposite, libXdamage +, libXext, xextproto, libXinerama, libjpeg, giflib, pkgconfig +}: +let + buildInputs = [ + xproto libX11 libXft libXcomposite libXdamage libXext xextproto + libXinerama libjpeg giflib pkgconfig + ]; +in +stdenv.mkDerivation rec { + version = "git-2015-03-01"; + name = "skippy-xd-${version}"; + inherit buildInputs; + src = fetchgit { + url = "https://github.com/richardgv/skippy-xd/"; + rev = "397216ca67"; + sha256 = "19lvy5888j7rl52dsxv1wwxxijdlk8d7qn1zzzy0b8wvqknhxypm"; + }; + makeFlags = ["PREFIX=$(out)"]; + preInstall = '' + sed -e "s@/etc/xdg@$out&@" -i Makefile + ''; + meta = { + inherit version; + description = ''Expose-style compositing-based standalone window switcher''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix new file mode 100644 index 000000000000..95f351297548 --- /dev/null +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchgit, gtk2, cmake, pkgconfig}: +let + buildInputs = [ + gtk2 cmake pkgconfig + ]; +in +stdenv.mkDerivation rec { + version = "0.4.2"; + name = "xwinmosaic-${version}"; + inherit buildInputs; + src = fetchgit { + url = "https://github.com/soulthreads/xwinmosaic/"; + rev = "refs/tags/v0.4.2"; + sha256 = "0ddriqx4idyp55v8js5xazmhl09jwkmnv5nlfzhs2cpvshcj56ri"; + }; + meta = { + inherit version; + description = ''X window switcher drawing a colourful grid''; + license = stdenv.lib.licenses.bsd2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index bfab9454d6df..57b36875a51d 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,18 +1,21 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline, - autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2}: + autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite + , liburcu, attr +}: let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.6.3"; + version="3.7.1"; name="${baseName}-${version}"; - hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz"; - sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4"; + hash="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.1/glusterfs-3.7.1.tar.gz"; + sha256="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 + acl sqlite liburcu attr ]; in stdenv.mkDerivation diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 90a7ce9efadf..01f3947cdfac 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -7,11 +7,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.32"; + version="2.35"; name="${baseName}-${version}"; - hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; - url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz"; - sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; + hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"; + url="http://softlayer-ams.dl.sourceforge.net/project/asymptote/2.35/asymptote-2.35.src.tgz"; + sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z"; }; buildInputs = [ freeglut ghostscriptX imagemagick fftw diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 1a24ba700513..4416c3e1625d 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q"; }; + # https://github.com/tgraf/bmon/pull/24#issuecomment-98068887 + postPatch = "sed '1i#include <net/if.h>' -i src/in_netlink.c"; + buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; preConfigure = "sh ./autogen.sh"; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index dd2798de2729..464e40ec0144 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid -, pkgconfig, gtkmm, libxml2 }: +, pkgconfig, gtkmm, libxml2, hicolor_icon_theme +}: stdenv.mkDerivation rec { name = "gparted-0.22.0"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-doc"; buildInputs = [ - parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 + parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 9e61a5c195e4..392734e2256d 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz"; - sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g"; + sha256 = "1wg6br30ccvxl2189a75lb3d03kg8spfkkp9qlf3whl0xirsm15n"; }; configurePhase = "scons config"; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index dbd3c631c29f..a05b3ccfa9aa 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - version = "4.47.0"; + version = "4.48.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0h25irimigral9xspkvjmplzddqphyn51n5fq221m7nps39wqnjb"; + sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29"; }; doCheck = false; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 871cd3e8f473..d65f1ac43351 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: stdenv.mkDerivation rec { - name = "strongswan-5.2.1"; + name = "strongswan-5.3.2"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "05cjjd7gg65bl6fswj2r2i13nn1nk4x86s06y75gwfdvnlrsnlga"; + sha256 = "09gjrd5f8iykh926y35blxlm2hlzpw15m847d8vc9ga29s6brad4"; }; dontPatchELF = true; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 021225c1b4d4..0507ff45dc72 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { buildInputs = [ getopt ] ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql.lib + ++ stdenv.lib.optional enableMySQLDatabase mysql.out ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2d1051131336..d64e194e93e2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null -, pkgconfig, boehmgc, perlPackages +{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc, perlPackages, libsodium , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.8"; + name = "nix-1.9"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c"; + sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1"; }; - patches = [ ./xfs.patch ]; - nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl sqlite ]; + buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium; propagatedBuildInputs = [ boehmgc ]; diff --git a/pkgs/tools/package-management/nix/xfs.patch b/pkgs/tools/package-management/nix/xfs.patch deleted file mode 100644 index 62ee9189ac1a..000000000000 --- a/pkgs/tools/package-management/nix/xfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc -index 119e71a..422ec97 100644 ---- a/src/libexpr/primops.cc -+++ b/src/libexpr/primops.cc -@@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val - for (auto & ent : entries) { - Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name)); - if (ent.type == DT_UNKNOWN) -- ent.type = getFileType(path); -+ ent.type = getFileType(path + "/" + ent.name); - mkStringNoCopy(*ent_val, - ent.type == DT_REG ? "regular" : - ent.type == DT_DIR ? "directory" : diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 2aed8df32605..ff9798b3f751 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.80b"; + version = "1.83b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0"; + sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 31a6bd2c4602..34561c3c33dd 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,15 +13,13 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.4"; + name = "gnupg-2.1.5"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4"; + sha256 = "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m"; }; - patches = [ ./socket-activate-2.1.1.patch ]; - postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; diff --git a/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch b/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch deleted file mode 100644 index 2c2d7b542501..000000000000 --- a/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch +++ /dev/null @@ -1,170 +0,0 @@ -Port Shea Levy's socket activation patch to version 2.1.1. - -diff -Naur gnupg-2.1.1-upstream/agent/gpg-agent.c gnupg-2.1.1/agent/gpg-agent.c ---- gnupg-2.1.1-upstream/agent/gpg-agent.c 2014-12-01 05:04:57.000000000 -0430 -+++ gnupg-2.1.1/agent/gpg-agent.c 2014-12-23 17:13:48.029286035 -0430 -@@ -125,7 +125,9 @@ - oPuttySupport, - oDisableScdaemon, - oDisableCheckOwnSocket, -- oWriteEnvFile -+ oWriteEnvFile, -+ oAgentFD, -+ oSSHAgentFD - }; - - -@@ -143,6 +145,8 @@ - ARGPARSE_group (301, N_("@Options:\n ")), - - ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")), -+ ARGPARSE_s_i (oAgentFD, "agent-fd", "@"), -+ ARGPARSE_s_i (oSSHAgentFD, "ssh-agent-fd", "@"), - ARGPARSE_s_n (oServer, "server", N_("run in server mode (foreground)")), - ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")), - ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")), -@@ -627,6 +631,31 @@ - return 1; /* handled */ - } - -+/* Handle agent socket(s) */ -+static void -+handle_agent_socks(int fd, int fd_extra, int fd_ssh) -+{ -+#ifndef HAVE_W32_SYSTEM -+ if (chdir("/")) -+ { -+ log_error ("chdir to / failed: %s\n", strerror (errno)); -+ exit (1); -+ } -+ -+ { -+ struct sigaction sa; -+ -+ sa.sa_handler = SIG_IGN; -+ sigemptyset (&sa.sa_mask); -+ sa.sa_flags = 0; -+ sigaction (SIGPIPE, &sa, NULL); -+ } -+#endif /*!HAVE_W32_SYSTEM*/ -+ -+ log_info ("%s %s started\n", strusage(11), strusage(13) ); -+ handle_connections (fd, fd_extra, fd_ssh); -+ assuan_sock_close (fd); -+} - - /* The main entry point. */ - int -@@ -643,6 +672,8 @@ - int default_config =1; - int pipe_server = 0; - int is_daemon = 0; -+ int fd_agent = GNUPG_INVALID_FD; -+ int fd_ssh_agent = GNUPG_INVALID_FD; - int nodetach = 0; - int csh_style = 0; - char *logfile = NULL; -@@ -850,6 +881,8 @@ - case oSh: csh_style = 0; break; - case oServer: pipe_server = 1; break; - case oDaemon: is_daemon = 1; break; -+ case oAgentFD: fd_agent = pargs.r.ret_int; break; -+ case oSSHAgentFD: fd_ssh_agent = pargs.r.ret_int; break; - - case oDisplay: default_display = xstrdup (pargs.r.ret_str); break; - case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break; -@@ -940,7 +973,8 @@ - bind_textdomain_codeset (PACKAGE_GT, "UTF-8"); - #endif - -- if (!pipe_server && !is_daemon && !gpgconf_list) -+ if (!pipe_server && !is_daemon && !gpgconf_list && -+ fd_agent == GNUPG_INVALID_FD) - { - /* We have been called without any options and thus we merely - check whether an agent is already running. We do this right -@@ -1090,6 +1124,10 @@ - agent_deinit_default_ctrl (ctrl); - xfree (ctrl); - } -+ else if (fd_agent != GNUPG_INVALID_FD) -+ { -+ handle_agent_socks(fd_agent, GNUPG_INVALID_FD, fd_ssh_agent); -+ } - else if (!is_daemon) - ; /* NOTREACHED */ - else -@@ -1287,26 +1325,8 @@ - log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); - opt.running_detached = 1; - } -- -- if (chdir("/")) -- { -- log_error ("chdir to / failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- { -- struct sigaction sa; -- -- sa.sa_handler = SIG_IGN; -- sigemptyset (&sa.sa_mask); -- sa.sa_flags = 0; -- sigaction (SIGPIPE, &sa, NULL); -- } --#endif /*!HAVE_W32_SYSTEM*/ -- -- log_info ("%s %s started\n", strusage(11), strusage(13) ); -- handle_connections (fd, fd_extra, fd_ssh); -- assuan_sock_close (fd); -+#endif /*!HAVE_W32_SYSTEM*/ -+ handle_agent_socks(fd, fd_extra, fd_ssh); - } - - return 0; -diff -Naur gnupg-2.1.1-upstream/doc/gpg-agent.texi gnupg-2.1.1/doc/gpg-agent.texi ---- gnupg-2.1.1-upstream/doc/gpg-agent.texi 2014-12-05 09:56:37.000000000 -0430 -+++ gnupg-2.1.1/doc/gpg-agent.texi 2014-12-23 16:26:38.366391186 -0430 -@@ -43,7 +43,15 @@ - .IR file ] - .RI [ options ] - .B \-\-daemon --.RI [ command_line ] -+.br -+.B gpg-agent -+.RB [ \-\-homedir -+.IR dir ] -+.RB [ \-\-options -+.IR file ] -+.RI [ options ] -+.B \-\-agent-fd -+.IR fd - @end ifset - - @mansect description -@@ -186,6 +194,11 @@ - a new process as a child of gpg-agent: @code{gpg-agent --daemon - /bin/sh}. This way you get a new shell with the environment setup - properly; if you exit from this shell, gpg-agent terminates as well. -+ -+@item --agent-fd @var{fd} -+@opindex agent-fd -+Start the gpg-agent using @var{fd} as the listening socket. This is useful for -+socket activation a la systemd and launchd. - @end table - - @mansect options -@@ -545,6 +558,12 @@ - remote machine. - - -+@item --ssh-agent-fd @var{fd} -+@opindex ssh-agent-fd -+ -+When starting the agent with @option{--agent-fd}, use this to pass in a socket -+to be used for the OpenSSH agent protocol. -+ - @anchor{option --enable-ssh-support} - @item --enable-ssh-support - @opindex enable-ssh-support diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 757959f53451..b4ff0b77f385 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; + # configure cannot find moc on its own + preConfigure = stdenv.lib.optionalString (qt4 != null) '' + export QTDIR="${qt4}" + export MOC="${qt4}/bin/moc" + ''; + configureFlags = [ (mkWith (libcap != null) "libcap") (mkWith (hasX) "x") @@ -36,8 +42,9 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; longDescription = '' - Pinentry provides a console and a GTK+ GUI that allows users to - enter a passphrase when `gpg' or `gpg2' is run and needs it. + Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index c6a5917640e8..bfa1a0ab9f4d 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { - name = "tor-0.2.6.8"; + name = "tor-0.2.6.9"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0xlsc2pa7i8hm8dyilln6p4rb0pig62b9c31yp1m0hj5jqw3d2xq"; + sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a"; }; # Note: torsocks is specified as a dependency, as the distributed diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 9d15b16a1885..e910241113b9 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-usercheck" ]; - NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE"; + # Attempt to remove -std=gnu89 when updating if using gcc5 + NIX_CFLAGS_COMPILE = "-std=gnu89 -DALLOW_NON_TSS_CONFIG_FILE"; NIX_LDFLAGS = "-lgcc_s"; # Fix broken libtool file diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 7b3e62a1bc03..a0ff9b063dd8 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - version = "1.46"; + version = "1.98"; name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy"; - url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; + sha256 = "14lf2pv52sr16977qjq1rsr42rfd3ywsss2xw9svgaa14g49ss6b"; + url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2"; }; dd_rhelp_src = fetchurl { diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 346bbef0bdf4..7e3ec2358c70 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.8"; + version = "1.4.9"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "06smdsri1v5v2smrd3jxq3n135x7cx0npcimc37lb144gzgyk9wz"; + sha256 = "0v2xfwik2mv6z8066raiypc4xymjvr8pb0mv3mc3g4ym4km132qp"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 2a0b2816ba70..af09b7af0308 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, attr }: -let version = "0.04.05"; in +let version = "0.04.06"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1xj3rrcvpjl3sgvl22m0bdrkscxxnipzh4s1ivmrifw7lq2zq1kg"; + sha256 = "1iwl16gzxl1gq7gkn6pwhk6ss641n11wgf37yd47jcdr5pac6z9s"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 86d121f0c22f..85bc40caa274 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: stdenv.mkDerivation rec { - version = "1.3"; + version = "1.4.2"; name = "thermald-${version}"; - src = fetchurl { - url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip"; - sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc"; + src = fetchFromGitHub { + owner = "01org"; + repo = "thermal_daemon"; + rev = "v${version}"; + sha256 = "051119wb0n31rn15pnx56d1r58a2d1fmj030q991mcv7pcy6c8mg"; }; - buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + + buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; @@ -25,12 +28,11 @@ stdenv.mkDerivation rec { preInstall = "sysconfdir=$out/etc"; - meta = { + meta = with stdenv.lib; { description = "Thermal Daemon"; - longDescription = '' - Thermal Daemon - ''; homepage = https://01.org/linux-thermal-daemon; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2630b2f79b6..bcf02133be7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1792,6 +1792,8 @@ let hwinfo = callPackage ../tools/system/hwinfo { }; + i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; + i2p = callPackage ../tools/networking/i2p {}; i2pd = callPackage ../tools/networking/i2pd {}; @@ -2061,6 +2063,8 @@ let maildrop = callPackage ../tools/networking/maildrop { }; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; + mailsend = callPackage ../tools/networking/mailsend { }; mailpile = callPackage ../applications/networking/mailreaders/mailpile { }; @@ -2682,6 +2686,8 @@ let privateer = callPackage ../games/privateer { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; + redmine = callPackage ../applications/version-management/redmine { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -2854,6 +2860,8 @@ let simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; + skydns = callPackage ../servers/dns/skydns { }; sleuthkit = callPackage ../tools/system/sleuthkit {}; @@ -3410,6 +3418,8 @@ let inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep; }; + xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -4022,18 +4032,11 @@ let jikes = callPackage ../development/compilers/jikes { }; julia02 = callPackage ../development/compilers/julia/0.2.nix { - liblapack = liblapack.override {shared = true;}; llvm = llvm_33; suitesparse = suitesparse_4_2; }; - julia03 = let - liblapack = liblapack_3_5_0.override {shared = true;}; - in callPackage ../development/compilers/julia/0.3.nix { - inherit liblapack; - suitesparse = suitesparse_4_2.override { - inherit liblapack; - }; + julia03 = callPackage ../development/compilers/julia/0.3.nix { llvm = llvm_33; }; julia = julia03; @@ -4859,6 +4862,7 @@ let glpk = null; suitesparse = null; jdk = null; + openblas = openblasCompat; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { fltk = fltk13.override { cfg.xftSupport = true; }; @@ -5308,6 +5312,8 @@ let csslint = callPackage ../development/web/csslint { }; + infer = callPackage ../development/tools/analysis/infer { }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -6731,6 +6737,8 @@ let libebml = callPackage ../development/libraries/libebml { }; + libebur128 = callPackage ../development/libraries/libebur128 { }; + libedit = callPackage ../development/libraries/libedit { }; libelf = callPackage ../development/libraries/libelf { }; @@ -8596,6 +8604,7 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + openblas = openblasCompat; withRecommendedPackages = false; }; @@ -10404,6 +10413,8 @@ let a2jmidid = callPackage ../applications/audio/a2jmidid { }; + aacgain = callPackage ../applications/audio/aacgain { }; + aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { }; aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { }; @@ -10724,7 +10735,10 @@ let darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; enableSharedExecutables = false; + enableSharedLibraries = false; isLibrary = false; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share"; }); darktable = callPackage ../applications/graphics/darktable { @@ -10934,6 +10948,8 @@ let metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { }; + monky = callPackage ../applications/editors/emacs-modes/monky { }; + notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; }); ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { }; @@ -11623,6 +11639,10 @@ let fftw = fftwSinglePrec; }; + ladspaPlugins-git = callPackage ../applications/audio/ladspa-plugins/git.nix { + fftw = fftwSinglePrec; + }; + ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; caps = callPackage ../applications/audio/caps { }; @@ -12229,6 +12249,8 @@ let rapidsvn = callPackage ../applications/version-management/rapidsvn { }; + ratmen = callPackage ../tools/X11/ratmen {}; + ratox = callPackage ../applications/networking/instant-messengers/ratox { }; ratpoison = callPackage ../applications/window-managers/ratpoison { }; @@ -13461,6 +13483,8 @@ let tintin = callPackage ../games/tintin { }; + tome4 = callPackage ../games/tome4 { }; + tpm = callPackage ../games/thePenguinMachine { }; tremulous = callPackage ../games/tremulous { }; @@ -13594,10 +13618,7 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { - callPackage = pkgs.newScope pkgs.gnome3_16; - self = pkgs.gnome3_16; - }); + gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { }); gnome3 = gnome3_16; @@ -13840,6 +13861,7 @@ let plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { kf5 = kf510; + kdeApps = kdeApps_15_04; }); plasma5_latest = plasma53; plasma5_stable = plasma53; @@ -13931,9 +13953,11 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - openblas = callPackage ../development/libraries/science/math/openblas { - liblapack = liblapack_3_5_0; - }; + openblas = callPackage ../development/libraries/science/math/openblas { }; + + # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with + # standard BLAS and LAPACK. + openblasCompat = openblas.override { blas64 = false; }; mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; @@ -13941,9 +13965,10 @@ let sage = callPackage ../applications/science/math/sage { }; suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { }; - suitesparse_4_4_1 = callPackage ../development/libraries/science/math/suitesparse {}; + suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {}; + suitesparse = suitesparse_4_4; - ipopt = callPackage ../development/libraries/science/math/ipopt { }; + ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; }; ### SCIENCE/MOLECULAR-DYNAMICS @@ -14427,10 +14452,13 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { + nixUnstable = nixStable; + /* + nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - }; + }); + */ nixops = callPackage ../tools/package-management/nixops { }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 852856d4c693..e08af379da8d 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -14,6 +14,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { + # BINARY PACKAGES + Autofac = fetchNuGet { baseName = "Autofac"; version = "3.5.2"; @@ -44,6 +46,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net40/*" ]; }; + FSharpDataSQLProvider = fetchNuGet { + baseName = "SQLProvider"; + version = "0.0.9-alpha"; + sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w"; + outputFiles = [ "lib/net40/*" ]; + }; + FsCheck = fetchNuGet { baseName = "FsCheck"; version = "1.0.4"; @@ -58,6 +67,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/net45/*" ]; }; + FsPickler = fetchNuGet { + baseName = "FsPickler"; + version = "1.2.9"; + sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4"; + outputFiles = [ "lib/net45/*" ]; + }; + FsUnit = fetchNuGet { baseName = "FsUnit"; version = "1.3.0.1"; @@ -87,6 +103,16 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; }; + Suave = fetchNuGet { + baseName = "Suave"; + version = "0.29.0"; + propagatedBuildInputs = [ FsPickler ]; + sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln"; + outputFiles = [ "lib/net40/*" ]; + }; + + # SOURCE PACKAGES + ExtCore = buildDotnetPackage rec { baseName = "ExtCore"; version = "0.8.46"; @@ -492,4 +518,5 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { platforms = with stdenv.lib.platforms; linux; }; }; + }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c65fe86c3829..f80df2edfcba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1068,7 +1068,12 @@ let sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; }; doCheck = false; - buildInputs = with pkgs; [ liblapack blas ]; + buildInputs = with pkgs; [ openblasCompat ]; + preConfigure = '' + export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + ''; meta = { homepage = "http://cvxopt.org/"; description = "Python Software for Convex Optimization"; @@ -4810,6 +4815,26 @@ let }; + django_pipeline = buildPythonPackage rec { + name = "django-pipeline-${version}"; + version = "1.5.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz"; + md5 = "dff8a4abb2895ee5df335c3fb2775a02"; + sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; + }; + + propagatedBuildInputs = with self; [ django futures ]; + + meta = with stdenv.lib; { + description = "Pipeline is an asset packaging library for Django."; + homepage = https://github.com/cyberdelia/django-pipeline; + license = stdenv.lib.licenses.mit; + }; + }; + + djblets = buildPythonPackage rec { name = "Djblets-0.6.28"; @@ -5920,12 +5945,12 @@ let gyp = buildPythonPackage rec { name = "gyp-${version}"; - version = "2015-05-15"; + version = "2015-06-11"; src = pkgs.fetchgit { url = "https://chromium.googlesource.com/external/gyp.git"; - rev = "9f594095c5b14f8bc518081a660e77890c294861"; - sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5"; + rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043"; + sha256 = "176sdxkva2irr1v645nn4q6rwc6grbb1wxj82n7x9hh09q4bxqcz"; }; patches = optionals pkgs.stdenv.isDarwin [ @@ -5941,28 +5966,6 @@ let }; }; - # Needed to build Chromium until #7402 is fixed. - gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec { - rev = "1977"; - name = "gyp-r${rev}"; - - src = pkgs.fetchsvn { - url = "http://gyp.googlecode.com/svn/trunk"; - inherit rev; - sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8"; - }; - - patches = optionals pkgs.stdenv.isDarwin [ - ../development/python-modules/gyp/no-darwin-cflags.patch - ]; - - meta = { - homepage = http://code.google.com/p/gyp; - license = licenses.bsd3; - description = "Generate Your Projects"; - }; - }); - guessit = buildPythonPackage rec { version = "0.9.4"; name = "guessit-${version}"; @@ -7872,7 +7875,7 @@ let numpy = let support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; - atlas = pkgs.atlasWithLapack; + openblas = pkgs.openblasCompat; pkgName = "numpy"; }; in buildPythonPackage ( rec { @@ -7895,7 +7898,7 @@ let setupPyBuildFlags = ["--fcompiler='gnu95'"]; buildInputs = [ pkgs.gfortran self.nose ]; - propagatedBuildInputs = [ support.atlas ]; + propagatedBuildInputs = [ support.openblas ]; meta = { description = "Scientific tools for Python"; @@ -11344,7 +11347,7 @@ let scipy = let support = import ../development/python-modules/numpy-scipy-support.nix { inherit python; - atlas = pkgs.atlasWithLapack; + openblas = pkgs.openblasCompat; pkgName = "numpy"; }; in buildPythonPackage rec { @@ -11382,15 +11385,14 @@ let }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ numpy scipy pkgs.atlas ]; + propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; buildPhase = '' - export ATLAS=${pkgs.atlas} ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95' ''; checkPhase = '' - LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests + LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ''; meta = { diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 0de95d59c8e4..fe723a038e27 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-05-19"; - rev = "6280837d21e5a241d961daf968f5379e6e2e392f"; + version = "2015-06-12"; + rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91"; + sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6"; }; in |