JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,382 Commits 2 Branches 0 Tags 13 GiB
86204e322f
Commit Graph

224 Commits

Author SHA1 Message Date
koral
ce0dd9e335 Added bashmount package. 2014-09-15 18:29:47 +02:00
Robert Helgesson
9241dd5671 Add myself to maintainers.nix. 2014-09-13 10:14:26 +02:00
Pascal Wittmann
3c6eceb5fb Merge pull request #4008 from dbohdan/master 
Add Jim Tcl interpreter
 2014-09-12 21:36:58 +02:00
Danyil Bohdan
2a89610d9a jimtcl: add dbohdan as maintainer 2014-09-12 22:23:59 +03:00
cillianderoiste
56f6952f0d Merge pull request #4049 from vandenoever/musescore 
Add MuseScore 1.3.
 2014-09-12 18:53:14 +02:00
Jos van den Oever
8a4ce8cf34 Add MuseScore 1.3. 2014-09-12 16:52:44 +02:00
Vladimír Čunát
963b5e820c lib/licenses: add cc-by-40 (fixes #4035) 2014-09-11 20:03:03 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Nicolas Pierron
4ff1ab5a56 Remove types.functionTo. 2014-09-07 19:41:45 +02:00
Nicolas Pierron
b5f0cc3cda Merge options having the submodule type. 
Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type.  If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.

In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
 2014-09-07 19:03:20 +02:00
Nicolas Pierron
bb944b4dc8 Annotate option-set options with the file in which they are declared. 
This modification improves NixOS manual by listing in which file, each
submodule option is declared.  This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
 2014-09-07 19:03:20 +02:00
Bob van der Linden
c839205a69 added libfreefare 
A library on top of libnfc for MIFARE support.
 2014-09-07 16:23:23 +02:00
Aristid Breitkreuz
494ba98e65 fix typo in postgresql license definition 2014-09-04 20:40:03 +02:00
Aristid Breitkreuz
73e569bf01 add postgresql 9.4beta2 2014-09-04 20:36:43 +02:00
Aristid Breitkreuz
0ec38e5b7f Add myself to lib/maintainers.nix 2014-09-04 20:36:43 +02:00
Moritz Heidkamp
6f682f9afb Add Chibi-Scheme expression 2014-09-04 16:06:42 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Daniel Peebles
3182cf00ff Add xar 2014-08-30 22:52:46 +01:00
Nicolas B. Pierron
a5d6219897 Merge pull request #3864 from nbp/useless-submodules 
Remove useless use of undocumented submodules.
 2014-08-30 18:21:17 +02:00
Florent Becker
59b1bd0607 Add myself to the maintainer list 2014-08-30 19:37:15 +04:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Vladimír Čunát
3f0ebe7e75 licenses: comment about two versions of MIT 
I decided to follow spdx.org and not to differentiate those two.
Packages would often have the wrong version anyway.
 2014-08-30 07:28:26 +02:00
Nicolas Pierron
eb7a17a1cf Add error an message to prevent use of useless submodules. 2014-08-29 18:54:15 +02:00
Michael Raskin
121050046d Adding flashrom BIOS update utility. Patch by Edward O'Callaghan 2014-08-29 01:27:28 +04:00
Michael Raskin
c7bb162710 Factor out the maintainer 2014-08-29 01:19:24 +04:00
Michael Raskin
f25709c48a List NCSA license properly 2014-08-29 01:14:10 +04:00
lethalman
b722b4c90f Merge pull request #3828 from manveru/di 
Add di package
 2014-08-28 14:23:16 +02:00
Michael Fellinger
e07b5c95af Add di package 2014-08-28 14:16:11 +02:00
Rüdiger Sonderfeld
ae9afc4d31 licenses: Add CC0 license. 
A universal public domain license.

http://creativecommons.org/publicdomain/zero/1.0/
 2014-08-28 13:03:32 +02:00
Eelco Dolstra
b1ce3cc172 Manual: Handle XML files in subdirectories 2014-08-25 14:33:33 +02:00
Rickard Nilsson
684e8b241e Merge pull request #3780 from ip1981/master 
Fixed rewrite rules for Mediawiki
 2014-08-25 12:46:08 +02:00
Igor Pashev
0383b57b3c Added concatMapStringsSep and concatImapStringsSep 
Example: configure rewrite rules for Mediawiki

    RewriteEngine On
    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
    ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
    RewriteRule ${if config.enableUploads
 2014-08-25 10:23:10 +02:00
Philip Horger
83c5a3d22d pnmixer: Add maintainer and fix name 2014-08-25 10:03:26 +02:00
Cray Elliott
85cdd7ce33 Add SDL2_net v2.0.0 2014-08-24 10:21:47 +02:00
Nathaniel Baxter
33879427b7 maintainers: add myself as a maintainer to obconf and teamspeak_client 2014-08-24 10:10:13 +02:00
Aycan iRiCAN
1ff1fe44d9 Added myself to maintainer of hdaemonize and hweblib 2014-08-23 12:28:35 +03:00
Daniel Bergey
a24775bf22 haskell Diagrams libraries 
latest versions support lens-4.4 - fix broken builds
add bergey as maintainer
 2014-08-23 02:05:39 +00:00
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