Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Eelco Dolstra
6b67028383
cacert: Update to 20140715
...
This is generated with a more recent version of mk-ca-bundle.pl. The
previous version mistakenly dropped some certificates, like "Verisign
Class 3 Public Primary Certification Authority".
2014-08-05 10:43:25 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Eelco Dolstra
b9c457ba12
cacert: Update to 20140704
2014-07-30 10:14:40 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Eelco Dolstra
0a11e40596
tzdata: Update to 2014e
2014-07-08 18:35:40 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Mihaly Barasz
1f2228cdc1
tzdata: use symlinks instead of hardlinks
...
Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
2014-04-29 16:25:10 +02:00
Eelco Dolstra
dc224baba1
tzdata: Update to 2014b
2014-04-29 16:13:15 +02:00
Mihaly Barasz
c2c90bf2bb
tzdata: fix 'posix' symlink
2014-04-29 16:08:19 +02:00
aszlig
46e90f76c6
tzdata: Provide lib as an additional output.
...
We're already using tzcode inside tzdata, so let's make it available as
an output here. The reason we need it is in order to compile OpenCFLite.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
Vladimír Čunát
546bd7738d
xorg xkeyboard-config: update, unify with the other expression
2014-01-30 13:46:02 +01:00
Bjørn Forsman
4d6605e882
Whitespace fixes in package expressions I maintain
2014-01-02 17:58:08 +01:00
Eelco Dolstra
3f799e7233
cacert: Update to 20131205
2013-12-20 18:29:06 +01:00
Nixpkgs Monitor
8298e450a7
shared_mime_info: update from 1.1 to 1.2
2013-12-04 06:53:44 +02:00
Eelco Dolstra
0c0bc0857e
tzdata: Update to 2013g
2013-10-15 17:24:33 +02:00
Eelco Dolstra
50b2e52988
hicolor-icon-theme: Move to data/icons
2013-08-15 16:53:40 +02:00
Evgeny Egorochkin
c7fbb70af0
shared-desktop-ontologies: version bump to 0.11.0
2013-07-12 16:36:12 +03:00
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
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
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
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
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
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
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
Eelco Dolstra
ebc1c7d6c7
cacert: Update to 20120628
2012-07-05 17:31:23 -04: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
793d0c983c
Move gsettings-desktop-schemas to data/misc
...
svn path=/nixpkgs/trunk/; revision=32929
2012-03-08 22:45:58 +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
c22e6aadc5
Add mobile-broadband-provider-info
...
svn path=/nixpkgs/trunk/; revision=31328
2012-01-05 23:25:28 +00:00
Yury G. Kudryashov
05f5c8802e
shared-desktop-ontologies-0.8.1
...
See
http://trueg.wordpress.com/2011/11/25/the-different-places-something-can-go-wrong/
svn path=/nixpkgs/trunk/; revision=30918
2011-12-15 20:16:46 +00:00
Michael Raskin
bfa4a2d374
Allow cross-builds
...
svn path=/nixpkgs/trunk/; revision=30708
2011-12-03 09:07:56 +00:00
Shea Levy
5143705396
Get Theme-GNU directly from spock while kernel.org is down
...
svn path=/nixpkgs/trunk/; revision=29537
2011-09-28 22:34:46 +00:00
Yury G. Kudryashov
63959f2a5a
Let poppler use ${POPPLER_DATADIR}
...
Also upgrade poppler-data
svn path=/nixpkgs/trunk/; revision=29342
2011-09-19 08:35:30 +00:00