JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,461 Commits 1 Branch 0 Tags 12 GiB
4b75f5a2ae
Commit Graph

240 Commits

Author SHA1 Message Date
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Evgeny Egorochkin
9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Evgeny Egorochkin
fb906e44ac shared-mime-info: update to 1.1 2013-05-25 12:01:26 +03:00
Rob Vermaas
d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Bjørn Forsman
ab7d500f36 freepats: new package 
freepats is a project to create a free and open set of instrument
patches, in any format, that can be used with softsynths.

I'm adding it because it is needed for WildMIDI, which is needed for
MIDI support in Qmmp (audio player). I'll add WildMIDI and Qmmp in the
next commit(s).
 2013-05-19 14:09:36 +02:00
Eelco Dolstra
d5c8f4cb60 cacert: Update to 20121229 2013-05-15 13:15:53 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Eelco Dolstra
419413ac52 man-pages: Update to 3.50 2013-03-27 23:00:02 +01:00
Lluís Batlle i Rossell
4ae71ad19d Adding the sgml dtd for docbook 3.1 
Required by iputils manpages.
 2013-03-18 15:07:20 +01:00
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