1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Commit graph

5641 commits

Author SHA1 Message Date
Shea Levy 139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:13:19 -05:00
Shea Levy a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Peter Simons 72629aa7da sane-backends-git: update to version 1.0.24.73-g6c4f6bc (i.e. current Git HEAD) 2014-01-03 12:42:48 +01:00
Domen Kožar 3ef95f0582 Merge pull request #1453 from ttuegel/clementine
Add clementine-1.2.1 and dependencies
2014-01-02 14:21:18 -08:00
Thomas Tuegel 776dea8d24 add clementine-1.2.1 2014-01-02 14:49:22 -06:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Ricardo M. Correia dd93ce3378 saneBackends: Update to 1.0.24 2014-01-02 15:53:07 +01:00
Domen Kožar 3710322678 Merge pull request #1442 from ttuegel/vim
vim: enable support for Lua
2014-01-01 14:28:45 -08:00
Domen Kožar 28acbbef3a vim: ft-nix-support: update keywords, add builtins 2014-01-01 21:22:02 +01:00
Thomas Tuegel dd0f48ed98 vim: enable support for Lua 2014-01-01 09:30:57 -06:00
Vladimír Čunát 506a304181 fftw: minor update and major refactoring
- Unify the "single" and "float" variants, which are the same thing.
- Enable threads and openmp wrapper by default (they are very small).
- Don't use sse on i686, as I'm quite sure we have no warrant for that.
  Cf. http://en.wikipedia.org/wiki/Pentium_Pro
- Disable static libs (big, no indication we need them).
- I tested most builds using fftw (they build OK).
2014-01-01 13:05:56 +01:00
William A. Kennington III 184dd198fb subversion: Tweaks and Fixes
Remove ssl and compression options which are no longer valid when using
serf in place of neon. Also, make sure serf is an optional dependency.
2013-12-31 07:59:37 -06:00
Domen Kožar 68e37cf417 ike: add missing dependencies, note kernel compatibility 2013-12-30 22:19:16 +01:00
Michael Raskin a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
William A. Kennington III 0270be1eb6 subversion: Update from 1.7.14 -> 1.8.5 2013-12-30 00:08:59 +00:00
Marius Rejdak 2da33b4ecf tint2 nixpkg 2013-12-29 23:35:46 +01:00
William A. Kennington III b05d8d8310 vlc: Update from 2.1.1 -> 2.1.2 2013-12-29 21:35:01 +01:00
Domen Kožar 5603e611a7 xbmc: 12.2 -> 12.3 2013-12-29 17:53:40 +01:00
Michael Raskin e9ec56a596 Update vim_configurable to the same source tag as default vim 2013-12-29 19:38:43 +04:00
Michael Raskin c5bbad405d Merge pull request #1423 from wkennington/vim
Update vim from 7.4.23 -> 7.4.131
2013-12-29 07:05:17 -08:00
Michael Raskin c356b67ce7 Merge pull request #1414 from coroa/gammu
Add gammu version 1.33.0 - a library and command line utility for interfacing phones
2013-12-29 07:02:35 -08:00
Michael Raskin 6177a4f556 Merge pull request #1410 from ktosiek/pr/compton
Bump compton to v0.1_beta2
2013-12-29 07:01:53 -08:00
Michael Raskin e4f659c201 Merge pull request #1409 from urv/master
calibre: upgrade from 1.15.0 to 1.17.0
2013-12-29 07:01:31 -08:00
Jonas Hoersch 4418c1e1d7 Add gammu version 1.33.0 - a library and command line utility for interfacing phones 2013-12-29 15:13:23 +01:00
William A. Kennington III a2ff906257 vim: Update from 7.4.23 -> 7.4.131
Instead of applying all of the patches, this build pulls an archive from
the source code repo with all of the patches already applied. This is the
preferred way from http://www.vim.org/sources.php
2013-12-29 07:51:58 -06:00
Domen Kožar 7324936915 salut_a_toi: use setuptools 2013-12-29 13:06:42 +01:00
Domen Kožar 5ac2d969f2 salut-a-toi: remove distribute dependency (not needed) 2013-12-29 10:24:37 +01:00
Vladimír Čunát 9f735bdf57 gnumeric: add platforms, maintainer 2013-12-28 15:49:19 +01:00
Vladimír Čunát a126ce011a gnumeric: add schemas and icons, refactor
Also move goffice under gnome3,
as it's released in the same way.
2013-12-28 15:45:20 +01:00
Moritz Ulrich 5890215501 windowManager.xmonad: Make it configurable and extensible.
PR #1366
The previous windowManager.xmonad option only starts xmonad and
doesn't make ghc available. This assumes that the user has GHC with
access to the xmonad package in his PATH when using xmonad.

Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE}
environment variables which define the path to either ghc or xmessage.
These are set automatically when using xmonad through
windowManager.xmonad.

