nixlib - Alyssa's collection of Nix expressions

	Commit message (Collapse)	Author	Age
*	Even more mirror:// fixes	Evgeny Egorochkin	2013-07-14
\|
*	More mirror:// URL fixes	Evgeny Egorochkin	2013-07-14
\|
*	shared-desktop-ontologies: version bump to 0.11.0	Evgeny Egorochkin	2013-07-12
\|
*	nixos.org/tarballs -> tarballs.nixos.org	Eelco Dolstra	2013-06-25
\| \| \| \| \|	It's currently the same machine, but tarballs.nixos.org should become an S3/CloudFront site eventually.
*	Merge remote-tracking branch 'hydra/master' into x-updates	Vladimír Čunát	2013-06-08
\|\ \| \| \| \| \| \| \| \|	Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix
\| *	Add package versions to some of the packages or fix existing ones to conform ↵	Evgeny Egorochkin	2013-06-07
\| \| \| \| \| \| \| \|	to nixpkgs conventions.
* \|	ReRevert Merge x-updates into master	Vladimír Čunát	2013-05-29
\|/ \| \| \| \| \| \| \| \|	This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix
*	shared-mime-info: update to 1.1	Evgeny Egorochkin	2013-05-25
\|
*	Fix maintainers attribute	Rob Vermaas	2013-05-21
\|
*	Add myself as maintainer for several packages	Bjørn Forsman	2013-05-20
\| \| \| \|	And set missing meta.platforms for the packages I've added earlier.
*	freepats: new package	Bjørn Forsman	2013-05-19
\| \| \| \| \| \| \| \| \|	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).
*	cacert: Update to 20121229	Eelco Dolstra	2013-05-15
\|
*	Revert Merge x-updates into master due to mesa bloat	Vladimír Čunát	2013-05-09
\| \| \| \| \| \| \| \| \| \| \|	See #490 discussion. This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)
*	Merge branch 'master' into x-updates	Vladimír Čunát	2013-04-04
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	man-pages: Update to 3.50	Eelco Dolstra	2013-03-27
\| \|
\| *	Adding the sgml dtd for docbook 3.1	Lluís Batlle i Rossell	2013-03-18
\| \| \| \| \| \| \| \|	Required by iputils manpages.
* \|	Merge branch 'master' into x-updates	Vladimír Čunát	2013-03-09
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	man-pages: Update to 3.48	Shea Levy	2013-03-08
\| \|
* \|	update gsettings-desktop-schemas and make system-wide	Vladimír Čunát	2013-02-21
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: pkgs/data/misc/gsettings-desktop-schemas/default.nix pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
* \|	Merge branch stdenv-updates into x-updates	Vladimír Čunát	2013-02-21
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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)
\| *	Merge remote-tracking branch 'origin/master' into stdenv-updates	Eelco Dolstra	2013-01-17
\| \|\
\| * \	Merge branch 'master' into stdenv-updates.	Peter Simons	2013-01-11
\| \|\ \
\| * \ \	Merge branch 'master' into stdenv-updates.	Peter Simons	2013-01-04
\| \|\ \ \
\| * \| \| \|	Rename buildNativeInputs -> nativeBuildInputs	Eelco Dolstra	2012-12-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs" sounds like an imperative rather than a noun phrase.
* \| \| \| \|	minor poppler-data update	Vladimír Čunát	2013-01-29
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Get rid of the "sf" alias for "sourceforge"	Eelco Dolstra	2013-01-14
\| \|_\|/ \|/\| \|
* \| \|	Libertine fonts: update and cleanup.	Vladimír Čunát	2013-01-10
\| \|/ \|/\|
* \|	linux man-pages: updating to 3.45	Lluís Batlle i Rossell	2013-01-04
\|/
*	Remove a bunch of unreferenced files	Eelco Dolstra	2012-11-29
\| \| \| \|	Plus a small number of obsolete packages (like old versions of qemu).
*	man-pages: update to version 3.43	Peter Simons	2012-11-05
\|
*	xkeyboard-config; Update to 2.7	Eelco Dolstra	2012-09-26
\|
*	Merge remote-tracking branch 'origin/master' into x-updates	Eelco Dolstra	2012-09-26
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix
\| *	Add tzdata	Eelco Dolstra	2012-09-18
\| \| \| \| \| \| \| \| \| \|	Glibc 2.16 no longer contains timezone data (yay!) so provide tzdata instead.
\| *	SDO-0.10.0	Yury G. Kudryashov	2012-08-26
\| \|
\| *	man-pages: Update to 3.42	Eelco Dolstra	2012-08-21
\| \|
\| *	Add some packages to the channel	Eelco Dolstra	2012-08-17
\| \|
\| *	mobile-broadband-provider-info: Update to 20120614	Rickard Nilsson	2012-07-31
\| \|
\| *	LMMath: add Latin Modern Math font	Michael Raskin	2012-07-19
\| \|
* \|	Merge branch 'master' into x-updates	Shea Levy	2012-07-18
\|\\|
\| *	TeXLive: update to 2012 snapshot from Debian	Michael Raskin	2012-07-13
\| \|
* \|	Merge remote-tracking branch 'upstream/master' into x-updates	Shea Levy	2012-07-14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix
\| *	cacert: Update to 20120628	Eelco Dolstra	2012-07-05
\| \|
\| *	ubuntu-font-family: rec back	Antono Vasiljev	2012-06-23
\| \|
\| *	ubuntu-font-family: free is a string, not var	Antono Vasiljev	2012-06-23
\| \|
\| *	Cleaning up ubuntu-font-family	Antono Vasiljev	2012-06-23
\| \|
\| *	sha256 in base32 format	Antono Vasiljev	2012-06-23
\| \|
\| *	Improved meta section for ubuntu-font-family	Antono Vasiljev	2012-06-23
\| \|
\| *	Added ubuntu-font-family	Antono Vasiljev	2012-06-23
\| \|
\| *	Add fonts from the DOSEmu project.	aszlig	2012-06-20
\| \| \| \| \| \| \| \|	These are mainly fonts like the DOS standard VGA fonts.
\| *	* Linux man-pages updated to 3.41.	Eelco Dolstra	2012-05-17
\| \| \| \| \| \| \| \|	svn path=/nixpkgs/trunk/; revision=34156