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
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
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
Domen Kožar
4aa3eec330
Merge branch 'master' into staging
...
Conflicts:
pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Eelco Dolstra
b8e33a5dcb
Ubuntu 14.10: Update hashes
2014-12-05 16:02:59 +01:00
Bas van Dijk
6fa969839a
Merge branch 'master' of https://github.com/NixOS/nixpkgs into update
...
Conflicts:
pkgs/development/libraries/haskell/text-binary/default.nix
pkgs/top-level/haskell-defaults.nix
pkgs/top-level/haskell-packages.nix
2014-12-05 07:54:48 +01:00
William A. Kennington III
4fcbe096b6
fetchgit: Simplify submodule url discovery
2014-12-04 15:17:58 -08:00
Bas van Dijk
35cdb19f03
Use mkdir -p instead of deprecated ensureDir
2014-11-29 14:24:31 +01:00
Vladimír Čunát
cbd2305d4d
Merge branch 'master' into staging
2014-11-28 18:59:07 +01:00
aszlig
444987193e
nixos: Rename virtualbox to virtualboxGuest.
...
Especially new users could be confused by this, so we're now marking
services.virtualbox.enable as obsolete and defaulting to
services.virtualboxGuest.enable instead. I believe this now makes it
clear, that this option is for guest additions only.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-27 18:42:22 +01:00
Vladimír Čunát
b5ff06eda4
Merge branch 'master' into staging
2014-11-26 21:48:26 +01:00
Vladimír Čunát
b1803465d9
imagemagick: use a stable URL, reshuffle mirrors
...
CC: #5133 .
2014-11-26 21:42:42 +01:00
Peter Simons
c7d3f60217
cabal: add support for "editedCabalFile" attribute to address https://github.com/NixOS/cabal2nix/issues/84
...
When 'editedCabalFile' is set to an SHA256 hash, the build driver replaces the
original Cabal instructions with the new version that is downloaded from
"http://hackage.haskell.org/package/${fname}/${pname}.cabal ".
2014-11-26 14:24:45 +01:00
Eelco Dolstra
e611215f5c
Move finding XML catalogs into a separate setup hook
...
This is because libxml/libxslt are not the only implementations that
respect $XML_CATALOG_FILES.
Also, look in share/xml for catalogs (in addition to the
now-deprecated xml/dtd and xml/xsl).
2014-11-25 16:23:48 +01:00
Vladimír Čunát
a9bad25ffe
Merge branch 'master' into staging
2014-11-24 22:14:25 +01:00
Domen Kožar
909b62fa6e
fetchurl: friendly message if hash is not given
2014-11-23 17:49:32 +01:00
Eelco Dolstra
17cf42d876
Fix patchelf RPM builds
...
http://hydra.nixos.org/build/17037187
2014-11-20 13:19:36 +01:00
Eelco Dolstra
99a2afd784
Update to Debian 7.7
2014-11-20 11:11:21 +01:00
Eelco Dolstra
e5513ac4dc
Add Ubuntu 14.10
2014-11-20 11:11:08 +01:00
Eelco Dolstra
fda5c17a6f
vmTools: Fix permissions on /tmp and /dev/*
2014-11-18 14:49:39 +01:00
Vladimír Čunát
8e44ae5bd4
stdenv lib64-moving: fail instead of overwriting
...
Silent overwriting is dangerous and it bit us straightaway on gcc_multi.
https://github.com/NixOS/nixpkgs/commit/51f1b4ec48d5
2014-11-17 11:27:38 +01:00
Vincent Laporte
cded306f82
nix-prefetch-git: allow dots in submodule names
2014-11-15 18:37:58 +00:00
Peter Simons
ffb635eb65
cabal: fix GHC 6.10.4 builds
...
3e8344d334
2014-11-15 18:20:40 +01:00
Eelco Dolstra
0a9ec07b93
findTarball: Fix the case where src is a directory
2014-11-10 20:06:50 +01:00
Edward Tjörnhammar
4030ab3ba4
add parens to de ambiguify
2014-11-10 06:53:24 +01:00
Edward Tjörnhammar
91c7ffc498
Revert "Revert "initialized git repo should use the set http_proxy""
...
This reverts commit f8a833cfb1https://github.com/NixOS/nixpkgs/commit/5af576f
2014-11-09 21:27:26 +01:00
Luca Bruno
f8a833cfb1
Revert "initialized git repo should use the set http_proxy"
...
This reverts commit 5af576ff7fhttps://github.com/NixOS/nixpkgs/commit/5af576f
2014-11-09 13:50:48 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Peter Simons
44273088ad
cabal: enable multi-threaded builds with GHC 7.8.x or later for executables
...
Multi-threaded builds exacerbate the non-determinism in ghc package ids, which
is a serious problem for libraries. Packages that define only executables,
however, should be safe to build with parallelism enabled.
2014-11-07 23:22:27 +01:00
Peter Simons
40bb2781ee
cabal: add "-hidir $TMPDIR" parameter to ghc call that compiles Setup.hs
...
Packages that don't have a Setup.hs file get to use a default version that
lives in the Nix store. By default ghc tries to put the Setup.o and Setup.hi
files in the same directory as the source file, which isn't writable. This
leads to build errors [1]. Thus, we re-direct those paths to a build-local
writable location: $TMPDIR.
Arguably, we could also use "." or copy the /nix/store/deadbeef-Setup.hs file
into the local source directory before compiling, which would work fine, too.
[1] https://github.com/NixOS/nixpkgs/issues/4851
2014-11-07 23:22:25 +01:00
Edward Tjörnhammar
5af576ff7f
initialized git repo should use the set http_proxy
2014-11-07 11:50:30 +01:00
Eelco Dolstra
f01ecbee50
nixBuild: Respect the preHook/postHook of the caller
2014-11-06 11:12:29 +01:00
Eelco Dolstra
c964077200
findTarball: Handle pipefail
...
It was failing because the bash subshell died with SIGPIPE, which is
no longer ignored.
http://hydra.nixos.org/build/16766452
2014-11-05 18:24:16 +01:00
Eelco Dolstra
83758d2b26
Die tabs die
2014-11-05 18:12:21 +01:00
Eelco Dolstra
2d498a3c1c
findTarballs: Take nullglob into account
2014-11-05 18:12:07 +01:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
...
Conflicts:
pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Joachim Fasting
71a443c1b2
Add mirrors for sage
2014-11-03 23:04:44 +01:00
Bjørn Forsman
96cacf01bf
nix-prefetch-git: run single-threaded 'git repack'
...
Without this, the generated pack files are non-deterministic.
I didn't notice this issue in my earlier testing, because my test repo
had too few commits for the thread scheduling to take effect. (Test repo
had about 10 commits.)
2014-11-03 22:52:57 +01:00
