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
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
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
Thomas Tuegel
8aa0d8f180
add emacsWithPackages
2015-04-21 13:06:24 -05: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