mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
47770 commits 218 branches 122 tags 7.1 GiB
Commit graph

1058 commits

Author SHA1 Message Date
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Domen Kožar e3319eb73d doc: modernize meta attributes documentation 2014-07-27 13:54:37 +02:00
Pascal Wittmann 50510d1985 calibre: update from 1.45.0 to 1.46.0 2014-07-25 11:16:24 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
Bjørn Forsman 3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Vladimír Čunát 5fa61a2904 blender: use permanent URL for the patch 
No hash changes.
 2014-07-22 18:06:42 +02:00
Eelco Dolstra 4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Sam Griffin 6ae6071c94 fixing whitespace 2014-07-21 23:59:26 -04:00
Sam Griffin 36aa19814b updating bitcoin to 0.9.2.1 2014-07-21 23:53:37 -04:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Vladimír Čunát f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Cillian de Róiste 2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
Pascal Wittmann a49e2f866d calibre: update from 1.44.0 to 1.45.0 2014-07-18 16:20:00 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra 327c2061d1 blender: Don't use system openjpeg 
It was ignored anyway (instead using the internal openjpeg copy).
 2014-07-15 23:34:34 +02:00
Eelco Dolstra 12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra 457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra 2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Vladimír Čunát 0ef81572d8 Merge pull request #3263 from cstrahan/finalterm 
finalterm: New package
 2014-07-15 14:50:25 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Charles Strahan cd8063c4b2 finalterm: Add package 2014-07-13 19:36:43 -04:00
Pascal Wittmann e8ef98cea2 calibre: update from 1.35.0 to 1.44.0 2014-07-11 22:57:59 +02:00
Peter Simons 61b60fb1ad cdrtools: mark as broken 
https://github.com/NixOS/nixos/issues/231
 2014-07-10 13:11:32 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
 2014-07-09 22:13:29 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Peter Simons 99c6b978a7 haskell-arbtt: update to version 0.8.1 2014-07-04 11:45:43 +02:00
Peter Simons 20a931aa8b xmobar: set the proper home page url 2014-07-03 16:52:23 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02:00
_1126 5cc1245a11 xmobar: Updated to 0.21 2014-07-02 01:30:49 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Oliver Charles 37e8ebc456 Merge pull request #3144 from wmertens/source-missing-fixes 
Source missing fixes
 2014-07-01 08:43:27 +01:00
Mihaly Barasz c3c41f4ba0 nc-indicators 0.1 -> 0.2 2014-06-30 16:16:38 +02:00
Wout Mertens ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
John Wiegley 79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr 
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
 2014-06-28 17:04:04 -07:00
Cillian de Róiste 009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates 
Hydra eval: 1131611
 2014-06-26 22:05:15 +02:00
John Wiegley d3790c569f Merge pull request #3067 from cstrahan/camlistore 
add camlistore package
 2014-06-24 15:21:12 -07:00
Charles Strahan 79e805e281 add camlistore package 2014-06-23 06:26:56 -04:00
Vladimír Čunát 6ca980f0b4 llpp: fix freetype include path 
Fixes build, probably after freetype-2.5 update.
 2014-06-22 14:11:46 +02:00
Nikita Mikhailov d851ce331d st: 0.4.1 -> 0.5 2014-06-22 17:25:49 +07:00
Cillian de Róiste 15166ca5c2 Add KDE Connect: A tool to connect and sync your devices with KDE 2014-06-22 10:56:43 +02:00
Bjørn Forsman 7911072947 sweethome3d: remove '.' at end of description 2014-06-15 13:49:55 +02:00
Edward Tjörnhammar 97f45b1e11 Adding SweetHome3D, TexturesLibraryEditor, FurnitureLibraryEditor 2014-06-15 13:04:59 +02:00
Michael Raskin 64274e9981 MuPDF: Add an auto-updater script and update to the latest version. 2014-06-13 13:37:12 +04:00
Arvin Moezzi 0dfd7efd36 calibre: upgrade from 1.31.0 to 1.35.0 2014-06-12 09:30:39 +02:00
Austin Seipp faa58159e1 Merge pull request #2885 from wmertens/pgadmin-1.18.1 
pgadmin: bump to 1.18.1
 2014-06-10 18:13:26 -05:00
