1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 03:25:02 +00:00
nixpkgs/pkgs/misc
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
..
apulse apulse: update from 0.1.2 to 0.1.4 2014-11-18 20:36:46 +01:00
beep beep: set meta.platforms 2014-10-25 17:24:47 +02:00
cups Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
drivers Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
emulators Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
foldingathome Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
freestyle Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
frescobaldi frescobaldi: Improved meta and formatting 2014-10-25 18:07:42 +02:00
ghostscript ghostscript: drop GNU fork and update 2014-11-14 13:51:26 +03:00
gxemul Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
jackaudio Revert "Remove obsolete jackaudio version 1." 2014-07-31 12:52:29 +02:00
lilypond lilypond: updated from 2.16.2 to 2.18.2 2014-10-12 14:52:55 +02:00
my-env Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
phabricator Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306 2014-09-03 15:46:59 +04:00
sails Add simulator for autonomous sailing boats 2014-10-14 12:00:42 +01:00
screensavers xscreensaver: 5.30 → 5.32 2014-12-21 11:14:25 +03:00
seafile-shared
solfege
sound-of-sorting Sound of Sorting: New Package 2014-10-01 02:04:36 +01:00
source-and-tags
themes clearlooks-phenix: Fix the Meta Description 2014-12-07 18:16:11 -05:00
uboot
vim-plugins Revert "vim-plugins: update" 2014-12-18 02:41:47 +03:00
xosd Fix many package descriptions 2014-08-24 22:31:37 +02:00
misc.nix rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00