diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/dmenu2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/finalterm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/jekyll/Gemfile | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/jekyll/Gemfile.lock | 72 | ||||
-rw-r--r-- | pkgs/applications/misc/jekyll/default.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/misc/jekyll/gemset.nix | 282 | ||||
-rw-r--r-- | pkgs/applications/misc/llpp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/sqliteman/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/misc/termite/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/wordnet/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xmove/default.nix | 2 |
14 files changed, 407 insertions, 23 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0f9dbf8d4223..fc013e9125fc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - name = "calibre-2.27.0"; + name = "calibre-2.28.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5"; + sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf"; }; inherit python; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 1637586eb477..54aec8606cd4 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dmenu2"; + name = "dmenu2-0.3pre-2014-07-08"; src = fetchhg { url = "https://bitbucket.org/melek/dmenu2"; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index e4b0675aa945..bdd1a9e8e28e 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with lib; { diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile new file mode 100644 index 000000000000..0788a359116d --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'jekyll' +gem 'rdiscount' diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock new file mode 100644 index 000000000000..76bddef5869e --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile.lock @@ -0,0 +1,72 @@ +GEM + remote: https://rubygems.org/ + specs: + blankslate (2.1.2.4) + celluloid (0.16.0) + timers (~> 4.0.0) + classifier-reborn (2.0.3) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.9.1.1) + colorator (0.1) + execjs (2.5.2) + fast-stemmer (1.0.2) + ffi (1.9.8) + hitimes (1.2.2) + jekyll (2.5.3) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-gist (1.2.1) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-watch (1.2.1) + listen (~> 2.7) + kramdown (1.7.0) + liquid (2.6.2) + listen (2.10.0) + celluloid (~> 0.16.0) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + mercenary (0.3.5) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.11) + pygments.rb (0.6.3) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rdiscount (2.1.8) + redcarpet (3.2.3) + safe_yaml (1.0.4) + sass (3.4.13) + timers (4.0.1) + hitimes + toml (0.1.2) + parslet (~> 1.5.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll + rdiscount diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix new file mode 100644 index 000000000000..cc1d4e7c6592 --- /dev/null +++ b/pkgs/applications/misc/jekyll/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "jekyll-2.5.3"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Simple, blog aware, static site generator"; + homepage = http://jekyllrb.com/; + license = with licenses; mit; + maintainers = with maintainers; [ pesterhazy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix new file mode 100644 index 000000000000..0ceb095b4c82 --- /dev/null +++ b/pkgs/applications/misc/jekyll/gemset.nix @@ -0,0 +1,282 @@ +{ + "blankslate" = { + version = "2.1.2.4"; + source = { + type = "gem"; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + }; + }; + "celluloid" = { + version = "0.16.0"; + source = { + type = "gem"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "classifier-reborn" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby"; + }; + dependencies = [ + "fast-stemmer" + ]; + }; + "coffee-script" = { + version = "2.4.1"; + source = { + type = "gem"; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + }; + dependencies = [ + "coffee-script-source" + "execjs" + ]; + }; + "coffee-script-source" = { + version = "1.9.1.1"; + source = { + type = "gem"; + sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5"; + }; + }; + "colorator" = { + version = "0.1"; + source = { + type = "gem"; + sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; + }; + }; + "execjs" = { + version = "2.5.2"; + source = { + type = "gem"; + sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0"; + }; + }; + "fast-stemmer" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh"; + }; + }; + "ffi" = { + version = "1.9.8"; + source = { + type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; + }; + }; + "hitimes" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4"; + }; + }; + "jekyll" = { + version = "2.5.3"; + source = { + type = "gem"; + sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n"; + }; + dependencies = [ + "classifier-reborn" + "colorator" + "jekyll-coffeescript" + "jekyll-gist" + "jekyll-paginate" + "jekyll-sass-converter" + "jekyll-watch" + "kramdown" + "liquid" + "mercenary" + "pygments.rb" + "redcarpet" + "safe_yaml" + "toml" + ]; + }; + "jekyll-coffeescript" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg"; + }; + dependencies = [ + "coffee-script" + ]; + }; + "jekyll-gist" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv"; + }; + }; + "jekyll-paginate" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; + }; + }; + "jekyll-sass-converter" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1"; + }; + dependencies = [ + "sass" + ]; + }; + "jekyll-watch" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja"; + }; + dependencies = [ + "listen" + ]; + }; + "kramdown" = { + version = "1.7.0"; + source = { + type = "gem"; + sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna"; + }; + }; + "liquid" = { + version = "2.6.2"; + source = { + type = "gem"; + sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb"; + }; + }; + "listen" = { + version = "2.10.0"; + source = { + type = "gem"; + sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i"; + }; + dependencies = [ + "celluloid" + "rb-fsevent" + "rb-inotify" + ]; + }; + "mercenary" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb"; + }; + }; + "parslet" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + }; + dependencies = [ + "blankslate" + ]; + }; + "posix-spawn" = { + version = "0.3.11"; + source = { + type = "gem"; + sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + }; + }; + "pygments.rb" = { + version = "0.6.3"; + source = { + type = "gem"; + sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i"; + }; + dependencies = [ + "posix-spawn" + "yajl-ruby" + ]; + }; + "rb-fsevent" = { + version = "0.9.4"; + source = { + type = "gem"; + sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7"; + }; + }; + "rb-inotify" = { + version = "0.9.5"; + source = { + type = "gem"; + sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; + }; + dependencies = [ + "ffi" + ]; + }; + "rdiscount" = { + version = "2.1.8"; + source = { + type = "gem"; + sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; + }; + }; + "redcarpet" = { + version = "3.2.3"; + source = { + type = "gem"; + sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sass" = { + version = "3.4.13"; + source = { + type = "gem"; + sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig"; + }; + }; + "timers" = { + version = "4.0.1"; + source = { + type = "gem"; + sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l"; + }; + dependencies = [ + "hitimes" + ]; + }; + "toml" = { + version = "0.1.2"; + source = { + type = "gem"; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + }; + dependencies = [ + "parslet" + ]; + }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index f2e23e0babfe..bbae8aca2b8b 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -4,12 +4,12 @@ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21"; + version = "21-git-2015-04-27"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "refs/tags/v${version}"; - sha256 = "0rxdq6j3bs4drnhlxgm0gcwkhxi98vmxm22lnkpic7h67lgsz51q"; + rev = "66868744188151eaa433d42c807e1efc5f623aa4"; + sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c"; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index c0cc702c9862..3c5caeda789e 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index a636c3bcfe56..ba68a46cf0c7 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/mina86/urxvt-tabbedex"; - rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42"; - sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e"; + rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363"; + sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3"; }; installPhase = '' @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index f655a0f8c260..a1d5ef153bbd 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4, qscintilla }: +{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { - name = "sqliteman"; - version = "1.2.0-c41b89e1"; + name = "sqliteman-${version}"; + version = "1.2.0"; - src = fetchurl { - url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz; - sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm"; + src = fetchFromGitHub { + repo = "sqliteman"; + owner = "pvanek"; + rev = version; + sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; buildInputs = [ cmake qt4 qscintilla ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 7c1fe5fc5cbd..ba3d3db3267d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "9"; + version = "10"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh"; + sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; }; makeFlags = "VERSION=v${version}"; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 6ead69db2209..c70436e68f99 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { buildInputs = [tcl tk x11 makeWrapper]; + patchPhase = '' + sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c + ''; + # Needs the path to `tclConfig.sh' and `tkConfig.sh'. configureFlags = "--with-tcl=" + tcl + "/lib " + "--with-tk=" + tk + "/lib"; diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 6612c22d4fee..a4427c11f6a5 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xmove-2.0b2"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; + url = mirror://debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf"; }; |