1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Commit graph

36 commits

Author SHA1 Message Date
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 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
William A. Kennington III d3f3317632 Revert "Revert "libvorbis: propagate libogg dependency""
This reverts commit 5728c06f83.
2015-05-07 01:38:14 -07:00
William A. Kennington III 3f9817fd51 Revert "libvorbis: Fix ogg dependency"
This reverts commit ca5c9e6cf2.
2015-05-07 01:38:03 -07:00
William A. Kennington III ca5c9e6cf2 libvorbis: Fix ogg dependency 2015-05-03 20:30:10 -07:00
William A. Kennington III 5728c06f83 Revert "libvorbis: propagate libogg dependency"
This reverts commit bd55792892.
2015-05-03 20:30:09 -07:00
Thomas Tuegel bd55792892 libvorbis: propagate libogg dependency 2015-05-02 13:59:58 -05:00
William A. Kennington III e2b6e11b94 libvorbis: Get rid of propagatedBuildInputs 2015-05-01 22:02:28 -07: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
William A. Kennington III 151c42aa98 libvorbis: 1.3.4 -> 1.3.5 2015-03-25 16:02:42 -07:00
Eelco Dolstra 39d9396380 Style fix 2014-09-24 15:07:18 +02:00
Vladimír Čunát a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +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
Luca Bruno c5e0079962 libvorbis: use pkgconfig instead of guessing paths. Closes #3014 2014-06-22 12:40:59 +02:00
Emery Hemingway ca59c577d0 libogg, libvorbis: update to 1.3.2, 1.3.4 2014-06-12 18:54:16 -04: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 f33363a841 update to 1.2.3
svn path=/nixpkgs/branches/stdenv-updates/; revision=19511
2010-01-17 23:04:26 +00:00
Ludovic Courtès 5f8017b492 libvorbis: Propagate `libogg'.
svn path=/nixpkgs/trunk/; revision=13813
2009-01-20 09:50:05 +00:00
Armijn Hemel 1d7ee3f29d update to 1.2.0
svn path=/nixpkgs/trunk/; revision=10011
2007-12-31 19:16:25 +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 381a915353 1.1.0 -> 1.1.2
svn path=/nixpkgs/trunk/; revision=5639
2006-07-06 22:56:04 +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 419f172ddb * Added Ogg Theora support to MPlayer.
svn path=/nixpkgs/trunk/; revision=2245
2005-02-16 16:18:43 +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