Commit graph

1551 commits

Author SHA1 Message Date
Ricardo M. Correia d6093505cc buildRustPackage: Get rid of /proc/self/cwd hack
This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
2015-04-23 20:22:19 +02:00
Ricardo M. Correia b993c2113c buildRustPackage: Add a mechanism to patch registry deps
... in a more generic way.

With this commit, if you need to patch a registry package to make it
work with Nix, you just need to add a script to patch-registry-deps
in the same style as the `pkg-config` script.
2015-04-23 16:41:52 +02:00
Ricardo M. Correia 0cde1dc524 cargo: Remove setupHook
Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
2015-04-23 15:26:23 +02:00
Thomas Tuegel 4887f44d02 emacsWithPackages: don't call package-initialize
Emacs will call package-initialize itself, if required, or the user will
call it in their initialization file. There is no reason to call it in
the wrapper and doing so only increases start-up time.
2015-04-23 08:08:22 -05:00
Ricardo M. Correia e42c17ee97 buildRustPackage: Fix Cargo.lock being ignored
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
2015-04-23 02:58:07 +02:00
Nikolay Amiantov 19c497050e fhs-userenv: refactor and try to chdir to the current directory
runScript now expects a filename instead of a Bash snippet; thus, "exec" should be
omitted.
2015-04-22 17:50:41 +03:00
Nikolay Amiantov 508ef7e629 fhs-userenv: fix mkdirs 2015-04-22 17:50:41 +03:00
Nikolay Amiantov b66be2a549 fhs-userenv: move mounts map 2015-04-22 17:50:40 +03:00
Nikolay Amiantov 97931361d7 fhs-userenv: refactor envvars and propagate SSL_CERT_FILE 2015-04-22 17:50:40 +03:00
Nikolay Amiantov de487c5c99 fhs-chrootenv: propagate SSL_CERT_FILE 2015-04-22 17:50:40 +03:00
Nikolay Amiantov 68fabf295d fhs-chrootenv-env: cleanup 2015-04-22 17:50:40 +03:00
Nikolay Amiantov 7a01374bf3 fhs-chrootenv-env: refactor /etc build and add ssl certs 2015-04-22 17:50:40 +03:00
Ricardo M. Correia d648be6724 buildRustPackage: Add check phase and enable it by default
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
2015-04-21 20:45:05 +02:00
Thomas Tuegel 8aa0d8f180 add emacsWithPackages 2015-04-21 13:06:24 -05:00
Georges Dubus 7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Ricardo M. Correia c55c7e1c1e fetchgit: Add support for specifying branch name
This is useful when `leaveDotGit = true` and some other derivation
expects some branch name to exist.

