JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,517 Commits 2 Branches 0 Tags 13 GiB
02122ccfd0
Commit Graph

1533 Commits

Author SHA1 Message Date
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