Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Emery Hemingway
2b6dcdfcd0
Rename 'emery' maintainer handle to 'ehmry', fixes #11493
...
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Vladimír Čunát
9935a85851
libogg: fix splitting and some referrers
2015-10-13 20:18:47 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Eelco Dolstra
e1f78bf677
More docs/manpages in separate outputs
2015-07-27 00:27:54 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eelco Dolstra
39d9396380
Style fix
2014-09-24 15:07:18 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Emery Hemingway
ca59c577d0
libogg, libvorbis: update to 1.3.2, 1.3.4
2014-06-12 18:54:16 -04:00
Nixpkgs Monitor
2d2e6199ee
libogg: update from 1.3.0 to 1.3.1
2013-12-18 18:18:36 +02:00
Eelco Dolstra
99b88cfb53
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +02: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
3a35ba350f
Turn multipleOutputs into a stdenv adaptation
...
This way we can merge it into stdenv.mkDerivation later without having
to modify any package expressions (except the overrides in
all-packages.nix).
2012-08-24 20:43:48 -04:00
Eelco Dolstra
b96ab17658
Abstract common multiple output handling into a function
2012-08-23 15:42:22 -04:00
Eelco Dolstra
fcf88305cc
Split a few libraries into multiple outputs
2012-08-23 15:01:00 -04:00
Lluís Batlle i Rossell
d83e1b4b5d
Updating libvorbis and libogg, and enabling by default libvorbis and libxvid on ffmpeg.
...
I think there are little drawbacks on that, whlie there are benefits.
svn path=/nixpkgs/trunk/; revision=32145
2012-02-08 19:54:16 +00:00
Lluís Batlle i Rossell
7cc0eee61d
Updating some xiph.org libraries, and making some cross-compile.
...
svn path=/nixpkgs/trunk/; revision=26943
2011-04-23 21:58:30 +00:00
Eelco Dolstra
f1b8c40eb4
* Updated libogg and libvorbis.
...
svn path=/nixpkgs/trunk/; revision=22838
2010-08-01 14:33:43 +00:00
Armijn Hemel
e2a24424ec
update to 1.1.4
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19510
2010-01-17 23:04:20 +00:00
Eelco Dolstra
ea9667ab18
* Fixed some more URLs.
...
svn path=/nixpkgs/trunk/; revision=9294
2007-09-11 11:15:37 +00:00
Eelco Dolstra
a0159dee8e
* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
...
URLs to http://nix.cs.uu.nl/dist/tarballs . With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Eelco Dolstra
1442e8ec22
* Copy a bunch of files to nix.cs.uu.nl.
...
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Armijn Hemel
4be14fe52c
1.1.2 -> 1.1.3
...
svn path=/nixpkgs/trunk/; revision=5640
2006-07-06 22:58:32 +00:00
Eelco Dolstra
454707da23
* catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
...
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182
* Move tarballs to catamaran so that we are no longer dependent on a
...
gazillion different servers. Resurrected some 25 missing files.
svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Rob Vermaas
cec2c24d85
added libvorbis libogg and flac
...
svn path=/nixpkgs/trunk/; revision=2063
2005-01-19 21:48:45 +00:00
