Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
Perry Barnoy
7df323125f
Merge branch 'master' of https://github.com/NixOS/nixpkgs into xfce4-whiskermenu-plugin
...
Pull from nixpkgs/master to resolve Travis CI build conflicts.
2015-10-19 14:10:40 -04:00
Louis Taylor
057964e8db
Update email address to currently preferred one
2015-10-17 19:01:46 +01:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Perry Barnoy
3d087ed3b1
Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin
...
Merge upstream.
2015-10-14 16:26:40 -04:00
Perry Barnoy
79321fbecd
- Added myself as a maintainer
...
- Boilerplate whiskermenu expression
2015-10-14 16:25:54 -04:00
Eelco Dolstra
5f077e2296
Factor out option renaming
...
Option aliases/deprecations can now be declared in any NixOS module,
not just in nixos/modules/rename.nix. This is more modular (since it
allows for example grub-related aliases to be declared in the grub
module), and allows aliases outside of NixOS (e.g. in NixOps modules).
The syntax is a bit funky. Ideally we'd have something like:
options = {
foo.bar.newOption = mkOption { ... };
foo.bar.oldOption = mkAliasOption [ "foo" "bar" "newOption" ];
};
but that's not possible because options cannot define values in
*other* options - you need to have a "config" for that. So instead we
have functions that return a *module*: mkRemovedOptionModule,
mkRenamedOptionModule and mkAliasOptionModule. These can be used via
"imports", e.g.
imports = [
(mkAliasOptionModule [ "foo" "bar" "oldOption" ] [ "foo" "bar" "newOption" ]);
];
As an added bonus, deprecation warnings now show the file name of the
offending module.
Fixes #10385 .
2015-10-14 18:18:47 +02:00
Desmond O. Chang
b41742414e
git-crypt: update maintainer
2015-10-14 21:46:27 +08:00
Florian Paul Schmidt
24b375ac06
alsa-tools: update maintainer
2015-10-13 12:48:03 +02:00
Arseniy Seroka
124bca6dc1
Merge pull request #10345 from javaguirre/package-phpcs
...
phpcs: init at 2.3.4
2015-10-12 16:39:05 +03:00
Javier Aguirre
9522afae2c
phpcs: init at 2.3.4
...
Adding javaguirre to maintainers
2015-10-12 12:11:54 +02:00
=
74a958fec7
non: init at 2015-10-6
2015-10-11 18:37:21 +02:00
Luke Gorrie
42e753f8b3
maintainers.nix: Add lukego
2015-10-08 10:11:06 +00:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Echo Nolan
89931277de
flashplayer: add myself to maintainers
2015-10-03 20:54:38 -07:00
Arnold Krille
bb7eb9829d
jackmix: init at version 0.5.2
...
Add jackmix to the nix pkgs.
2015-10-02 14:56:59 +02:00
lethalman
e9d554580c
Merge pull request #10066 from michaelpj/p/heatseeker
...
heatseeker: init at 1.3.0
2015-10-02 11:36:07 +02:00
Thomas Tuegel
e92cbb73e4
lib.licenses: add fdl13
2015-09-27 09:45:35 -05:00
Thomas Tuegel
f9e5745efa
lib: add makeScope
2015-09-27 09:45:23 -05:00
Michael Peyton Jones
ef8e002bf0
heatseeker: init at 1.3.0
2015-09-25 16:27:43 +01:00
Vladimír Čunát
0be672ced1
kdevplatform: maintained by @ambrop72, /cc #9981 .
2015-09-22 08:44:23 +02:00
David Kleuker
6fc40fada1
add myself to maintainers
2015-09-20 21:16:22 +02:00
Arseniy Seroka
8862188761
Merge pull request #9924 from erikryb/master
...
perseus: init at 4-beta
2015-09-19 13:21:53 +03:00
Domen Kožar
72ea74b641
Merge pull request #9934 from offlinehacker/nixos/kibana/add
...
Update kibana, add kibana nixos service
2015-09-19 10:38:45 +02:00
Erik Rybakken
64c1a9a2e2
perseus: init at 4-beta
2015-09-19 00:56:24 +02:00
Jaka Hudoklin
341ac85644
Add lib.filterAttrsRecursive function
2015-09-19 00:33:44 +02:00
Jan Malakhovski
33ae3f2fe4
nixos,lib: move environment generation related copy-paste to lib
2015-09-18 18:48:49 +00:00
Samuel Rivas
40d26f6730
erlang-mode: refactor maintainers ( close #9855 )
2015-09-14 23:47:20 +02:00
Bryan Gardiner
7d74847471
goatee, goatee-gtk: add myself as maintainer
2015-09-11 20:37:53 -07:00
Rommel M. Martinez
6919533410
devilspie2: init at 0.39
2015-09-10 05:11:56 +08:00
Frederik Rietdijk
cd5a9afeac
add myself as maintainer
2015-09-09 15:25:49 +02:00
Arseniy Seroka
2017d56edf
Merge pull request #9708 from a1russell/playonlinux
...
Add playonlinux derivation.
2015-09-09 12:28:46 +03:00
Adam Russell
735673bb9f
playonlinux: init at 4.2.8
2015-09-09 00:05:02 -05:00
Tim Cuthbertson
9dfef9ff26
gup: init at version 0.5.1
2015-09-08 20:45:20 +10:00
Guillaume Maudoux
96a1539256
python-cgroup-utils: init at 0.6
2015-08-31 18:27:19 +02:00
Andreas Wagner
e7a024abc4
urjtag: init at 0.10
...
[Bjørn: make the function argument lines occupy less vertical space.]
2015-08-30 20:47:24 +02:00
Thomas Tuegel
fc0baf0ebe
Merge pull request #9343 from akaWolf/qtcreator
...
qtcreator: refactor for using qt54; qt4SDK, qt5SDK: commented
2015-08-29 18:10:27 -05:00
Jaka Hudoklin
ed63e18652
Merge pull request #9384 from jefdaj/bitcoinxt-twopackages
...
Add BitcoinXT as a separate package
2015-08-29 18:47:48 +02:00
Damien Cassou
de3a53f277
Merge pull request #9525 from DamienCassou/update-maintainer-email
...
Change my email address
2015-08-29 16:59:47 +02:00
Damien Cassou
41507ce415
Change my email address
2015-08-29 16:57:08 +02:00
Sibi
89cec3c895
Add myself as maintainer ( close #9495 ).
...
Related to https://github.com/NixOS/cabal2nix/pull/196
2015-08-28 16:50:15 +02:00
lethalman
9458bde4c1
Merge pull request #9450 from lebastr/rosegarden
...
rosegarden: init at 14.12
2015-08-26 11:57:26 +02:00
Alexander
ee6140beaa
rosegarden: init at 14.12
2015-08-26 09:35:05 +00:00
lethalman
a45a0911d4
Merge pull request #9376 from rick68/softether
...
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
Daniel Fox Franke
617a158e3c
libb2: init at 0.97
2015-08-25 14:25:05 -04:00
Kosyrev Serge
61be6847c0
maintainers: add Kosyrev Serge
2015-08-24 22:32:22 +03:00
Artjom Vejsel
9c206b6cf7
qtcreator: refactor for using qt54
2015-08-24 11:34:28 +03:00
Jeffrey David Johnson
17c0af24d2
add bitcoin-xt as a separate package
2015-08-20 23:57:10 -07:00
Wei-Ming Yang
efd34824eb
softether: support SoftEther VPN 4.18
2015-08-21 13:59:00 +08:00
Thomas Tuegel
8f271a771d
Merge pull request #9270 from Mathnerd314/supertux-editor
...
supertux-editor: init at git-2014-08-20
2015-08-17 17:13:44 -05:00