Commit Graph

414 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Lluís Batlle i Rossell
4018d18e96 Committing patch adding verilog from Antonio Vargas Gonzalez
From his original, I adapted some spacing, and removed the release.nix reference
(superfluous having set meta.platforms)

svn path=/nixpkgs/trunk/; revision=24860
2010-11-25 22:01:14 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Eelco Dolstra
798a6bb103 * Typo.
svn path=/nixpkgs/trunk/; revision=24288
2010-10-14 13:55:08 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Russell O'Connor
5763650f45 adding roconnor to maintainers.
svn path=/nixpkgs/trunk/; revision=24039
2010-10-04 01:22:27 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Evgeny Egorochkin
1ba4551be7 Added Karn Kallio to maintainer list
svn path=/nixpkgs/trunk/; revision=23982
2010-09-28 09:33:49 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Eelco Dolstra
2202d32006 * Add stringAfter' as a synonym of fullDepEntry', with the arguments
flipped to denote what it actually does (i.e., a string fragment
  that comes *after* the named fragments).  One day we can have
  `stringBefore'.

svn path=/nixpkgs/trunk/; revision=23761
2010-09-13 15:31:06 +00:00
Nicolas Pierron
7f8037cfd7 Add additional shortcuts frequently used in NixOS.
svn path=/nixpkgs/trunk/; revision=23733
2010-09-10 18:03:16 +00:00
Eelco Dolstra
df1d0752eb * Get rid of the template argument in mkOverride.
svn path=/nixpkgs/trunk/; revision=23709
2010-09-10 09:31:31 +00:00
Michael Raskin
32071d5b4d Adding a list-in-list checker for builderDefs closePropagation
svn path=/nixpkgs/branches/stdenv-updates/; revision=23608
2010-09-03 08:15:45 +00:00
Lluís Batlle i Rossell
641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
2010-09-01 09:50:12 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Yury G. Kudryashov
9e4202d273 make makeOverridable noop for functions like a: b: c(a, b)
svn path=/nixpkgs/trunk/; revision=23262
2010-08-19 22:52:53 +00:00
Eelco Dolstra
1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Eelco Dolstra
415cf4cd1c * Omit the "Defined by:" elements in the configuration.nix section of
the manual.  While it's a useful feature, it has the unfortunate
  side-effect of causing the manual to be rebuilt every time the user
  adds an option definition to any module (including
  configuration.nix), and rebuilding the manual is rather slow.

svn path=/nixpkgs/trunk/; revision=23110
2010-08-11 11:46:09 +00:00
Lluís Batlle i Rossell
8783e812b5 More changes beyond stdenv-linux for the fuloong2f platform
svn path=/nixpkgs/branches/stdenv-updates/; revision=22973
2010-08-05 18:51:12 +00:00
Sander van der Burg
1e9dc2b254 It seems that lib.zip is already taken from attributesets, therefore renaming it to zipTwoLists
svn path=/nixpkgs/trunk/; revision=22887
2010-08-02 16:48:19 +00:00
Sander van der Burg
beee6e5e1d Moved 'zip' function from nixos/lib/build-vms.nix
svn path=/nixpkgs/trunk/; revision=22882
2010-08-02 16:10:01 +00:00
Eelco Dolstra
fd268b4852 * Add callPackage etc.
svn path=/nixpkgs/trunk/; revision=22876
2010-08-02 13:57:57 +00:00
Eelco Dolstra
acd34843f0 * Move "checker" to lib. It seems to be unused though.
svn path=/nixpkgs/trunk/; revision=22819
2010-07-30 09:24:55 +00:00
Eelco Dolstra
d67aefc19d * Remove `customKernel' which is obsolete as far as I can tell.
* Remove `sumTwoArgs' since it has no remaining callers.

svn path=/nixpkgs/trunk/; revision=22797
2010-07-28 16:09:13 +00:00
Ludovic Courtès
c4d05c0e3e Give Org-Mode a high priority.
svn path=/nixpkgs/trunk/; revision=22694
2010-07-22 08:59:46 +00:00
Lluís Batlle i Rossell
208dd0f5ec Adding armv5tel-linux to the linux platforms.
svn path=/nixpkgs/trunk/; revision=22591
2010-07-13 21:33:20 +00:00
Michael Raskin
aadb898a0b Implementing a fix allowing deepOverride without changing dependency-tree-leaf packages
svn path=/nixpkgs/trunk/; revision=22533
2010-07-08 15:31:59 +00:00
Michael Raskin
ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Michael Raskin
14eea491b8 Adding Redstore HTTP RDF/SPARQL server
svn path=/nixpkgs/trunk/; revision=22428
2010-06-29 22:18:49 +00:00
Evgeny Egorochkin
ae9883bcab First commit! :P
svn path=/nixpkgs/trunk/; revision=22307
2010-06-17 10:18:13 +00:00
Marc Weber
d3341315bd adding gis system grass (graphviz 3d is not supported yet)
svn path=/nixpkgs/trunk/; revision=22131
2010-06-03 15:19:59 +00:00
Eelco Dolstra
bf010ace55 * Remove the mysterious `_args' attribute because it screws up the
manual generation (causes `nixos-rebuild build-vm' evaluation to
  fail in the `networking.ifaces' option).

svn path=/nixpkgs/trunk/; revision=22084
2010-06-01 14:24:16 +00:00
Eelco Dolstra
1ba3165b4e * Allow the default for option values displayed in the manual to be
overriden.  Some defaults should not be evaluated because they cause
  unnecessary evaluation or might cause evaluation errors
  (e.g. assertions).  For instance, the value of the
  `boot.kernelPackages' option is an attribute set.  Some packages in
  that set might not evaluate (e.g. AUFS2 on kernels that don't have
  the AUFS2 patch), and in any case it slows down nixos-rebuild to
  evaluate lots of packages that are not actually used in the
  configuration.

svn path=/nixpkgs/trunk/; revision=22043
2010-05-28 11:20:45 +00:00
David Guibert
6c526f1695 add myself to the maintainers list
svn path=/nixpkgs/trunk/; revision=22007
2010-05-27 19:33:16 +00:00
Marc Weber
bddb72ec8a psotgis:
- support older versions (which are used by other distributions)
- give utilyt scripts nicer names
- pg_db_postgis_enable: support loading comments

svn path=/nixpkgs/trunk/; revision=21992
2010-05-26 19:01:10 +00:00
Marc Weber
32edcce80b Build a package with debugging information so that you can run it within gdb or run valgrind on it.
Example: xmessageDebug = misc.debugVersion xorg.xmessage

svn path=/nixpkgs/trunk/; revision=21945
2010-05-23 15:54:10 +00:00
Eelco Dolstra
cde9d0fb13 * The old evaluator segfaults if the `outPath' attribute is missing.
Work around it for the moment.

svn path=/nixpkgs/trunk/; revision=21747
2010-05-12 13:24:09 +00:00
Marco Maggesi
d4785a25dd Add myself to nixpkgs/pkgs/lib/maintainers.nix
svn path=/nixpkgs/trunk/; revision=21744
2010-05-12 12:25:23 +00:00
Eelco Dolstra
9ec34da2ee * In the generation of the `options.xml' file used to produce the
NixOS manual and  manpages, remove all derivation attributes except
  the `name' attribute.  This cuts the size of `options.xml' from 7.0
  MiB to 473 KiB, and more importantly, cuts evaluation time of the
  system derivation from 1.63s to 1.10s on my laptop (a 32%
  improvement).

svn path=/nixpkgs/trunk/; revision=21739
2010-05-12 11:07:49 +00:00
Eelco Dolstra
da7e1fbea3 * Do not silently ignore broken "example" and "default" attributes
when generating the documentation.  If they're broken, they should
  be fixed.

svn path=/nixpkgs/trunk/; revision=21738
2010-05-12 09:31:46 +00:00
Eelco Dolstra
5564bd2635 * Make stack traces more consistent.
svn path=/nixpkgs/trunk/; revision=21652
2010-05-07 15:13:43 +00:00
Marc Weber
ae8d4501b6 adding maybeEnv. This will replace from-env.nix in nixos and will be reused in copySystemConfiguration
svn path=/nixpkgs/trunk/; revision=21353
2010-04-27 18:44:23 +00:00
Ludovic Courtès
0e7e20042b Add the GNU Linear Programming Kit (GLPK).
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21284
2010-04-23 21:15:48 +00:00
Marc Weber
9e59164e57 adding lib function haskell's drop x elements from head of list
svn path=/nixpkgs/trunk/; revision=21141
2010-04-17 18:26:40 +00:00
Yury G. Kudryashov
f26e437b72 Don't depend on X unless djview3 is requested
Also rename option name to "qt3"

svn path=/nixpkgs/trunk/; revision=20908
2010-04-01 12:34:50 +00:00
Eelco Dolstra
7dffd96978 * Allow `overrideDerivation' to work on derivations to which
`makeOverridable' has been applied (!).  Ugly.

svn path=/nixpkgs/trunk/; revision=20591
2010-03-12 00:01:56 +00:00
Ludovic Courtès
4b7ff33c26 options: Learn how to merge identical integer values.
svn path=/nixpkgs/trunk/; revision=20581
2010-03-11 22:03:49 +00:00
Ludovic Courtès
529e1900ca options: Use the built-in type predicates.
svn path=/nixpkgs/trunk/; revision=20580
2010-03-11 22:03:45 +00:00
Eelco Dolstra
a3111812ad * In overrideDerivation, filter out the `type' attribute.
svn path=/nixpkgs/trunk/; revision=20487
2010-03-09 11:57:05 +00:00
Rob Vermaas
7869d22938 i am an idiot, thnx ludo for pointing out my stupidity :-)
svn path=/nixpkgs/trunk/; revision=20309
2010-03-01 14:32:23 +00:00
Rob Vermaas
4d94733de2 typo (lists in list)
svn path=/nixpkgs/trunk/; revision=20303
2010-03-01 12:49:15 +00:00
Rob Vermaas
6dbcd591ef use mesaplatforms from lib
svn path=/nixpkgs/trunk/; revision=20302
2010-03-01 12:32:40 +00:00
Sander van der Burg
a777402b21 Added library general public license (LGPL 2.0). Although LGPL 2.1 is almost the same, I want to be precise
svn path=/nixpkgs/trunk/; revision=20259
2010-02-25 15:44:28 +00:00
Sander van der Burg
05245ea055 Added licenses to the lib attributeset
svn path=/nixpkgs/trunk/; revision=20249
2010-02-25 13:09:08 +00:00
Sander van der Burg
680c80e0b4 Added initial licenses attributeset to specify meta.license attributes more concisely
svn path=/nixpkgs/trunk/; revision=20248
2010-02-25 13:06:17 +00:00
Michael Raskin
89d1b7881f Update SGT puzzles and improve builderDefs processing of propagated(Native)BuildInputs after stdenv merge
svn path=/nixpkgs/trunk/; revision=20093
2010-02-18 10:29:40 +00:00
Marc Weber
4007d19700 fix vim_configurable
svn path=/nixpkgs/trunk/; revision=20084
2010-02-18 01:49:22 +00:00
Peter Simons
200c07d817 pkgs/applications/version-management/git-and-tools/git: added myself to the list of maintainers
svn path=/nixpkgs/trunk/; revision=20082
2010-02-18 00:28:15 +00:00
Eelco Dolstra
f1713f192d * Fix the VM builds. They were broken because a `hostDrv' and
`buildDrv' attribute gets added to every derivation in
  `makeStdenvCross'.  So filter out those attributes.  But the real
  question is why makeStdenvCross is applied when I'm not doing a
  cross compilation.

svn path=/nixpkgs/trunk/; revision=19862
2010-02-08 13:35:38 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra
631ea03875 * Fix / disable some packages that give evaluation errors in Hydra.
svn path=/nixpkgs/trunk/; revision=19833
2010-02-05 14:13:25 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Eelco Dolstra
69211adabe * Doh.
svn path=/nixpkgs/trunk/; revision=19732
2010-01-29 12:45:11 +00:00
Eelco Dolstra
c61d1424d0 * Spam everybody with failures of the Nixpkgs tarball so that
hopefully whoever broke it can fix it ;-)

