From 418a837897e597c5dc2eb4e458462bd04b2abde7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 12 Aug 2016 06:38:08 -0400 Subject: Remove perl dependency. Fixes #341 --- release.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index ace0f9cc8..7bfde71a6 100644 --- a/release.nix +++ b/release.nix @@ -24,18 +24,14 @@ let inherit officialRelease; buildInputs = - [ curl bison flex perl libxml2 libxslt bzip2 xz + [ curl bison flex libxml2 libxslt bzip2 xz pkgconfig sqlite libsodium boehmgc docbook5 docbook5_xsl autoconf-archive git ]; - configureFlags = '' - --with-dbi=${perlPackages.DBI}/${perl.libPrefix} - --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} - --enable-gc - ''; + configureFlags = "--enable-gc"; postUnpack = '' # Clean up when building from a working tree. @@ -73,7 +69,7 @@ let src = tarball; buildInputs = - [ curl perl bzip2 xz openssl pkgconfig sqlite boehmgc ] + [ curl bzip2 xz openssl pkgconfig sqlite boehmgc ] ++ lib.optional stdenv.isLinux libsodium ++ lib.optional stdenv.isLinux (aws-sdk-cpp.override { @@ -83,8 +79,6 @@ let configureFlags = '' --disable-init-state - --with-dbi=${perlPackages.DBI}/${perl.libPrefix} - --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --enable-gc --sysconfdir=/etc ''; @@ -147,15 +141,13 @@ let src = tarball; buildInputs = - [ curl perl bzip2 openssl pkgconfig sqlite xz libsodium + [ curl bzip2 openssl pkgconfig sqlite xz libsodium # These are for "make check" only: graphviz libxml2 libxslt ]; configureFlags = '' --disable-init-state - --with-dbi=${perlPackages.DBI}/${perl.libPrefix} - --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} ''; dontInstall = false; @@ -282,7 +274,7 @@ let src = jobs.tarball; diskImage = (diskImageFun vmTools.diskImageFuns) { extraPackages = - [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "libcurl-devel" "openssl-devel" "xz-devel" ] + [ "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "libcurl-devel" "openssl-devel" "xz-devel" ] ++ extraPackages; }; memSize = 1024; meta.schedulingPriority = 50; @@ -303,14 +295,14 @@ let src = jobs.tarball; diskImage = (diskImageFun vmTools.diskImageFuns) { extraPackages = - [ "libdbd-sqlite3-perl" "libsqlite3-dev" "libbz2-dev" "libwww-curl-perl" "libcurl-dev" "libcurl3-nss" "libssl-dev" "liblzma-dev" ] + [ "libsqlite3-dev" "libbz2-dev" "libcurl-dev" "libcurl3-nss" "libssl-dev" "liblzma-dev" ] ++ extraPackages; }; memSize = 1024; meta.schedulingPriority = 50; postInstall = "make installcheck"; configureFlags = "--sysconfdir=/etc"; debRequires = - [ "curl" "libdbd-sqlite3-perl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libwww-curl-perl" "libssl1.0.0" "liblzma5" ] + [ "curl" "libsqlite3-0" "libbz2-1.0" "bzip2" "xz-utils" "libssl1.0.0" "liblzma5" ] ++ extraDebPackages; debMaintainer = "Eelco Dolstra "; doInstallCheck = true; -- cgit v1.2.3 From f7b7df8d1fcb41156fe92ef2ecf5b17074b88446 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 12 Aug 2016 09:44:01 -0400 Subject: Add nix-perl package for the perl bindings --- release.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 7bfde71a6..b93b64ea9 100644 --- a/release.nix +++ b/release.nix @@ -41,6 +41,7 @@ let ''; preConfigure = '' + (cd perl ; autoreconf --install --force --verbose) # TeX needs a writable font cache. export VARTEXFONTS=$TMPDIR/texfonts ''; @@ -96,6 +97,32 @@ let }); + perl = pkgs.lib.genAttrs systems (system: + + let pkgs = import { inherit system; }; in with pkgs; + + releaseTools.nixBuild { + name = "nix-perl"; + src = tarball; + + buildInputs = + [ (builtins.getAttr system jobs.build) curl bzip2 xz pkgconfig pkgs.perl ] + ++ lib.optional stdenv.isLinux libsodium; + + configureFlags = '' + --with-dbi=${perlPackages.DBI}/${pkgs.perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${pkgs.perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${pkgs.perl.libPrefix} + ''; + + enableParallelBuilding = true; + + postUnpack = "sourceRoot=$sourceRoot/perl"; + + preBuild = "unset NIX_INDENT_MAKE"; + }); + + binaryTarball = pkgs.lib.genAttrs systems (system: # FIXME: temporarily use a different branch for the Darwin build. -- cgit v1.2.3 From a75475ca611fbc9074792a30740d19fd3a3a6cf7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 30 Mar 2017 16:51:50 -0400 Subject: Remove tabs --- release.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index b93b64ea9..c0e1385e1 100644 --- a/release.nix +++ b/release.nix @@ -31,7 +31,7 @@ let git ]; - configureFlags = "--enable-gc"; + configureFlags = "--enable-gc"; postUnpack = '' # Clean up when building from a working tree. @@ -109,7 +109,7 @@ let [ (builtins.getAttr system jobs.build) curl bzip2 xz pkgconfig pkgs.perl ] ++ lib.optional stdenv.isLinux libsodium; - configureFlags = '' + configureFlags = '' --with-dbi=${perlPackages.DBI}/${pkgs.perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${pkgs.perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${pkgs.perl.libPrefix} @@ -117,7 +117,7 @@ let enableParallelBuilding = true; - postUnpack = "sourceRoot=$sourceRoot/perl"; + postUnpack = "sourceRoot=$sourceRoot/perl"; preBuild = "unset NIX_INDENT_MAKE"; }); -- cgit v1.2.3