diff options
Diffstat (limited to 'pkgs/applications/misc')
46 files changed, 523 insertions, 2263 deletions
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix new file mode 100644 index 000000000000..a8914a9014d9 --- /dev/null +++ b/pkgs/applications/misc/artha/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }: + +stdenv.mkDerivation rec { + name = "artha-${version}"; + version = "1.0.3"; + + src = fetchurl { + url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2"; + sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; + }; + + buildInputs = [ dbus_glib gtk pkgconfig wordnet ]; + + meta = with stdenv.lib; { + description = "An offline thesaurus based on WordNet"; + homepage = http://artha.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01299dc671dd..bc4c97d1f213 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw , jackaudioSupport ? false, libjack2 -, cudaSupport ? false, cudatoolkit65 +, cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudatoolkit65 + ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; postUnpack = diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 787b5e805287..abea6201e759 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,12 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.31.0"; + name = "calibre-${version}"; + version = "2.36.0"; src = fetchurl { - url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1414c324alvgwbiszalklck1kay41yca2wnm488imr2768fihzkz"; + url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz"; + sha256 = "1my7fjj1lc28mhmvb85rcc4c5bwsycs6bgmafbx9agil5bgrbnb2"; }; inherit python; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index eb73f48559a6..97b67a3ae332 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "cherrytree-0.35.8"; + + name = "cherrytree-${version}"; + version = "0.35.9"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8"; + sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 ]; + propagatedBuildInputs = with pythonPackages; + [ sqlite3 ]; - buildInputs = with pythonPackages; [ python gettext wrapPython pygtk dbus pygtksourceview ]; + buildInputs = with pythonPackages; + [ python gettext wrapPython pygtk dbus pygtksourceview ]; - pythonPath = with pythonPackages; [ pygtk dbus pygtksourceview ]; + pythonPath = with pythonPackages; + [ pygtk dbus pygtksourceview ]; patches = [ ./subprocess.patch ]; @@ -27,10 +33,21 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { - description = "A hierarchical note taking application, featuring rich text and syntax highlighting, storing data in a single xml or sqlite file"; + meta = { + description = "An hierarchical note taking application"; + longDescription = '' + Cherrytree is an hierarchical note taking application, + featuring rich text, syntax highlighting and powerful search + capabilities. It organizes all information in units called + "nodes", as in a tree, and can be very useful to store any piece + of information, from tables and links to pictures and even entire + documents. All those little bits of information you have scattered + around your hard drive can be conveniently placed into a + Cherrytree document where you can easily find it. + ''; homepage = http://www.giuspen.com/cherrytree; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux; - }; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; + }; } diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix new file mode 100644 index 000000000000..2b92dc8d19e9 --- /dev/null +++ b/pkgs/applications/misc/chirp/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libxml2Python, libxslt, makeWrapper +, python, pyserial, pygtk +}: +let + version = "0.4.1"; +in +stdenv.mkDerivation rec { + name = "chirp-${version}"; + inherit version; + + src = fetchurl { + url = "http://chirp.danplanet.com/download/0.4.1/chirp-${version}.tar.gz"; + sha256 = "17iihghqjprn2hld193qw0yl1kkrf6m0fp57l7ibkflxr0nnb7cc"; + }; + + buildInputs = [ + makeWrapper + pyserial pygtk libxml2Python libxslt pyserial + ]; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/chirp + cp -r . $out/share/chirp/ + ln -s $out/share/chirp/chirpw $out/bin/chirpw + + for file in "$out"/bin/*; do + wrapProgram "$file" \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "A free, open-source tool for programming your amateur radio."; + homepage = http://chirp.danplanet.com/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.the-kenny ]; + }; +} diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix new file mode 100644 index 000000000000..c7a76ef00a6a --- /dev/null +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, ncurses }: + +let + version = "1.2a"; +in with stdenv.lib; +stdenv.mkDerivation rec { + + name = "cmatrix-${version}"; + + src = fetchurl{ + url = "http://www.asty.org/cmatrix/dist/${name}.tar.gz"; + sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz"; + }; + + buildInputs = [ pkgconfig ncurses ]; + + meta = { + description = "Simulates the falling characters theme from The Matrix movie"; + longDescription = '' + CMatrix simulates the display from "The Matrix" and is based + on the screensaver from the movie's website. + ''; + homepage = http://www.asty.org/cmatrix/; + platforms = ncurses.meta.platforms; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a13004ecd022..a711cc1db87c 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; - version = "15.02.1"; + version = "15.04"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "18pb31vd9786q522i1i780wpzr6vih9gg9d8k508gh2d5yr4aal6"; + sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix new file mode 100644 index 000000000000..4d13e62bdfec --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, dpkg, bash, python27Packages }: + +let + py = python27Packages; +in +stdenv.mkDerivation rec { + name = "cura-lulzbot"; + version = "15.02.1-1.03-5064"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; + sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb"; + sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1"; + } + else throw "${name} is not supported on ${stdenv.system}"; + + python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; + pythonPath = python_deps; + propagatedBuildInputs = python_deps; + buildInputs = [ dpkg bash py.wrapPython ]; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = "dpkg-deb -x ${src} ./"; + + installPhase = '' + mkdir -p $out/bin + cp -r usr/share $out/share + find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \; + + cat <<EOT > $out/bin/cura + #!${bash}/bin/bash + PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@" + EOT + + chmod 555 $out/bin/cura + ''; + + meta = with stdenv.lib; { + description = "3D printing host software for the Lulzbot"; + + longDescription = '' + Cura LulzBot Edition is a fork of the 3D printing/slicing + software from Ultimaker, with changes to support 3D printers + from Aleph Objects. + ''; + + homepage = https://www.lulzbot.com/cura/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index bbd944066357..6afd11a555cb 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "15.02.1"; + version = "15.04"; in stdenv.mkDerivation { name = "curaengine-${version}"; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "18fxh910b66s45757zqh8bm5kdxjgvxispjqknqkwl1nrllzmx53"; + sha256 = "0rgrsyi7951fsv3lzprlzrg55jf6pbdjfql85dylwmg9nc4y8xym"; }; installPhase = '' diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix new file mode 100644 index 000000000000..fc8d0ec36c85 --- /dev/null +++ b/pkgs/applications/misc/direwolf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, unzip, alsaLib }: +let + version = "1.2"; +in +stdenv.mkDerivation rec { + name = "direwolf-${version}"; + inherit version; + + src = fetchurl { + url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip"; + sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f"; + }; + + buildInputs = [ + unzip alsaLib + ]; + + patchPhase = '' + substituteInPlace Makefile.linux \ + --replace "/usr/local" "$out" \ + --replace "/usr/share" "$out/share" + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway."; + # On the page: This page will be disappearing on October 8, 2015. + homepage = https://home.comcast.net/~wb2osz/site/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.the-kenny ]; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index b910b1796a3e..ed37b0d96bc7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "electrum-${version}"; - version = "2.3.2"; + version = "2.4.3"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "0idqm77d5rbwpw14wqg4ysvbjyqjw7zlqfcdxniy74i2qwz163bi"; + sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f"; }; propagatedBuildInputs = with pythonPackages; [ @@ -16,6 +16,7 @@ buildPythonPackage rec { protobuf pyasn1 pyasn1-modules + pycrypto pyqt4 qrcode requests @@ -26,6 +27,7 @@ buildPythonPackage rec { preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix index 360d98537ccf..5fc6eb2c2744 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor the-kenny ]; }; } diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 440d2b790c21..d3e61da4fab0 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr # drivers (optional): -, rtl-sdr +, rtl-sdr, hackrf , pulseaudioSupport ? true, libpulseaudio }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 gnuradio boost gnuradio-osmosdr rtl-sdr + qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; configurePhase = ''qmake PREFIX="$out"''; @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; platforms = platforms.linux; # should work on Darwin / OS X too - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor the-kenny ]; }; } diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix new file mode 100644 index 000000000000..ce8109717d44 --- /dev/null +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}: + +stdenv.mkDerivation rec { + name = "gxmessage-${version}"; + version = "3.4.3"; + + src = fetchurl { + url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz"; + sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; + }; + + buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ]; + meta = { + description = "a GTK enabled dropin replacement for xmessage"; + homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [jfb]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix index 806392f717fc..b815884a29cb 100644 --- a/pkgs/applications/misc/hackrf/default.nix +++ b/pkgs/applications/misc/hackrf/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "hackrf-${version}"; - version = "2014.08.1"; + version = "2015.07.2"; src = fetchgit { url = "git://github.com/mossmann/hackrf"; rev = "refs/tags/v${version}"; - sha256 = "1f3mmzyn6qqbl02h6dkz0zybppihqgpdxjgqmkb1pn3i0d98ydb3"; + sha256 = "0wa4m0kdq8q2ib724w8ry8shmmm1liaaawhjygrjx6zxz9jxr3vm"; }; buildInputs = [ @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = http://greatscottgadgets.com/hackrf/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.sjmackenzie ]; + maintainers = with maintainers; [ sjmackenzie the-kenny ]; }; } diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix new file mode 100644 index 000000000000..3a94456e6cc7 --- /dev/null +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils +, intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3 +}: + +# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes +# this message: +# +# WARNING:root:Could not import wnck - workspace tracking will be disabled + +buildPythonPackage rec { + name = "hamster-time-tracker-1.04"; + namePrefix = ""; + + src = fetchzip { + name = "${name}-src"; + url = "https://github.com/projecthamster/hamster/archive/${name}.tar.gz"; + sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; + }; + + buildInputs = [ docbook2x libxslt gnome_doc_utils intltool dbus_glib ]; + + propagatedBuildInputs = [ pygobject pygtk pyxdg gnome_python dbus sqlite3 ]; + + configurePhase = '' + python waf configure --prefix="$out" + ''; + + buildPhase = '' + python waf build + ''; + + installPhase = '' + python waf install + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Time tracking application"; + homepage = https://projecthamster.wordpress.com/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh deleted file mode 100644 index 08bba946cce2..000000000000 --- a/pkgs/applications/misc/hello/ex-1/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -PATH=$perl/bin:$PATH - -tar xvfz $src -cd hello-* -./configure --prefix=$out -make -make install diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix deleted file mode 100644 index 51b2ccb58ed3..000000000000 --- a/pkgs/applications/misc/hello/ex-1/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, perl}: - -stdenv.mkDerivation { - name = "hello-2.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://gnu/hello/hello-2.1.1.tar.gz; - md5 = "70c9ccf9fac07f762c24f2df2290784d"; - }; - inherit perl; - - meta = { - description = "GNU Hello, a classic computer science tool"; - homepage = http://www.gnu.org/software/hello/; - }; -} diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index a076a2bb7cfe..1f78355ca3a1 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20150107"; + version = "3.20150614"; lib = stdenv.lib; in @@ -31,8 +31,8 @@ stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "https://github.com/joeyh/ikiwiki/archive/debian/${version}.tar.gz"; - sha256 = "12kiqjxrh93gysdp7bhglnks2md9davl8jgzqlj0m8xs5rf1972n"; + url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; + sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 9c592fcbb2d0..ce57db371dde 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -5,8 +5,8 @@ let mupdf_src = fetchurl { - url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz; - sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; + url = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz; + sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq"; }; tess_src = fetchurl { @@ -21,10 +21,10 @@ let in stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.30"; + version = "2.32"; src = fetchzip { url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1fjjznkplrbyrg48wbij4kqgkz9i5icq7savl6brsf9haahdz6q5"; + sha256 = "1v3cj5bwpjvy7s66sfqcmkxs91f7nxaykjpdjm2wn87vn6q7n19m"; }; buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib @@ -41,8 +41,8 @@ in stdenv.mkDerivation rec { plibs=`pwd`/patched_libraries tar zxf ${mupdf_src} - cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/ - cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf + cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.6-source/source/fitz/ + cp $src/mupdf_mod/pdf-* mupdf-1.6-source/source/pdf tar zxf ${tess_src} cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { make libs cp src/libPgm2asc.a $plibs/lib - cd ../mupdf-1.5-source + cd ../mupdf-1.6-source make prefix=$plibs install install -Dm644 build/debug/libmujs.a $plibs/lib diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index f659e4f6c2dd..950d16eeac8a 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -2,11 +2,11 @@ buildDotnetPackage rec { baseName = "keepass"; - version = "2.29"; + version = "2.30"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "051s0aznyyhbpdbly6h5rs0ax0zvkp45dh93nmq6lwhicswjwn5m"; + sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 1c5f2c6e7810..ff61ea5d0103 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: stdenv.mkDerivation { - name = "keepassx2-2.0alpha6"; + name = "keepassx2-2.0beta1"; src = fetchurl { - url = "https://github.com/keepassx/keepassx/archive/2.0-alpha6.tar.gz"; - sha256 = "592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0"; + url = "https://github.com/keepassx/keepassx/archive/2.0-beta1.tar.gz"; + sha256 = "1wnbk9laixz16lmchr1lnv8m9i6rkxv6slnx8f0fyczx90y97qdw"; }; buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 2652af9bed92..cbc728bc1f5f 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgs, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; name = "khal-${version}"; src = fetchurl { - url = "https://github.com/geier/khal/archive/v${version}.tar.gz"; - sha256 = "1rjs5s8ky4n628rs6l5ggaj2abb4kq2avvxmimjjgxz3zh9xlz6s"; + url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz"; + sha256 = "16nsib70rczln0hrh93bas58lr8crvq8yipj7qnfs4hbs9b8sbhs"; }; propagatedBuildInputs = with pythonPackages; [ @@ -23,6 +23,7 @@ pythonPackages.buildPythonPackage rec { tzlocal urwid python.modules.sqlite3 + pkginfo ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index bd0727ccab11..9d9b69f59588 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,19 +1,20 @@ { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs, xsel }: +, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl }: let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2015-06-27"; + version = "21-git-2015-07-30"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "843c42ef41bb78a3b1ee995fc2bab91f8796e8ad"; - sha256 = "0h8wa7f5bj5sm3sr8namcyy81s4s80hyasimyfw935lqyw2q2k60"; + rev = "e9fe06d684b145a104cc319673076e069e853cac"; + sha256 = "0x3hgn6sfjln2sqdw40ylcj943rn732a6mlfwz01llx8ykiyvsvq"; + fetchSubmodules = false; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl - gtk3 jbig2dec openjpeg mujs ]; + gtk3 jbig2dec openjpeg mujs openssl ]; configurePhase = '' sh configure.sh -O -F ${mupdf} diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 27830b9baee5..fcde5ed3abd2 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.1.3"; + version = "2.1.4"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz"; - sha256 = "10jnqz7ilxppv60h0hpkq7wgc3fbcm3z19xhnqz9hwp3brz2xm9g"; + sha256 = "0apkir1rw3msdpps0y0c8skr293h6c4l48c1vx0w4brz337lhdfi"; }; configureFlags = [ diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 3a597c9de523..55de14257878 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.75"; + version = "0.7.77"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy"; + sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; - preConfigure = "sh autogen"; + preConfigure = "sh autogen.sh"; meta = { description = "Supplies technical and tag information about a video or audio file (GUI version)"; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index c9792f3a2af3..5c6f3f9a148a 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.75"; + version = "0.7.77"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy"; + sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sourceRoot = "./MediaInfo/Project/GNU/CLI/"; configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; - preConfigure = "sh autogen"; + preConfigure = "sh autogen.sh"; meta = { description = "Supplies technical and tag information about a video or audio file"; diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix new file mode 100644 index 000000000000..794746653f75 --- /dev/null +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, qt4, libpulseaudio }: +let + version = "1.0.0"; +in +stdenv.mkDerivation { + name = "multimon-ng-${version}"; + + src = fetchFromGitHub { + owner = "EliasOenal"; + repo = "multimon-ng"; + rev = "4cc984f35f859539c94aa56d3fc6218a6de51148"; + sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga"; + }; + + buildInputs = [ qt4 libpulseaudio ]; + + preBuild = "qmake multimon-ng.pro"; + + installPhase = '' + mkdir -p $out/bin + cp multimon-ng $out/bin + ''; + + meta = with stdenv.lib; { + description = "Multimon is a digital baseband audio protocol decoder."; + longDescription = '' + multimon-ng a fork of multimon, a digital baseband audio + protocol decoder for common signaling modes in commercial and + amateur radio data services. It decodes the following digital + transmission modes: + + POCSAG512 POCSAG1200 POCSAG2400 EAS UFSK1200 CLIPFSK AFSK1200 + AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2 + ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW + ''; + homepage = "https://github.com/EliasOenal/multimon-ng"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9b39f1c3c388..12dbbe6a9aa4 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,12 +2,12 @@ , libX11, libXext }: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.7a"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh"; + sha256 = "073xq6kczq331awycvznpc49b22idqzdlw4g9254zi0z07x5y0wc"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { Version=1.0 Name=mupdf Comment=PDF viewer - Exec=$out/bin/mupdf-x11 + Exec=$out/bin/mupdf-x11 %f Terminal=false EOF ''; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index e11e920fdd47..3d526e3f3e72 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pstree-2.36"; + name = "pstree-2.39"; src = fetchurl { url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"; - sha256 = "1vx4fndmkkx3bmcv71rpzjjbn24hlfs10pl99dsfhbx16a2d41cx"; + sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; unpackPhase = "unpackFile \$src; sourceRoot=."; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 828019011fc4..e768a692f594 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "0.8.4"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0"; + sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz"; }; buildInputs = [ git gnupg makeWrapper pass qt5.base ]; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7c08bf9d2e79..c6bc87ce13d4 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { description = "File manager with minimalistic curses interface"; homepage = "http://ranger.nongnu.org/"; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 244464130bea..dc799bd6ff52 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,7 +1,16 @@ -{ fetchurl, stdenv, gettext, geoclue, intltool, makeWrapper -, pkgconfig , python, pygobject3, pyxdg }: +{ fetchurl, stdenv, gettext, intltool, pkgconfig, makeWrapper +, geoclue, python, pygobject3, pyxdg +, libdrm, libX11, libxcb, libXxf86vm +, guiSupport ? true +, drmSupport ? true +, randrSupport ? true +, vidModeSupport ? true +}: -let version = "1.10"; in +let + version = "1.10"; + mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}"; +in stdenv.mkDerivation { name = "redshift-${version}"; src = fetchurl { @@ -9,19 +18,29 @@ stdenv.mkDerivation { url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; }; - buildInputs = [ - gettext intltool makeWrapper pkgconfig python pygobject3 pyxdg + buildInputs = [ geoclue ] + ++ stdenv.lib.optional guiSupport [ python pygobject3 pyxdg ] + ++ stdenv.lib.optional drmSupport [ libdrm ] + ++ stdenv.lib.optional randrSupport [ libxcb ] + ++ stdenv.lib.optional vidModeSupport [ libX11 libXxf86vm ]; + nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ]; + + configureFlags = [ + (mkFlag guiSupport "gui") + (mkFlag drmSupport "drm") + (mkFlag randrSupport "randr") + (mkFlag vidModeSupport "vidmode") ]; - preInstall = '' + preInstall = stdenv.lib.optionalString guiSupport '' substituteInPlace src/redshift-gtk/redshift-gtk python \ --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" ''; -/* - postInstall = '' - wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH + + postInstall = stdenv.lib.optionalString guiSupport '' + wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : "$PYTHONPATH" ''; -*/ + meta = with stdenv.lib; { inherit version; description = "Gradually change screen color temperature"; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index a57647e18e70..a5b90890df2a 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,17 +5,18 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq"; + sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5"; + sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411"; }; in stdenv.mkDerivation { - name = "rescuetime-2.8.8.1040"; + # https://www.rescuetime.com/updates/linux_release_notes.html + name = "rescuetime-2.8.9.1170"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index ccde370c2925..7a8c9dfd71ef 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "2015-06-08"; + version = "1.2"; src = fetchgit { url = "https://github.com/carnager/rofi-pass"; - rev = "7e376b5ec64974c4e8478acf3ada8d111896f391"; - sha256 = "1ywsxdgy5m63a2f5vd7np2f1qffz7y95z7s1gq5d87s8xd8myadl"; + rev = "refs/tags/${version}"; + sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h"; }; buildInputs = [ rofi wmctrl xprop xdotool ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index d190ed706c4c..37a664a49185 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgs, python, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "1.4"; + version = "1.4.2"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "071p7idprknpra6mrdjjka8lrr80ykag62rhbsaf6zcz1d9p55cp"; + sha256 = "103ahwaaghxpih5bkbzqyqgxqmx6kc859vjla8fy8scg21cijghh"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix new file mode 100644 index 000000000000..988db35500ba --- /dev/null +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, fetchurl, ghc, aeson, aeson-pretty, base, binary, bytestring +, directory, filepath, HTF, HUnit, mtl, parsec, process, shelly +, stdenv, text, transformers, unix, xdg-basedir +, happy +}: + +mkDerivation rec { + pname = "super-user-spark"; + version = "0.1.0.0"; + + src = fetchurl { + url = "https://github.com/NorfairKing/super-user-spark/archive/v0.1.tar.gz"; + sha256 = "90258cb2d38f35b03867fdf82dbd49500cdec04f3cf05d0eaa18592cb44fe13f"; + }; + + isLibrary = false; + isExecutable = true; + jailbreak = true; + + buildDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + mtl parsec process shelly text transformers unix xdg-basedir happy + ]; + testDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + HUnit mtl parsec process shelly text transformers unix xdg-basedir + ]; + license = stdenv.lib.licenses.mit; + homepage = "https://github.com/NorfairKing/super-user-spark"; + description = "A safe way to never worry about your beautifully configured system again"; + platforms = ghc.meta.platforms; + maintainers = stdenv.lib.maintainers.badi; +} diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix new file mode 100644 index 000000000000..8086e8ca56d4 --- /dev/null +++ b/pkgs/applications/misc/synapse/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee +, keybinder3, json_glib, zeitgeist, vala +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "synapse-0.2.99.1"; + + src = fetchurl { + url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz"; + sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220"; + }; + + buildInputs = [ + intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist + vala + ]; + + meta = { + longDescription = '' + Semantic launcher written in Vala that you can use to start applications + as well as find and access relevant documents and files by making use of + the Zeitgeist engine + ''; + description = '' + Semantic launcher to start applications and find relevant files + ''; + homepage = https://launchpad.net/synapse-project; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; mahe; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/applications/misc/synergy/cryptopp.patch b/pkgs/applications/misc/synergy/cryptopp.patch deleted file mode 100644 index 1c296423acd6..000000000000 --- a/pkgs/applications/misc/synergy/cryptopp.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -urN synergy-1.4.17-Source/CMakeLists.txt synergy-1.4.17-Source-fix/CMakeLists.txt ---- synergy-1.4.17-Source/CMakeLists.txt 2014-03-14 21:34:19.000000000 +0100 -+++ synergy-1.4.17-Source-fix/CMakeLists.txt 2014-04-11 13:37:18.839338710 +0200 -@@ -145,6 +145,9 @@ - check_type_size(long SIZEOF_LONG) - check_type_size(short SIZEOF_SHORT) - -+ # let's just assume cryptopp exists (provided by the Nix expression) -+ list(APPEND libs cryptopp) -+ - # pthread is used on both Linux and Mac - check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) - if (HAVE_PTHREAD) -@@ -317,7 +320,6 @@ - endif() - - add_subdirectory(src) --add_subdirectory(ext) - - if (WIN32) - # TODO: consider using /analyze to uncover potential bugs in the source code. -diff -urN synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h ---- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h 2014-02-28 13:36:45.000000000 +0100 -+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoMode_cryptopp.h 2014-04-11 13:36:01.111985556 +0200 -@@ -25,6 +25,6 @@ - # pragma GCC system_header - #endif - --#include <cryptopp562/gcm.h> --#include <cryptopp562/modes.h> --#include <cryptopp562/aes.h> -+#include <cryptopp/gcm.h> -+#include <cryptopp/modes.h> -+#include <cryptopp/aes.h> -diff -urN synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h ---- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h 2014-02-28 13:36:45.000000000 +0100 -+++ synergy-1.4.17-Source-fix/src/lib/io/CryptoStream_cryptopp.h 2014-04-11 13:36:07.173013005 +0200 -@@ -25,5 +25,5 @@ - # pragma GCC system_header - #endif - --#include <cryptopp562/osrng.h> --#include <cryptopp562/sha.h> -+#include <cryptopp/osrng.h> -+#include <cryptopp/sha.h> diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 0d3337b478f0..c010047845fc 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,38 +1,44 @@ { stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr -, xinput, curl, cryptopp ? null, unzip }: - -assert stdenv.isLinux -> cryptopp != null; +, xinput, curl, openssl, unzip }: with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.6.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "synergy"; repo = "synergy"; - rev = version; - sha256 = "0n4zvz669vi2wyn6i6xhxp0j3nvjl4yzm441cqv6hb0d5k26wbcn"; + rev = "v${version}-stable"; + sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33"; }; - patches = optional stdenv.isLinux ./cryptopp.patch; - - postPatch = (if stdenv.isLinux then '' - sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ - set(HAVE_X11_EXTENSIONS_XRANDR_H true)' CMakeLists.txt - '' else '' - ${unzip}/bin/unzip -d ext/cryptopp562 ext/cryptopp562.zip - '') + '' + postPatch = '' ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip + '' + # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt + # it's not able to find it (it's trying to search the store path of libX11 + # instead) and we don't get XRandR support, even though the CMake output + # _seems_ to say so: + # + # Looking for XRRQueryExtension in Xrandr - found + # + # The relevant part however is: + # + # Looking for XRRNotifyEvent - not found + # + # So let's force it: + + optionalString stdenv.isLinux '' + sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ + set(HAVE_X11_EXTENSIONS_XRANDR_H true) + ' CMakeLists.txt ''; - buildInputs = [ cmake x11 libX11 libXi libXtst libXrandr xinput curl ] - ++ optional stdenv.isLinux cryptopp; - - # At this moment make install doesn't work for synergy - # http://synergy-foss.org/spit/issues/details/3317/ + buildInputs = [ + cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl + ]; installPhase = '' mkdir -p $out/bin @@ -45,8 +51,8 @@ stdenv.mkDerivation rec { checkPhase = "../bin/unittests"; meta = { - description = "Tool to share the mouse keyboard and the clipboard between computers"; - homepage = http://synergy-foss.org; + description = "Share one mouse and keyboard between multiple computers"; + homepage = "http://synergy-project.org/"; license = licenses.gpl2; maintainers = [ maintainers.aszlig ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/tessel/default.nix b/pkgs/applications/misc/tessel/default.nix deleted file mode 100644 index 6a11713c7501..000000000000 --- a/pkgs/applications/misc/tessel/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }: - -with stdenv.lib; - -let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - neededNatives = [ libusb1 pkgconfig python utillinux ]; - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - name = "tessel-0.3.16"; - bin = true; - - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz"; - name = "tessel-0.3.16.tgz"; - sha1 = "900a8d897ba03d7a9d5927697180284772d70738"; - }) - ]; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - postInstall = '' - mkdir -p $out/etc/udev/rules.d - cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/ - ''; - - passthru.names = [ "tessel" ]; - - meta = { - description = "Command line tools and programmatic access library for Tessel devices"; - homepage = https://tessel.io; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/tessel/package.nix b/pkgs/applications/misc/tessel/package.nix deleted file mode 100644 index d388387ccaf8..000000000000 --- a/pkgs/applications/misc/tessel/package.nix +++ /dev/null @@ -1,1974 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.5"; - by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "abbrev-1.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; - name = "abbrev-1.0.5.tgz"; - sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; - }) - ]; - buildInputs = - (self.nativeDeps."abbrev" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "abbrev" ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "asn1-0.1.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }) - ]; - buildInputs = - (self.nativeDeps."asn1" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "asn1" ]; - }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "assert-plus-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; - }) - ]; - buildInputs = - (self.nativeDeps."assert-plus" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "assert-plus" ]; - }; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.10"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - "async" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.9.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sign2-0.5.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sign2" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "aws-sign2" ]; - }; - by-spec."bindings-shyp"."~0.2.3" = - self.by-version."bindings-shyp"."0.2.3"; - by-version."bindings-shyp"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "bindings-shyp-0.2.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bindings-shyp/-/bindings-shyp-0.2.3.tgz"; - name = "bindings-shyp-0.2.3.tgz"; - sha1 = "909151c14c701f350eb6be8ad14784ad79813671"; - }) - ]; - buildInputs = - (self.nativeDeps."bindings-shyp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "bindings-shyp" ]; - }; - by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "block-stream-0.0.7"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; - }) - ]; - buildInputs = - (self.nativeDeps."block-stream" or []); - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "block-stream" ]; - }; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "boom-0.4.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }) - ]; - buildInputs = - (self.nativeDeps."boom" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "boom" ]; - }; - by-spec."buffer-equal"."~0.0.0" = - self.by-version."buffer-equal"."0.0.1"; - by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-equal-0.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - name = "buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "buffer-equal" ]; - }; - by-spec."bunker"."0.1.X" = - self.by-version."bunker"."0.1.2"; - by-version."bunker"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "bunker-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; - name = "bunker-0.1.2.tgz"; - sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; - }) - ]; - buildInputs = - (self.nativeDeps."bunker" or []); - deps = { - "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; - }; - peerDependencies = [ - ]; - passthru.names = [ "bunker" ]; - }; - by-spec."burrito".">=0.2.5 <0.3" = - self.by-version."burrito"."0.2.12"; - by-version."burrito"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "burrito-0.2.12"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; - name = "burrito-0.2.12.tgz"; - sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; - }) - ]; - buildInputs = - (self.nativeDeps."burrito" or []); - deps = { - "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; - "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "burrito" ]; - }; - by-spec."charm"."0.1.x" = - self.by-version."charm"."0.1.2"; - by-version."charm"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "charm-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; - name = "charm-0.1.2.tgz"; - sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; - }) - ]; - buildInputs = - (self.nativeDeps."charm" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "charm" ]; - }; - by-spec."colony-compiler"."~0.6.21" = - self.by-version."colony-compiler"."0.6.23"; - by-version."colony-compiler"."0.6.23" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-0.6.23"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler/-/colony-compiler-0.6.23.tgz"; - name = "colony-compiler-0.6.23.tgz"; - sha1 = "0bef9e899e1ae928f6fe5e0dcca6cab4d47ab448"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler" or []); - deps = { - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "optimist-0.5.2" = self.by-version."optimist"."0.5.2"; - "nan-1.0.0" = self.by-version."nan"."1.0.0"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; - # "colony-compiler-shyp-win32-ia32-0.6.17-1" = self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; - # "colony-compiler-shyp-win32-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; - # "colony-compiler-shyp-darwin-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler" ]; - }; - "colony-compiler" = self.by-version."colony-compiler"."0.6.23"; - by-spec."colony-compiler-shyp-darwin-x64"."0.6.x" = - self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; - by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-darwin-x64-0.6.17-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-darwin-x64/-/colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; - name = "colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; - sha1 = "33eedbee7ff8679fde69ba03bf27777110113732"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-darwin-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-darwin-x64" ]; - }; - by-spec."colony-compiler-shyp-win32-ia32"."0.6.x" = - self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; - by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-win32-ia32-0.6.17-1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-win32-ia32/-/colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; - name = "colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; - sha1 = "6e11a978be5df7be00112d2a349d5e34925f443a"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-win32-ia32" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-win32-ia32" ]; - }; - by-spec."colony-compiler-shyp-win32-x64"."0.6.x" = - self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; - by-version."colony-compiler-shyp-win32-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-win32-x64-0.6.17-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-win32-x64/-/colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; - name = "colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; - sha1 = "cd30416df0ab52e49c74e81d69bd23329983d005"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-win32-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-win32-x64" ]; - }; - by-spec."colors"."0.5.x" = - self.by-version."colors"."0.5.1"; - by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.5.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; - name = "colors-0.5.1.tgz"; - sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - by-spec."colors"."~0.6.0-1" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - "colors" = self.by-version."colors"."0.6.2"; - by-spec."colors"."~0.6.1" = - self.by-version."colors"."0.6.2"; - by-spec."colorsafeconsole"."0.0.4" = - self.by-version."colorsafeconsole"."0.0.4"; - by-version."colorsafeconsole"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "colorsafeconsole-0.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colorsafeconsole/-/colorsafeconsole-0.0.4.tgz"; - name = "colorsafeconsole-0.0.4.tgz"; - sha1 = "dc10508bb000e51964fb485fd8557faa169effbe"; - }) - ]; - buildInputs = - (self.nativeDeps."colorsafeconsole" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colorsafeconsole" ]; - }; - "colorsafeconsole" = self.by-version."colorsafeconsole"."0.0.4"; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "combined-stream-0.0.7"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }) - ]; - buildInputs = - (self.nativeDeps."combined-stream" or []); - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "combined-stream" ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "cryptiles-0.2.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }) - ]; - buildInputs = - (self.nativeDeps."cryptiles" or []); - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "cryptiles" ]; - }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "ctype-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }) - ]; - buildInputs = - (self.nativeDeps."ctype" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ctype" ]; - }; - by-spec."debug"."^0.8.1" = - self.by-version."debug"."0.8.1"; - by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.8.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - name = "debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - "debug" = self.by-version."debug"."0.8.1"; - by-spec."deep-equal"."~0.0.0" = - self.by-version."deep-equal"."0.0.0"; - by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; - name = "deep-equal-0.0.0.tgz"; - sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; - }; - by-spec."deep-equal"."~0.2.0" = - self.by-version."deep-equal"."0.2.1"; - by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; - name = "deep-equal-0.2.1.tgz"; - sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; - }; - by-spec."deep-is"."0.1.x" = - self.by-version."deep-is"."0.1.3"; - by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "deep-is-0.1.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - name = "deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-is" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-is" ]; - }; - by-spec."defined"."~0.0.0" = - self.by-version."defined"."0.0.0"; - by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "defined-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; - name = "defined-0.0.0.tgz"; - sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; - }) - ]; - buildInputs = - (self.nativeDeps."defined" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "defined" ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "delayed-stream-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }) - ]; - buildInputs = - (self.nativeDeps."delayed-stream" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "delayed-stream" ]; - }; - by-spec."difflet"."~0.2.0" = - self.by-version."difflet"."0.2.6"; - by-version."difflet"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "difflet-0.2.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; - name = "difflet-0.2.6.tgz"; - sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; - }) - ]; - buildInputs = - (self.nativeDeps."difflet" or []); - deps = { - "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; - "charm-0.1.2" = self.by-version."charm"."0.1.2"; - "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "difflet" ]; - }; - by-spec."effess"."~0.0.2" = - self.by-version."effess"."0.0.5"; - by-version."effess"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "effess-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/effess/-/effess-0.0.5.tgz"; - name = "effess-0.0.5.tgz"; - sha1 = "d328fd03929c168c02a63d9d3d889657dc9499db"; - }) - ]; - buildInputs = - (self.nativeDeps."effess" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "effess" ]; - }; - by-spec."effess"."~0.0.5" = - self.by-version."effess"."0.0.5"; - "effess" = self.by-version."effess"."0.0.5"; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "forever-agent-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }) - ]; - buildInputs = - (self.nativeDeps."forever-agent" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "forever-agent" ]; - }; - by-spec."form-data"."~0.1.0" = - self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.1.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }) - ]; - buildInputs = - (self.nativeDeps."form-data" or []); - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "form-data" ]; - }; - by-spec."fstream"."~0.1.25" = - self.by-version."fstream"."0.1.31"; - by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.31"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - name = "fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream" or []); - deps = { - "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - }; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - "fstream" = self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.28" = - self.by-version."fstream"."0.1.31"; - by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - by-spec."glob"."~3.2.9" = - self.by-version."glob"."3.2.11"; - by-spec."graceful-fs"."~1" = - self.by-version."graceful-fs"."1.2.3"; - by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - name = "graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.4"; - by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-3.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"; - name = "graceful-fs-3.0.4.tgz"; - sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."hardware-resolve"."~0.1.3" = - self.by-version."hardware-resolve"."0.1.6"; - by-version."hardware-resolve"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "hardware-resolve-0.1.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hardware-resolve/-/hardware-resolve-0.1.6.tgz"; - name = "hardware-resolve-0.1.6.tgz"; - sha1 = "b03f5077ab1b4b185ecd9486a3ba754f4b46e02a"; - }) - ]; - buildInputs = - (self.nativeDeps."hardware-resolve" or []); - deps = { - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - "effess-0.0.5" = self.by-version."effess"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "hardware-resolve" ]; - }; - "hardware-resolve" = self.by-version."hardware-resolve"."0.1.6"; - by-spec."hawk"."~1.0.0" = - self.by-version."hawk"."1.0.0"; - by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "hawk-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - name = "hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "hoek-0.9.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }) - ]; - buildInputs = - (self.nativeDeps."hoek" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "hoek" ]; - }; - by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "http-signature-0.10.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; - }) - ]; - buildInputs = - (self.nativeDeps."http-signature" or []); - deps = { - "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.2" = self.by-version."ctype"."0.5.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "http-signature" ]; - }; - by-spec."humanize"."0.0.9" = - self.by-version."humanize"."0.0.9"; - by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "humanize-0.0.9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; - name = "humanize-0.0.9.tgz"; - sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; - }) - ]; - buildInputs = - (self.nativeDeps."humanize" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "humanize" ]; - }; - "humanize" = self.by-version."humanize"."0.0.9"; - by-spec."inherits"."*" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "inherits-2.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.0" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "json-stringify-safe-5.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; - }) - ]; - buildInputs = - (self.nativeDeps."json-stringify-safe" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "json-stringify-safe" ]; - }; - by-spec."keypress"."~0.2.1" = - self.by-version."keypress"."0.2.1"; - by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "keypress-0.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - name = "keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; - }) - ]; - buildInputs = - (self.nativeDeps."keypress" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "keypress" ]; - }; - "keypress" = self.by-version."keypress"."0.2.1"; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.5.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - by-spec."mime"."~1.2.9" = - self.by-version."mime"."1.2.11"; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.14"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.0.8"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; - by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - by-spec."mkdirp"."~0.3 || 0.4 || 0.5" = - self.by-version."mkdirp"."0.5.0"; - by-spec."mkdirp"."~0.3.5" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."mute-stream"."~0.0.4" = - self.by-version."mute-stream"."0.0.4"; - by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "mute-stream-0.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - name = "mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; - }) - ]; - buildInputs = - (self.nativeDeps."mute-stream" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mute-stream" ]; - }; - by-spec."my-local-ip"."~1.0.0" = - self.by-version."my-local-ip"."1.0.0"; - by-version."my-local-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "my-local-ip-1.0.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz"; - name = "my-local-ip-1.0.0.tgz"; - sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; - }) - ]; - buildInputs = - (self.nativeDeps."my-local-ip" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "my-local-ip" ]; - }; - "my-local-ip" = self.by-version."my-local-ip"."1.0.0"; - by-spec."nan"."~1.0.0" = - self.by-version."nan"."1.0.0"; - by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "nan-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - name = "nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }) - ]; - buildInputs = - (self.nativeDeps."nan" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "nan" ]; - }; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; - }; - by-spec."nomnom"."~1.6.2" = - self.by-version."nomnom"."1.6.2"; - by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { - name = "nomnom-1.6.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; - name = "nomnom-1.6.2.tgz"; - sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; - }) - ]; - buildInputs = - (self.nativeDeps."nomnom" or []); - deps = { - "colors-0.5.1" = self.by-version."colors"."0.5.1"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "nomnom" ]; - }; - "nomnom" = self.by-version."nomnom"."1.6.2"; - by-spec."nopt"."~2" = - self.by-version."nopt"."2.2.1"; - by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - name = "nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }) - ]; - buildInputs = - (self.nativeDeps."nopt" or []); - deps = { - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - by-spec."oauth-sign"."~0.3.0" = - self.by-version."oauth-sign"."0.3.0"; - by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "oauth-sign-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - name = "oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }) - ]; - buildInputs = - (self.nativeDeps."oauth-sign" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "oauth-sign" ]; - }; - by-spec."object-inspect"."~0.4.0" = - self.by-version."object-inspect"."0.4.0"; - by-version."object-inspect"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "object-inspect-0.4.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - name = "object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; - }) - ]; - buildInputs = - (self.nativeDeps."object-inspect" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "object-inspect" ]; - }; - by-spec."optimist"."~0.5.2" = - self.by-version."optimist"."0.5.2"; - by-version."optimist"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz"; - name = "optimist-0.5.2.tgz"; - sha1 = "85c8c1454b3315e4a78947e857b1df033450bfbc"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = { - "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - by-spec."osenv"."0.0.3" = - self.by-version."osenv"."0.0.3"; - by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "osenv-0.0.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - name = "osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; - }) - ]; - buildInputs = - (self.nativeDeps."osenv" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "osenv" ]; - }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.2"; - by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "punycode-1.3.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - name = "punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; - }; - by-spec."qs"."~0.6.0" = - self.by-version."qs"."0.6.6"; - by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - name = "qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }) - ]; - buildInputs = - (self.nativeDeps."qs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - by-spec."read"."^1.0.5" = - self.by-version."read"."1.0.5"; - by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - name = "read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read" or []); - deps = { - "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; - }; - "read" = self.by-version."read"."1.0.5"; - by-spec."request"."~2.33.0" = - self.by-version."request"."2.33.0"; - by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.33.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; - name = "request-2.33.0.tgz"; - sha1 = "5167878131726070ec633752ea230a2379dc65ff"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - "request" = self.by-version."request"."2.33.0"; - by-spec."resumer"."~0.0.0" = - self.by-version."resumer"."0.0.0"; - by-version."resumer"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "resumer-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - name = "resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; - }) - ]; - buildInputs = - (self.nativeDeps."resumer" or []); - deps = { - "through-2.3.6" = self.by-version."through"."2.3.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "resumer" ]; - }; - by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."rimraf"."~2.1.4" = - self.by-version."rimraf"."2.1.4"; - by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.1.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; - name = "rimraf-2.1.4.tgz"; - sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."runforcover"."~0.0.2" = - self.by-version."runforcover"."0.0.2"; - by-version."runforcover"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "runforcover-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; - name = "runforcover-0.0.2.tgz"; - sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; - }) - ]; - buildInputs = - (self.nativeDeps."runforcover" or []); - deps = { - "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "runforcover" ]; - }; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; - by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.3.2"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; - name = "semver-2.3.2.tgz"; - sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - "semver" = self.by-version."semver"."2.3.2"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "sigmund-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }) - ]; - buildInputs = - (self.nativeDeps."sigmund" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "sigmund" ]; - }; - by-spec."slide"."*" = - self.by-version."slide"."1.1.6"; - by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "slide-1.1.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - name = "slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }) - ]; - buildInputs = - (self.nativeDeps."slide" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "slide" ]; - }; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sntp-0.2.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }) - ]; - buildInputs = - (self.nativeDeps."sntp" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "sntp" ]; - }; - by-spec."structured-clone"."~0.2.2" = - self.by-version."structured-clone"."0.2.2"; - by-version."structured-clone"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "structured-clone-0.2.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/structured-clone/-/structured-clone-0.2.2.tgz"; - name = "structured-clone-0.2.2.tgz"; - sha1 = "ac92b6be31958a643db30f1335abc6a1b02dfdc2"; - }) - ]; - buildInputs = - (self.nativeDeps."structured-clone" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "structured-clone" ]; - }; - "structured-clone" = self.by-version."structured-clone"."0.2.2"; - by-spec."tap"."~0.4.8" = - self.by-version."tap"."0.4.13"; - by-version."tap"."0.4.13" = lib.makeOverridable self.buildNodePackage { - name = "tap-0.4.13"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tap/-/tap-0.4.13.tgz"; - name = "tap-0.4.13.tgz"; - sha1 = "3986134d6759727fc2223e61126eeb87243accbc"; - }) - ]; - buildInputs = - (self.nativeDeps."tap" or []); - deps = { - "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; - "difflet-0.2.6" = self.by-version."difflet"."0.2.6"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tap" ]; - }; - "tap" = self.by-version."tap"."0.4.13"; - by-spec."tape"."~2.12.3" = - self.by-version."tape"."2.12.3"; - by-version."tape"."2.12.3" = lib.makeOverridable self.buildNodePackage { - name = "tape-2.12.3"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tape/-/tape-2.12.3.tgz"; - name = "tape-2.12.3.tgz"; - sha1 = "5559d5454050292627537c012991ec6971f66156"; - }) - ]; - buildInputs = - (self.nativeDeps."tape" or []); - deps = { - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; - "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0"; - "resumer-0.0.0" = self.by-version."resumer"."0.0.0"; - "through-2.3.6" = self.by-version."through"."2.3.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tape" ]; - }; - "tape" = self.by-version."tape"."2.12.3"; - by-spec."tar"."~0.1.18" = - self.by-version."tar"."0.1.20"; - by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.20"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; - name = "tar-0.1.20.tgz"; - sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; - }) - ]; - buildInputs = - (self.nativeDeps."tar" or []); - deps = { - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tar" ]; - }; - "tar" = self.by-version."tar"."0.1.20"; - by-spec."temp"."~0.6.0" = - self.by-version."temp"."0.6.0"; - by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.6.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; - name = "temp-0.6.0.tgz"; - sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; - }) - ]; - buildInputs = - (self.nativeDeps."temp" or []); - deps = { - "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "temp" ]; - }; - "temp" = self.by-version."temp"."0.6.0"; - by-spec."through"."~2.3.4" = - self.by-version."through"."2.3.6"; - by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage { - name = "through-2.3.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz"; - name = "through-2.3.6.tgz"; - sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8"; - }) - ]; - buildInputs = - (self.nativeDeps."through" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "through" ]; - }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.12.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; - }; - by-spec."traverse"."0.6.x" = - self.by-version."traverse"."0.6.6"; - by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "traverse-0.6.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - name = "traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; - by-spec."traverse"."~0.5.1" = - self.by-version."traverse"."0.5.2"; - by-version."traverse"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "traverse-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; - name = "traverse-0.5.2.tgz"; - sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; - by-spec."tunnel-agent"."~0.3.0" = - self.by-version."tunnel-agent"."0.3.0"; - by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "tunnel-agent-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - name = "tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }) - ]; - buildInputs = - (self.nativeDeps."tunnel-agent" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "tunnel-agent" ]; - }; - by-spec."uglify-js"."~1.1.1" = - self.by-version."uglify-js"."1.1.1"; - by-version."uglify-js"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-1.1.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; - name = "uglify-js-1.1.1.tgz"; - sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; - by-spec."underscore"."~1.4.4" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - by-spec."usb"."~0.3.11" = - self.by-version."usb"."0.3.11"; - by-version."usb"."0.3.11" = lib.makeOverridable self.buildNodePackage { - name = "usb-0.3.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb/-/usb-0.3.11.tgz"; - name = "usb-0.3.11.tgz"; - sha1 = "ee61d114181fd1de8738053920cde069d0aa428e"; - }) - ]; - buildInputs = - (self.nativeDeps."usb" or []); - deps = { - "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; - # "usb-shyp-win32-x64-0.3.11-0" = self.by-version."usb-shyp-win32-x64"."0.3.11-0"; - # "usb-shyp-win32-ia32-0.3.11-0" = self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; - # "usb-shyp-darwin-x64-0.3.11-0" = self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "usb" ]; - }; - "usb" = self.by-version."usb"."0.3.11"; - by-spec."usb-shyp-darwin-x64"."0.3.x" = - self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; - by-version."usb-shyp-darwin-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-darwin-x64-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-darwin-x64/-/usb-shyp-darwin-x64-0.3.11-0.tgz"; - name = "usb-shyp-darwin-x64-0.3.11-0.tgz"; - sha1 = "8e6c98e5dff676576dac02c8a0465f1eae833285"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-darwin-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-darwin-x64" ]; - }; - by-spec."usb-shyp-win32-ia32"."0.3.x" = - self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; - by-version."usb-shyp-win32-ia32"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-win32-ia32-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-win32-ia32/-/usb-shyp-win32-ia32-0.3.11-0.tgz"; - name = "usb-shyp-win32-ia32-0.3.11-0.tgz"; - sha1 = "365babb7f648cb8aff12f70c65445e1b0958bbbb"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-win32-ia32" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-win32-ia32" ]; - }; - by-spec."usb-shyp-win32-x64"."0.3.x" = - self.by-version."usb-shyp-win32-x64"."0.3.11-0"; - by-version."usb-shyp-win32-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-win32-x64-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-win32-x64/-/usb-shyp-win32-x64-0.3.11-0.tgz"; - name = "usb-shyp-win32-x64-0.3.11-0.tgz"; - sha1 = "561417f00ab33c9d990a56e3a4ee446a21a3fcbe"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-win32-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-win32-x64" ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.2"; - by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "wordwrap-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - name = "wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; - }; - by-spec."yamlish"."*" = - self.by-version."yamlish"."0.0.6"; - by-version."yamlish"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "yamlish-0.0.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz"; - name = "yamlish-0.0.6.tgz"; - sha1 = "c5df8f7661731351e39eb52223f83a46659452e3"; - }) - ]; - buildInputs = - (self.nativeDeps."yamlish" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "yamlish" ]; - }; -} diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 187ab0390143..c7a01f2ac1b9 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -17,8 +17,12 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build + # The config locking scheme relies on the binary being called "tilda", + # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: postInstall = '' - wrapProgram "$out/bin/tilda" \ + mkdir $out/bin/wrapped + mv "$out/bin/tilda" "$out/bin/wrapped/tilda" + makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; diff --git a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch deleted file mode 100644 index 9bfe3831c4aa..000000000000 --- a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch +++ /dev/null @@ -1,57 +0,0 @@ -From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001 -From: Oliver Winker <oliver@oli1170.net> -Date: Tue, 12 Aug 2014 19:08:05 +0200 -Subject: [PATCH] Fix for openssl 1.0.1i - -Fixes following application error ---- -Errors -error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error ---- - -Due to openssl 1.0.1i change: ---- -commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291 -Author: Emilia Kasper <emilia@openssl.org> -Date: Wed Jul 2 19:02:33 2014 +0200 - - Fix OID handling: - - - Upon parsing, reject OIDs with invalid base-128 encoding. - - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function. - - CVE-2014-3508 - - Reviewed-by: Dr. Stephen Henson <steve@openssl.org> - Reviewed-by: Kurt Roeckx <kurt@openssl.org> - Reviewed-by: Tim Hudson <tjh@openssl.org> ---- ---- - lib/x509v3ext.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp -index cf74c32..d94cbda 100644 ---- a/lib/x509v3ext.cpp -+++ b/lib/x509v3ext.cpp -@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n) - x509v3ext::x509v3ext(const x509v3ext &n) - { - ext = NULL; -+ if (!n.isValid()) -+ return; - set(n.ext); - } - -@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const - - bool x509v3ext::isValid() const - { -- return ext->value->length > 0 && -+ return ext && ext->value && ext->value->length > 0 && - OBJ_obj2nid(ext->object) != NID_undef; - } - --- -2.0.1 - diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index d5fa5e5ec56d..76de3627630a 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { name = "xca-${version}"; - version = "0.9.3"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8"; + sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2"; }; - patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ]; - - configurePhase = '' - export PATH=$PATH:${which}/bin - export QTDIR=${qt4} - prefix=$out ./configure ${openssl} ${libtool} - ''; - postInstall = '' wrapProgram "$out/bin/xca" \ --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib" diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 78d499396772..dbc5e84e67bc 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -2,7 +2,7 @@ , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt -, sword, clucene_core +, sword, clucene_core, biblesync , gnome_doc_utils , libgsf, gconf , gtkhtml, libgtkhtml, libglade, scrollkeeper @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { name = "xiphos-${version}"; - version = "4.0.0"; + version = "4.0.3-20150806"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz"; - sha256 = "0rk9xhnaqm17af9ppjf2yqpy9p8s0z7m5ax586b7p16lylcqjh68"; + url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz"; + sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv"; }; buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt - sword clucene_core gnome_doc_utils libgsf gconf gtkhtml libgtkhtml + sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ]; prePatch = '' |