William A. Kennington III
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07: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
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
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
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
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
5cb1af03ef
libkeyfinder -> 0.11 (final)
2015-06-04 18:35:43 +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
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
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
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
1e6e52c2ac
Revert "krb5: 1.13.1 -> 1.13.2"
...
This reverts commit 85932bc5a9
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
1b32ae03f3
Revert "krb5: Fixes"
...
This reverts commit a74e4863f3
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
c449f292d2
Revert "krb5: Make lib build parallel"
...
This reverts commit ac2f05a50a
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
b5dea5c86a
Fix wayland
2015-06-04 14:54:48 +02:00
Eelco Dolstra
98a4eabd99
Revert "qemu: 2.2.2 -> 2.3.0"
...
This reverts commit 19c259161b
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
3096d03435
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
...
This reverts commit 25a148fa19
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
4f60156afb
Revert "qemu-nix: Build statically"
...
This reverts commit 5afa4f18d6
.
2015-06-04 14:54:47 +02:00
lethalman
8e564526fc
Merge pull request #8157 from monocell/spotify-fix
...
fix spotify by using older libgcrypt
2015-06-04 10:05:43 +02:00
Emil Rangden
165cb05ea5
fix spotify by using older libgcrypt
2015-06-03 16:50:53 +02:00
Michael Raskin
8daf4f5445
Add Curses development kit
2015-06-02 20:32:12 +03:00
Michael Raskin
747c6e913f
Add gtdialog tool
2015-06-02 20:32:12 +03:00
Arseniy Seroka
eb2c3c6681
Merge pull request #8124 from pmahoney/skarnet-update
...
Skarnet update
2015-06-02 19:25:37 +03:00
Domen Kožar
d2825dbc73
Merge pull request #8108 from codyopel/sass
...
update Sassc and libsass
2015-06-02 12:32:26 +02:00
Vladimír Čunát
c86c1b79af
libav(-11): maintenance update, including security
2015-06-02 11:02:11 +02:00
Tobias Geerinckx-Rice
7db1aa06a5
nxproxy & libxcomp: use lite instead of full nx-libs
2015-06-02 01:46:05 +02:00
Patrick Mahoney
74964c255e
Update skarnet.org software
...
execline 2.1.2.0
s6-dns 2.0.0.3
s6-networking 2.1.0.1
s6-portable-utils 2.0.5.0
skalibs 2.3.4.0
2015-06-01 15:20:56 -05:00
Patrick Mahoney
9835f18fbd
Add myself as maintainer for skarnet software
2015-06-01 15:20:56 -05:00
Eelco Dolstra
cb9429bd31
ncurses: Don't install static libraries
...
Nixpkgs convention is not to install static libraries.
2015-06-01 20:47:08 +02:00
Eelco Dolstra
779ab6bfc7
ncurses: Revert to normal style
...
Also re-enable building shared libraries on Mac OS X as these worked
fine in the past.
2015-06-01 20:38:19 +02:00
lethalman
80dd602c48
Merge pull request #7479 from bobvanderlinden/hwinfo
...
added hwinfo
2015-06-01 17:09:00 +02:00
Eelco Dolstra
3aee39bb83
openssl: Fix removal of the ssl/misc scripts
...
This drops the dependency of $out on Perl.
(cherry picked from commit a5fb18473e
)
Signed-off-by: Domen Kožar <domen@dev.si>
Conflicts:
pkgs/development/libraries/openssl/default.nix
2015-06-01 11:01:57 +02:00
Domen Kožar
dc3316268e
Merge branch 'master' into staging
2015-06-01 11:00:51 +02:00
William A. Kennington III
5afa4f18d6
qemu-nix: Build statically
2015-06-01 01:50:05 -07:00
codyopel
a53ca334d6
libsass: 3.2.2 -> 3.2.4
2015-06-01 01:27:46 -04:00
codyopel
ec7f3fb516
libass: 0.12.1 -> 0.12.2
2015-05-31 19:47:59 -04:00
William A. Kennington III
867d2c5c46
openssl: Remove References to OPENSSL_X509_CERT_FILE
2015-05-31 15:50:51 -07:00
William A. Kennington III
98fb54a6dc
gss: 1.0.2 -> 1.0.3
2015-05-31 13:55:18 -07:00
Tobias Geerinckx-Rice
b43f5d3881
accounts-qt: don't cast to string for no reason
2015-05-31 22:01:52 +02:00