Commit Graph

55344 Commits

Author SHA1 Message Date
Pascal Wittmann
eac4f2aa31 calibre: update from 2.29.0 to 2.30.0 2015-06-08 12:17:32 +02:00
Jaka Hudoklin
8b79a09f78 Merge pull request #7553 from offlinehacker/pkgs/python-packages/graphite-beacon
Add graphite beacon package and module
2015-06-08 12:17:01 +02:00
Kovacsics Robert (NixOS-SSD2)
f4dce11c19 Major update to vips and nip2 to 8.0.2, changes:
- Much better conversion to greyscale
- More efficient use of file descriptors
- Rewritten TIFF pyramid creator
- Removed old stuff

See http://libvips.blogspot.co.uk/2015/05/whats-new-in-80.html
and https://github.com/jcupitt/libvips/blob/master/ChangeLog
2015-06-08 10:56:00 +01:00
Peter Simons
b5f868f48b Merge pull request #8150 from ts468/upstream.calamares
Add Calamares: A distribution independent installer framework.
2015-06-08 11:48:41 +02:00
Kovacsics Robert (NixOS-SSD2)
8e7f4d3c33 Remind update to 3.1.14, changes:
* Version 3.1 Patch 14 - 2014-04-24

- NEW FEATURE: Putting the line __EOF__ in a .rem file causes Remind to
  treat it as end-of-file.

- IMPROVEMENT: Use better PNG images for moons in the HTML display

- CHANGE: Author name updated from "David" to "Dianne"

- BUG FIX: The "-n" command-line option should really run in
  "ADVANCE_MODE" rather than "CAL_MODE" internally; otherwise, the
  substitution sequences may be misinterpreted.

- BUG FIX: A typo in clearing out MD5 sum context has been fixed.

