Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #11025 from rick68/patch-1 | Peter Simons | 2015-11-15 |
|\ | | | | | Update deprecated.nix | ||
| * | Update deprecated.nix | Wei-Ming Yang | 2015-11-15 |
| | | | | | | fix a typo | ||
* | | Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" | William A. Kennington III | 2015-11-14 |
|/ | | | | | | This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes. | ||
* | Merge commit 'cb21b77' into master.upstream | William A. Kennington III | 2015-11-13 |
|\ | | | | | | | This is a partial merge of staging for builds which are working | ||
| * | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-07 |
| |\ | |||
| * \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-05 |
| |\ \ | |||
| * \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-11-04 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-10-30 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge master into staging | Vladimír Čunát | 2015-10-23 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master.upstream' into staging.upstream | William A. Kennington III | 2015-10-15 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06" | Eelco Dolstra | 2015-10-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix | ||
* | | | | | | | | Merge pull request #10989 from rnhmjoj/maintainer | Domen Kožar | 2015-11-12 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add myself as a maintainer | ||
| * | | | | | | | | add myself as a maintainer | rnhmjoj | 2015-11-12 |
| | | | | | | | | | |||
* | | | | | | | | | clfswm: add maintainer | Robert Glossop | 2015-11-11 |
| | | | | | | | | | |||
* | | | | | | | | | Add myself as maintainer | Stéphane Jourdois | 2015-11-09 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||
* | | | | | | | | Merge pull request #10849 from lolwat97/imgur-screenshot | Nikolay Amiantov | 2015-11-06 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Add imgur-screenshot package | ||
| * | | | | | | | maintainers: add lw | Sergey Sofeychuk | 2015-11-06 |
| | |_|_|_|_|/ | |/| | | | | | |||
* / | | | | | | gnuradio-nacl: init at 2015-11-05 | Matthew O'Gorman | 2015-11-05 |
|/ / / / / / | |||
* | | | | | | Merge pull request #10791 from msteen/master | Domen Kožar | 2015-11-02 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added msteen to the list of maintainers. | ||
| * | | | | | | Added msteen to the list of maintainers. | Matthijs Steen | 2015-11-02 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | mbuffer: new package | Daniel Frank | 2015-10-31 |
| |_|_|_|/ |/| | | | | |||
* | | | | | Add elasticdog as a maintainer | Aaron Bull Schaefer | 2015-10-25 |
| | | | | | |||
* | | | | | Merge pull request #10566 from spencerjanssen/cockatrice | Arseniy Seroka | 2015-10-25 |
|\ \ \ \ \ | | | | | | | | | | | | | cockatrice: init at 2015-09-24 | ||
| * | | | | | Add myself as a maintainer | Spencer Janssen | 2015-10-23 |
| | | | | | | |||
* | | | | | | rkt: bump to v0.10.0 | Stefan Junker | 2015-10-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||
* | | | | | | Merge pull request #10517 from demin-dmitriy/sublime3 | Wout Mertens | 2015-10-24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | sublime3: make sublime text work with pkexec and gksudo | ||
| * | | | | | | sublime3: add myself as a maintainer | Demin Dmitriy | 2015-10-24 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge pull request #10563 from wedens/kbdd | goibhniu | 2015-10-24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | kbdd: init | ||
| * | | | | | | kbdd: init | wedens | 2015-10-24 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge pull request #10504 from brandonedens/meson-build | goibhniu | 2015-10-24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Meson build package | ||
| * | | | | | Add maintainer. | Brandon Edens | 2015-10-20 |
| | | | | | | |||
* | | | | | | Add stdenv bootstrap tools generation to release.nix | Eelco Dolstra | 2015-10-23 |
| |/ / / / |/| | | | | |||
* | | | | | Merge branch 'master' of https://github.com/NixOS/nixpkgs into ↵ | Perry Barnoy | 2015-10-19 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xfce4-whiskermenu-plugin Pull from nixpkgs/master to resolve Travis CI build conflicts. | ||
| * | | | | Update email address to currently preferred one | Louis Taylor | 2015-10-17 |
| | |_|/ | |/| | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin | Perry Barnoy | 2015-10-14 |
|\| | | | | | | | | | | | | | | | Merge upstream. | ||
| * | | | Factor out option renaming | Eelco Dolstra | 2015-10-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||
| * | | | git-crypt: update maintainer | Desmond O. Chang | 2015-10-14 |
| | | | | |||
| * | | | alsa-tools: update maintainer | Florian Paul Schmidt | 2015-10-13 |
| | | | | |||
* | | | | - Added myself as a maintainer | Perry Barnoy | 2015-10-14 |
|/ / / | | | | | | | | | | - Boilerplate whiskermenu expression | ||
* | | | Merge pull request #10345 from javaguirre/package-phpcs | Arseniy Seroka | 2015-10-12 |
|\ \ \ | |/ / |/| | | phpcs: init at 2.3.4 | ||
| * | | phpcs: init at 2.3.4 | Javier Aguirre | 2015-10-12 |
| | | | | | | | | | | | | Adding javaguirre to maintainers | ||
* | | | non: init at 2015-10-6 | = | 2015-10-11 |
|/ / | |||
* | | maintainers.nix: Add lukego | Luke Gorrie | 2015-10-08 |
| | | |||
* | | flashplayer: add myself to maintainers | Echo Nolan | 2015-10-03 |
|/ | |||
* | jackmix: init at version 0.5.2 | Arnold Krille | 2015-10-02 |
| | | | | Add jackmix to the nix pkgs. | ||
* | Merge pull request #10066 from michaelpj/p/heatseeker | lethalman | 2015-10-02 |
|\ | | | | | heatseeker: init at 1.3.0 | ||
| * | heatseeker: init at 1.3.0 | Michael Peyton Jones | 2015-09-25 |
| | | |||
* | | lib.licenses: add fdl13 | Thomas Tuegel | 2015-09-27 |
| | | |||
* | | lib: add makeScope | Thomas Tuegel | 2015-09-27 |
|/ | |||
* | kdevplatform: maintained by @ambrop72, /cc #9981. | Vladimír Čunát | 2015-09-22 |
| |