3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

358 commits

Author SHA1 Message Date
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Domen Kožar 69c6aa5c1b Merge pull request #10989 from rnhmjoj/maintainer
add myself as a maintainer
2015-11-12 20:52:50 +01:00
rnhmjoj d9274215e7 add myself as a maintainer 2015-11-12 19:25:15 +01:00
Robert Glossop a911a4f4c5 clfswm: add maintainer 2015-11-11 00:57:09 -05:00
Stéphane Jourdois ca23c1a29a Add myself as maintainer 2015-11-09 00:43:33 +01:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Nikolay Amiantov 75259cbf87 Merge pull request #10849 from lolwat97/imgur-screenshot
Add imgur-screenshot package
2015-11-06 23:58:39 +03:00
Sergey Sofeychuk 76e33c3602 maintainers: add lw 2015-11-06 23:48:32 +03:00
William A. Kennington III 1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
Matthew O'Gorman f761f06988 gnuradio-nacl: init at 2015-11-05 2015-11-05 21:17:39 +01:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Domen Kožar fc36317c9b Merge pull request #10791 from msteen/master
Added msteen to the list of maintainers.
2015-11-02 14:40:50 +01:00
Matthijs Steen b44df493d3 Added msteen to the list of maintainers. 2015-11-02 14:38:34 +01:00
Daniel Frank bcc7f58c1f mbuffer: new package 2015-10-31 13:45:21 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Aaron Bull Schaefer 4140c0de65 Add elasticdog as a maintainer 2015-10-25 23:22:21 +00:00
Arseniy Seroka 70f9d81688 Merge pull request #10566 from spencerjanssen/cockatrice
cockatrice: init at 2015-09-24
2015-10-25 04:24:19 +03:00
Stefan Junker 8e8a985c4c rkt: bump to v0.10.0
* bump stage1 base image to v794.1.0 according to upstream release
* make use of BUILDDIR environment variable to control output path
* make use of the configure option for the stage1 image path and the stage1 base image path
* fix homepage URL

* add myself to the list of maintianers
2015-10-25 02:13:01 +02:00
Wout Mertens 5c34563cda Merge pull request #10517 from demin-dmitriy/sublime3
sublime3: make sublime text work with pkexec and gksudo
2015-10-24 19:16:34 +02:00
Demin Dmitriy 8a1e5d9a27 sublime3: add myself as a maintainer 2015-10-24 18:15:59 +03:00
goibhniu 0b09ae45fa Merge pull request #10563 from wedens/kbdd
kbdd: init
2015-10-24 13:21:53 +02:00
wedens 1b0ba9525d kbdd: init 2015-10-24 17:15:15 +06:00
goibhniu f8af597f0c Merge pull request #10504 from brandonedens/meson-build
Meson build package
2015-10-24 12:40:14 +02:00
Spencer Janssen c65cfc8b66 Add myself as a maintainer 2015-10-23 14:32:02 -05:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brandon Edens 7c4064a0c4 Add maintainer. 2015-10-20 22:15:42 -07: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
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
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
Erik Rybakken 64c1a9a2e2 perseus: init at 4-beta 2015-09-19 00:56:24 +02: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