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

49188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjørn Forsman
e84b0c94f0 nixos/jekins: rename option services.jenkins.{extraOpts => extraOptions} 
I noticed "extraOptions" is infinitely more used than "extraOpts" in
NixOS.
 2014-09-09 17:40:53 +02:00
Bjørn Forsman
cb614ef4ad nixos/jenkins: remove use of types.string (it's deprecated) 2014-09-09 17:36:25 +02:00
Bjørn Forsman
cf7b782ea9 nixos/jenkins: add services.jenkins.extraOpts option 
Allows passing extra command line arguments to Jenkins.
 2014-09-09 17:36:25 +02:00
Eelco Dolstra
4ae3e32e82 Merge pull request #4012 from ibeex/master 
added darwin as supported platform for meld
 2014-09-09 15:35:58 +02:00
Ivan Brkanac
841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Eelco Dolstra
dcb36abbf5 Merge pull request #4009 from manveru/fix-nixos-doc 
fix location of options.xml
 2014-09-09 13:57:57 +02:00
Georges Dubus
7c0e0849af kde4: added the security patch for CVE-2014-5033 to nixpkgs because it is not available upstream 2014-09-09 13:54:42 +02:00
Michael Fellinger
33aaa7ac54 fix location of options.xml 2014-09-09 13:43:23 +02:00
Danyil Bohdan
dee958d3e6 jimtcl: remove end dot from description 2014-09-09 14:30:03 +03:00
Danyil Bohdan
03df715281 Add Jim Tcl interpreter 2014-09-09 14:19:49 +03:00
Pascal Wittmann
95b4d2af94 Merge pull request #3934 from MP2E/chocolate-doom 
chocolateDoom and chocolateDoomMaster added
 2014-09-09 12:16:18 +02:00
Domen Kožar
78e5e556cc Revert "fixes #1923" 
This reverts commit 1849840aa3.

Breaks git-annex
 2014-09-09 12:11:53 +02:00
Christoph Hrdinka
4f5b4ceb85 build-fhs-chrootenv: bind mount chroots /tmp to hosts /tmp 2014-09-09 12:10:54 +02:00
Eelco Dolstra
a654c7db38 Merge pull request #4006 from madjar/master 
I'm not sure whether fetchgit with `leaveDotGit` can ever be made deterministic... But I'll merge anyway.
 2014-09-09 12:06:18 +02:00
Georges Dubus
c7da3fe7be nox: updated sha to work after the recent fetchgit changes 2014-09-09 12:01:17 +02:00
William A. Kennington III
04b2f73236 unetbootin: 603 -> 608 2014-09-08 23:46:44 -07:00
Cray Elliott
d2270f8d79 Fix chocolateDoom and chocolateDoomMaster descriptions 2014-09-08 22:11:40 -07:00
Domen Kožar
1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Vladimír Čunát
dd3192f5ee Revert "spaceFM: update from 0.9.2 to 0.9.4" (fixes #3916) 
This reverts commit c53ae9b462.
It's just a temporary work-around until someone finds a real fix.
 2014-09-08 18:28:14 +02:00
Pascal Wittmann
2d9956114d gtypist: update from 2.9.4 to 2.9.5 and fix typefortune 
also adopted it and set platforms to linux
 2014-09-08 17:37:16 +02:00
Bjørn Forsman
1a5501889c jenkins: update to latest (v1.579) 2014-09-08 17:08:05 +02:00
Bjørn Forsman
af2334912a jenkins: expression cleanup 
* Include version number in package name
* Remove trailing dot in meta.description
* Simplify meta by using "with stdenv.lib;"
 2014-09-08 17:05:15 +02:00
Eelco Dolstra
19b1fafe5f linux: Update to 3.12.28 2014-09-08 15:49:27 +02:00
Eelco Dolstra
68d88a75fc Merge pull request #3997 from bjornfor/nixos-test-report 
nixos/test-reports: use local copy of jquery
 2014-09-08 15:24:31 +02:00
Ricardo M. Correia
48105a0aa1 pythonPackages.beautifulsoup4: Fix hash 
The src tarball was modified in the PyPI repository.

I have compared the old tarball against the new one, the only difference
being that the new one is missing the following files/directories:

AUTHORS.txt
COPYING.txt
doc/
NEWS.txt
scripts/
TODO.txt
 2014-09-08 15:20:30 +02:00
Ricardo M. Correia
ae453d1a0e perlPackages.Plack: update from 1.0030 to 1.0031 2014-09-08 15:19:39 +02:00
Ricardo M. Correia
238a84ac78 grsecurity: Update stable and test patches 
stable: 3.0-3.14.17-201408260041 -> 3.0-3.14.18-201409060013
test:   3.0-3.15.10-201408212335 -> 3.0-3.16.2-201409060014
 2014-09-08 15:16:38 +02:00
Ricardo M. Correia
c155ae31ee Merge pull request #3992 from wkennington/master.kernel 
Kernel Updates
 2014-09-08 15:15:54 +02:00
Ricardo M. Correia
99d0c10a0b paxctl: Update from 0.8 -> 0.9 2014-09-08 15:14:48 +02:00
Ricardo M. Correia
d5df399a4b gradm: Update from 3.0-201405281853 -> 3.0-201408301734 2014-09-08 15:14:11 +02:00
Eelco Dolstra
1a9c27c092 Typo 2014-09-08 13:58:44 +02:00
Eelco Dolstra
af69fcde47 Fix Nixpkgs evaluation 
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
 2014-09-08 13:10:13 +02:00
Oliver Charles
5e3eff3bbd haskellPackages.twitterConduit: Update to 0.0.5.8 and remove 'broken' flag 2014-09-08 12:08:03 +01:00
Luca Bruno
dfa6f03ea3 Do not assert absolute path for nodev grub device. Closes #3996 2014-09-08 12:00:34 +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
Peter Simons
ff85b53c5f highlight: update to version 3.18 to fix build errors with Lua 5.2 2014-09-08 10:22:50 +02:00
Domen Kožar
0487521ab2 Merge pull request #4001 from aherrmann/pr_mpi 
mpi4py: Disable for Python3 and PyPy
 2014-09-07 19:56:34 +02:00
Peter Simons
073cd3cfb9 Update version of 'lua' and 'lua5' attributes to lua 5.2. 
@vcunat kindly pointed out that earlier versions are vulnerable to
CVE-2014-5461. There remain a whole lot of packages that have hard-coded
use of version 5.1, unfortunately.
 2014-09-07 19:55:30 +02:00
Nicolas B. Pierron
568f7d70b9 Merge pull request #3866 from nbp/remove-functionTo-type 
Remove types.functionTo
 2014-09-07 10:46:13 -07:00
Andreas Herrmann
970f51ac0a mpi4py: Disable for Python3 and PyPy 
Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.

[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
 2014-09-07 19:44:08 +02:00
Nicolas Pierron
4ff1ab5a56 Remove types.functionTo. 2014-09-07 19:41:45 +02:00
Nicolas Pierron
becde6132b Replace environment.profileVariables by environment.profileRelativeEnvVars 2014-09-07 19:41:00 +02:00
Nicolas B. Pierron
388b7baa73 Merge pull request #3856 from nbp/submodule-declarations 
Annotate option-set options with the file in which they are declared.
 2014-09-07 10:39:47 -07:00
Nicolas B. Pierron
a4e60ebacf Merge pull request #3811 from nbp/options-json 
Export the list of options to XML & JSON, such that external tools can use it.
 2014-09-07 10:39:03 -07: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
Nicolas Pierron
79411db08b Export options.json & options.xml for building tools for NixOS. 2014-09-07 18:39:24 +02:00
Aristid Breitkreuz
476b94a34d Merge pull request #3998 from bobvanderlinden/libfreefare 
added libfreefare
 2014-09-07 18:08:56 +02:00
Rickard Nilsson
da9ef1ddaa Merge pull request #3999 from ip1981/master 
Updated Mediawiki to 1.23.3
 2014-09-07 18:02:05 +02:00
Igor Pashev
5c6e4e7433 Updated Mediawiki to 1.23.3 
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
 2014-09-07 17:50:51 +02:00