Wout Mertens 84b8a9ceb0 pgadmin: bump to 1.18.1 2014-06-10 15:31:48 +02:00
cillianderoiste fc91b87dd3 Merge pull request #2762 from pSub/llpp 
Added llpp, a mupdf based pdf pager written in ocaml.
 2014-06-08 11:17:15 +02:00
Pascal Wittmann 86b7cf8bb4 Added llpp, a mupdf based pdf pager written in ocaml. 
Updated lablgl to 1.05 and mupdf to 1.4.
Added myself as maintainer for lablgl.
 2014-06-04 22:15:06 +02:00
Rok Garbas 8e72c1ef71 vifm: update to 0.7.7 2014-06-01 14:36:45 +01:00
Bjørn Forsman 91d40ef2ea avrdudess: new package 
AVRDUDESS is a GUI for AVRDUDE. In other words, it is a GUI for
programming AVR microcontrollers.
 2014-05-31 19:31:35 +02:00
Lluís Batlle i Rossell 9df4bb9d67 ocropus: it was still missing a package: lxml 
Now "./run-tests" passes. But it can't be run without DISPLAY, so
I don't run it in the builder.
 2014-05-29 10:13:31 +02:00
Lluís Batlle i Rossell caa9007e84 Making ocropus-hocr run (matplotlib + gdk backend) 
I added the gtk backend to matplotlib; if these added dependencies are
too much, we can make this optional.
 2014-05-29 09:46:03 +02:00
Lluís Batlle i Rossell 6a35958936 Adding missing dependencies. There is still a matplotlib problem running ocropus-hocr. 2014-05-28 12:39:54 +02:00
Lluís Batlle i Rossell 3ee69912b2 Adding ocropus, based on an expression from iElectric. 2014-05-28 12:15:02 +02:00
Rob Vermaas 5f0d62801d Merge pull request #2737 from AndersonTorres/galculator 
Galculator: add version 2.3.1
 2014-05-28 08:38:22 +02:00
Michael Raskin 75607107ea Merge pull request #2721 from evolarium/urxvt 
Add unicode3 option to rxvt_unicode
 2014-05-27 02:28:59 -07:00
Michael Raskin 40471227a9 Merge pull request #2679 from kirelagin/zathura-mupdf 
Zathura mupdf
 2014-05-27 01:54:49 -07:00
Michael Raskin 8274466f6b Merge pull request #2404 from ttuegel/rxvt-unicode 
rxvt-unicode: add 256-color resources patch
 2014-05-27 01:49:46 -07:00
Jaka Hudoklin 115b7313c5 xca: fix package 
For some reason library paths are not set at all for some libraries during
the build. Wrapper with LD_LIBRARY_PATH set for relevant libraries is currently
solution.
 2014-05-25 14:28:49 +02:00
AndersonTorres 956a012988 Galculator: add version 2.3.1 
Galculator is a GTK full-fledged calculator.
 2014-05-24 13:33:28 -03:00
Peter Simons 807482ca18 xmobar: enable all extensions by default 
https://github.com/NixOS/nixpkgs/pull/2728
 2014-05-23 18:13:54 +02:00
Peter Simons 5b85e4825c arbtt: re-generate with cabal2nix 2014-05-23 17:58:05 +02:00
Peter Simons a71a8e85de arbtt: jailbreak to fix build with tasty > 0.7 2014-05-23 17:39:16 +02:00
Jordan Patterson 0bc17d9fa9 Add unicode3 option to rxvt_unicode 
Needed to user fonts patched for powerline.
 2014-05-22 15:13:25 -06:00
Peter Simons 6eeb989a35 xmobar: re-generate with cabal2nix 2014-05-21 16:12:06 +02:00
Eelco Dolstra 4844969689 blender: Make JACK support optional. 2014-05-19 21:47:11 +02:00
Vladimír Čunát 8e9ead8656 berlios.de probably shut down, replace it 
The shutdown was announced years ago, only now it stopped working.
 2014-05-18 13:30:27 +02:00
