mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity
55710 commits 329 branches 124 tags 6.7 GiB
Commit graph

55710 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Raskin 24faa6878b Midori now depends on sqlite 2015-01-06 22:36:17 +03:00
William A. Kennington III 50469c1511 libtirpc: 0.2.4 -> 0.2.5 2015-01-06 11:27:48 -08:00
Peter Simons 90f20fa41d Merge pull request #5610 from sivteck/machines 
Update haskell machines-io and machines-directory libraries
 2015-01-06 20:01:41 +01:00
Sivaram Balakrishnan f8f5627085 Update haskell machines-io and machines-directory libraries 
Signed-off-by: Sivaram Balakrishnan <sivaram1992@gmail.com>
 2015-01-06 23:59:15 +05:30
Rob Vermaas cbdf1abc33 Use recurseIntoAttrs for libuvVersions 2015-01-06 19:26:48 +01:00
John Wiegley b63caa13b3 Revert "curl: wrap binary so it can find the zlib dylib" 
This reverts commit b4a5a049d8.
 2015-01-06 10:36:15 -06:00
John Wiegley 7cd3ace827 Revert "curl: Correct a syntax error" 
This reverts commit 053083368b.
 2015-01-06 10:36:15 -06:00
Michael Raskin 6d74aacbea Pass sqlite to webkitgtk --- fails to configure otherwise 2015-01-06 19:34:30 +03:00
John Wiegley 053083368b curl: Correct a syntax error 2015-01-06 10:15:17 -06:00
John Wiegley b4a5a049d8 curl: wrap binary so it can find the zlib dylib 
This is needed at least when first installing on a clean Mavericks
machine.
 2015-01-06 10:12:57 -06:00
aszlig e957d71680
heimdal: Move openssh to propagatedBuildInputs. 
A few more libraries were switched to using the kerberos attribute
instead of krb5 in 5fe7439. So those libraries are now built against
heimbal instead of MIT kerberos.

One of those libraries is libtirpc, which results in the following build
output:

http://hydra.nixos.org/build/18423661/nixlog/1/raw

The reason for this is, that "pkgconfig --libs" of heimdal lists
-lcrypto (which is part of OpenSSL), which is not propagated to
libtirpc.

See here (lines wrapped with backslash at the end of line):

$ nix-shell -p heimdal pkgconfig --command 'pkg-config --libs heimdal-gssapi'
-L/nix/store/cxjkl33j0mb4ilffaijl7gschbjzfv35-heimdal-1.5.3/lib -lgssapi \
-lheimntlm -lkrb5 -lhx509 -lcom_err -lcrypto -lasn1 -lwind -lroken -lcrypt \
-ldl -lresolv -pthread

Versus using MIT kerberos:

$ nix-shell -p krb5 pkgconfig --command 'pkg-config --libs krb5'
-L/nix/store/91vyw8yn89qnv8m8b35kgc4c4v7zp9as-krb5-1.13/lib -lkrb5 \
-lk5crypto -lcom_err

So the latter only lists libraries that are part of krb5 itself.

By adding openssh to propagatedBuildInputs, we should be able to build
any package that depends on either krb5/heimdal without any missing
dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-06 17:11:16 +01:00
Michael Raskin bc159cc816 Update botan and fix the build 2015-01-06 18:47:02 +03:00
Oliver Charles 302f056f91 haskellPackages.nonEmpty: New expression 2015-01-06 15:05:24 +00:00
John Wiegley ce59dec5bb python34: as a workaround, explicitly set MACOSX_DEPLOYMENT_TARGET 
Otherwise, it crashes with a segfault while running the tests.
 2015-01-06 09:56:08 -05:00
John Wiegley fd26805059 sqsh: remove trailing whitespace in the Nix file 2015-01-06 09:56:08 -05:00
John Wiegley 19956bd328 ccache: remove assertion that allows building only on Linux 2015-01-06 09:56:07 -05:00
John Wiegley f570f9722f libsoup: always add sqlite as a build dependency 
Also, conditionalize --without-gnome
 2015-01-06 09:56:07 -05:00
Domen Kožar c876f7a25d document options to nixos-install script 2015-01-06 14:49:24 +01:00
Eelco Dolstra 0b8ac6b791 mercurial: Update to 3.2.4 2015-01-06 14:29:22 +01:00
Peter Simons c6f9de8932 Merge pull request #5602 from abbradar/iwlwifi 
iwlwifi: update firmware
 2015-01-06 13:56:23 +01:00
Nikolay Amiantov fb277ec1ac iwlwifi: update firmware 2015-01-06 15:53:54 +03:00
vbgl 56b8f1441b Merge pull request #5588 from rycee/package/bibtool 
Add package 'bibtool'.
 2015-01-06 13:48:10 +01:00
