Commit Graph
100 Commits
Author SHA1 Message Date
Marc Weber f8b5b85df6 displaycal: init at 3.2.4.0 2017-04-30 21:12:36 +02:00
Marc Weber b51f165334 apache-httpd
* Introduce listen = [ { ip = "*"; port = 443; } ]; configuartion.
* deprecated port = 443 option which is no longer needed
2016-11-12 15:35:38 +01:00
Marc Weber c3f56e912a Add nixpkgs documentation about how to create a derivation with Vim + plugins 2016-06-25 21:39:00 +02:00
Marc Weber 2d34bc06a0 fix wavpack .pc file
The .pc file is missing declaration of exec_prefix causing other packages to
fail such as gst-plugins-good beacuse pkg-config stops processing
remaining .pc files

I notified david at wavpack com

enableParallelBuilding = true; also happens to work
2015-05-04 08:09:42 +00:00
Marc Weber 411545b038 update vam, vim2nix, fixes 6183 2015-02-06 20:02:56 +01:00
Marc Weber abd016cea8 Refactoring vim plugins again:
- sort automatcially generated vim derivations
- move the plugins to be derived by VAM into its own file: vim-plugin-names
- rename vimrc into vimUtils moving all common code into it
  so that it is possible to use it within ~/.nixpkgs/config.nix
- Moving all important documentation into vimUtils
- provide vimPlugins.pluginnames2Nix to provide a bin/vim-* command
  writing updated derivations into its buffer

VAM's repository's nix.vim got some improvements @ VAM repository, eg hg
fetchout out got fixed and shell failures are noticed now (Thanks to Arseniy
Seroka)
2014-12-04 15:32:38 +01:00
Marc Weber 613ca23e85 experimental/vim-vam-pathogen-vimrc-support
This patch implements derving a .vimrc from vim-plugins.nix loading those
plugins by either Pathogen or VAM (VAM seems to be slightly faster and is much
more powerful).

Example:

  environment.systemPackages = [
   # default plain vim
   vim_configurable

   # vim which get's called vim-with-addon-nix
   (vim_configurable.customize {
      name = "vim-with-addon-nix";
     vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }];
   })
  ];

This way you can provide an "enhanced Vim" and a standard Vim.

Details about what this commit changes:
1) provide a new toplevel name vimrc which
  * provides a way to build up a .vimrc using either pathogen or VAM (knowing about plugin dependencies by name)
  * can enhance vim to support. vim.customize { name = "name-user"; vam.pluginDictionaries and/or pathogen.pluginNames = .. }
  * introduce rtp names for each vim plugin pointing to the runtimepath path
  * suggest naming to be the same as vim-pi so that VAM's dependencies work
  * derive some packages as example from vim-pi using VAM's new autoload/nix.vim
    supporting simple dependencies
  * test case for vim-addon-nix for VAM/pathogen

2) enhance vim_configurable to support .customize

3) update many plugins by using VAM's implementation not rewriting those which
  * vim-pi doesn't know about the git source yet (TODO: make vim-pi be aware of
    those)
  * have special build code

This commit partially conflicts with commits done by Bjørn Forsman starting by
37f961628b, eg the one using lower case attr and pkg names, because they don't
match vim-pi (eg YouCompleteMe). Rather than resolving the conflict this just
adds aliases so that both names can be used
2014-11-08 19:34:17 +01:00
Marc Weber ba154ec9d4 apache 2_4 update, fixes some CVE's
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
2014-07-24 18:10:10 +02:00
Marc Weber 672adc126e nixos: add 'firebird' group
The firebird module complains without missing 'firebird' group, add it.
2014-07-08 00:00:33 +02:00
Marc Weber 31fc4c6aa4 Shea told me composableDerivation is hard to understand.
Thus comment it and why it was written long time ago until it'll get replaced piecewise.
2014-04-30 20:31:40 +02:00
Marc Weber 577c20c23b tigervnc: fix ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
I'm unsure about
- is it ok to apply this patch globally, or should it be overridden for tigervnc only?
- how many rebuilds it triggers
- whether it was neccessary to update to latest dev version (seems to work)
The bug report indicates that others distros just includes this patch (?)

