Commit Graph

1363 Commits

Author SHA1 Message Date
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
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