mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Code Issues Wiki Activity
47547 commits 233 branches 124 tags 7.3 GiB
Commit graph

187 commits

Author SHA1 Message Date
Vladimír Čunát d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
 2014-08-21 15:09:31 +02:00
Eelco Dolstra f932910323 types.nix: Add ‘either’ type 2014-08-19 18:24:37 +02:00
Nathan Bijnens 23da6f9ca4 mailutils: fix for sendmail path 2014-08-15 21:16:33 +02:00
Eelco Dolstra df7bc53606 Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
Vladimír Čunát 5d8c8845ed licenses: add LPL-102 2014-08-15 00:11:09 +02:00
Luca Bruno b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Vladimír Čunát 7133c791b5 licenses: fixup double isc definition 2014-08-14 21:04:24 +02:00
Vladimír Čunát d1ed0f44cd Merge #2823: better cygwin support, also add x86_64 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
 2014-08-14 20:38:09 +02:00
William A. Kennington III ae48ab82ad license: Add isc 2014-08-13 15:10:04 -05:00
Vladimír Čunát 665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs 
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
 2014-08-12 19:08:53 +02:00
Vladimír Čunát 905b163b49 Revert "lib/licenses.nix: allow choosing license by its shortName" 
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
 2014-08-12 19:05:54 +02:00
Matt Miemiec 8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Christoph Hrdinka f44e69a55d luminanceHDR: add version 2.4.0 
fixes #3229
 2014-08-12 10:19:35 +02:00
Damien Cassou fe045a71c4 Adding myself to the maintainers 2014-08-10 15:57:24 +02:00
Luca Bruno b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
NOTtheMessiah 127441813b added license for gcolor2 and myself to maintainers 2014-08-07 01:19:24 +02:00
William A. Kennington III ede3e60a3c unifi: Add wkennington as a maintainer 2014-08-05 21:48:19 -05:00
Vladimír Čunát 229e5c41df lib/licenses.nix: allow choosing license by its shortName 
Example: license = licenses."GPL-2.0+";
This comes with some performance cost during eval of licenses.nix,
but that's probably negligible.
 2014-07-30 19:22:09 +02:00
Vladimír Čunát 0f2101215d lib/licenses.nix: improve sortedness 2014-07-30 18:16:36 +02:00
Vladimír Čunát 32c237d782 lib/licenses.nix: convert to spdx.org shortnames 
Done where possible, replacing links to point to spdx.org (probably stabler).
Also make libtiff use its dedicated license.
 2014-07-30 18:16:09 +02:00
Paul Colomiets 9bc1676e5a Upgrade docker to 1.1.2 and add docker module 
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
 2014-07-28 21:45:49 +02:00
Sven Keidel ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
tv c12f6e3ce9 maintainers: add tv 2014-07-12 13:18:46 +02:00
cillianderoiste d6e8e764ae Merge pull request #3233 from wjlroe/exercism 
New Exercism package
 2014-07-10 18:56:47 +02:00
William Roe 09209878c6 Added wjlroe (me) as maintainer of this new Exercism package 2014-07-10 15:03:50 +01:00
Martin Lavoie 3df7911f35 Add bitbucket-cli to nixpkgs 
Adding refnil as mainteners

Added alias in top-level
 2014-07-09 01:15:49 +02:00
Oliver Charles 847a9a5c30 Merge pull request #3206 from bosu/mp3splt 
Add mp3splt: utility to split mp3 files
 2014-07-07 19:58:00 +01:00
Boris Sukholitko 70ad9ad8f9 Add mp3splt 2014-07-07 21:38:14 +03:00
Jascha Geerds 28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Oliver Charles 2480f2465c Merge pull request #3138 from flosse/lua5-expat 
added luaexpat 1.3.0
 2014-07-01 08:47:39 +01:00
Michael Raskin d001de0100 Merge pull request #3102 from auntieNeo/ipafont 
Added package for Japanese IPAFonts.
 2014-06-30 10:19:48 +04:00
Michael Raskin d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute 
Added Kochi substitute Japanese font package
 2014-06-30 10:14:14 +04:00
Markus Kohlhase 7987cd2cc1 added luaexpat 1.3.0 2014-06-30 00:38:05 +02:00
Michael Raskin a278c3dfa8 Fix tarball by adding the missing maintainer entry; email copied from commit metadata 2014-06-29 10:18:39 +04:00
Vladimír Čunát c00f589ff2 licenses: add attribute "free" to fix eval of smlnjBootstrap 2014-06-27 09:48:42 +02:00
Jan Malakhovski 0ea84c4445 minor fix in documentation 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-06-26 11:13:15 +02:00
Jonathan Glines 339b347987 Added package for Japanese IPAFonts. 2014-06-15 10:02:41 -06:00
Jonathan Glines b913409e0b Removed non-free kochi-substitute and added kochi from Debian package. 2014-06-11 22:08:14 -06:00
Vladimír Čunát e1775895a6 Merge #2711: add ansible-1.6.1 
Conflicts (trivial):
	lib/maintainers.nix
 2014-06-11 20:29:55 +02:00
Kirill Elagin 751a01063d lib: Do not take string context into account 
Close #2883.
 2014-06-11 20:22:58 +02:00
Jonathan Glines 8e2556bd7f Added auntie as a maintainer, and set license properly. 2014-06-08 23:47:59 -06:00
Austin Seipp ec1eadf5a0 Merge pull request #2691 from joelteon/cdecl-osx 
Update cdecl to block-supporting version
 2014-06-03 20:37:30 -05:00
Philip Lykke Carlsen e87da7761a subtitleeditor, gstreamermm: new packages 2014-06-03 22:00:47 +02:00
Peter Simons ce7be7584f Merge pull request #2790 from ehmry/unbound 
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
 2014-05-30 14:46:29 +02:00
Emery Hemingway 0ddce8db12 unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd 2014-05-29 09:59:55 -04:00
Sander van der Burg 9ec52d6323 Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin 2014-05-29 14:47:07 +02:00
Matthew Brown 3e7f8bce62 maintainers.nix: add missing edeoryd46, fixing channel 
Close #2783.
 2014-05-28 21:51:35 +02:00
Alexei Robyn 4fa4518875 Add TeamSpeak 3 server & service module (close #2056) 
Conflicts (trivial):
	lib/maintainers.nix
	nixos/modules/misc/ids.nix
 2014-05-27 17:30:26 +02:00
Luca Bruno 0f51ae90b9 Revert "typescript: add package. Closes #2712" 
This reverts commit 93a7cf74b9.
 2014-05-21 15:57:34 +02:00
Jussi Maki 93a7cf74b9 typescript: add package. Closes #2712 
Typed superset of JavaScript that compiles to plain JavaScript.

http://www.typescriptlang.org/
 2014-05-21 15:21:48 +02:00