Cf. #1498. vcunat: the patch should be usable globally, as e.g. Arch does it.
Using autoreconfHook doesn't work for me, maybe --force is bad for it.
2014-01-28 16:10:12 +01:00
Marc Weber 0d0eb44a35 drop myhasktags, current hackage version has everything my version had 2014-01-23 14:44:21 +01:00
Marc Weber 4a96c8cf6a gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH 2013-11-01 10:32:24 +01:00
Marc Weber 78f7baf3b7 Fix .deepOverride on poppler, glib
By moving the default derivation into callPackage call, close #1115.
2013-10-26 13:54:24 +02:00
Marc Weber 6cb91c33d0 Firebird service:
* simplify directory layout
 * clean up option descriptions
 * let the user override Firebird package
 * create firebird user
 * clarify TODO comment

Close  # 1061.
2013-10-21 20:33:11 +03:00
Marc Weber 4683774277 experimental/vsftpd
vsftpd improvements:
- intorduce one declarative list of options
- make docummentation strings more understandable and add missing options
  such as SSL/TLS support
- Use environment.etc."vsftpd".text because I can't think about any
  reason why a shell script should be used.
  That code was written in 2009.
2013-10-12 01:05:13 +02:00
Marc Weber 5dbc5f120c firebird service
many suggestions contributed by bjornfor and edolstra
2013-10-05 23:07:33 +02:00
Marc Weber 513dad6527 colord, gusb: package.
Part of #517.
2013-09-15 11:53:11 +03:00
Marc Weber c823bc37d6 backup tools bup, storeBackup: implement sanity check
bup:
- update
- run make test (all tests seem to pass :-)
- add python.modules.readline
- add comment that there is no way to prune old revisions (yet)
2013-09-01 02:22:01 +02:00
Marc Weber 6f6bc030f9 adding store-backup 2013-08-31 22:16:22 +02:00
Marc Weber cf762c8f58 firebirdSuper settings
document why its better to not use --with-system-icu

See patch for nixos adding firebird service

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-08-31 23:05:32 +03:00
Marc Weber 57032af1ae ati-proprietary: update, make it build with linux 3.10, fix breakage.
with contributions by Jaka Hudoklin.
2013-08-22 13:00:23 +03:00
Marc Weber 7a76598447 Improve error messages.
Improve function name: ensureDefaultType: It runs the check function, so
checkDefault is much easier to understand.
2013-08-22 11:20:57 +03:00
Marc Weber 52204af457 Refactor: introduce isType reducing redundancy (trivial change) 2013-08-22 11:10:53 +03:00
Marc Weber acd4dcde63 Always merge functions "merge" and "check" if type defines them. 2013-08-22 10:32:13 +03:00
Marc Weber 53994036d3 Replace fold by all because its more readable and shorter 2013-08-22 10:16:00 +03:00
Marc Weber a3f148ce96 Improve option types documentation. 2013-08-22 10:01:27 +03:00
Marc Weber 983c87a1dd Improve the error message for uniq option type. 2013-08-22 09:50:25 +03:00
Marc Weber fd803fce60 List should be an alias of listOf, and it should no longer be used.
Add deprecation notice to list.
Nixos has already been ported from list to listOf (8b2256686b).
2013-08-22 09:45:22 +03:00
Marc Weber b00d824930 Drop inferred, because "it was supposed to be used at every location
which has no type" according to pierron - but isn't used in
nixos/nixpkgs
2013-08-22 09:37:20 +03:00
Marc Weber 2fcd1195e6 bash: change shell script option types from string to lines
installation-cd-base: export mountPoint=/mnt. This doesn't change the default behavior, but an explicit
mount point specification is cleaner.
2013-08-15 09:28:44 +03:00
Marc Weber d97ea69a81 systemd: check service.name.Type and service.name.Restart 2013-08-15 09:19:51 +03:00
Marc Weber 84ca773f9b use simpleDerivation for all Vim plugins 2013-07-19 20:17:42 +02:00
Marc Weber d25d1e4d24 ocaml adding deriving 2013-06-19 03:07:27 +03:00
Marc Weber ccb2e9a832 Adding multiple versions of sbt. Probably you want to use the latest(default). 2013-06-19 02:45:40 +03:00
Marc Weber 67d41e4424 gpl fix 2013-05-30 01:30:48 +02:00
Marc Weber f7ef08e5cd experimental/cmake-improvement
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper

