From bd8d7a8d15def4730491c4e19a0a0406bc740c9c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Jul 2012 17:21:41 -0400 Subject: [PATCH] Add some packages to the channel --- .../applications/version-management/bazaar/default.nix | 1 + pkgs/development/perl-modules/DBD-Pg/default.nix | 10 ++++++---- pkgs/development/perl-modules/DBD-SQLite/default.nix | 10 ++++++---- pkgs/top-level/perl-packages.nix | 5 +++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 462aede3b1c..856320f0168 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 02c43640407..0d0cb1accc5 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,15 +1,17 @@ -{ fetchurl, buildPerlPackage, DBI, postgresql }: +{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }: buildPerlPackage rec { name = "DBD-Pg-2.19.2"; - + src = fetchurl { url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz"; sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9"; }; - + buildInputs = [ postgresql ]; propagatedBuildInputs = [ DBI ]; - + makeMakerFlags = "POSTGRES_HOME=${postgresql}"; + + meta.platforms = stdenv.lib.platforms.linux; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 8e1faf900a0..4cc2eb6a01c 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,15 +1,15 @@ -{fetchurl, buildPerlPackage, DBI, sqlite}: +{ stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { name = "DBD-SQLite-1.35"; - + src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z"; }; - + propagatedBuildInputs = [ DBI ]; - + makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; patches = [ @@ -23,4 +23,6 @@ buildPerlPackage rec { # Disabled because the tests can randomly fail due to timeouts # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). doCheck = false; + + meta.platforms = stdenv.lib.platforms.linux; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c5d2de58fca..7fc3a0442e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -405,6 +405,7 @@ rec { CatalystDevel DBIxClassSchemaLoader MooseXNonMoose NamespaceClean HashMerge DBIxClassCursorCached ]; + meta.platforms = stdenv.lib.platforms.linux; }; CatalystRuntime = buildPerlPackage rec{ @@ -1201,7 +1202,7 @@ rec { }; DBDSQLite = import ../development/perl-modules/DBD-SQLite { - inherit fetchurl buildPerlPackage DBI; + inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; }; @@ -1211,7 +1212,7 @@ rec { }; DBDPg = import ../development/perl-modules/DBD-Pg { - inherit fetchurl buildPerlPackage DBI; + inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) postgresql; };