philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

227 commits

Author SHA1 Message Date
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Shea Levy 23cbda5b3c man-pages: Update to 3.48 2013-03-08 19:49:53 -05:00
Vladimír Čunát bf4313cd88 update gsettings-desktop-schemas and make system-wide 
Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
 2013-02-21 20:42:39 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Vladimír Čunát 319b6f77ca minor poppler-data update 2013-01-29 14:07:30 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Vladimír Čunát 6f1aad769f Libertine fonts: update and cleanup. 2013-01-10 22:36:42 +01:00
Peter Simons 9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Lluís Batlle i Rossell d002376fbf linux man-pages: updating to 3.45 2013-01-04 10:28:34 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Peter Simons 234b4affa3 man-pages: update to version 3.43 2012-11-05 11:42:05 +01:00
Eelco Dolstra 9f9a561107 xkeyboard-config; Update to 2.7 2012-09-26 15:51:57 -04:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
Eelco Dolstra 167df7ad32 Add tzdata 
Glibc 2.16 no longer contains timezone data (yay!) so provide tzdata
instead.
 2012-09-18 14:00:18 -04:00
Yury G. Kudryashov 497c364f7c SDO-0.10.0 2012-08-26 22:23:17 +04:00
Eelco Dolstra 1dadeaeb18 man-pages: Update to 3.42 2012-08-21 08:42:44 -04:00
Eelco Dolstra acdd81fb9c Add some packages to the channel 2012-08-17 09:53:55 -04:00
Rickard Nilsson 2faada9f30 mobile-broadband-provider-info: Update to 20120614 2012-07-31 15:16:11 +02:00
Michael Raskin 7bb60c640d LMMath: add Latin Modern Math font 2012-07-19 09:07:57 +04:00
Shea Levy 4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates 
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
 2012-07-14 14:24:27 -04:00
Michael Raskin f2a77f5d9d TeXLive: update to 2012 snapshot from Debian 2012-07-13 18:18:52 +04:00
Eelco Dolstra ebc1c7d6c7 cacert: Update to 20120628 2012-07-05 17:31:23 -04:00
Antono Vasiljev dd3354f002 ubuntu-font-family: rec back 2012-06-23 02:42:37 +03:00
Antono Vasiljev 6db0c4c51d ubuntu-font-family: free is a string, not var 2012-06-23 02:40:04 +03:00
Antono Vasiljev d4092f153e Cleaning up ubuntu-font-family 2012-06-23 02:38:27 +03:00
Antono Vasiljev b5b9b0371c sha256 in base32 format 2012-06-23 02:36:46 +03:00
Antono Vasiljev 48eeb312c5 Improved meta section for ubuntu-font-family 2012-06-23 02:23:02 +03:00
Antono Vasiljev 1b2d1f8399 Added ubuntu-font-family 2012-06-23 01:55:47 +03:00
aszlig c1c74e45c5 Add fonts from the DOSEmu project. 
These are mainly fonts like the DOS standard VGA fonts.
 2012-06-20 23:25:16 -04:00
Eelco Dolstra 45a98ed3fc * Linux man-pages updated to 3.41. 
svn path=/nixpkgs/trunk/; revision=34156
 2012-05-17 16:07:03 +00:00
Eelco Dolstra 1a4d1facda * xkeyboard-config updated to 2.5.1. 
svn path=/nixpkgs/branches/x-updates/; revision=34127
 2012-05-15 21:30:03 +00:00
Yury G. Kudryashov 9b6f100fa0 shared-mime-info-1.0 
svn path=/nixpkgs/trunk/; revision=33505
 2012-03-31 21:29:12 +00:00
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk 
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
 2012-03-31 20:01:40 +00:00
Shea Levy 938ba8c526 man-pages-3.38 
svn path=/nixpkgs/trunk/; revision=33493
 2012-03-30 19:31:57 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Michael Raskin 318c747520 Update and fix DejaVu fonts 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33370
 2012-03-23 09:47:23 +00:00
Mathijs Kwik 9365291276 dejavu-fonts broke during the merge of stdenv-upgrade. 
problem/fix described here:
http://comments.gmane.org/gmane.comp.fonts.dejavu/3608

svn path=/nixpkgs/trunk/; revision=33227
 2012-03-18 08:11:14 +00:00
Yury G. Kudryashov a466941945 Move last piece o gnome3 to top-level 
Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
 2012-03-17 16:46:12 +00:00
Yury G. Kudryashov 793d0c983c Move gsettings-desktop-schemas to data/misc 
svn path=/nixpkgs/trunk/; revision=32929
 2012-03-08 22:45:58 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Eelco Dolstra 8096ed3b12 * man-pages updated to 3.35. 
svn path=/nixpkgs/trunk/; revision=32375
 2012-02-17 22:25:47 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov 5fe8b64cea SDO: add meta.homepage 
svn path=/nixpkgs/trunk/; revision=31566
 2012-01-14 18:04:34 +00:00
Yury G. Kudryashov 6df3e4e928 Add cantarell-fonts, part of GNOME-3 
svn path=/nixpkgs/trunk/; revision=31375
 2012-01-06 20:10:23 +00:00
Yury G. Kudryashov c22e6aadc5 Add mobile-broadband-provider-info 
svn path=/nixpkgs/trunk/; revision=31328
 2012-01-05 23:25:28 +00:00