3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

8435 commits

Author SHA1 Message Date
Vladimír Čunát 4495d06a7f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
2015-02-04 22:00:07 +01:00
Bjørn Forsman bc18d0dbc0 mendeley: gcc.gcc -> gcc.cc (fix evaluation) 2015-02-04 07:16:19 +01:00
Shea Levy 5ac0318332 Merge branch 'new-darwin-stdenv' of git://github.com/gridaphobe/nixpkgs
refs #6122
2015-02-03 18:19:22 -05:00
Eric Seidel fe49487a05 fix evaluation 2015-02-03 14:31:07 -08:00
Domen Kožar f8dacd8528 Merge pull request #6090 from richardlarocque/xbmc_rtmp
xbmc: Add rtmp support
2015-02-03 23:22:52 +01:00
Nikolay Amiantov 93928557b9 Merge pull request #6107 from abbradar/updates
Update my packages
2015-02-03 15:39:26 +03:00
Peter Simons 31ecab7b7e mikmod: update to version 3.2.6 2015-02-03 12:46:39 +01:00
Nikolay Amiantov 9b631cd0f8 bomi: rename from cmplayer and update 2015-02-03 14:27:43 +03:00
Peter Simons b7ecd5e729 Merge pull request #5025 from abbradar/xmonad-wrapper
nixos/xmonad: make a wrapper
2015-02-03 11:52:09 +01:00
Sou Bunnbu 7f17bfc37b Merge pull request #6113 from AndersonTorres/windowmaker
WindowMaker: adding support for more image formats
2015-02-03 11:21:22 +08:00
Shea Levy aea1254f96 cc-wrapper merge fixes 2015-02-02 21:30:05 -05:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
AndersonTorres 1c0c07c2ed WindowMaker: adding support for more image formats
Now Windowmaker is built with support for almost all image formats
(except WEBP - its autodetection is failing)
2015-02-02 23:45:59 -02:00
Nikolay Amiantov b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Kosyrev Serge b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
Edward Tjörnhammar f8038b0c6c kodi: 14.0 -> 14.1, added myself as maintainer 2015-02-02 20:15:52 +01:00
Andrey Arapov 7ed1435aa9 owncloud: update to 1.7.1 2015-02-02 18:28:55 +01:00
Nikolay Amiantov 28d9da7498 pidgin-otr: adopt and add platforms 2015-02-02 14:00:17 +03:00
Tobias Geerinckx-Rice 1fde266b48 Update keyfinder-cli 20150125 -> 20150130 2015-02-02 02:02:29 +01:00
Richard Larocque d221fd91a3 xbmc: Add rtmp support 2015-02-01 13:56:26 -08:00
Mateusz Kowalczyk 212026e8f5 Merge pull request #6084 from devhell/mpv
mpv: 0.7.2 -> 0.7.3; waf: 1.8.1 -> 1.8.5
2015-02-01 18:04:54 +00:00
Thomas Tuegel 95829c8959 k3b: propagate cdrecord dependency
By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
2015-02-01 10:34:30 -06:00
Thomas Tuegel 2b933f31f6 kdeApps.kmix: remove Qt 4 dependencies 2015-02-01 10:26:55 -06:00
Michael Raskin c6dfb67059 Fresh LibreOffice 4.4 at least starts to build 2015-02-01 18:41:33 +03:00
Michael Raskin a3008a638f Update qpdfview 2015-02-01 18:41:32 +03:00
Bjørn Forsman b26a6e8a23 spek: new package
spek is an accoustic spectrum analyzer. It helps analyse your audio
files by showing their spectrogram.

http://spek.cc/
2015-02-01 15:19:41 +01:00
Edward Tjörnhammar 96d6344b13 idea updates:
idea-{community,ultimate}: 14.0.2 -> 14.0.3
  android-studio: 1.0.2 -> 1.1.0b2
  clion: eap bump