svn path=/nixpkgs/trunk/; revision=19731
2010-01-29 12:26:12 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Alexander Tsamutali
509125bb14 Added myself to the maintainers list.
svn path=/nixpkgs/trunk/; revision=19268
2010-01-06 17:26:44 +00:00
Eelco Dolstra
21358e7ad0 * Support require/imports in top-level anonymous configurations,
i.e. the elements of initModules that are not paths.
* Support a "key" attribute in anonymous configurations to allow
  lazyGenericClosure to distinguish between them.

svn path=/nixpkgs/trunk/; revision=19240
2010-01-05 17:04:55 +00:00
Nicolas Pierron
1e0b14522a * Retrieve the filename of a path.
svn path=/nixpkgs/trunk/; revision=19180
2010-01-03 11:07:05 +00:00
Nicolas Pierron
d311b4e98f * Add a function to take the last element of a list.
svn path=/nixpkgs/trunk/; revision=19179
2010-01-03 11:05:42 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Marc Weber
0888bf7107 remove mapRecordFlatten & fix source autofs
svn path=/nixpkgs/trunk/; revision=18987
2009-12-16 05:52:36 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Marc Weber
7ef915ebc8 nixpkgs lib: adding haskell's take
svn path=/nixpkgs/trunk/; revision=18848
2009-12-08 21:47:14 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Rob Vermaas
0db7aaca02 add x86_64-darwin as platform
svn path=/nixpkgs/trunk/; revision=18646
2009-11-26 15:03:42 +00:00
Marc Weber
10e806bcef testAllTrue helper function
svn path=/nixpkgs/trunk/; revision=18540
2009-11-22 21:28:46 +00:00
Marc Weber
976def943b nix lib: add nixType returning type of value as string which is used in
eqStrict now to return false when a b have different types. Passing
string and {} to eqStrict caused coercion failures when running tests
previously

