3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1621 commits

Author SHA1 Message Date
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Nikolay Amiantov aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Mateusz Kowalczyk cd2cd41c96 ristretto: wrap icon theme 2014-11-03 20:02:41 +00:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
cillianderoiste 919ed14477 Merge pull request #4627 from abbradar/xfce-mixer
xfce4-mixer: add pulseaudio support
2014-10-31 15:08:42 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
koral d95bb47970 termite: fixed shebangs 2014-10-31 08:31:45 +01:00
koral f53ba30c87 Upgraded termite to v8, and its dependency vte to v0.38.0 2014-10-29 12:32:29 +01:00
Luca Bruno 34f681dcf8 Revert "vte: update pkg and patch"
This reverts commit 383075e009.
2014-10-28 21:46:56 +01:00
Luca Bruno 9fd1807279 Revert "vte: fix chroot build"
This reverts commit c17427597e.
2014-10-28 21:46:48 +01:00
Domen Kožar ca1d7dea55 fix scrollkeeper build 2014-10-28 11:36:44 +01:00
lethalman db376cac59 Merge pull request #4695 from DamienCassou/gnome-pomodoro-0.10.3
New version of gnome-shell-pomodoro
2014-10-28 09:53:39 +01:00
wmertens 114a775254 Merge pull request #4544 from k0ral/webkitgtk
webkitgtk: 2.4.6 -> 2.6.1
2014-10-28 09:36:02 +01:00
Damien Cassou 672b913487 New version of gnome-shell-pomodoro 2014-10-26 14:07:26 +01:00
Aristid Breitkreuz c17427597e vte: fix chroot build 2014-10-25 16:45:00 +02:00
Arseniy Seroka 383075e009 vte: update pkg and patch 2014-10-25 16:45:00 +02:00
Aristid Breitkreuz 42aa2e25ec gvfs: lightWeight -> !gnomeSupport 2014-10-25 16:17:39 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Nikolay Amiantov d771822d5f xfce4-mixer: add pulseaudio support 2014-10-23 16:22:43 +04:00
Nikolay Amiantov 333ccae68f xfce: add config into scope 2014-10-23 16:15:55 +04:00
Vladimír Čunát c9de1ea49e xfce4-panel: synchronize gst plugins with xfce4-mixer 2014-10-23 14:08:33 +02:00
Vladimír Čunát 72ad248606 xfce4-panel: fix the mixer applet (fixes #4563) 2014-10-23 13:44:05 +02:00
Shea Levy 8d67b707c7 libgit2-glib: Buidl broke with libgit2 + libssh2 2014-10-22 19:19:57 -04:00
Domen Kožar efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Thomas Strobel 46596d6354 Upgrade: Enlightenment E19: 0.19.0 -> 0.19.1 2014-10-19 14:58:04 +02:00
koral f24f7010b7 webkitgtk: 2.4.6 -> 2.6.1 2014-10-19 11:45:20 +02:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Damien Cassou 9166e29645 Update gnome pomodoro using fetchFromGitHub 2014-10-13 11:02:56 +02:00
Damien Cassou 73b428afc8 gnome-pomodoro: use fetchgit to be more stable 2014-10-13 10:56:59 +02:00
Pascal Wittmann b168a8c118 Merge pull request #4457 from DamienCassou/gpaste-3.12.3.1
gpaste 3.12.3 -> 3.12.3.1
2014-10-10 15:39:55 +02:00
Damien Cassou 45ad3e09fd gpaste 3.12.3 -> 3.12.3.1 2014-10-10 12:55:56 +02:00
Georges Dubus a172b4b1f8 Merge pull request #4436 from madjar/kde414
Switch to kde 4.14 and remove 4.12
2014-10-09 17:42:19 +02:00
Georges Dubus 0295a6c483 Removed kde 4.12 2014-10-09 12:05:56 +02:00
Oliver Hunt 6f64a7cf43 Added granite
Added meta details, changed hash to sha256, and added versions for granite

Changed name to use versions

Fixed license

Yet another typo fix

Added myself as maintainer and fixed typo

Fixed maintainers

Added pantheon terminal

woops
2014-10-09 01:55:27 +02:00
Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
AndersonTorres 5c6170a848 XFCE battery plugin: new package
Closes #4386
2014-10-05 17:18:37 +01:00
wmertens 6320c4a980 kde-workspace: Use automatic version (close #4383)
See https://github.com/NixOS/nixpkgs/pull/4265#discussion_r18430068

This should work but I didn't test it 😁
2014-10-05 17:05:40 +02:00
Luca Bruno e707530751 giflib: add back the 5.0 version
Should fix tracker and may be used to fix
other packages after commit 61f8cee.

Untested as it takes too much time to recompile
everything these days.
2014-10-02 01:41:35 +02:00
Vladimír Čunát 85fba5fdbd kde-4.14: fix kactivities download
It was not released with 4.14.
http://osdir.com/ml/kde-commits/2014-07/msg02039.html
2014-09-27 18:16:26 +02:00
Vladimír Čunát 4bcae6dc96 merge #4265: add KDE 4.14.1 2014-09-27 18:15:00 +02:00
lethalman 9e7619b09b Merge pull request #4292 from DamienCassou/gpaste-3.12.3
gpaste 3.12.2 -> 3.12.3
2014-09-27 12:32:11 +02:00
Damien Cassou f160705eb2 gpaste 3.12.2 -> 3.12.3 2014-09-27 12:24:12 +02:00
ambrop7@gmail.com 0e8e45f3ab kde-4.14: Make it all build. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 446a3d7806 kde-4.14: Adjust fixed output hashes. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 91a41170e4 kde-4.14: Initial porting.
Nix evaulation succeeds (but probably not building everything).
2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 35d5888ca6 kde-4.14: Fix source for module subdirectory packages. 2014-09-24 23:48:39 +02:00
ambrop7@gmail.com 1d8a197cba kde: Some tweaks to kde-manifest.sh
- Allow packages with different versions than $release (kde-workspace)
- Extra checks

This is a copy of 41faadbcce
but for 4.14.
2014-09-24 23:48:38 +02:00
ambrop7@gmail.com 8fef5ed675 kde: Copy 4.12 to 4.14 as a base" 2014-09-24 23:48:38 +02:00
William A. Kennington III 514784dcd0 kde412: Add boost libs to kdepim 2014-09-22 11:34:53 -07:00
Peter Simons e81b9f4bd8 Merge pull request #4085 from wkennington/master.boost
Boost Updates
2014-09-22 13:53:34 +02:00
lethalman 4cc00a1f2b Merge pull request #4169 from DamienCassou/gnome-shell-pomodoro
gnome-shell-pomodoro for gnome 3.12 package
2014-09-22 09:47:34 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Damien Cassou 49ddf2827b gnome-shell-pomodoro for gnome 3.12 package 2014-09-19 18:38:33 +02:00
koral 2a56f3d3f3 Added termite package and updated vte to be compatible. 2014-09-18 23:29:58 +02:00
Eelco Dolstra 91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Thomas Strobel 1613d6cca6 Add package: Enlightenment E19!
Wayland desktop shell is not enabled, yet.
2014-09-15 23:34:28 +02:00
Luca Bruno d4b49aa25f Fix gnome3_10 namespace 2014-09-15 01:38:06 +02:00
Vladimír Čunát d957b4bd78 Merge recent master into staging
Hydra nixpkgs: ?compare=1151601
2014-09-13 21:48:29 +02:00
lethalman d2bf37f183 Merge pull request #4010 from madjar/master
kde4: added the security patch for CVE-2014-5033 to nixpkgs because it is not available upstream
2014-09-10 10:10:36 +02:00
Eelco Dolstra 4ae3e32e82 Merge pull request #4012 from ibeex/master
added darwin as supported platform for meld
2014-09-09 15:35:58 +02:00
Ivan Brkanac 841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Georges Dubus 7c0e0849af kde4: added the security patch for CVE-2014-5033 to nixpkgs because it is not available upstream 2014-09-09 13:54:42 +02:00
Eelco Dolstra 88822dc23c Merge branch 'p/orig-modular-stdenv' of github.com:vcunat/nixpkgs into staging 2014-09-08 22:32:11 +02:00
Luca Bruno e4e39f26ba Change default from gnome 3.10 to gnome 3.12 2014-09-08 18:35:45 +02:00
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát 06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Luca Bruno 7d6a27a780 evolution: fix build 2014-09-05 12:46:16 +02:00
Michael Raskin a3b9bf6c87 Merge pull request #3653 from iyzsong/nixos/xfce4-mixer
nixos: don't set variables for gstreamer-0.10 (fix #3652)
2014-09-04 20:54:57 +04:00
Luca Bruno 1d0c2faf6b totem: drop upstream patch after update 2014-09-03 10:02:41 +02:00
Luca Bruno e23504c0b2 evolution-data-server: update from 3.12.2 to 3.12.5 2014-09-03 10:02:41 +02:00
Luca Bruno 268a5618f4 Merge branch 'gnome3' 2014-09-02 12:59:47 +02:00
Luca Bruno 17e96cd1a3 vte: update from 0.36.2 to 0.36.3 2014-09-02 12:57:10 +02:00
Luca Bruno 12018a0df9 gnome3_12.tracker: update from 1.0.1 to 1.0.3, potentially fixes CVE-2012-2671, CVE-2012-6109 2014-09-02 12:56:07 +02:00
Luca Bruno f02ab3f9c4 gnome3_12.totem: update from 3.12.1 to 3.12.2 2014-09-02 12:56:01 +02:00
Luca Bruno 70991e666e gnome3_12.gtksourceview: update from 3.12.2 to 3.12.3 2014-09-02 12:55:54 +02:00
Luca Bruno 7cb6d4cd87 gnome3_12.grilo-plugins: update from 0.2.12 to 0.2.13 2014-09-02 12:55:46 +02:00
Luca Bruno 4426b5aca7 grilo: update from 0.2.10 to 0.2.11 2014-09-02 12:55:33 +02:00
Luca Bruno b00b560dba gnome3_12.gnome-user-docs: update from 3.12.1 to 3.12.2 2014-09-02 12:54:38 +02:00
Luca Bruno ac7f0a8cf2 gnome3_12.gnome-music: update from 3.12.2 to 3.12.2.1 2014-09-02 12:54:30 +02:00
Luca Bruno 95dffc12e8 gnome3_12.gnome-calculator: update from 3.12.1 to 3.12.3 2014-09-02 12:54:22 +02:00
Luca Bruno f08c327ab2 gnome3_12.gedit: update from 3.12.1 to 3.12.2 2014-09-02 12:54:14 +02:00
Luca Bruno f3bc1dc263 gnome3_12.geary: update from 0.6.0 to 0.6.2 2014-09-02 12:54:08 +02:00
Luca Bruno de51a490f5 gnome3_12.folks: update from 0.9.6 to 0.9.8 2014-09-02 12:54:01 +02:00
Luca Bruno 64746e1f24 gnome3_12.evolution: update from 3.12.2 to 3.12.5 2014-09-02 12:53:49 +02:00
Luca Bruno df6d65ad55 gnome3_12.empathy: update from 3.12.2 to 3.12.5 2014-09-02 12:53:41 +02:00
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Luca Bruno 463585a5ec gnome-tweak-tool: update 3.10.1 -> 3.12.0 2014-09-02 11:24:49 +02:00
Luca Bruno eaeee57483 gnome-tweak-tool: update 3.10.1 -> 3.12.0 2014-09-02 11:20:26 +02:00
Damien Cassou 9a26b38ad3 Make sure gnome-python has gnomevfs binding 2014-08-30 15:56:22 +02:00
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Domen Kožar 39320b0fa3 gnome3.gitg: fix build by updating it to unstable 2014-08-28 20:53:01 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra c77fde7810 yelp: Fix description 2014-08-24 15:25:27 +02:00
Domen Kožar e93eb33058 gtkglext: cleanup 2014-08-23 11:46:54 +02:00