Commit graph

37601 commits

Author SHA1 Message Date
Sander van der Burg ad8974fc53 Disable test for setuptools on darwin, and add darwin to supported platforms for serf. This should make nodejs working on darwin again 2014-01-06 14:12:37 +01:00
Peter Simons 4fbb9e293c Merge pull request #1460 from ttuegel/texlive
Bump TeXLive versions
2014-01-06 03:24:23 -08:00
Peter Simons c70c8a7158 git-annex: try to fix test suite 2014-01-06 12:09:58 +01:00
Peter Simons ca6c043312 haskell-crypto-conduit: jailbreak for recent versions of crypto-api 2014-01-06 12:09:58 +01:00
Peter Simons 3394e55f60 haskell-web-routes: update to version 0.27.4 2014-01-06 12:09:58 +01:00
Peter Simons 18914b931e haskell-web-routes-boomerang: update to version 0.28.1 2014-01-06 12:09:58 +01:00
Peter Simons c126096e46 haskell-persistent-sqlite: update to version 1.3.0.1 2014-01-06 12:09:58 +01:00
Peter Simons 117fcf801b haskell-crypto-api: update to version 0.13 2014-01-06 12:09:58 +01:00
Peter Simons 9ea0efdebe haskell-cipher-aes128: update to version 0.6 2014-01-06 12:09:57 +01:00
Peter Simons 3eeae1c4df haskell-boomerang: update to version 1.4.1 2014-01-06 12:09:57 +01:00
Peter Simons 713633f051 haskell-hoogle: update to version 4.2.27 2014-01-06 12:09:57 +01:00
Peter Simons 75b08cc830 haskell-force-layout: update to version 0.3 2014-01-06 12:09:57 +01:00
Peter Simons d91b03e9a8 haskell-diagrams: update to version 1.0.0.1 2014-01-06 12:09:57 +01:00
Peter Simons d8dc14c8d7 haskell-diagrams-contrib: update to version 1.1 2014-01-06 12:09:57 +01:00
Peter Simons de9ff84ca0 haskell-network: update to version 2.4.2.2 2014-01-06 12:09:57 +01:00
Peter Simons a397d62d31 haskell-text: update to version 1.0.0.1 2014-01-06 12:09:57 +01:00
Peter Simons 822c755ea9 haskell-smtp-mail: update to version 0.1.4.4 2014-01-06 12:09:57 +01:00
Peter Simons 0d06ef978f haskell-persistent-template: update to version 1.3.1 2014-01-06 12:09:57 +01:00
Peter Simons f77b9da184 haskell-mmorph: update to version 1.0.1 2014-01-06 12:09:56 +01:00
Peter Simons 4f78ed6da7 haskell-liblastfm: update to version 0.3.2.0 2014-01-06 12:09:56 +01:00
Peter Simons 7a3ed91a65 haskell-hslua: update to version 0.3.10 2014-01-06 12:09:56 +01:00
Peter Simons 6851ccd529 haskell-foldl: update to version 1.0.1 2014-01-06 12:09:56 +01:00
Peter Simons c7358d64a8 haskell-errors: update to version 1.4.5 2014-01-06 12:09:55 +01:00
Peter Simons fa203c0673 haskell-cassava: update to version 0.3.0.0 2014-01-06 12:09:55 +01:00
Peter Simons 1eb504e542 haskell-DRBG: update to version 0.5.2 2014-01-06 12:09:55 +01:00
Peter Simons 74c4d15bf2 haskell-elm-server: update to version 0.10.1 2014-01-06 12:09:55 +01:00
Peter Simons 75090c7c86 haskell-git-annex: update to version 5.20131230 2014-01-06 12:09:55 +01:00
Peter Simons 27425f638d haskell-wai-handler-fastcgi: re-generate with cabal2nix 2014-01-06 12:09:55 +01:00
Shea Levy 053e029ee6 Some arches have multiple Makefiles
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 16:07:32 -05:00
Shea Levy b0000b29af gummiboot module: Don't use obsolete environment.nix option
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 15:53:39 -05:00
Shea Levy 886a675f79 Fix extra kernelDev reference
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 13:15:03 -05:00
Moritz Heidkamp b10fe8ae3f stumpwm: Copy stumpish to bin/, add contrib/ directory. 2014-01-05 17:38:14 +00:00
Shea Levy adb57a0cc4 kernel: Fix depmod references
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 10:31:16 -05:00
Thomas Tuegel 17d02b49e3 texlive-beamer: bump to version 3.24 2014-01-05 09:00:25 -06:00
Thomas Tuegel 522a835743 texlive-extra: bump to version 20131219 2014-01-05 09:00:25 -06:00
Thomas Tuegel a6f9ad96ee texlive-core: bump to version 20131219 2014-01-05 09:00:25 -06:00
Shea Levy 1d11a242b3 Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 08:11:18 -05:00
Shea Levy ef930ced64 klibcShrunk should be a kernelPackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:45:14 -05:00
Shea Levy f4ce59cee0 Remove non-kernel-specific klibc derivation
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:38:58 -05:00
Michael Raskin 4dad238bab Fix forced CPU choice according to current openblas documentation 2014-01-05 16:34:05 +04:00
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
Ian-Woo Kim 010e63c69d poppler-glib.pc has ${includedir}/poppler in cflags (needed for dependent pkgs)
Cf. #1458.
2014-01-05 13:03:30 +01:00
Shea Levy ac2035287f Greatly reduce kernel closure size
Based on access analysis with strace, I determined an essentially
minimal required set of files from the kernel source that was needed to
build all current kernel packages on 3.10, which ultimately resulted in
keeping 30M of source. Generalizing from that minimal set, which
required ad-hoc specifications of which headers outside of include/ and
arch/*/include and which files in the scripts/ directory should be kept,
to a policy of keeping all non-arch-specific headers that aren't part of
the drivers/ directory and the entire scripts/ directory added an
additional 17M, but there was nothing in the analysis that indicated
that that ad-hoc specification was at all complete so I think the extra
hit is worth the likely greater compatibility.

For reference, we now keep:

* All headers that are NOT in arch/${notTargetArch}/include or drivers/
* The scripts/ directory
* Makefile
* arch/${targetArch}/Makefile

IMO the most likely cause of future problems are the headers in
drivers/, but hopefully they won't actually be needed as they add 50M
Ideally kernel packages would only use include and
arch/${targetArch}/include, but alas this is observably not the case.

master:
  * $out
    * size: 234M
    * references-closure: linux-headers, glibc, attr, acl, zlib, gcc,
      coreutils, perl, bash
merge-kernel-builds:
  * $out
    * size: 152M
    * references-closure: none
  * $dev
    * size: 57M
    * references-closure: linux-headers, glibc, zlib, gcc

So even with the non-minimal set we still beat out master. Keeping the
drivers headers would make us only slightly bigger.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 06:55:47 -05:00
Nixpkgs Monitor a4d4ddb8ef youtubeDL: update from 2013.12.20 to 2014.01.03 2014-01-05 08:15:21 +02: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
Michael Raskin 75f97f5299 Update Octave to 3.8.0 2014-01-05 02:49:45 +04:00
Michael Raskin 30ddb92a2d Merge pull request #1457 from iyzsong/supercollider
add SuperCollider 3.6.6
2014-01-04 05:51:25 -08:00
Song Wenwu 5f3a737d79 add SuperCollider 3.6.6 2014-01-04 21:39:35 +08:00
Michael Raskin f6d51f7717 Buid Xvnc in TigerVNC 2014-01-04 15:02:52 +04:00
Michael Raskin ad45ac4c2a Update ZPAQ 2014-01-04 15:01:30 +04:00