svn path=/nixpkgs/trunk/; revision=18539
2009-11-22 21:28:43 +00:00
Marc Weber
88e654b1ed follow runTests change prefixing all tests by "test"
svn path=/nixpkgs/trunk/; revision=18538
2009-11-22 21:28:41 +00:00
Marc Weber
02972b92d5 nix lang runTests: ignore tests which are not prefixed by "test"
svn path=/nixpkgs/trunk/; revision=18537
2009-11-22 21:28:38 +00:00
Marc Weber
715d09d836 add some debugging functions
traceCallXml is used to trace arguments and result

svn path=/nixpkgs/trunk/; revision=18536
2009-11-22 21:28:36 +00:00
Eelco Dolstra
11c3e92738 * Bring back Emacs 22 by request from Ludovic.
svn path=/nixpkgs/trunk/; revision=18529
2009-11-22 16:29:15 +00:00
Lluís Batlle i Rossell
e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra
81c5c44ddb * Move makeOverridable out of all-packages.nix.
svn path=/nixpkgs/trunk/; revision=18469
2009-11-19 17:30:21 +00:00
Nicolas Pierron
56ed820f84 Add systems.nix give more control over the increasing list of supported
systems.  This is not yet used because it has to be integrated with the
current system.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18468
2009-11-19 17:19:39 +00:00
Eelco Dolstra
519e7870b6 * Move `modifyDerivation' from build-support/vm to lib and rename it
to `overrideDerivation'.

