Commit Graph

1491 Commits

Author SHA1 Message Date
John Ericson
be2cba690c agda: Remove unused/uneeded abstractions, including postprocess 2015-05-31 01:55:10 +00:00
John Ericson
9b31a07b0d agda: Just with all of the string helper functions 2015-05-31 01:54:09 +00:00
John Ericson
21b10ab44f agda: postprocess and defaults need not be in the scope of args 2015-05-30 19:22:32 +00:00
John Ericson
c1f5748983 agda: Provide a .env like Haskell instead of .extras 2015-05-30 15:10:30 +00:00
William A. Kennington III
14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Ricardo M. Correia
d7ebe7a4f3 buildRustPackage: Accept srcs attribute as well
Add support for building Rust packages that have multiple sources, i.e.,
that use the `srcs` and `sourceRoot` attributes instead of just `src`.
2015-05-29 19:46:20 +02:00
Benjamin Staffin
1db5bafc94 Typo fix! s/wheezy/jessie/ 2015-05-29 11:16:33 +02:00
Benjamin Staffin
c7ac0ed3eb Add Debian 8.0
Had to add file type logic in debClosureGenerator because Packages.bz2
is not available for Jessie - only Packages.xz is.
2015-05-29 10:49:20 +02:00
vbgl
2857d5d7a8 Merge pull request #7823 from ericbmerritt/ocaml-enhancements
Ocaml enhancements
2015-05-26 23:52:32 +02:00
Arseniy Seroka
89810619ff Merge pull request #7973 from oxij/fetchurl-meta
fetchurl: allow adding meta info; fetchFrom*: add meta.homepage
2015-05-25 21:14:35 +03:00
Vladimír Čunát
f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
Jan Malakhovski
bdf32ed2ab fetchurl: allow adding meta info; fetchFrom*: add meta.homepage
The point of this is to be able to do `meta.homepage = src.meta.homepage;`
instead of the usual copy-paste for the packages that are hosted
on these hosting services.
2015-05-24 14:26:39 +00:00
Mateusz Kowalczyk
177d40f582 Merge branch 'agda' of https://github.com/Ericson2314/nixpkgs into agda 2015-05-23 04:15:50 +01:00
Eric Merritt
d814c50505 add an ocaml specific builder to the system 2015-05-22 10:12:21 -07:00
Eelco Dolstra
178c52e7ad Add Ubuntu 15.04 2015-05-22 13:21:02 +02:00
John Ericson
91ab6c9e89 agda: Wrapper is no longer built by default
Instead it is provided to the user who can choose whether or not
to include it in the final derivati. Example of including would
be:

```nix
callPackage ... (self: { inherit (self.extras) extraThing; })
```

These extras are also available downstream without being built by
default. This is achieved with `passthru`.
2015-05-20 16:01:40 +00:00
John Ericson
33c28bdc83 agda: Agda dependencies are treated seperately
- Only they are added to the optional build path (share/agda)
 - Only they are are passed as an include dir (share/agda)
 - Only they are propigatedBuildInputs
2015-05-20 16:01:04 +00:00
Ricardo M. Correia
9b752fd0e1 buildRustPackage: Don't hardcode registry index hash
Instead, discover it automatically when building the package.

This makes `buildRustPackage` more future-proof with respect to changes
in how `cargo` generates the hash.

Also, it fixes broken builds in i686 because apparently, cargo generates
a different registry index hash in this architecture (compared to
x86-64).
2015-05-19 19:02:38 +02:00
John Ericson
ae444ea4c4 agda: Remove extraBuildFlags
This is unused, future users can just use override `buildFlags`
and extend/replace as needed. `includeDirs` is provided for this
purpose.

We should add `dirOf self.everythingFile` rather than `.`, but
`dirOf` breaks on relative paths so that is not an option.
2015-05-18 12:33:00 -04:00
John Ericson
95c1c686a3 agda: Remove buildTools, it is unused 2015-05-18 04:10:37 +00:00
John Ericson
45052c02a8 agda: Replace eval with runHook
This is what haskell-ng does, so I figure it is the right thing to
do.
2015-05-17 20:15:09 -04:00
John Ericson
705c4d7b49 agda: Remove unnecessary env-var export
Derivation attributes are automatically exported as environment
variables already.
2015-05-17 20:15:09 -04:00
Thomas Tuegel
5583067fd8 emacsWithPackages: install support files
The wrapper needs to link the desktop file, icons, info and man pages
into place so they will appear when emacsWithPackages is installed.
2015-05-17 14:24:34 -05:00
Eric Seidel
67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang
Add isGNU and isClang attributes to cc-wrapper
2015-05-14 10:09:07 -07:00
Wout Mertens
1f400ea463 Merge pull request #6411 from NixOS/passAsFile
writeTextFile: Use passAsFile if available
2015-05-14 13:57:24 +02:00
Eelco Dolstra
6671bb8be4 Remove gccStdInc
This reverts d927da8dae. Having a copy
of gcc-wrapper/setup-hook.sh is bad for maintainability - it had
already started to diverge. Also, gccStdInc gave a nix-env conflict
with the standard gcc. And it wasn't actually used in Nixpkgs.

Instead, if you really need to change "-isystem" to "-I", you can now
set ccIncludeFlag to "-I".
2015-05-13 18:17:25 +02:00
Eelco Dolstra
fef86de618 Make module loading work in VMs
Also, execute stage 2 as PID 1.
2015-05-13 17:36:58 +02:00
Eelco Dolstra
b97362989f Provide /run in VMs 2015-05-13 17:36:29 +02:00
Ricardo M. Correia
755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust
Add support for Rust / Cargo packaging
2015-05-12 17:30:11 +02:00
Eric Seidel
395829686d add is{GNU,Clang} attrs to cc-wrapper.
These will be more pleasant to use than the existing

    (cc.cc.isClang or false)

nonsense we currently do.
2015-05-11 14:39:36 -07:00
William A. Kennington III
c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
William A. Kennington III
0e4057b167 kernel: 4.0.1 -> 4.0.2 2015-05-07 20:32:24 -07:00
Eelco Dolstra
c3f6c8c582 Mount /dev/shm in VMs 2015-05-07 15:31:36 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Edward Tjörnhammar
655eed7a93 Merge pull request #7235 from risicle/fetchhgsubrepo
fetchhg: add option to fetch hg subrepos
2015-05-04 18:20:32 +02:00
Robert Scott
366da9e70f fetchhg: add option to fetch hg subrepos 2015-05-04 16:18:26 +01:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Edward Tjörnhammar
4256ab778a fetchhg: pass proxyvars to hg 2015-04-28 22:44:57 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
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