Previously, `nix-prefetch-git` always created a branch with a
hard-coded name (`fetchgit`).
2015-04-21 19:46:29 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Nikolay Amiantov 25618c3670 agda: migrate to haskell-ng, update and cleanup
Resolves https://github.com/NixOS/nixpkgs/pull/7172.
2015-04-06 21:24:33 +02:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome
closes #1707
2015-04-04 22:22:12 -07:00
Michael Raskin 6b678048cd Merge pull request #5874 from robberer/nixos/libredirectaccess
libredirect: add access syscall
2015-04-04 21:29:21 +03:00
Arseniy Seroka 8592c6c004 Merge pull request #7150 from joachifm/grsec-types
grsecurity module: use types.enum
2015-04-03 16:03:49 +03:00
Joachim Fasting ba93a75724 grsecurity module: use types.enum
Also
- set desktop as default system
- make virtualisationSoftware nullOr
- make virtualisationConfig nullOr
2015-04-03 13:45:45 +02:00
Eric Seidel bb363dd2f2 fetchgitlocal: use output of git show and git diff to tell nix whether the source has changed.
this is way more hacky than i was hoping...
2015-03-31 20:00:00 -07:00
William A. Kennington III fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Charles Strahan d590a0f4b6 ghcjs: support for Haskell-NG
closes #5828
closes #6786
2015-03-29 03:34:04 +02:00
Eric Seidel 1a68f81db4 fetchgitlocal: don't force copying the whole source directory into the store.. 2015-03-28 13:13:18 -07:00
Eric Seidel da73e45cd0 fetchgitlocal: local fetcher based on git ls-files 2015-03-28 12:59:12 -07:00
Daniel Peebles dcde8a967f Merge pull request #7038 from avnik/gccgo-wrapper
Rename ccgo back to gccgo
2015-03-27 21:05:22 -04:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III 4631afc21e Support unraring source files 2015-03-27 15:36:26 -07:00
Alexander V. Nikolaev 3311513df6 Rename ccgo back to gccgo
I believe this is result of typo, introduced in 48f63c2f.
2015-03-27 12:45:32 +02:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
William A. Kennington III f2655e4fa0 makeInitrd: Support prepending other initrds 2015-03-25 14:14:46 -07:00
Thomas Tuegel 2e0775e3a8 Revert "cc-wrapper: fix missing attribute"
This reverts commit 6454b8f9ef.
2015-03-24 17:48:53 -05:00
Thomas Tuegel 6454b8f9ef cc-wrapper: fix missing attribute 2015-03-24 17:14:55 -05:00
Eelco Dolstra 9c579f691f fix-darwin-dylib-names: Fix all outputs
This fixes the install names of the Boost dylibs on Darwin.
2015-03-24 16:28:20 +01:00
Eelco Dolstra b4830add94 Revert "fix-darwin-dylib-names: Fix all outputs"
This reverts commit 253f3d72c2.
2015-03-24 16:27:54 +01:00
Eelco Dolstra 253f3d72c2 fix-darwin-dylib-names: Fix all outputs
This fixes the install names of the Boost dylibs on Darwin.
2015-03-24 15:59:05 +01:00
Vladimír Čunát e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Ricardo M. Correia 7c8247a8c5 grsecurity: Update stable and test patches
stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203
test:   3.1-3.18.9-201503071142  -> 3.1-3.19.1-201503122205
2015-03-15 03:49:58 +01:00
Luca Bruno b1adfeb23d fhs-userenv: Make it work on kernel < 3.19 cc @abbradar
It may not be very secure, but I think it's better to make it work
with older kernel since 3.19 is not the default on nixos.
2015-03-10 18:12:38 +01:00
lethalman fcfe8ecc33 Merge pull request #6737 from anderspapitto/fhs
build-fhs-userenv passes through command line args
2015-03-10 17:53:32 +01:00
Peter Simons 5d02f0e854 fetchgit: add 'deepClone' argument to disable shallow fetching
This patch resolves https://github.com/NixOS/nixpkgs/issues/6395. Deep
cloning is useful in combination with 'leaveDotGit' for builds that want
to run "git describe" to obtain a proper version string, etc., like the
'haskellngPackages.cabal2nix' package does.
2015-03-10 13:14:00 +01:00
Peter Simons 6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Anders Papitto 4bcc817521 build-fhs-userenv passes through command line args
The motivation for this change is to allow things like the
following derivation, which wraps the debian-packaged
hello binary.

let nixpkgs = import <nixpkgs> {};
    stdenv = nixpkgs.stdenv;
in rec {
  dumb-hello = stdenv.mkDerivation {
    name = "dumb-hello";
    builder = ./builder.sh;
    dpkg = nixpkgs.dpkg;
    src = nixpkgs.fetchurl {
      url = "http://ftp.us.debian.org/debian/pool/main/h/hello-traditional/hello-traditional_2.9-2_amd64.deb";
      md5 = "f5f3c28b65221dae44dda6f242c23316";
    };
  };
  full-hello = nixpkgs.buildFHSUserEnv {
    name = "full-hello";
    targetPkgs = pkgs: [ dumb-hello ];
    multiPkgs = pkgs: [ pkgs.dpkg ];
    runScript = "hello";
  };
}
2015-03-09 23:44:51 -07:00
Nikolay Amiantov 3e395b71da chroot-env: add locales, refactor environment 2015-03-09 17:29:43 +03:00
Nikolay Amiantov e3ab3df26e chroot-env: ignore collisions and fix permissions 2015-03-09 17:29:43 +03:00
Nikolay Amiantov 4aba7639c8 chroot-env: build /etc 2015-03-09 17:29:43 +03:00
Thomas Tuegel afa4c3aed2 autonix: allow one-to-many dependency resolution 2015-03-08 17:28:44 -05:00
Shea Levy f91dea4c0b cc-wrapper: Set default system include flags for non-gcc c++ on Linux
Without this, clang can't find libstdc++. This needs to happen in the wrapper
so that the libc++ setup hook can still override it
2015-03-06 19:04:43 +00:00
Eric Seidel 6b60f3dcad Merge pull request #6641 from oxij/emacs-ng
Somewhat more generic emacs packages' builder and a bunch of new emacs packages and metas
2015-03-05 13:22:45 -08:00
Eelco Dolstra 6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
Jan Malakhovski e4a4e109ba refactor Emacs packages'/modes' builders
This simplifies melpa builder by merging with it my old emacs modes builder,
adds better instructions and support for overrides in emacs-packages.nix,
and renames some emacs-related stuff in all-packages.nix for sanity reasons.

