Michael Raskin
b26c770651
Exporting XFCE gvfs: it is referenced in NixOS, it is unclear how to remove the dependency cleanly and it affects rebuild even with config that doesn't mention XFCE at all.
2013-03-09 12:20:19 +04:00
Shea Levy
23cbda5b3c
man-pages: Update to 3.48
2013-03-08 19:49:53 -05:00
Shea Levy
08d076d6fc
Merge branch 'perl.130308' of git://github.com/jcumming/nixpkgs
...
Trivial update to XML-LibXML perlPackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:17:40 -05:00
Shea Levy
8934644d20
tor: minor cleanups
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:15:26 -05:00
Shea Levy
9a5ca5aced
tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do
2013-03-08 19:14:43 -05:00
Shea Levy
35d957b8f9
Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs
...
This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:13:17 -05:00
Shea Levy
9158ad45f1
Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs
...
This adds a new package, xchainkeys. It builds, so I ship.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:08:56 -05:00
Shea Levy
7410a36dec
Merge remote-tracking branch 'upstream/pygobject-2.28.6'
...
This branch updates pygobject (the diff itself is trivial), which
affects a lot of packages but due to the recent stdenv merge this seems
like a good time for this.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:05:25 -05:00
Shea Levy
e07a7e6156
Merge branch 'master' of git://github.com/fignuts/nixpkgs
...
This updates mysql-workbench. Didn't compile before, compiles now.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:01:04 -05:00
Shea Levy
064155ad38
Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs
...
Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:22:13 -05:00
Shea Levy
fc3994074e
Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs
...
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:19:02 -05:00
Shea Levy
5e434ef318
Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs
...
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:00:16 -05:00
Shea Levy
e13c058fd2
Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
...
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.
I've tested that it builds, nothing more.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -05:00
Shea Levy
b634efe63c
ocamlPackages.opam: Fix indentation
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:12:56 -05:00
Shea Levy
66ad165829
Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs
...
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:10:54 -05:00
Shea Levy
1670244f80
Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs
...
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
2013-03-08 17:03:22 -05:00
orbitz
55be059467
Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me
2013-03-08 22:59:54 +01:00
orbitz
98a6759bc7
Delete 0.9.4
2013-03-08 22:48:58 +01:00
orbitz
fd48192018
Add opam 0.9.5
2013-03-08 22:42:22 +01:00
Shea Levy
1de517844b
Whoops, buildNativeInputs is now nativeBuildInputs
2013-03-08 16:39:09 -05:00
Shea Levy
f2c79c4542
Remove some references to non-existent packages
2013-03-08 16:36:59 -05:00
Shea Levy
b938cacbe1
tmux: Update to 1.7
2013-03-08 15:49:22 -05:00
cillianderoiste
e5440d9a83
Merge pull request #362 from jcumming/firmware.130308
...
linux-firmware.git moved, and so did the intel wireless firmware urls.
2013-03-08 09:45:43 -08:00
Александр Цамутали
63256d0834
games/unvanquished: Update to 0.13.1.
2013-03-08 20:58:48 +04:00
Jack Cummings
1e2e5babf1
XML-LibXML-2.0014, as XML-LibXML-2.0001 doesn't exist upstream anymore
2013-03-08 07:44:30 -08:00
Jack Cummings
e863477995
need to link against -lgcc_s for the testsuite to work
2013-03-08 07:43:30 -08:00
Jack Cummings
7fcfcb2614
linux-firmware.git moved, and so did the intel wireless firmware urls.
2013-03-08 07:40:47 -08:00
Michael Raskin
f80dfee0c5
SBCL: patch for new Glibc no longer needed
2013-03-08 17:55:11 +04:00
Peter Simons
c8ff45b5c7
haskell-doctest: jailbreak to support QuickCheck version 2.6
2013-03-08 13:56:12 +01:00
Peter Simons
7ac086aab7
haskell-test-framework-quickcheck2: jailbreak to support QuickCheck version 2.6
2013-03-08 13:56:00 +01:00
Peter Simons
1f38a4ca66
haskell-cabal2nix: update to version 1.47
2013-03-08 13:44:59 +01:00
Peter Simons
cf53885d84
haskell-syb: update to version 0.4.0
2013-03-08 13:43:35 +01:00
Peter Simons
d7bc87693f
haskell-quickcheck: update to version 2.6
2013-03-08 13:43:21 +01:00
Peter Simons
f805ec1e0a
happstack-server: disable test suite to fix build error
2013-03-08 13:37:59 +01:00
Peter Simons
7db1b1e085
haskell-zip-archive: disable test suite
...
The test suite fails because it expects to find /usr/bin/zip.
2013-03-08 13:37:59 +01:00
Peter Simons
8dc669a726
haskell-uulib: update to version 0.9.15
2013-03-08 13:37:58 +01:00
Peter Simons
610f063554
haskell-http-conduit: update to version 1.9.1
2013-03-08 13:37:58 +01:00
Peter Simons
9ff74626f9
haskell-ghc-mod: update to version 1.12.1
2013-03-08 13:37:58 +01:00
Peter Simons
a675c7f245
haskell-data-default: update to version 0.5.1
2013-03-08 13:37:58 +01:00
Peter Simons
e447fcc8dd
haskell-cuda: re-generate the expression with recent cabal2nix
2013-03-08 13:37:58 +01:00
Peter Simons
d96af07c9f
xmobar: patch to support <freeratio> variable in memory monitor
2013-03-08 13:37:58 +01:00
Peter Simons
b31be07af0
haskell-multiarg: update to version 0.10.0.0
2013-03-08 13:37:58 +01:00
Peter Simons
1090f928c4
haskell-monad-control: update to version 0.3.2
2013-03-08 13:37:58 +01:00
Peter Simons
525342632f
haskell-hakyll: disable test suite to fix build error
2013-03-08 13:37:58 +01:00
Peter Simons
1d0e0fd167
haskell-hakyll: update to version 4.2.1.0
2013-03-08 13:37:57 +01:00
Peter Simons
fcd895afb3
pkgs/build-support/cabal: disable the split objects feature on Darwin by default
...
According to <http://hackage.haskell.org/trac/ghc/ticket/4013 >, this
feature won't work with XCode versions older than 3.2.
This means that Mac users will have considerably larger binaries because
some build-time dependencies (such as HTTP) will be mis-detected as
run-time dependencies.
2013-03-08 13:37:57 +01:00
orbitz
6da29419e4
Add opam 0.9.4
2013-03-08 11:56:50 +01:00
David Guibert
856f6c2aea
fix iftop
2013-03-08 09:08:57 +01:00
Song Wenwu
9cbcbc5323
add xchainkeys-0.11
2013-03-08 13:55:32 +08:00
Eelco Dolstra
234c6b74c6
Merge remote-tracking branch 'origin/stdenv-updates'
2013-03-07 23:09:05 +01:00