svn path=/nixpkgs/trunk/; revision=18466
2009-11-19 16:43:58 +00:00
Eelco Dolstra
aa392c3aa7 * Move functions like `runCommand' out of all-packages.nix and into
build-support/.

svn path=/nixpkgs/trunk/; revision=18465
2009-11-19 16:07:47 +00:00
Eelco Dolstra
aed79cca1a * Another unused function.
svn path=/nixpkgs/trunk/; revision=18391
2009-11-17 15:36:48 +00:00
Eelco Dolstra
a56509c0db * Remove some more unused functions.
svn path=/nixpkgs/trunk/; revision=18390
2009-11-17 15:31:48 +00:00
Eelco Dolstra
802fa4ba0b * Remove sumArgs and its few remaining uses. Idem for composedArgs.
svn path=/nixpkgs/trunk/; revision=18388
2009-11-17 15:26:22 +00:00
Nicolas Pierron
da1311b893 * Add the Go Programming Language compiler.
svn path=/nixpkgs/trunk/; revision=18348
2009-11-14 20:14:28 +00:00
Nicolas Pierron
7482474aef * Improve showVal: handle integer and strings.
svn path=/nixpkgs/trunk/; revision=18346
2009-11-14 20:14:15 +00:00
Nicolas Pierron
d791b830aa * Fix typo and clarify why you should not use "mkFixStrictness" on top of
plain list or attribute set.

svn path=/nixpkgs/trunk/; revision=18260
2009-11-07 16:24:11 +00:00
Nicolas Pierron
b901c0e808 * Add an awful hack to bypass the strictness of isType operators for
option definitions.

svn path=/nixpkgs/trunk/; revision=18259
2009-11-07 16:09:04 +00:00
Nicolas Pierron
8b47086b85 * Change the check function to accept sub-modules with arguments in
option definitions.

svn path=/nixpkgs/trunk/; revision=18252
2009-11-07 12:15:39 +00:00
Nicolas Pierron
bb077b253f * Add a function to sort a list.
* Add a new property to order NixOS definitions without creating
  dependencies between snippets.
* Add mkHeader & mkFooter properties (special case of mkOrder).

svn path=/nixpkgs/trunk/; revision=18242
2009-11-07 01:59:55 +00:00
Nicolas Pierron
88f113d032 * Add a function to replace "pkgs.checker". The function checkModule does a
traversal of all definitions and also check definitions contained inside
  sub-modules.

svn path=/nixpkgs/trunk/; revision=18241
2009-11-07 01:59:50 +00:00
Nicolas Pierron
233d72e4fb * Add "_args" to all sub-module configurations result. This attribute
enable argument introspection outside of the scope of each sub-module.

svn path=/nixpkgs/trunk/; revision=18240
2009-11-07 01:59:45 +00:00
Nicolas Pierron
10d74af2f6 * Add a type to handle environment variables with the usual string
separator ":".

svn path=/nixpkgs/trunk/; revision=18239
2009-11-07 01:58:56 +00:00
Nicolas Pierron
09bed4bffc * Report file locations in the stack-trace when multiple option
declarations cannot be merged.

svn path=/nixpkgs/trunk/; revision=18149
2009-11-05 16:36:03 +00:00
Nicolas Pierron
d8bbae877a * Add a type for read-only options. Options which are only declared
are used when a module produces read-only data for other modules.

svn path=/nixpkgs/trunk/; revision=18148
2009-11-05 15:39:45 +00:00