- BUG FIX: Typo in Spanish translation was fixed.
2015-06-08 10:36:18 +01:00
Thomas Strobel
d3435d7ce0 New package: Calamares
Add Calamares, a distribution independent installer framework.
2015-06-08 11:22:09 +02:00
Thomas Strobel
02b7901023 New flag for compiling libyaml-cpp as PIC. 2015-06-08 11:17:50 +02:00
Vladimír Čunát
043a8478c3 SDL: propagate libcap and fixup native inputs
Close #8205.
All inputs except pkgconfig shouldn't be native but rather disabled on
cygwin, I suppose.
2015-06-08 11:16:33 +02:00
Anders Papitto
50e9fa5719 dirt: include sound samples (close #8179)
also add self as maintainer
2015-06-08 10:16:03 +02:00
Jude Taylor
b9de32de5b update GHC HEAD and configuration 2015-06-08 00:48:34 -07:00
Lengyel Balázs
c3d9e90f0e Updated apcupsd to version 3.14.13 2015-06-08 09:03:30 +02:00
William A. Kennington III
6e68e874b5 openjdk8: Fix refernces to the bootstrap 2015-06-08 00:00:12 -07:00
William A. Kennington III
a5ef488b11 opendjk: Make boostraps for each major version and update openjdk7 2015-06-07 21:02:02 -07:00
William A. Kennington III
a8d1010027 icedtea: Remove 2015-06-07 21:02:02 -07:00
William A. Kennington III
0cc68fa478 openjdk-make-bootstrap: Use openjdk8 2015-06-07 21:02:02 -07:00
William A. Kennington III
bdcb721546 java: Refactor top level and build ordering 2015-06-07 21:02:02 -07:00
Thomas Tuegel
e0db2213fc Update qt-5.4.1 -> qt-5.4.2 2015-06-07 22:18:35 -05:00
Robbin C
757942ddbf wavegain: show correct maintainer 2015-06-08 10:31:30 +08:00
Tobias Geerinckx-Rice
09b95b88a5 python-packages: add buttersink 0.6.6 2015-06-08 01:19:07 +02:00
Tomasz Kontusz
380c7d1f72 Bump sstp to 1.0.10 2015-06-08 00:23:46 +02:00
Tomasz Kontusz
bbf0f7e16f Bump d-feet to 0.3.9 2015-06-08 00:10:48 +02:00
William A. Kennington III
514a9fdf87 Merge pull request #8173 from dezgeg/pr-kernel-config
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
2015-06-07 10:14:51 -07:00
fro_ozen
c5993a1988 Change dina-font's platform to platform.unix 2015-06-07 19:05:17 +02:00
fro_ozen
4ae0815d3b Add the tewi font 2015-06-07 19:05:05 +02:00
Nixpkgs Monitor
389820e798 weechat: update from 1.1.1 to 1.2, potentially fixes CVE-2012-6047, CVE-2012-6554 2015-06-07 15:43:54 +02:00
Moritz Ulrich
f68ab19ff5 slic3r: Update to 1.2.7. 2015-06-07 15:43:53 +02:00
Nixpkgs Monitor
2a74e84992 pngcrush: update from 1.7.83 to 1.7.85 2015-06-07 15:43:53 +02:00
Nixpkgs Monitor
c25027f210 openttd: update from 1.4.4 to 1.5.1 2015-06-07 15:43:53 +02:00
Arseniy Seroka
ab8561e3e5 fix: vim-xkbswitch proper lib 2015-06-07 16:00:13 +03:00
Arseniy Seroka
d2ee96c7b8 Merge pull request #8208 from magnetophon/caps-update-master
update caps to 0.9.24
2015-06-07 14:38:51 +03:00
Herwig Hochleitner
8b0b9be025 emacs24: add options for acl and gpm 2015-06-07 13:26:27 +02:00
Aristid Breitkreuz
f63a9f2534 fix libcap for packages depending on pulseaudio 2015-06-07 11:06:54 +00:00
Bart Brouns
dbec88f564 update caps to 0.9.24 2015-06-07 12:05:11 +02:00
Vladimír Čunát
317f4ea72d ncurses: header location fixes
- move headers directly to $out/include and set up symlinks.
Some packages were failing to find them (e.g. mariadb).
- postInstall was failing, only it was ignored due to a bug;
now it succeeds.
2015-06-07 09:22:35 +02:00
Vladimír Čunát
4c475520d9 spidermonkey_17: remove *.a to save 8 MB
The sole user (polkit) still builds fine.
Inspired by #8147.
2015-06-07 09:22:14 +02:00
Vladimír Čunát
5df1aadd68 glib hooks: move gsettings-schemas if on wrong place
Fixes #7325.
2015-06-07 09:22:13 +02:00
Vladimír Čunát
0b216645bd gtk+ stack: leftover "major" updates 2015-06-07 09:22:13 +02:00
Vladimír Čunát
deb33d513f dbus: small update 2015-06-07 09:22:13 +02:00
Vladimír Čunát
d57ef6b523 liferea: fix build problem hidden by #7524 2015-06-07 09:21:20 +02:00
Arseniy Seroka
944972ba4a Merge pull request #8199 from bobvanderlinden/zopfli
added zopfli package
2015-06-07 01:13:58 +03:00
Peter Simons
0520540018 haskell-bytestring-builder: trigger rebuild with GHC 7.8.x to mitiagate broken library ID 2015-06-07 00:09:06 +02:00
Peter Simons
820c87af1f haskell-webwebsockets: disable spuriously failing test suite 2015-06-07 00:09:06 +02:00
Peter Simons
14cf76bb84 hackage-packages.nix: update to 7e9d164c83 with hackage2nix revision d827dc6865dcad7d4890f27985383cc6d7cd1236 2015-06-07 00:09:01 +02:00
Bob van der Linden
a818dba90b added zopfli package 2015-06-06 23:59:51 +02:00
Arseniy Seroka
433a8d766e Merge pull request #8166 from richardlarocque/firefox_icon
Fix firefox-bin icon path
2015-06-07 00:14:37 +03:00
Mateusz Kowalczyk
423c666628 Merge pull request #8202 from ardumont/add-apvlv
[new] Add apvlv pdf reader
2015-06-06 20:58:17 +01:00
William A. Kennington III
4991e62285 musl: 1.1.9 -> 1.1.10 2015-06-06 12:56:10 -07:00
William A. Kennington III
0a8e830196 kernel: 4.0.4 -> 4.0.5 2015-06-06 12:32:58 -07:00
William A. Kennington III
24042f3803 kernel: 3.14.43 -> 3.14.44 2015-06-06 12:32:58 -07:00
William A. Kennington III
1adef3db3d kernel: 3.10.79 -> 3.10.80 2015-06-06 12:32:58 -07:00
lethalman
df08e5adfc Merge pull request #7955 from obadz/dotnet
dotNET packages
2015-06-06 21:21:55 +02:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
Domen Kožar
a96f7c9e0a Merge pull request #8197 from taku0/firefox-bin-libmozgnome
firefox-bin, thunderbird-bin: update patchelf arguments
2015-06-06 21:03:16 +02:00
William A. Kennington III
40b66f6131 Revert "libmicrohttpd: 0.9.41 -> 0.9.42"
This reverts commit 89d9a6079c.
2015-06-06 12:02:49 -07:00
Antoine R. Dumont
dac5a45acf Add apvlv pdf reader 2015-06-06 21:02:46 +02:00
William A. Kennington III
d30d0c783d Revert "pam: Factor out dependencies"
This reverts commit 7141d96bde.
2015-06-06 12:02:38 -07:00
William A. Kennington III
9882cecb10 Revert "Use mit5 as kerberos since it is better supported"
This reverts commit 80648d7e24.
2015-06-06 12:02:26 -07:00
William A. Kennington III
3d92654e13 Revert "heimdal: No need to override openldap anymore"
This reverts commit 4fa5cc71f2.
2015-06-06 12:02:18 -07:00
William A. Kennington III
d5ac5c00d8 Revert "heimdal: 1.5.3 -> 2015-05-26"
This reverts commit 1e14f0a055.
2015-06-06 12:02:06 -07:00
William A. Kennington III
b073b56325 Revert "Use libheimdal instead of heimdal"
This reverts commit 06c9915ed1.
2015-06-06 12:01:59 -07:00
William A. Kennington III
cfd831a40a Revert "samba: Use built in kerberos"
This reverts commit 6b17264e08.
2015-06-06 12:01:50 -07:00
William A. Kennington III
c6175f8161 Revert "heimdal: Remove more references"
This reverts commit 7b1336d2f1.
2015-06-06 12:01:42 -07:00
Arseniy Seroka
ee8825935f google-music: beta_1.0.129.6633 -> beta_1.0.182.3607 2015-06-06 20:43:09 +03:00
Vincent Laporte
142400b8d5 ocaml-merlin: update from 2.1.2 to 2.2 2015-06-06 17:42:24 +02:00
obadz
d4681bf626 Lay down the foundation for packaging the .NET echosystem
- fetchNuGet can fetch binaries from nuget servers
- buildDotnetPackage can build .NET packages using mono/xbuild
  - Places nuget & paket as they would clash with nix
  - Patch project files because F# targets are expected to be found in
    the mono directory (and we know that's not going to happen on nix)
  - Find DLLs that were copied from buildInputs and replace by symlink
    for sharing
  - Export produced DLL via the pkg-config mechanism
  - Create wrappers for produced EXEs
- Repackaged this new infrastructure: keepass, monodevelop
- Newly packaged: ExtCore, UnionArgParser, FSharp.Data, Paket, and a
  bunch more..

This is a combination of 73 commits.
2015-06-06 09:06:22 -04:00
Arseniy Seroka
4cf3596fda Merge pull request #8198 from vbgl/re-1.4
ocaml-re: update from 1.3.1 to 1.4.0
2015-06-06 15:58:40 +03:00
Arseniy Seroka
5395128a36 Merge pull request #8196 from taku0/flashplayer_2.2.202.460
flashplayer: Update from 11.2.202.457 -> 11.2.202.460
2015-06-06 15:58:24 +03:00
Arseniy Seroka
90f4843f45 f2fs-tools: 1.3.0 -> 1.4.1 2015-06-06 15:22:02 +03:00
Tobias Geerinckx-Rice
8c0389ac01 python-packages: prompt_toolkit -> 0.39
Fixes:
- Fixed layout.py example.
- Fixed eventloop for Python 64bit on Windows.
- Fix in history.
- Fix in key bindings.
2015-06-06 12:28:48 +02:00
Vincent Laporte
e32d6f6b52 ocaml-re: update from 1.3.1 to 1.4.0 2015-06-06 12:08:09 +02:00
taku0
5f890ceca1 firefox-bin, thunderbird-bin: update patchelf arguments 2015-06-06 19:05:57 +09:00
taku0
6aa10201cc flashplayer: Update from 11.2.202.457 -> 11.2.202.460 2015-06-06 18:38:18 +09:00
Peter Simons
08c4a192e2 ghc-7.10.x.nix: remove obsolete re-build hacks from the package set configuration 2015-06-06 09:43:15 +02:00
Bjørn Forsman
52184b53c0 Revert "Revert "Explicitly pass -pthread flag to fix the build after some updates""
This reverts commit 6cfea50ad1.

I think the reason for the revert was because of patch dependencies. We really
need this patch to fix heimdal build.

Or else:

  $ nix-build -A heimdal
  ...
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_getspecific'
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_key_create'
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_setspecific'
  collect2: error: ld returned 1 exit status
  Makefile:509: recipe for target 'tc' failed
  make[2]: *** [tc] Error 1
2015-06-06 09:23:33 +02:00
Peter Simons
7e04b7319c haskell: disable parallel compilation for libraries to mitigate the effects of GHC's non-deterministic library ID bug
Further details can be found at <https://github.com/peti/ghc-library-id-bug>
and <https://ghc.haskell.org/trac/ghc/ticket/4012>.
2015-06-05 23:55:01 +02:00
Thomas Tuegel
fbcdb66264 kdeApps_15_04.ktp-text-ui: add missing kdbusaddons dependency 2015-06-05 16:39:50 -05:00
Thomas Tuegel
217506aca1 Update kde-applications-15.04.1 -> kde-applications-15.04.2 2015-06-05 16:39:50 -05:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
William A. Kennington III
ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Ricardo M. Correia
9176f73cee buildRustPackage: Cosmetic improvement 2015-06-05 19:18:45 +02:00
lethalman
b19cae8544 Merge pull request #8185 from desiderius/master
python-packages: updates pyinotify 0.9.3 to 0.9.5
2015-06-05 18:38:36 +02:00
lethalman
9683743e68 Merge pull request #8191 from ragnard/wrk-update
wrk: Update from 3.1.2 to 4.0.0 (master)
2015-06-05 18:31:18 +02:00
goibhniu
c17aa9d3c6 Merge pull request #7875 from fkz/digikam
updated digikam to version 4.10.0
2015-06-05 17:53:55 +02:00
Ragnar Dahlén
45cad45e4d wrk: Update from 3.1.2 to 4.0.0 (master) 2015-06-05 15:15:21 +01:00
Eelco Dolstra
a70d0275e2 nixUnstable: Bump
This should fix the NixOS installer tests.
2015-06-05 13:53:49 +02:00
Peter Simons
7acb77ca2b cabal2nix: run "git reset --hard" to clean up the source to avoid the "-dirty" tag 2015-06-05 12:42:34 +02:00
Peter Simons
c1c4ca08de youtube-dl: clean up the expression and document the pandoc situation
This patch resolves https://github.com/NixOS/nixpkgs/pull/8184.
2015-06-05 10:38:35 +02:00
Michael Phillips
86a511a398 youtube-dl: remove unnecessary pandoc dependency 2015-06-05 10:31:59 +02:00
desiderius
daf0e6500d python-packages: updates pyinotify 0.9.3 to 0.9.5 2015-06-05 09:20:46 +02:00
William A. Kennington III
6d42d6928e Merge pull request #8111 from codyopel/musescore
musescore: 2.0.0 -> 2.0.1
2015-06-05 00:13:02 -07:00
William A. Kennington III
04f0ab105c Merge pull request #8105 from codyopel/beets
Updated Beets and dependenecies
2015-06-04 23:59:14 -07:00
Rok Garbas
a84e6336bd cygwin: make coreutils build on cygwin 2015-06-05 00:39:38 +02:00
Rok Garbas
9e99a66c24 cygwin: make flex building on cygwin 2015-06-05 00:39:29 +02:00
Rok Garbas
8908471ecc cygwin: add needed patches for boost 1.57.0 to build 2015-06-05 00:39:15 +02:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tobias Geerinckx-Rice
860589227b eid-mw: don't install useless about-eid-mw.desktop 2015-06-04 20:31:05 +02:00
Eelco Dolstra
99d2e80d97 In VM builds, connect stdin to /dev/null
This prevents programs from hanging while trying to read from stdin.
2015-06-04 20:08:56 +02:00
Allen Nelson
8bf170f280 Remove lingering dependence on atlas with numpy.
Closes https://github.com/NixOS/nixpkgs/pull/8133.
2015-06-04 20:07:41 +02:00
Peter Simons
f1587a2d1e Move numpy-scipy-support.nix file from the top-level to development/python-modules.
The top-level is not supposed to contain sub-directories, IMHO.
2015-06-04 19:59:46 +02:00
Eelco Dolstra
3ede0a64a2 make: Don't segfault if we can't get a tty name
This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
2015-06-04 19:47:34 +02:00
Tobias Geerinckx-Rice
fcee71066b rsstail -> 1.9.1 2015-06-04 18:35:44 +02:00
Tobias Geerinckx-Rice
921249e13d keyfinder -> 1.26 2015-06-04 18:35:43 +02:00
Tobias Geerinckx-Rice
5cb1af03ef libkeyfinder -> 0.11 (final) 2015-06-04 18:35:43 +02:00
Tobias Geerinckx-Rice
f5c5e4af74 perl-packages: IOSocketSSL -> 2.016
Many, many fixes. Too many to list here. See:
<https://github.com/noxxi/p5-io-socket-ssl/blob/master/Changes>
2015-06-04 18:35:43 +02:00
Eelco Dolstra
08d4e4ce18 Merge pull request #8175 from wizeman/u/zfs-fix-rm
zfs: Fix systemd warning
2015-06-04 17:43:32 +02:00
Peter Simons
2db9a8289d haskell-semigroupoids: disable doctests suite to avoid version conflict with doctest 0.10.x 2015-06-04 17:42:06 +02:00
Peter Simons
e0f7ab678a ghc-events: fix build of latest version with ghc-7.8.x 2015-06-04 17:42:06 +02:00
Peter Simons
a982892116 Fix evaluation errors on Hydra. 2015-06-04 17:42:06 +02:00
Peter Simons
dbf55842e8 haskell-comonad: disable test suite to work avoid doctest failure 2015-06-04 17:42:06 +02:00
Peter Simons
697a80c004 haskell-influxdb: build has been fixed upstream 2015-06-04 17:42:06 +02:00
Peter Simons
6130aa2a4d haskell-cipher-aes: test suite has been fixed upstream 2015-06-04 17:42:06 +02:00
Peter Simons
80e98ba00a hackage-packages.nix: update to 25f7b30351 with hackage2nix revision d8b7e62373ad16bdc2a5a93d0870bc05b814ac39 2015-06-04 17:42:02 +02:00
Ricardo M. Correia
3afae4037b zfs: Fix systemd warning
The `zfs-share` service was trying to execute the `rm` binary, but it
was providing an invalid `/bin` path.

This should fix #8171.
2015-06-04 17:35:39 +02:00
Vladimír Čunát
646ee283e8 gst-plugins-base-0.10: fix 32-bit build with gcc-4.9 2015-06-04 16:15:35 +02:00
Vladimír Čunát
aaaa9f0041 lame: fix build on 32-bit with gcc 4.9 2015-06-04 16:13:06 +02:00
Eelco Dolstra
f1d465f429 pulseaudio: Revert to regular style
Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
2015-06-04 14:54:54 +02:00
Eelco Dolstra
f08c8bc752 postgresql: Latest versions 2015-06-04 14:54:54 +02:00
Eelco Dolstra
22c627bf5b Remove PostgreSQL 8.4 (EOL) 2015-06-04 14:54:54 +02:00
Eelco Dolstra
fb2d45233a Fix typos 2015-06-04 14:54:54 +02:00
Eelco Dolstra
330d198be1 libgcrypt: Revert to old style 2015-06-04 14:54:54 +02:00
Eelco Dolstra
c47e78bbec libssh: Revert to old style 2015-06-04 14:54:53 +02:00
Eelco Dolstra
5b7c6d0440 audit: Update to 2.4.2 2015-06-04 14:54:53 +02:00
Eelco Dolstra
7fae300ebc e2fsprogs: Update to 1.42.13 2015-06-04 14:54:53 +02:00
Eelco Dolstra
e3356b396d Revert "libssh2: Modernize Build"
This reverts commit e9ee5f9961.
2015-06-04 14:54:53 +02:00
Eelco Dolstra
487736dc62 Revert "libssh2: Fix for darwin"
This reverts commit 2c9481e0fd.
2015-06-04 14:54:53 +02:00
Eelco Dolstra
f1f7bd9a93 libmicrohttpd: Fix build and drop curl dependency
Curl was only used for the test suite, which was disabled anyway.
2015-06-04 14:54:53 +02:00
Eelco Dolstra
020cb43f55 Revert "kerberos: Modernize build"
This reverts commit 9740b0d12d.
2015-06-04 14:54:52 +02:00
Eelco Dolstra
056e2c8d6a Revert "heimdal: Disable DCE as it was breaking the build"
This reverts commit 0f2de4c64e.
2015-06-04 14:54:52 +02:00
Eelco Dolstra
6cfea50ad1 Revert "Explicitly pass -pthread flag to fix the build after some updates"
This reverts commit ed38a2d32b.
2015-06-04 14:54:52 +02:00
Eelco Dolstra
6c878e0d05 Fix cacert 2015-06-04 14:54:52 +02:00
Eelco Dolstra
cde5053d9a Revert "curl: Modernize build"
This reverts commit 5e3fe3916a.
2015-06-04 14:54:52 +02:00
Eelco Dolstra
68493cd8dc Revert "curl: propagate inputs instead of patching pkgconfig"
This reverts commit 206d63edac.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
513bd8bd22 Revert "libmicrohttpd: Modernize"
This reverts commit c5d13d4fe9.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
eae17c3743 Revert "libxml2: Refactor and fix library propagation"
This reverts commit 287ec76b8f.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
16f87d772f Revert "libverto: Add derivation"
This reverts commit 4389ae5208.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
ab8b68cd99 Revert "bind: Modify build"
This reverts commit 0a06b99d69.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
676fbc2578 Revert "bind: Enable parallel building"
This reverts commit e74b5704a8.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
4fdf489073 Revert "dnsutils: Add smaller derivation of bind"
This reverts commit bb6ac771c4.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
0a4de71cb0 Revert "bind: Add propagatedBuildInputs"
This reverts commit 9f70b1ab31.
2015-06-04 14:54:51 +02:00
Eelco Dolstra
4c16c271f6 Revert "audit: 2.9.1 -> 2.9.2"
This reverts commit 7e126ac83e.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
5931932f05 Revert "rsyslog: krb5 -> libkrb5 argument changed few commits ago"
This reverts commit 6a5126348b.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
832aeb66f8 Revert "Fix krb5 reference"
This reverts commit 9f0da5315b.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
93bd7f95aa Revert "389-ds-base: Remove kerberos line as it is strictly dependent on krb5"
This reverts commit b1e4371a1c.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
5d8fe045b6 Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
Eelco Dolstra
17b6a597fb Revert "ceph: Now evaluate on darwin"
This reverts commit 54963fb5b7.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
660e85a0d9 Revert "ceph: Add development version"
This reverts commit 81f705e98c.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
24390ab377 Revert "ceph: Update git"
This reverts commit 2154348ba0.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
05f1457c1e Revert "postgresql: Refactor 8.4 into generic"
This reverts commit 1bb67e514b.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
5efd73fce6 Revert "postgresql: 9.0.19 -> 9.0.20"
This reverts commit 8c99f2e3d6.
2015-06-04 14:54:49 +02:00
Eelco Dolstra
e3ab9804ba Revert "postgresql: 9.1.15 -> 9.1.16"
This reverts commit be94d4bc25.
2015-06-04 14:54:49 +02:00