Peter Simons f48cd56cbe Merge pull request #5600 from dmalikov/master 
haskellPackages.xmonadScreenshot: bump to 0.1.1.0
 2015-01-06 12:43:33 +01:00
Dmitry Malikov 532da23aaf haskellPackages.xmonadScreenshot: bump to 0.1.1.0 2015-01-06 14:07:31 +03:00
Eelco Dolstra d2d09547a3 Build stdenv on Darwin 2015-01-06 11:55:47 +01:00
Eelco Dolstra fddc347689 Tweak 2015-01-06 11:55:47 +01:00
Eelco Dolstra ab10131663 Remove scheduling priorities 
This was only used for stdenv and is pretty obsolete now.
 2015-01-06 11:55:47 +01:00
Domen Kožar c8d5a73f67 Merge pull request #5599 from brendanlong/syncthing-0.10.17 
syncthing: Update to 0.10.17
 2015-01-06 11:23:53 +01:00
Domen Kožar fb508b6a58 add stress: configurable amount of CPU, memory, I/O, and disk stress on the system 2015-01-06 11:15:48 +01:00
Karn Kallio 19cd862a6d pakcs: advance version 1.11.3 to 1.11.4, also fixing the build. 2015-01-06 11:15:48 +01:00
Vincent Laporte 0eccb88a5c zathura: update from 0.3.1 to 0.3.2 2015-01-06 11:05:30 +01:00
Vincent Laporte 8bc3314699 ocaml-lambda-term: adds dependency to camlp4 2015-01-06 11:05:30 +01:00
Sander van der Burg af9bb71848 Merge pull request #5592 from AndersonTorres/fsuae 
FS-UAE (version 2.4.1): New Package
 2015-01-06 09:59:56 +00:00
Brendan Long 9d23d09bc9 syncthing: Update to 0.10.17 2015-01-06 02:24:48 -06:00
Nikolay Amiantov e9d868de63 kernel: enable intel_pstate 2015-01-06 03:07:32 +03:00
Mateusz Kowalczyk ebf4d5c62b livestreamer: update to 1.11.1 2015-01-05 21:11:04 +00:00
AndersonTorres 291d507d98 FS-UAE (version 2.4.1): New Package 
FS-UAE is a new, cycle-accurate, customizable Amiga Emulator.
 2015-01-05 17:47:07 -02:00
Shea Levy 3e1fdb7a35 gcc-wrapper is used for clang too 2015-01-05 14:39:22 -05:00
Peter Simons d7798d1b8b Merge pull request #5590 from jmwoehr/classy-prelude-yesod 
New Haskell package: classy-prelude-yesod
 2015-01-05 20:37:15 +01:00
Peter Simons 0c99319efe Merge pull request #5591 from dmalikov/master 
haskellPackages.xmonadScreenshot: add 0.1.0.0
 2015-01-05 20:36:30 +01:00
Peter Simons f1fc78d998 haskell-defaults.nix: down-grade cabal-install to 1.20.x for GHC < 7.4.x 2015-01-05 19:52:28 +01:00
Peter Simons a0a192e318 haskell-defaults.nix: switch jailbreak-cabal back to Cabal 1.20.x. 
https://github.com/peti/jailbreak-cabal/issues/3
 2015-01-05 18:39:19 +01:00
Peter Simons 4f50600ae0 haskell-defaults.nix: build Cabal 1.22.x with binary 0.7.x on GHC versions < 7.8.x 
https://github.com/haskell/cabal/issues/2322
 2015-01-05 18:39:19 +01:00
Peter Simons 920a7cc1a8 haskell-jailbreak: use Cabal 1.22.x to build this tool 2015-01-05 18:39:19 +01:00
Peter Simons dc70244447 Update HEAD versions of Cabal and cabal-install version to 1.22.0.0. 2015-01-05 18:39:19 +01:00
Peter Simons a1c1be46e1 haskell-ghc-mod: update to version 5.2.1.2 2015-01-05 18:39:19 +01:00
Peter Simons d8c600c129 haskell-git-annex: update to version 5.20141231 2015-01-05 18:39:18 +01:00
Dmitry Malikov 712186fa43 haskellPackages.xmonadScreenshot: add 0.1.0.0 2015-01-05 19:48:05 +03:00
Peter Simons ea94a6d653 nixos/modules/services/misc/nix-daemon.nix: document meaning of '0' for the buildCores attribute 2015-01-05 15:38:08 +01:00
vbgl 9560540940 Merge pull request #5576 from ryantm/patch-2 
update Calibre to latest version 2.15.0
 2015-01-05 13:37:55 +01:00