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

subunit: split package into everything and python lib

Browse source
This commit is contained in:
Domen Kožar 2015-05-10 11:39:42 +02:00
parent 7142d47991
commit 90ee280913
4 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/libraries/subunit/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ stdenv, fetchurl, pkgconfig, check, cppunit, perl, pythonPackages }:
# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
stdenv.mkDerivation rec {
name = "subunit-${version}";
version = "1.0.0";
src = fetchurl {
url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
};
buildInputs = [ pkgconfig check cppunit perl pythonPackages.wrapPython ];
propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
postFixup = "wrapPythonPrograms";
meta = with stdenv.lib; {
description = "A streaming protocol for test results";
homepage = https://launchpad.net/subunit;
license = licenses.asl20;
platforms = platforms.linux;
};
}

4
pkgs/servers/samba/4.x.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent
, ldb, popt, iniparser, pythonPackages, libbsd, nss_wrapper, socket_wrapper , ldb, popt, iniparser, subunit, libbsd, nss_wrapper, socket_wrapper
, uid_wrapper, libarchive , uid_wrapper, libarchive
# source3/wscript optionals # source3/wscript optionals
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42
docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser
pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper subunit libbsd nss_wrapper socket_wrapper uid_wrapper
libarchive libarchive
kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs

3
pkgs/top-level/all-packages.nix
View file

@ -8724,7 +8724,6 @@ let
samba4 = callPackage ../servers/samba/4.x.nix { samba4 = callPackage ../servers/samba/4.x.nix {
python = python2; python = python2;
pythonPackages = python2Packages;
kerberos = heimdal; kerberos = heimdal;
libgcrypt = libgcrypt_1_6; libgcrypt = libgcrypt_1_6;
cups = if stdenv.isDarwin then null else cups; cups = if stdenv.isDarwin then null else cups;
@ -12147,6 +12146,8 @@ let
pythonBindings = true; pythonBindings = true;
}); });
subunit = callPackage ../development/libraries/subunit { };
surf = callPackage ../applications/misc/surf { surf = callPackage ../applications/misc/surf {
webkit = webkitgtk2; webkit = webkitgtk2;
}; };

21
pkgs/top-level/python-packages.nix
View file

@ -12084,26 +12084,13 @@ let
}; };
}; };
subunit = stdenv.mkDerivation rec { subunit = buildPythonPackage rec {
name = "subunit-${version}"; name = pkgs.subunit.name;
version = "1.0.0"; src = pkgs.subunit.src;
src = pkgs.fetchurl {
url = "https://launchpad.net/subunit/trunk/${version}/+download/${name}.tar.gz";
sha256 = "1fnhrrwww90746an2nz2kn9qdf9pklmaf5lm22gssl6648f2rp2m";
};
buildInputs = (with pkgs; [ pkgconfig check cppunit perl ]) ++ [ self.wrapPython ];
propagatedBuildInputs = with self; [ testtools testscenarios ]; propagatedBuildInputs = with self; [ testtools testscenarios ];
postFixup = "wrapPythonPrograms"; meta = pkgs.subunit.meta;
meta = {
description = "A streaming protocol for test results";
homepage = https://launchpad.net/subunit;
license = licenses.asl20;
};
}; };