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
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