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