This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`

Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch

Also cmake builds in parallel perfectly fine

update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
2013-05-28 16:22:45 +02:00
Marc Weber 71628d6e35 vim: supporting multiple sources:
- vim-nox: client-server implementation without X
- latest:  latest mercurial sources (still very stable)
- default: latest release

vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
2013-05-27 22:26:29 +02:00
Marc Weber af4d6b73de adding alchemy painting application 2013-05-22 22:58:05 +02:00
Marc Weber 87a579dd53 partclone, partimage. both are used by clonezilla and drbl (which I haven't packaged yet) 2013-05-16 17:18:11 +02:00
Marc Weber 93063dcf03 eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more declarative style (use getAttr in favour of if) 2013-05-16 09:59:26 +02:00
Marc Weber b50b9bf2b7 add versionedDerivation 2013-05-08 15:43:07 +03:00
Marc Weber e0fab80c27 experimental/multiple-versions-in-one-file
This patch introduces mergeAttrsByVersion to lib.

In some cases it does make sense to keep "experimental" and "older" versions of
the same package in one file because it follows the "do it once only" principle.
Very often many versions share their build instructions - so even though I
understand Eelcos opinion that different versions should be put into their own
.nix files - its my feeling telling me that this is fastest for most cases.

I agree with Eelco that if tweaks for individual versions become too much they
should be split into individual files.

See comments above mergeAttrsByVersion learn about its usage.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-05-08 15:43:07 +03:00
Marc Weber b5e6e1b78c without these two settings my USB dvb-t stick doesn't work 2013-05-06 05:15:34 +02:00
Marc Weber 5f612ddfdc fix wacom hotplug and all Intuos 5 issues
- drop custom config:
  (please wacom using folks review this part and think
  about how to get it back if its important to you)

- put default config shipping with  xf86_input_wacom
  into /etc/X11/xorg.conf.d/
  which seems to be interpreted again when
  devices are hot plugged

- when starting x11, also provide xinput
  .. you never know when you need it

This fixes all problems I had:
- device only worked when plugged in, then xorg was started
(an alternative quick fix is switching to terminal by ctrl-alt-F1 and back)
- I had to disable some devices, because eg myaint switched input
device many times a sec rendering it unusable otherwise, some of those devices
configured did not work.

Details:
http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=FAQ#Is_hotplugging_supported_for_my_USB_tablet.3F
See 12 -> HAL or xorg.conf.d
2013-04-27 03:37:47 +02:00
Marc Weber 18297893a3 dbus_daemon is referenced by nixos 2013-04-12 00:19:15 +02:00
Marc Weber 788e760b51 experimental/shadow
For /etc/skel/* files put file contents into user directories rather than
"symlinks". This way users can edit their .bashrc files.

This small patch works fine with the multi-shell-support topic branch found on
my github page which rewrites .bashrc and similar files to source /etc/ files.
Thus users can opt-out or set options - still following system updates.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-04-11 16:24:11 +02:00
Marc Weber 9bf073b58b s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings 2013-04-10 23:54:37 +02:00
Marc Weber 88a8330d44 make ORBit2 build again by disabling deprecation warnings for linc2, the commit introducing it didn't show any strong reason 2013-04-08 14:50:10 +02:00
Marc Weber 4926ad90e7 adding lprof 2013-03-29 14:52:47 +01:00
Marc Weber 259f76d24c wacom driver updates required for intuos 5 wacom tablet.\
Note I had to disable some recognized "pens" by using xinput disable.
So maybe 2 drivers are active?
However tilt/preasure works nicely inside gimp, inkscape, mypaint
2013-03-24 18:55:43 +01:00
Marc Weber bfc290421d When enabling wacom put xsetwacom in PATH.
I know that gnome/kde may have their own way to configure wacom tablets
2013-03-24 18:31:31 +01:00
Marc Weber f3e6b42258 replace list by listOf using same style as for attrsOf 2013-03-14 17:09:21 +01:00
Marc Weber 5784fa5f79 for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work 2013-02-04 12:07:37 +01:00
Marc Weber 1a948d97a2 fix sort in lists.nix 2012-11-20 13:56:14 +01:00
Marc Weber 8dfa0a361f source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash 2012-10-25 06:52:43 +02:00
Marc Weber ca5077f03f 2.6-2 moved to 2.6-3, so patches were not found
Maybe some new important patches can be found here?
http://patch-tracker.debian.org/package/plotutils/2.6-3

upstream source didn't change
2012-10-25 06:07:39 +02:00
Marc Weber b18be4e5e5 adding csound 2012-10-18 06:24:32 +02:00
Marc Weber 7b40d67d61 adding taskwarrior 2012-10-11 06:12:23 +02:00
Marc Weber 2e7847cd12 making ati dirvers compile again
See comments on the nixos patch
2012-10-07 18:03:06 +02:00
Marc Weber 87bb6b1c6d making ati proprietary drivers work again
However SLIM is still broken and you have to create a
/usr/lib/dri/fglrx_dri.so symlink pointing to
/run/opengl-driver/lib/fglrx_dri.so

At least fgl_glxgears shows 10 times more frames per second now
2012-10-07 17:24:42 +02:00
Marc Weber 1c35a0ca48 adding python libraries serial and game which are both dependencies of plover steno engine which needs more testing 2012-09-27 01:35:40 +02:00
Marc Weber d9152f0133 fix build of smpeg 2012-09-27 01:29:53 +02:00
Marc Weber 8cb034fd30 fix blender build and enable parallel building 2012-09-19 22:41:15 +02:00
Marc Weber ef9a15a5a4 fix/update debootstrap (thereby updating fakeroot)
fakeroot is used to create devices.tar.gz now (thanks to aszlig)
2012-09-19 11:48:27 +02:00
Marc Weber aa583c8cf4 experimental/lib-fold-attr
adding useful function foldAttr which behave like fold on attr values grouped by name
(without assertions now)

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2012-08-28 15:06:14 +02:00
Marc Weber 47e67f5e9c renaming all occurrences of /var/run/{booted,current}-system
in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
2012-07-23 14:01:35 -04:00
Marc Weber 7ddea025e4 dont hardcode apache group name when setting permissions for state dir 2012-07-23 03:28:21 +02:00
Marc Weber 3221159f5f fix init-script-builder 2012-07-21 19:26:36 +02:00
Marc Weber 0dd9b4caaf reverting -r22286
svn path=/nixos/trunk/; revision=22358
2010-06-21 14:17:19 +00:00
Marc Weber f3e7f0fdf0 reverting my patch series adding -j -l support for make
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
2010-06-19 15:52:28 +00:00
Marc Weber f446814260 no longer pass -j to make without arg which means no limit on forks. This brought down the build farm
svn path=/nixpkgs/branches/stdenv-updates/; revision=22293
2010-06-16 12:39:19 +00:00
Marc Weber d0fd8da8f0 example how to pass options to nix-daemon
svn path=/nixos/trunk/; revision=22286
2010-06-15 19:04:06 +00:00
Marc Weber 2dafd54743 opt-out some failing phases
svn path=/nixpkgs/branches/stdenv-updates/; revision=22285
2010-06-15 19:00:58 +00:00
Marc Weber 7db7857d15 nix num-cores.patch
pass MAX_PARALLELIZATION and TARGET_LOAD to the builder. See comments

svn path=/nixpkgs/branches/stdenv-updates/; revision=22284
2010-06-15 19:00:54 +00:00
Marc Weber 3c14e712ca setup.sh: add -j and -l options
svn path=/nixpkgs/branches/stdenv-updates/; revision=22283
2010-06-15 19:00:51 +00:00
Marc Weber 4f1075c40b generic/setup.sh: remove duplication: - add generic showCommand function which prints a command before running it - add runMake which is using that function passing the makefile if set
make all make invokations use runMake

svn path=/nixpkgs/branches/stdenv-updates/; revision=22282
2010-06-15 19:00:48 +00:00
Marc Weber 02adc9484b adobe_flex_sdk, use - instead of _ in name
svn path=/nixpkgs/trunk/; revision=22269
2010-06-14 22:35:40 +00:00
Marc Weber 88d7d68c77 update Adobe Flex SDK
svn path=/nixpkgs/trunk/; revision=22260
2010-06-14 16:52:15 +00:00
Marc Weber 47046e66c4 update lvm2 (this time not using latest version because I hope this is more stable and won't be removed that fast..
svn path=/nixpkgs/trunk/; revision=22175
2010-06-08 05:44:04 +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
Marc Weber d3be228d96 adding firebird (and embedded library ?)
svn path=/nixpkgs/trunk/; revision=22130
2010-06-03 15:19:56 +00:00
Marc Weber cfec548174 [PATCH] Fix pidgin-sipe plugin to build with latest pidgin - contributed
by David Brown

svn path=/nixpkgs/trunk/; revision=22129
2010-06-03 15:14:29 +00:00
Marc Weber 0be243e26d t/gis/qgis
updating qgis

Signed-off-by: Marc Weber <marco-oweber@gmx.de>

svn path=/nixpkgs/trunk/; revision=22115
2010-06-03 00:51:23 +00:00
Marc Weber 0d6228fa83 t/gis/gdal
updating gdal

Signed-off-by: Marc Weber <marco-oweber@gmx.de>

svn path=/nixpkgs/trunk/; revision=22114
2010-06-03 00:51:20 +00:00
Marc Weber 5f5d6f185f t/gis/libgeotiff
adding libgeotiff

Signed-off-by: Marc Weber <marco-oweber@gmx.de>

svn path=/nixpkgs/trunk/; revision=22113
2010-06-03 00:51:13 +00:00
Marc Weber 8dcb020e80 updating opera 10.10
svn path=/nixpkgs/trunk/; revision=22112
2010-06-02 23:35:39 +00:00
Marc Weber 473d5a9ba8 pidgin update, ICQ messages were suddenly embedded within HTML text ?
svn path=/nixpkgs/trunk/; revision=22091
2010-06-01 17:45:05 +00:00
Marc Weber 5a59b1b55d adding PHP. 5.3.2. See comments.
I had to add the newer PHP because current PHP 5.2.11 doesn't read SOAP
from https urls. Debian's PHP does work - I couldn't find their fix

svn path=/nixpkgs/trunk/; revision=22056
2010-05-29 18:26:54 +00:00
Marc Weber 603fd4f206 HaXe and Neko update, C backend does work on NixOS
haxelib install hxcpp; Maybe export HXCPP_M64=1 then take off :)

svn path=/nixpkgs/trunk/; revision=22055
2010-05-29 18:26:45 +00:00
Marc Weber 932899f3da Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".
contributed by David Guibert
Signed-off-by: David Guibert <david.guibert@gmail.com>

svn path=/nixpkgs/trunk/; revision=22041
2010-05-28 10:57:50 +00:00
Marc Weber 814a4c93f7 iptables: hash did change
svn path=/nixpkgs/trunk/; revision=21993
2010-05-26 19:01:15 +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
Marc Weber 26e718ba23 move assertions so that buildign the NixOS manual doesn't fail
svn path=/nixpkgs/trunk/; revision=21855
2010-05-19 10:01:07 +00:00
Marc Weber 6361b3a682 adding ati-drivers There is still much to be done, see http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixpkgs/trunk/; revision=21848
2010-05-18 19:36:55 +00:00
Marc Weber 674d396576 adding initial support for proprietary ati drivers You have to add some impure paths, see: http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixos/trunk/; revision=21847
2010-05-18 19:36:11 +00:00
Marc Weber aebfa8548f Revert "update wmii. libixp vanished"
The new wmii has some wired behaviour:
- When you move windows the curser location changes.
  Until the window manager has changed that location movement of mouse is
  ignored.
- window do not always popup in the col which was focused.
- wmiimenu broke

old wmii does not build with newer libixp

Until I know how to fix those issues I'll revert my update

This reverts -r 21683

svn path=/nixpkgs/trunk/; revision=21816
2010-05-17 13:35:38 +00:00
Marc Weber 657ae2a621 adding libdwg - optional dependency of grass
svn path=/nixpkgs/trunk/; revision=21736
2010-05-12 00:50:01 +00:00
Marc Weber 75ca72cf75 adding GIS application OpenJUMP
svn path=/nixpkgs/trunk/; revision=21735
2010-05-11 22:19:37 +00:00