2015-01-31 20:50:34 +01:00
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Sven Keidel b50cabf2d4 cool-old-term: rename to cool-retro-term (close #6071)
The project has changed its name to cool-retro-term. The project also added a
dependency that is included as a submodule. I added this dependency as a
separate expression.
2015-01-31 19:23:45 +01:00
lethalman 59d1d46088 Merge pull request #6069 from arno01/cherrytree
Adds a new package: cherrytree - A hierarchical note taking application
2015-01-31 14:42:08 +01:00
Andrey Arapov 79c5029f2e flashplayer: minor update (sha256 correction) 2015-01-31 12:21:08 +01:00
Jascha Geerds a90106eb22 Merge pull request #6065 from arno01/utox
libtoxcore, utox, qtox, toxic: Update to the newest Dev version
2015-01-31 11:26:14 +01:00
Andrey Arapov 522d059dc9 libtoxcore, utox, qtox, toxic: Update to the newest Dev version 2015-01-31 03:20:12 +01:00
Andrey Arapov 9f623a820d Adds a new package: cherrytree - A hierarchical note taking application
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.

This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.

Official page http://www.giuspen.com/cherrytree
2015-01-31 02:17:00 +01:00
devhell 5c0be2f8c9 mpv: 0.7.2 -> 0.7.3; waf: 1.8.1 -> 1.8.5 2015-01-30 20:42:11 +00:00
Peter Simons 008256d8bd emacs-flycheck: add current snapshot from Git 2015-01-30 18:30:59 +01:00
Peter Simons 9f1cb04876 emacs-let-alist: add version 1.0.3 2015-01-30 18:30:38 +01:00
Sibi 7f5718b06f Version bump and made name attribute to lowercase.
(Tested the fix in my local machine just to be sure)
2015-01-30 18:49:38 +05:30
Pascal Wittmann 98a69c0dcb calibre: update from 2.17.0 to 2.18.0 2015-01-30 09:04:45 +01:00
Vladimír Čunát b35e0a09a8 imagemagick: fixup URL after #6056 2015-01-29 23:18:19 +01:00
Lluís Batlle i Rossell e3a93dc45f gpa: using mirror url.
(cherry picked from commit bdc630e7e9)
2015-01-29 22:38:46 +01:00
Lluís Batlle i Rossell 0326fd03d4 Adding GPA, The GNU Privacy Assistant.
(cherry picked from commit 24a89c028a)
2015-01-29 20:29:58 +01:00
Sibi 8e5cf5889c imagemagick: rename package to lowercase (close #6056)
Change it to lowercase to according to the convention presented here:
http://nixos.org/nixpkgs/manual/#chap-conventions

Thanks to goibhniu from #nixos for pointing me this.
2015-01-29 19:36:26 +01:00
Edward O'Callaghan e7ecb78aab version-management/gitolite: Bump version 3.6.1 -> 3.6.2
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:45:50 +11:00
Vincent Laporte 58297aa1e7 Why3: build also the Coq tactic. 2015-01-29 08:43:15 +01:00
Rok Garbas 21db3eaa60 i3lock: it's cleaner to use $out/share/man in the first place.
it is true that $out/man is automatically moved to $out/share/man, but using
"share" folder is cleaner solutions suggested by @edolstra here #6014
2015-01-28 19:56:13 +01:00
lethalman 2140080b08 Merge pull request #5750 from rycee/issue/5741
Wrap 'tig' command to add with git to PATH.
2015-01-28 14:52:45 +01:00
lethalman 057eac65d9 Merge pull request #5587 from nckx/keyfinder
Add libkeyfinder and keyfinder{,-cli} interfaces
2015-01-28 14:49:57 +01:00
Wout Mertens 7e045d412a pstree: fix direct reference to gcc 2015-01-28 12:35:54 +01:00
Pascal Wittmann fcd3270737 Merge pull request #6011 from taku0/firefox-bin-35.0.1
Update firefox-bin to 35.0.1
2015-01-28 12:10:31 +01:00