My (or specific: @aristidb and my) changes make it possible to use
Xmonad without adding GHC to any profile. This is useful if you want
to add a different GHC to your profile.

This commit introduces some options:

- xmonad.haskellPackages: Controls which Haskell package set & GHC set
  is used to (re)build Xmonad

- xmonad.extraPackages: Function returning a list of additional
  packages to make available to GHC when rebuilding Xmonad

- xmonad.enableContribExtras: Boolean option to build xmonadContrib
  and xmonadExtras.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-28 09:29:53 +01:00
Moritz Ulrich 5331088ba1 ledger3: Update to latest git (8d38060968) 2013-12-28 00:57:17 +00:00
Song Wenwu 9b273eb971 midori: build with webkit2 to support GTK+2 plugins (close #1412) 2013-12-26 18:14:45 +01:00
Song Wenwu 55a49a3f93 midori: fix file chooser dialog (Ctrl+o)
vcunat: change to double-prefix of the variable, instead of clearing it.
2013-12-26 18:14:45 +01:00
Song Wenwu 0889c86b86 midori: update from 0.4.4 to 0.5.6 (close #1411) 2013-12-26 09:19:19 +01:00
Tomasz Kontusz 37a3f21799 Bump compton to v0.1_beta2 2013-12-26 01:22:24 +01:00
Florian Friesdorf 7a988c62af git-repo-1.20, update and pin python 2013-12-26 01:01:01 +01:00
Florian Friesdorf 46f627e8f7 git-repo-1.19 2013-12-26 00:45:21 +01:00
Edward Tjörnhammar 01c39bdefc Adding IntelliJ IDEA13 Community and Ultimate 2013-12-26 00:12:19 +01:00
Vladimír Čunát b80d1c5923 Merge x-updates 2013-12-25 23:56:41 +01:00
AndersonTorres 378f962c0e Aegisub: New Package
Adding Aegisub: an advanced movie subtitle editor
2013-12-25 22:24:19 +01:00
Arvin Moezzi 8fc2319320 calibre: upgrade from 1.15.0 to 1.17.0 2013-12-25 14:51:08 +01:00
Peter Simons a4462d9a03 git-annex: fix build some more 2013-12-23 22:30:43 +01:00
Peter Simons 47a3ece984 git-annex: disable test suite to fix build
The "lock" test fails. Upstream knows this, and apparently the failure
is caused by a bug in the test suite -- not in the application code.
2013-12-23 22:30:43 +01:00
Peter Simons 2ac0fedb60 haskell-git-annex: update to version 5.20131221 2013-12-23 22:30:42 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik 939a0d3b4a firefox: enable gstreamer for h.264 support in HTML5 video 2013-12-23 15:48:36 +01:00
Mathijs Kwik 82131d5013 clucene_core: switch to versioning scheme to make overriding easier 2013-12-23 15:48:35 +01:00
Mathijs Kwik e966ebd5e1 kdesvn: upgrade to 1.6.0 2013-12-23 10:25:16 +01:00
Mathijs Kwik c5d05a5652 jigdo: depend on db4 instead of db45 2013-12-23 10:25:15 +01:00
Mathijs Kwik a508d30c53 openimageio: hash change 2013-12-23 10:25:15 +01:00