summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
...
| * | | | | Merge master into stagingVladimír Čunát2015-10-23
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-15
| |\ \ \ \ \ \
| * | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06"Eelco Dolstra2015-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
* | | | | | | | Merge pull request #10989 from rnhmjoj/maintainerDomen Kožar2015-11-12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add myself as a maintainer
| * | | | | | | | add myself as a maintainerrnhmjoj2015-11-12
| | | | | | | | |
* | | | | | | | | clfswm: add maintainerRobert Glossop2015-11-11
| | | | | | | | |
* | | | | | | | | Add myself as maintainerStéphane Jourdois2015-11-09
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #10849 from lolwat97/imgur-screenshotNikolay Amiantov2015-11-06
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Add imgur-screenshot package
| * | | | | | | maintainers: add lwSergey Sofeychuk2015-11-06
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | gnuradio-nacl: init at 2015-11-05Matthew O'Gorman2015-11-05
|/ / / / / /
* | | | | | Merge pull request #10791 from msteen/masterDomen Kožar2015-11-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added msteen to the list of maintainers.
| * | | | | | Added msteen to the list of maintainers.Matthijs Steen2015-11-02
| | |_|_|/ / | |/| | | |
* | | | | | mbuffer: new packageDaniel Frank2015-10-31
| |_|_|_|/ |/| | | |
* | | | | Add elasticdog as a maintainerAaron Bull Schaefer2015-10-25
| | | | |
* | | | | Merge pull request #10566 from spencerjanssen/cockatriceArseniy Seroka2015-10-25
|\ \ \ \ \ | | | | | | | | | | | | cockatrice: init at 2015-09-24
| * | | | | Add myself as a maintainerSpencer Janssen2015-10-23
| | | | | |
* | | | | | rkt: bump to v0.10.0Stefan Junker2015-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/sublime3Wout Mertens2015-10-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | sublime3: make sublime text work with pkexec and gksudo
| * | | | | | sublime3: add myself as a maintainerDemin Dmitriy2015-10-24
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10563 from wedens/kbddgoibhniu2015-10-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | kbdd: init
| * | | | | | kbdd: initwedens2015-10-24
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10504 from brandonedens/meson-buildgoibhniu2015-10-24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Meson build package
| * | | | | Add maintainer.Brandon Edens2015-10-20
| | | | | |
* | | | | | Add stdenv bootstrap tools generation to release.nixEelco Dolstra2015-10-23
| |/ / / / |/| | | |
* | | | | Merge branch 'master' of https://github.com/NixOS/nixpkgs into ↵Perry Barnoy2015-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | xfce4-whiskermenu-plugin Pull from nixpkgs/master to resolve Travis CI build conflicts.
| * | | | Update email address to currently preferred oneLouis Taylor2015-10-17
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-pluginPerry Barnoy2015-10-14
|\| | | | | | | | | | | | | | | Merge upstream.
| * | | Factor out option renamingEelco Dolstra2015-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 maintainerDesmond O. Chang2015-10-14
| | | |
| * | | alsa-tools: update maintainerFlorian Paul Schmidt2015-10-13
| | | |
* | | | - Added myself as a maintainerPerry Barnoy2015-10-14
|/ / / | | | | | | | | | - Boilerplate whiskermenu expression
* | | Merge pull request #10345 from javaguirre/package-phpcsArseniy Seroka2015-10-12
|\ \ \ | |/ / |/| | phpcs: init at 2.3.4
| * | phpcs: init at 2.3.4Javier Aguirre2015-10-12
| | | | | | | | | | | | Adding javaguirre to maintainers
* | | non: init at 2015-10-6=2015-10-11
|/ /
* | maintainers.nix: Add lukegoLuke Gorrie2015-10-08
| |
* | flashplayer: add myself to maintainersEcho Nolan2015-10-03
|/
* jackmix: init at version 0.5.2Arnold Krille2015-10-02
| | | | Add jackmix to the nix pkgs.
* Merge pull request #10066 from michaelpj/p/heatseekerlethalman2015-10-02
|\ | | | | heatseeker: init at 1.3.0
| * heatseeker: init at 1.3.0Michael Peyton Jones2015-09-25
| |
* | lib.licenses: add fdl13Thomas Tuegel2015-09-27
| |
* | lib: add makeScopeThomas Tuegel2015-09-27
|/
* kdevplatform: maintained by @ambrop72, /cc #9981.Vladimír Čunát2015-09-22
|
* add myself to maintainersDavid Kleuker2015-09-20
|
* Merge pull request #9924 from erikryb/masterArseniy Seroka2015-09-19
|\ | | | | perseus: init at 4-beta
| * perseus: init at 4-betaErik Rybakken2015-09-19
| |
* | Merge pull request #9934 from offlinehacker/nixos/kibana/addDomen Kožar2015-09-19
|\ \ | | | | | | Update kibana, add kibana nixos service
| * | Add lib.filterAttrsRecursive functionJaka Hudoklin2015-09-19
| |/
* / nixos,lib: move environment generation related copy-paste to libJan Malakhovski2015-09-18
|/
* erlang-mode: refactor maintainers (close #9855)Samuel Rivas2015-09-14
|
* goatee, goatee-gtk: add myself as maintainerBryan Gardiner2015-09-11
|