1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Commit graph

407 commits

Author SHA1 Message Date
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
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
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +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
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
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
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
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
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
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
Luca Bruno d4b49aa25f Fix gnome3_10 namespace 2014-09-15 01:38:06 +02:00
Luca Bruno e4e39f26ba Change default from gnome 3.10 to gnome 3.12 2014-09-08 18:35:45 +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
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 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