alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixUnstable: 1.12pre4523_3b81b26 -> 1.12pre4911_b30d1e7

Browse source
This commit is contained in:
Eelco Dolstra 2016-12-09 11:18:22 +01:00
parent c94e44b0ae
commit c94454a45a
1 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
pkgs/tools/package-management/nix/default.nix
View file

@ -1,20 +1,31 @@
{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
}:
let
common = { name, src }: stdenv.mkDerivation rec {
common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec {
inherit name src;
version = lib.getVersion name;
VERSION_SUFFIX = lib.optionalString fromGit suffix;
outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs = [ perl pkgconfig ];
nativeBuildInputs =
[ perl pkgconfig ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
buildInputs = [ curl openssl sqlite xz ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "1.12pre")
(aws-sdk-cpp.override {
apis = ["s3"];
customMemoryManagement = false;
});
propagatedBuildInputs = [ boehmgc ];
@ -28,14 +39,17 @@ let
'';
configureFlags =
''
--with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc
--with-dbi=${perlPackages.DBI}/${perl.libPrefix}
--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
--disable-init-state
--enable-gc
'';
[ "--with-store-dir=${storeDir}"
"--localstatedir=${stateDir}"
"--sysconfdir=/etc"
"--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
"--disable-init-state"
"--enable-gc"
]
++ lib.optional (!lib.versionAtLeast version "1.12pre") [
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
];
makeFlags = "profiledir=$(out)/etc/profile.d";
@ -97,11 +111,15 @@ in rec {
};
nixUnstable = lib.lowPrio (common rec {
name = "nix-1.12pre4523_3b81b26";
src = fetchurl {
url = "http://hydra.nixos.org/build/33598573/download/4/${name}.tar.xz";
sha256 = "0469zv09m85824w4vqj2ag0nciq51xvrvsys7bd5v4nrxihk9991";
name = "nix-1.12${suffix}";
suffix = "pre4911_b30d1e7";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "b30d1e7ada0a8fbaacc25e24e5e788d18bfe8d3c";
sha256 = "04j6aw2bi3k7m5jyqwn1vrf78br5kdfpjsj15b5r5lvxdqhlknvm";
};
fromGit = true;
});
}