I declare this backwards compatible since direct uses of emacsPackages in
configuration.nix are very unlikely.
2015-03-03 16:02:15 +00:00
Jan Malakhovski a444eff3f2 reorganize emacs related files 2015-03-03 05:31:38 +00:00
Eelco Dolstra 3a31043b43 fillDiskWithRPMs: Pass --extract-over-symlinks to cpio
http://hydra.nixos.org/build/20003320
2015-02-27 14:00:11 +01:00
Bjørn Forsman 06f5651ef5 nix-prefetch-git: print commit date (close #6522)
The commit date can be used as a version number in packages that don't
have proper releases.
2015-02-24 23:02:59 +01:00
Nikolay Amiantov 6b72418ee5 Merge pull request #6532 from abbradar/6486-fix
buiildFHSEnv: check if multiPkgs is empty
2015-02-23 14:09:07 +03:00
Nikolay Amiantov b002fdd89f buiildFHSEnv: check if multiPkgs is empty
Fixes #6486
2015-02-23 13:54:41 +03:00
Joel Taylor 8bfa1a2efc Patches for a lot of packages for GHC 7.10 2015-02-22 17:33:10 -08:00
Vladimír Čunát c00d36f6c1 fetchurl: fix typo from 105154afed pushed today 2015-02-22 20:27:29 +01:00
Vladimír Čunát 105154afed fetchurl: build the mirror list locally 2015-02-22 19:26:22 +01:00
Thomas Tuegel fdcfefee2c autonix: tweak manifest format 2015-02-21 11:39:18 -06:00
Bjørn Forsman c22435e70d clang-analyzer: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Nikolay Amiantov 621d1ab444 R: update mirrors 2015-02-18 15:41:46 +03:00
Wout Mertens 5c9319ddac writeTextFile: Use passAsFile if available 2015-02-18 01:08:03 +01:00
Eric Seidel 76a501acdb reorganize emacs packages and add some meta info 2015-02-17 15:08:55 -08:00
Shea Levy 2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Florian Friesdorf e82e14ef60 mirrors: move more reliable postgresql mirror up
Picked from #6101.
2015-02-14 10:31:12 +01:00
Peter Simons 600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Eelco Dolstra fa47d347a4 Fix conflict between fedora-release and generic-release
http://hydra.nixos.org/build/19594340
2015-02-12 17:55:29 +01:00
Eelco Dolstra ff37dc6fb6 Remove tabs 2015-02-12 17:55:29 +01:00
Eelco Dolstra 28ea9050fa Remove ancient RedHat 9 / SuSE 9 images
These are 12 years old and I don't think anybody is using them.
2015-02-12 17:55:29 +01:00
Eelco Dolstra da73688e3d fillDiskWithRPMs: Shut up some warnings 2015-02-12 17:55:28 +01:00
Eelco Dolstra 3786f08d25 Add Fedora 21 2015-02-10 11:32:43 +01:00
Dan Peebles 7bea6aafae Some cc-wrapper changes to better support darwin and clang:
- Add a conditional flag for the c++ std lib
- Build binaries that get linked by our own dyld (someday)
- Automatically add framework directories in the setup hook
2015-02-08 21:15:22 -05:00
William A. Kennington III 5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar 33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
Thomas Tuegel 73f8aebd8d autonix: expose importManifest 2015-02-07 12:52:01 -06:00
Thomas Strobel d255d41678 Update: new features for nix-template-rpm
- nix-template-rpm can now split the generated templates into
    a static part that goes into the nixpkgs tree
    a dynamic part that can be updated easily to track the rpm spec files
- add lookup mechanism for package names and package paths
- add mechanism to update existing nix-expression with new download files
2015-02-06 20:12:57 +01:00
lethalman 4060b86bcf Merge pull request #6182 from monocell/php-update-5.5-5.6
Php update 5.5/5.6
2015-02-06 10:49:35 +01:00
Emil Rangden 8c125c0c74 fix phpPackages memcache,memcached,xdebug
These packages, and maybe some more include unix.h for some reason.
Creating that file makes them build, and in the case of xdebug also
appear to work.
2015-02-05 20:28:16 +01:00
Nikolay Amiantov 3500978b8f build-fhs-*: prefer local build 2015-02-05 20:39:01 +03:00
Nikolay Amiantov 4b3bb7b448 userFHSEnv: add build tool 2015-02-05 19:46:25 +03:00
Nikolay Amiantov b3ee378f50 buildFHSChrootEnv: split environment and chroot scripts 2015-02-05 19:46:00 +03:00
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
Longrin Wischnewski 19f0b18b99 libredirect: add access syscall 2015-01-20 18:52:37 +01: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
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 added some magic -optP-P flag that the old compiler
version doesn't support.
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 f8a833cfb1.
This makes sure the check returns a zero code.

See discussion on https://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 5af576ff7f.

See discussion on https://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

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
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
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Bjørn Forsman 53614cf1a7 nix-prefetch-git: fix determinism with leaveDotGit
Add more files to the delete list:

 * .git/FETCH_HEAD
 * .git/ORIG_HEAD
 * .git/refs/remotes/origin/HEAD
 * .git/config

Further, remove all remote branches, remove tags not reachable from the
given 'rev', do a full repack and then garbage collect unreferenced
objects.

According to my testing, the result is fully deterministic. As in "any
change done to the upstream repo, ahead of 'rev', will not affect the
hash of the resulting 'clone'". Even changing the clone URL will not
change the output hash, because .git/config is removed.

A new version of git can of course change store format, but that's
unavoidable.

For big repositories, the repack operation may be a bit heavy. But as
far as I can see there is no cheaper way to determinism.
2014-11-02 13:15:33 +01:00
Bjørn Forsman faaa8a6acf nix-prefetch-git: remove unneeded semicolons
Shell isn't Perl ;-)
2014-11-01 15:17:11 +01:00
Bjørn Forsman 8ec8358724 nix-prefetch-git: whitespace cleanup
Use 4 spaces per indent level instead of a mix of 2 spaces, 4 spaces and
hardtab. (According to nixpkgs coding style for shell scripts.)
2014-11-01 13:47:37 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Eelco Dolstra 2ee8b30b64 stdenv.lib -> lib 2014-10-27 10:25:35 +01:00
Moritz Ulrich cdd2dd70aa Merge remote-tracking branch 'refs/remotes/origin/master' into chicken-eggs 2014-10-27 01:14:13 +01:00
Raffael Mancini 3ee2ca1d21 Added an up-to-date http debian mirror for those without ftp access. 2014-10-25 17:10:22 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Edward Tjörnhammar a5af1c228e Adding fetchurl mirrors for roy marples projects(dhcpcd, openresolv) 2014-10-23 19:45:33 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Ricardo M. Correia cb95ac1352 Merge pull request #4609 from alexanderkjeldaas/updated-grsec
Updated grsec.
2014-10-22 16:37:21 +02:00
Chris Double 40791a4ec5 Fix build-fhs-chrootenv mount script 2014-10-22 10:39:17 +02:00
Alexander Kjeldaas 005bb796e6 Updated grsec. 2014-10-22 02:18:41 +02:00
Peter Simons bddf342631 Patch 7a20d76 failed when the Haskell expression lacked a meta attribute. This commit fixes that issue. 2014-10-22 00:23:12 +02:00
Peter Simons 7a20d76482 Disable all Haskell builds for Darwin on Hydra.
Hydra generates a GHC closure for Darwin that for no apparent reason
contains an ancient, broken Haddock binary -- probably because of an
impurity in the build system. That bug makes those GHC binaries
unusable: <https://github.com/NixOS/nixpkgs/issues/2689>.
2014-10-21 23:54:51 +02:00
Shea Levy 3fe41ca763 Debain 7.6-amd64 tarball was updated in place 2014-10-20 15:26:51 -04:00
Shea Levy 652030e85d debian packages tarball was updated in place 2014-10-20 15:23:44 -04:00
Shea Levy a3ffe238e7 Revert "cabal: enable multi-threaded builds with GHC 7.8.x or later"
This likely exacerbates the non-determinism in ghc package ids, so until
that is fixed let's live with the slow builds.

This reverts commit 817c0e4144.
2014-10-16 13:17:30 -04:00
Nikolay Amiantov 09f33a4389 substituteAllFiles: add derivation
Closes #4145
2014-10-16 15:27:25 +01:00
Moritz Ulrich e47428d0e2 Infrastructure to build chicken eggs. 2014-10-13 23:29:27 +02:00
Eelco Dolstra 2c65f3fa66 Fix stdenv-native 2014-10-11 23:10:27 +02:00
Eelco Dolstra 79d0d7b437 Unify gcc-wrapper and clang-wrapper 2014-10-11 22:26:39 +02:00
Eelco Dolstra 0d67d13527 gcc-wrapper: Style fix 2014-10-11 22:26:39 +02:00
Eelco Dolstra 02122ccfd0 gcc-wrapper: Style fix 2014-10-11 22:26:39 +02:00
Eelco Dolstra ffbdcbfe29 gcc-wrapper: Wrap ld.gold
This ensures that gcc's ‘-fuse-ld=gold’ flag works.
2014-10-10 14:55:17 +02:00
Eelco Dolstra 3e0a348728 gcc-wrapper: Get rid of builder.sh + cleanup 2014-10-10 14:55:08 +02:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Eelco Dolstra 51f1b4ec48 Automatically move stuff in lib64 to lib 2014-10-07 15:04:13 +02:00