Domen Kožar
ee74e1a055
solr: 4.10.2 -> 4.10.3, CVE-2014-3628
...
(cherry picked from commit 4fa25ee93a45df61d97cf7ddd0149bbd954216d0)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:48:28 +01:00
Eric Seidel
6f7632a7bd
update libcxx[abi] to 3.5
2015-02-03 14:02:59 -08:00
Shea Levy
aea1254f96
cc-wrapper merge fixes
2015-02-02 21:30:05 -05:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Thomas Tuegel
2b933f31f6
kdeApps.kmix: remove Qt 4 dependencies
2015-02-01 10:26:55 -06:00
Shea Levy
cfb29ab882
Merge branch 'gridaphobe' into staging
...
fix cc-wrapper for cross-compilation
2015-01-28 13:47:47 -05:00
Eelco Dolstra
6f8fad2253
Remove executable bits from non-executable files
2015-01-27 18:54:38 +01:00
Thomas Strobel
f0228c6eb2
Add: nix-template-rpm: Script to generate templates of nix expressions from RPM .spec files
2015-01-27 01:18:52 -08:00
Thomas Tuegel
c6f1c75472
kdeApps: update to 14.12.1
2015-01-26 21:01:06 -06:00
Thomas Tuegel
1fbecd1295
gcc-wrapper: comment on alternate setup hook
...
We now have an alternate setup hook for gcc-wrapper that uses -I to add
include paths rather than -isystem. The latter flag can change the
search order specified by the build system. For KDE 5 packages, we don't
want that!
2015-01-26 21:00:39 -06:00
Thomas Tuegel
8be6792829
autonix: add Nix library
2015-01-26 20:59:51 -06:00
Thomas Tuegel
d927da8dae
gcc-wrapper: parameterize setup-hook
...
The default setup-hook for gcc-wrapper adds include directories with
-isystem, which upsets the order -I flags are processed. This adds an
alternative setup-hook that only uses -I flags. The build system's
ordering of -I flags is then respected. This is important when different
packages provide includes with the same name, such as building packages
that depend on Qt4 and Qt5.
2015-01-26 20:59:50 -06:00
Shea Levy
9bccb95a82
cc-wrapper: Fix for cross-compiling
...
Fixes #5949
Suggested by @ambrop72
2015-01-25 23:29:06 -05:00
Charles Strahan
24b5eb61eb
fetchzip: fix unpacking regression
...
This resolves a regression introduced in fc01353703
, where providing a
name without a proper extension breaks existing uses of fetchzip (they
now fail to unpack). Of particular note, that commit broke all uses of
fetchFromGitHub because it uses a name like so: "${repo}-${rev}-src"
Fixes #5954
2015-01-25 20:16:21 -05:00
Charles Strahan
e4bf6c3f17
gpgme: use different mirror
2015-01-24 17:06:44 -05:00
Charles Strahan
fc01353703
fetchzip: various fixes
...
This fixes:
* Passing stripRoot.
* Archives containing a single file.
* Archives where the root folder has the same name as one of it's children.
Fixes #5851
2015-01-23 17:10:40 -05:00
Charles Strahan
4a3e689519
nix-prefetch-zip: support single files and recuring directories
...
See #5851
2015-01-23 17:10:40 -05:00
Charles Strahan
b6f9975b6a
nix-prefetch-zip: unset $name
...
nix-shell leaks $name, breaking nix-prefetch-zip.
2015-01-22 21:18:16 -05:00
Franz Pletz
07e1566b7d
fetchurl: add mirrors for OpenBSD ( close #5551 )
...
This changes source URLs for openssh and libressl accordingly.
2015-01-20 16:24:00 +01:00
Peter Simons
ec6b82a0c2
Merge branch 'master' into staging.
2015-01-19 18:41:17 +01:00
Peter Simons
cfce8509b8
grsecurity: add GRKERNSEC_DENYUSB option (disabled by default)
...
This option tells the kernel to ignore plug-in events of USB devices. Useful to
protect against attacks with malicious hardware. Currently disabled by default,
though.
2015-01-19 00:15:41 +03:00
Shea Levy
f326b7995c
Remove libc++ stuff from cc-wrapper
...
This is now part of the libc++ setup hook
2015-01-16 11:30:51 -05:00
Shea Levy
7dc57a389e
cc-wrapper: Set CC/CXX more specifically if possible
2015-01-16 10:50:53 -05:00
Eelco Dolstra
1b1e015e6e
Update Debian to 7.8
2015-01-15 14:51:55 +01:00
Eric Seidel
b070eacfcd
rename occurrences of cc.gcc to cc.cc
2015-01-14 20:51:58 -08:00
Eric Seidel
48f63c2f2e
rename gcc-wrapper to cc-wrapper.
...
also makes cc-wrapper compatible with clang in the darwin fork.
2015-01-14 20:26:56 -08:00
Vladimír Čunát
77d66ed834
fetchgit: improve name detection, discard nix-1.8 check
...
The name detection didn't work for e.g. http://git.suckless.org/sinit/ .
I tested the tarball builds now.
@shlevy claimed nixpkgs requires nix-1.8 features anyway,
so the additional check with message were superfluous.
2015-01-13 19:45:31 +01:00
Vladimír Čunát
7637e71cee
merge #5521 : give fetchgit outputs nicer names
2015-01-13 17:46:44 +01:00
Eelco Dolstra
7358b8dfda
Fix a warning in initrd generation
...
${pkgs.busybox}/bin and ${pkgs.busybox}/sbin are now the same
directory, so don't copy both.
2015-01-12 17:52:30 +01:00
Eelco Dolstra
872f8c0431
Remove RHEL 7 RC
...
It no longer exists on the RedHat FTP site.
2015-01-12 15:13:21 +01:00
Eelco Dolstra
02df7cdaa0
Fix CentOS 6.5 URLs
2015-01-12 15:13:05 +01:00
Peter Simons
4cf52df32e
Merge pull request #5663 from ryantrinkle/fix-cabal-js
...
Use Cabal_1_22_0_0 instead of Cabal_HEAD in cabalJs
2015-01-09 15:33:03 +01:00
Ryan Trinkle
20710afb46
Use Cabal_1_22_0_0 instead of Cabal_HEAD in cabalJs
...
Cabal_HEAD no longer exists. When Cabal_1_22_0_0 or later becomes the default, this should be updated again to point to Cabal
2015-01-09 08:29:56 -05:00
John Wiegley
268da01677
cabal: Allow optional use of cpphs as a preprocessor
...
Pinging @peti. This is needed on Darwin/Yosemite because clang's
preprocessor is broken there.
2015-01-08 11:55:11 -06:00
William A. Kennington III
c82410eeda
java: Normalize to the default jre / jdk
2015-01-07 14:55:41 -08:00
Shea Levy
3e1fdb7a35
gcc-wrapper is used for clang too
2015-01-05 14:39:22 -05:00
Ryan Trinkle
b1e967958e
Eliminate incorrect version checks from cabalJs
2015-01-02 12:30:19 -05:00
Shea Levy
a8603605aa
fetchgit: give output a nicer name
...
Instead of git-export, we get the basename of the repo, plus the
shortrev if the commit-ish is a rev.
2015-01-01 10:03:45 -05:00
Ricardo M. Correia
0a97acdc0f
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test: 3.0-3.17.7-201412211910 -> 3.0-3.18.1-201412281149
2015-01-01 15:45:31 +01:00
Charles Strahan
df55381b65
ghcjs: restructure
2014-12-31 00:03:43 -05:00
Ricardo M. Correia
1d44322d53
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test: 3.0-3.17.7-201412211910 -> 3.0-3.18.1-201412281149
2014-12-29 03:00:47 +01:00
Charles Strahan
347a9674c1
ghcjs: cleanup
2014-12-27 18:48:12 -05:00
Charles Strahan
a188373640
Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs
...
Conflicts:
pkgs/development/libraries/haskell/ghcjs-dom/default.nix
pkgs/top-level/haskell-packages.nix
2014-12-27 14:35:01 -05:00
Shea Levy
05edd656f6
Missed gcc refs
2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Igor Pashev
d57927748a
autoreconf may need gettext
...
E. g. for AC_LIB_PREFIX
2014-12-22 20:20:00 +00:00
vi
0c49b2942e
Added mirrors for MySQL.
2014-12-17 11:14:46 +00:00
Vladimír Čunát
1a0a161920
gnat: make it build again ( close #5307 )
...
Problems are worked around by using older gcc wrapper for gnat bootstrap.
(from ca441636f1^)
I tried nicer solutions first, but I was unable to fix all problems for hours.
2014-12-14 16:24:31 +01:00
Michael Raskin
9ed097ab50
Fix fetchzip for actuall zip files
2014-12-12 15:16:57 +03:00
Charles Strahan
fb59151109
purify ghcjs
2014-12-11 20:56:41 -05:00