diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/bitcoin/altcoins.nix | 55 | ||||
-rw-r--r-- | pkgs/applications/misc/bitcoin/litecoin.nix | 60 | ||||
-rw-r--r-- | pkgs/applications/misc/eaglemode/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/evtest/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio-osmosdr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gnuradio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gqrx/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/misc/gramps/default.nix | 57 | ||||
-rw-r--r-- | pkgs/applications/misc/llpp/default.nix | 82 | ||||
-rw-r--r-- | pkgs/applications/misc/rescuetime/default.nix | 44 | ||||
-rw-r--r-- | pkgs/applications/misc/slmenu/default.nix | 30 |
11 files changed, 261 insertions, 97 deletions
diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix index 931dfcaa8611..4b7d81ba8825 100644 --- a/pkgs/applications/misc/bitcoin/altcoins.nix +++ b/pkgs/applications/misc/bitcoin/altcoins.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig , openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf -, utillinux, autogen, autoconf, autobuild, automake, db }: +, utillinux, autogen, autoconf, autobuild, automake, autoreconfHook, db }: with stdenv.lib; @@ -8,7 +8,7 @@ let buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a: stdenv.mkDerivation ({ name = "${walletName}${toString (optional (!gui) "d")}-${a.version}"; - buildInputs = [ openssl db48 boost zlib miniupnpc ] + buildInputs = [ pkgconfig openssl db48 boost zlib miniupnpc ] ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or []; configurePhase = optional gui "qmake"; @@ -27,7 +27,7 @@ let meta = { platforms = platforms.unix; license = license.mit; - maintainers = [ maintainers.offline ]; + maintainers = [ maintainers.offline ] ++ a.extraMaintainers; }; } // a) ); @@ -35,31 +35,6 @@ let in rec { inherit buildAltcoin; - litecoin = buildAltcoin rec { - walletName = "litecoin"; - version = "0.8.5.3-rc3"; - - src = fetchurl { - url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; - sha256 = "1z4a7bm3z9kd7n0s38kln31z8shsd32d5d5v3br5p0jlnr5g3lk7"; - }; - - meta = { - description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; - longDescription= '' - Litecoin is a peer-to-peer Internet currency that enables instant payments - to anyone in the world. It is based on the Bitcoin protocol but differs - from Bitcoin in that it can be efficiently mined with consumer-grade hardware. - Litecoin provides faster transaction confirmations (2.5 minutes on average) - and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target - the regular computers and GPUs most people already have. - The Litecoin network is scheduled to produce 84 million currency units. - ''; - homepage = https://litecoin.org/; - }; - }; - litecoind = litecoin.override { gui = false; }; - namecoin = buildAltcoin rec { walletName = "namecoin"; version = "0.3.51.00"; @@ -80,4 +55,28 @@ in rec { }; }; + darkcoin = buildAltcoin rec { + walletName = "darkcoin"; + version = "0.9.13.15"; + + src = fetchurl { + url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; + sha256 = "1kly2y3g4dr1jwwf81smqvc7k662x6rvg4ggmxva1yaifb67bgjb"; + }; + + extraBuildInputs = [ glib ]; + + meta = { + description = "A decentralized key/value registration and transfer system"; + longDescription = '' + Darkcoin (DRK) is an open sourced, privacy-centric digital + currency. It allows you keep your finances private as you make + transactions, similar to cash. + ''; + homepage = http://darkcoin.io; + extraMaintainers = [ maintainers.AndersonTorres ]; + }; + }; + darkcoind = darkcoin.override { gui = false; }; + } diff --git a/pkgs/applications/misc/bitcoin/litecoin.nix b/pkgs/applications/misc/bitcoin/litecoin.nix new file mode 100644 index 000000000000..3e5d9427cf32 --- /dev/null +++ b/pkgs/applications/misc/bitcoin/litecoin.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, pkgconfig +, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf +, utillinux, autogen, autoreconfHook }: + +with stdenv.lib; + +let + mkAutoreconfCoin = + { name, version, withGui, src, meta }: + + stdenv.mkDerivation { + + inherit src meta; + + name = name + (toString (optional (!withGui) "d")) + "-" + version; + + buildInputs = [ autogen autoreconfHook pkgconfig openssl + boost zlib miniupnpc db48 glib utillinux protobuf ] + ++ optionals withGui [ qt4 qrencode protobuf ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; + }; + + mkLitecoin = { withGui }: + + mkAutoreconfCoin rec { + + name = "litecoin"; + version = "0.9.3-preview5"; + inherit withGui; + + src = fetchurl { + url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; + sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6"; + }; + + meta = with stdenv.lib; { + description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; + longDescription= '' + Litecoin is a peer-to-peer Internet currency that enables instant payments + to anyone in the world. It is based on the Bitcoin protocol but differs + from Bitcoin in that it can be efficiently mined with consumer-grade hardware. + Litecoin provides faster transaction confirmations (2.5 minutes on average) + and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target + the regular computers and GPUs most people already have. + The Litecoin network is scheduled to produce 84 million currency units. + ''; + homepage = https://litecoin.org/; + platforms = platforms.unix; + license = licenses.mit; + maintainers = [ maintainers.offline maintainers.AndersonTorres ]; + }; + }; + +in { + + litecoin = mkLitecoin { withGui = true; }; + litecoind = mkLitecoin { withGui = false; }; + +} diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 9d9b22abcb19..db613cd49222 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext" - yes y | perl make.pl build + perl make.pl build ''; dontPatchELF = true; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 638f254364e8..bccfd95e32bf 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }: stdenv.mkDerivation rec { - name = "evtest-1.31"; + name = "evtest-1.32"; preConfigure = "autoreconf -iv"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://anongit.freedesktop.org/evtest"; - rev = "871371806017301373b8b0e5b7e8f168ce1ea13f"; - sha256 = "1hxldlldlrb9lnnybn839a97fpqd1cixbmci2wzgr0rzhjbwhcgp"; + rev = "refs/tags/evtest-1.32"; + sha256 = "150lb7d2gnkcqgfw1hcnb8lcvdb52fpig9j9qxjizp6irhlw2a31"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix index 2e9d74c2441d..ec48a9da92f1 100644 --- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix +++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix @@ -7,12 +7,12 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-osmosdr-${version}"; - version = "0.1.0"; + version = "0.1.4"; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; rev = "refs/tags/v${version}"; - sha256 = "112zfvnr6fjvhdc06ihi2sb0dp441qy7jq8rvr81nbyv3r8jspj4"; + sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 045d6f9f92ab..888d39c37320 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.5"; + version = "3.7.5.1"; src = fetchurl { url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; - sha256 = "0hv2nyz2hp1mjinin2q7jimh9mr81rjqvghqmaglz8w70qcn4zs6"; + sha256 = "0gg4i8s1z5pcfk8d7n7baxv3lx2cjcizimvbziraj27lcbvpmwar"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index a52081077509..d0a57e4cec27 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,11 +8,11 @@ assert pulseaudioSupport -> pulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "mirror://sourceforge/project/gqrx/${version}/${name}-src.tar.gz"; - sha256 = "15ncx2shh43skph7sj3jvmkls9cbbbysld49c8xd23fhdsxanj9x"; + url = "mirror://sourceforge/project/gqrx/${version}/${name}.tar.xz"; + sha256 = "0fyfkdd2ailg54ppv1y2fy2c692jmlmsyl1lxr20lyn6bvd9gpyn"; }; buildInputs = [ @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { configurePhase = ''qmake PREFIX="$out"''; + postInstall = '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/icons" + + cp gqrx.desktop "$out/share/applications/" + cp icons/gqrx.svg "$out/share/icons/" + ''; + meta = with stdenv.lib; { description = "Software defined radio (SDR) receiver"; longDescription = '' diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix new file mode 100644 index 000000000000..31cdb8d17863 --- /dev/null +++ b/pkgs/applications/misc/gramps/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool, + pango, gsettings_desktop_schemas }: + +pythonPackages.buildPythonPackage rec { + version = "4.1.1"; + name = "gramps-${version}"; + namePrefix = ""; + + buildInputs = [ intltool gtk3 ]; + + # Currently broken + doCheck = false; + + src = fetchurl { + url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz"; + sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060"; + }; + + pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ]; + + # Same installPhase as in buildPythonPackage but without --old-and-unmanageble + # install flag. + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + + runHook postInstall + ''; + + # gobjectIntrospection package, wrap accordingly + preFixup = '' + wrapProgram $out/bin/gramps \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + ''; + + meta = with stdenv.lib; { + description = "Genealogy software"; + homepage = http://gramps-project.org; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index e04898fba29f..5284d441b44f 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,75 +1,41 @@ -{ stdenv, fetchgit, ocaml, mupdf, lablgl, mesa -, libX11, libXext, gtk3, freetype, zlib, openjpeg -, jbig2dec, libjpeg, ncurses }: +{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl +, gtk3, openjpeg, jbig2dec, mujs }: -stdenv.mkDerivation { - name = "llpp-2014-05-26"; +let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; +in stdenv.mkDerivation rec { + name = "llpp-2014-11-29"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "902143de64d86b5714b3a59d2cc7085083b87249"; - sha256 = "038xl4gbvm57na2lz1fw36sf43zaxq407zi2d53985vc33677j9s"; + rev = "481c8398b2c5dc4589738f5f80104ed75b9c73ff"; + sha256 = "13zi5mzpd9j4mmm68m3zkv49xgkhswhqvmp4bbyi0psmhxak8y5l"; }; - buildInputs = [ ocaml mupdf lablgl mesa libX11 libXext gtk3 - freetype jbig2dec libjpeg openjpeg zlib ncurses ]; + buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl + gtk3 jbig2dec openjpeg mujs ]; - # The build phase was extracted from buildall.sh, because that script - # fetched the dependencies on its own. - buildPhase = '' - ccopt="-O" - ccopt="$ccopt -I ${jbig2dec}/include" - ccopt="$ccopt -I ${libjpeg}/include" - ccopt="$ccopt -I ${freetype}/include/freetype2" - ccopt="$ccopt -I ${openjpeg}/include" - ccopt="$ccopt -I ${zlib}/include" - ccopt="$ccopt -I ${mupdf}/include" - ccopt="$ccopt -include ft2build.h" - ccopt="$ccopt -D_GNU_SOURCE" - - cclib="$cclib -lmupdf" - cclib="$cclib -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lpthread" - cclib="$cclib -lX11" - cclib="$cclib -lfreetype" - - comp=ocamlc.opt - cmsuf=cmo - - sh mkhelp.sh keystoml.ml KEYS > help.ml - - $comp -c -o link.o -ccopt "$ccopt" link.c - $comp -c -o help.$cmsuf help.ml - $comp -c -o utils.$cmsuf utils.ml - $comp -c -o wsi.cmi wsi.mli - $comp -c -o wsi.$cmsuf wsi.ml - $comp -c -o parser.$cmsuf parser.ml - $comp -c -o main.$cmsuf -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl main.ml - - $comp -custom -o llpp \ - -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl \ - str.cma unix.cma lablgl.cma \ - link.o \ - -cclib "$cclib" \ - help.cmo \ - utils.cmo \ - parser.cmo \ - wsi.cmo \ - main.cmo + configurePhase = '' + sh configure.sh -O -F ${mupdf} + sed -i 's;-lopenjpeg;-lopenjp2;g' .config + sed -i 's;$builddir/link\.so;link.so;g' build.ninja ''; - # Binary fails with 'No bytecode file specified.' if stripped. - dontStrip = true; + buildPhase = "${ninja}/bin/ninja"; installPhase = '' - install -d $out/bin - install llpp llppac $out/bin + install -d $out/bin $out/lib + install build/llpp $out/bin + install link.so $out/lib + wrapProgram $out/bin/llpp \ + --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ + --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" ''; - meta = { + meta = with stdenv.lib; { homepage = http://repo.or.cz/w/llpp.git; description = "A MuPDF based PDF pager written in OCaml"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL"; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix new file mode 100644 index 000000000000..2fd43382c402 --- /dev/null +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchurl, dpkg, patchelf, qt4, libXtst, libXext, libX11, makeWrapper, libXScrnSaver }: + +let + src = + if stdenv.system == "i686-linux" then fetchurl { + name = "rescuetime-installer.deb"; + url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; + sha256 = "03dj0ivavxlcvx7dv7y6zllwqkclfyxkfax691zv2qclmk5gf8wz"; + } else fetchurl { + name = "rescuetime-installer.deb"; + url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; + sha256 = "11by4lkij1ryv8h3mz55hj3ssrikl697rs5b7mlg3g058gr2v3wl"; + }; + +in + +stdenv.mkDerivation { + name = "rescuetime-2.8.6.1015"; + inherit src; + buildInputs = [ dpkg makeWrapper ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p $out/bin + cp usr/bin/rescuetime $out/bin + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + $out/bin/rescuetime + + wrapProgram $out/bin/rescuetime \ + --prefix LD_PRELOAD : ${qt4}/lib/libQtGui.so.4:${qt4}/lib/libQtCore.so.4:${libXtst}/lib/libXtst.so.6:${libXext}/lib/libXext.so.6:${libX11}/lib/libX11.so.6:${libXScrnSaver}/lib/libXss.so.1 + ''; + meta = with lib; { + description = "Helps you understand your daily habits so you can focus and be more productive"; + homepage = "https://www.rescuetime.com"; + maintainers = with maintainers; [ cstrahan ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix new file mode 100644 index 000000000000..193bcf205f5b --- /dev/null +++ b/pkgs/applications/misc/slmenu/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchhg}: +let + s = + rec { + baseName = "slmenu"; + version = "hg-${date}"; + date = "2012-02-01"; + name = "${baseName}-${version}"; + url = "https://bitbucket.org/rafaelgg/slmenu/"; + rev = "7e74fa5db73e8b018da48d50dbbaf11cb5c62d13"; + sha256 = "0zb7mm8344d3xmvrl62psazcabfk75pp083jqkmywdsrikgjagv6"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchhg { + inherit (s) url sha256; + }; + makeFlags = ''PREFIX=$(out)''; + meta = { + inherit (s) version; + description = ''A console dmenu-like tool''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} |