Benno Fünfstück a7b67d93c1 haskell-xmobar: build with mpd support 2014-05-17 21:00:28 +02:00
Kirill Elagin d15c34f677 zathura: mupdf plugin 2014-05-17 16:46:20 +04:00
Kirill Elagin a422c021b6 mupdf: build a shared library instead 2014-05-17 16:14:42 +04:00
Kirill Elagin fec634c25a mupdf: build with -fpic 2014-05-17 16:14:07 +04:00
Vladimír Čunát f77e2dcb38 mupdf: fix patch hash by fetchpatch 
Thanks to @kirelagin for reporting on IRC.
 2014-05-17 12:15:41 +02:00
Vladimír Čunát 4ac818601e blender: fix build and minor update to 2.70a 
It seems it needs to explicitly know python version in case of 3.4.
 2014-05-16 22:55:55 +02:00
Georges Dubus 658c136615 add Posterazor (close #2538) 
@vcunat patched for newer gcc.
 2014-05-15 21:32:21 +02:00
Jordan Patterson 4b668bb554 rxvt-unicode: update to 9.20, fixing CVE-2014-3121 (close #2649) 2014-05-15 20:57:57 +02:00
Benjamin Podszun 07a5187063 taskwarrior: bump to 2.3.0 (close #2567) 
vcunat fixed the evaluation
 2014-05-08 23:17:08 +02:00
Rob Vermaas 31428612c2 Upgrade rtmpdump and get_iplayer 2014-05-07 20:56:37 +02:00
Emery Hemingway 3b1a171c05 qtbitcointrader: initial expression 2014-05-01 15:50:57 +02:00
Peter Simons 3f23727e09 haskell-arbtt: update to version 0.8 2014-04-29 01:35:45 +02:00
Thomas Tuegel 2eeba3a300 rxvt-unicode: add 256-color resources patch 2014-04-25 18:48:04 -05:00
Eelco Dolstra dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
aszlig f122e0e229
dmenu: Patch in store path to dmenu_run. 
If dmenu isn't installed in the user environment, dmenu_run will fail
because it searches $PATH for its own binaries.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-04-22 07:22:00 +02:00
Ricardo M. Correia 09f0d57842 bitcoin: Update from 0.8.6 -> 0.9.1 2014-04-17 20:47:18 +02:00
Luca Bruno 7d64d63a1c spacefm: fix gsettings schemas 
Could not test it as the application did not start
for other reasons.
 2014-04-17 13:42:50 +02:00
Bjørn Forsman c83903069f gnuradio: update 3.7.2.1 -> 3.7.3 
Changelog:
http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_7_3/

(Build tested.)
 2014-04-15 07:11:41 +02:00
Ertugrul Söylemez a0886ae024 keepassx: Renamed KeePassX 2.0 to keepassx2. 2014-04-13 03:28:20 +02:00
Mathijs Kwik d87ae02fc1 synergy: upgrade to 1.4.17 2014-04-11 14:09:07 +02:00
Peter Simons 7f90e454fb ikiwiki: update to version 3.20140227 2014-04-08 12:48:22 +02:00
Domen Kožar 29bc5feb1d Merge pull request #2139 from lethalman/gnome3 
Fix gsettings schemas usage for several packages due to #1901
 2014-04-06 13:59:46 +02:00
Luca Bruno 35ccaa2e52 Fix gsettings schemas usage for several packages due to #1901 
Also add icons to epiphany
 2014-04-06 11:02:21 +02:00
Arvin Moezzi f82b678508 calibre: upgrade from 1.25.0 to 1.31.0 2014-04-04 09:25:32 +02:00
Evgeny Egorochkin 3830fa8195 add git repositry and meta.branch 2014-04-03 07:55:17 +03:00
Evgeny Egorochkin c53ae9b462 spaceFM: update from 0.9.2 to 0.9.4 2014-03-30 19:27:19 +03:00