3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

639 commits

Author SHA1 Message Date
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Peter Simons 89a5717c7a lib/trivial.nix: improve spelling 2015-11-25 11:30:43 +01:00
Christian Zagrodnick 1cdacc6aa2 lib/strings: add a toInt helper (close #11242)
While the function itself is pretty easy, it's not straitforward to find a way to convert string to int with nix.
2015-11-25 08:50:02 +01:00
Rickard Nilsson 38196171e8 Merge pull request #10773 from rvl/longview
Linode Longview package and module
2015-11-24 13:16:30 +01:00
Peter Simons 405fda497a lib: document fix and add fix', extends functions
These functions used to live in pkgs/development/haskell-modules/default.nix,
but they are generic, really, and should be easily accessible to everyone.
2015-11-24 12:48:03 +01:00
Rodney Lorrimar a754e7b8a6 Add self to maintainers 2015-11-22 12:37:00 +00:00
Pascal Wittmann 5dfceebaba Merge pull request #11039 from Phlogistique/sonic-pi
sonic-pi: init at 2.8.0
2015-11-22 10:13:07 +01:00
Noé Rubinstein 01a81506a6 sonic-pi: init at 2.8.0 2015-11-21 20:41:30 +01:00
goibhniu c199019290 Merge pull request #11109 from ForNeVeR/pash
pash: init at git-2015-11-06
2015-11-21 10:44:00 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jude Taylor 7039b24cdc cherry-pick lib.sandbox into master 2015-11-19 11:33:21 -08:00
Friedrich von Never 1c3b6a2812 pash: init at git-2015-11-06 2015-11-19 23:00:56 +06:00
Pascal Wittmann d1d5f9c9c1 Merge pull request #11121 from manveru/google-fonts
google-fonts: new package
2015-11-18 12:36:20 +01:00
Michael Fellinger 08c6a2cd92 google-fonts: init at 2015-11-18 2015-11-18 12:19:37 +01:00
Peter Simons 084e37ec7b Merge pull request #11025 from rick68/patch-1
Update deprecated.nix
2015-11-15 09:04:07 +01:00
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
Wei-Ming Yang 8b78f17f5f Update deprecated.nix
fix a typo
2015-11-15 03:41:39 +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
Eelco Dolstra 45c7dd7d98 Add stdenv bootstrap tools generation to release.nix 2015-10-23 13:05:36 +02: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
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