From 96a215af062e8285978fdd645cbb18c1b27c580d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 29 Sep 2013 23:34:45 +0200 Subject: [PATCH 01/15] New package: zeroinstall-injector-2.3.3. --- srcpkgs/zeroinstall-injector/template | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/zeroinstall-injector/template diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template new file mode 100644 index 00000000000..29b491fa19f --- /dev/null +++ b/srcpkgs/zeroinstall-injector/template @@ -0,0 +1,26 @@ +# Template file for 'zeroinstall-injector' +pkgname=zeroinstall-injector +version=2.3.3 +revision=1 +wrksrc="0install-${version}" +build_style=python-module +makedepends="python-devel gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme" +short_desc="A cross-distribution software installation system" +maintainer="Juan RP " +license="LGPL-2.1" +homepage="http://0install.net" +distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2" +checksum=80fbd8cd6144f1bda32415201c8978297a3ac95304e7fc73c1cc02eb8d1aca5e + +pre_configure() { + sed -i "s|man/|share/&|" setup.py +} + +zeroinstall-injector_package() { + pycompile_module="zeroinstall" + depends="${makedepends}" + noarch=yes + pkg_install() { + vmove all + } +} From 5db08bddf544344660f6a9e0199b7d3a71883b41 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 29 Sep 2013 23:54:38 +0200 Subject: [PATCH 02/15] pygobject2: depends on py2cairo not pycairo. --- srcpkgs/pygobject2/template | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template index e54d91fb115..2dc8a4ed75f 100644 --- a/srcpkgs/pygobject2/template +++ b/srcpkgs/pygobject2/template @@ -1,25 +1,22 @@ # Template file for 'pygobject2' pkgname=pygobject2 version=2.28.6 -revision=5 +revision=6 wrksrc=${pkgname%2}-${version} build_style=gnu-configure configure_args="--disable-introspection" hostmakedepends="pkg-config" -makedepends="libffi-devel libglib-devel cairo-devel python-devel pycairo-devel" +makedepends="libffi-devel libglib-devel cairo-devel python-devel py2cairo-devel" short_desc="Python bindings for GObject (GLib 2.x)" homepage="http://www.pygtk.org/" license="LGPL-2.1" maintainer="Juan RP " distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz" checksum=fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 -long_desc=" - Pygobject is a set of Python bindings for the GLib's GObject library, - version 2." pygobject2-devel_package() { - depends="libffi-devel libglib-devel libgirepository-devel pycairo-devel pygobject2>=${version}" - short_desc+=" -- development files" + depends="libffi-devel libglib-devel libgirepository-devel py2cairo-devel pygobject2>=${version}" + short_desc+=" - development files" pycompile_module="usr/share/pygobject/2.0/codegen" replaces="pygobject-devel<3.0.0" pkg_install() { @@ -30,10 +27,10 @@ pygobject2-devel_package() { } pygobject2_package() { - depends="cairo libgirepository python pycairo" + depends="cairo libgirepository python py2cairo" pycompile_module="glib gobject gtk-2.0 pygtk" replaces="pygobject<3.0.0" pkg_install() { - vmove usr + vmove all } } From ffefb57c9ac4481f89011ef933aa60c963ba68ca Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 29 Sep 2013 23:56:25 +0200 Subject: [PATCH 03/15] pygtk: depend on py2cairo not pycairo. --- srcpkgs/pygtk/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template index 5025e132078..46270da8ee2 100644 --- a/srcpkgs/pygtk/template +++ b/srcpkgs/pygtk/template @@ -1,27 +1,25 @@ # Template file for 'pygtk' pkgname=pygtk version=2.24.0 -revision=6 +revision=7 build_style=gnu-configure # XXX: missing python-numpy build dep hostmakedepends="pkg-config" -makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel" +makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel>=2.28.6_6" short_desc="Python bindings for the GTK+ toolkit" homepage="http://www.pygtk.org" license="LGPL-2.1" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2" checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912 -long_desc=" - Pygtk is a set of Python bindings for the GTK+ toolkit." post_install() { vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs } pygtk-devel_package() { - depends="python-devel gtk+-devel pygobject2-devel pycairo-devel pygtk>=${version}" - short_desc+=" -- development files" + depends="python-devel gtk+-devel py2cairo-devel pygtk>=${version}" + short_desc+=" - development files" pycompile_module="demos" pkg_install() { vmove usr/include @@ -33,9 +31,9 @@ pygtk-devel_package() { } pygtk_package() { - depends="python pygobject2 pycairo" + depends="python pygobject2 py2cairo" pycompile_module="gtk-2.0/gtk" pkg_install() { - vmove usr + vmove all } } From 2d810f5e48e27330b76002f5cf5bbc24e9771a62 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 00:01:52 +0200 Subject: [PATCH 04/15] zeroinstall-injector: depends on xdg-utils. --- srcpkgs/zeroinstall-injector/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template index 29b491fa19f..bb3ed5bacf6 100644 --- a/srcpkgs/zeroinstall-injector/template +++ b/srcpkgs/zeroinstall-injector/template @@ -4,7 +4,7 @@ version=2.3.3 revision=1 wrksrc="0install-${version}" build_style=python-module -makedepends="python-devel gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme" +makedepends="python-devel gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils" short_desc="A cross-distribution software installation system" maintainer="Juan RP " license="LGPL-2.1" From 78a529bd17d13b04b181398cdc603ce10828d739 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 00:57:19 +0200 Subject: [PATCH 05/15] pygobject2: does not need to depend on libgirepository. --- srcpkgs/pygobject2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template index 2dc8a4ed75f..b7a778c0770 100644 --- a/srcpkgs/pygobject2/template +++ b/srcpkgs/pygobject2/template @@ -1,7 +1,7 @@ # Template file for 'pygobject2' pkgname=pygobject2 version=2.28.6 -revision=6 +revision=7 wrksrc=${pkgname%2}-${version} build_style=gnu-configure configure_args="--disable-introspection" @@ -15,7 +15,7 @@ distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz" checksum=fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 pygobject2-devel_package() { - depends="libffi-devel libglib-devel libgirepository-devel py2cairo-devel pygobject2>=${version}" + depends="libffi-devel libglib-devel py2cairo-devel pygobject2>=${version}" short_desc+=" - development files" pycompile_module="usr/share/pygobject/2.0/codegen" replaces="pygobject-devel<3.0.0" @@ -27,7 +27,7 @@ pygobject2-devel_package() { } pygobject2_package() { - depends="cairo libgirepository python py2cairo" + depends="cairo python py2cairo" pycompile_module="glib gobject gtk-2.0 pygtk" replaces="pygobject<3.0.0" pkg_install() { From 00164d76a9638cd237e1e89a56d262717990c08b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 01:00:12 +0200 Subject: [PATCH 06/15] zeroinstall-injector: depend on python, not python-devel. --- srcpkgs/zeroinstall-injector/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template index bb3ed5bacf6..4aecf085e88 100644 --- a/srcpkgs/zeroinstall-injector/template +++ b/srcpkgs/zeroinstall-injector/template @@ -1,10 +1,10 @@ # Template file for 'zeroinstall-injector' pkgname=zeroinstall-injector version=2.3.3 -revision=1 +revision=2 wrksrc="0install-${version}" build_style=python-module -makedepends="python-devel gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils" +makedepends="python gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils" short_desc="A cross-distribution software installation system" maintainer="Juan RP " license="LGPL-2.1" From 205e7920c29c12b8b04ba504f8a5c3a9f47c30b8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 01:32:46 +0200 Subject: [PATCH 07/15] New package: perl-WWW-Curl-4.15. --- srcpkgs/perl-WWW-Curl/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/perl-WWW-Curl/template diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template new file mode 100644 index 00000000000..004a23fe873 --- /dev/null +++ b/srcpkgs/perl-WWW-Curl/template @@ -0,0 +1,20 @@ +# Template build file for 'perl-WWW-Curl'. +pkgname=perl-WWW-Curl +version=4.15 +revision=1 +wrksrc="WWW-Curl-${version}" +build_style=perl-module +hostmakedepends="perl libcurl-devel" +short_desc="WWW::Curl - Perl extension interface for libcurl" +maintainer="Juan RP " +homepage="http://search.cpan.org/dist/WWW-Curl/" +license="GPL-2" +distfiles="${CPAN_SITE}/WWW/WWW-Curl-$version.tar.gz" +checksum=3ef40494537a1ce7f848f3b524f5690cf47db458c0bb662e15c4642dc13c5fa1 + +perl-WWW-Curl_package() { + depends="perl" + pkg_install() { + vmove all + } +} From 41a7cc65b1517d43182369176feae799b591c781 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 01:45:02 +0200 Subject: [PATCH 08/15] New package: perl-DBI-1.628. --- srcpkgs/perl-DBI/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/perl-DBI/template diff --git a/srcpkgs/perl-DBI/template b/srcpkgs/perl-DBI/template new file mode 100644 index 00000000000..d771bd0dd12 --- /dev/null +++ b/srcpkgs/perl-DBI/template @@ -0,0 +1,20 @@ +# Template build file for 'perl-DBI'. +pkgname=perl-DBI +version=1.628 +revision=1 +wrksrc="DBI-${version}" +build_style=perl-module +hostmakedepends="perl" +short_desc="Database independent interface for Perl" +maintainer="Juan RP " +homepage="http://search.cpan.org/dist/DBI" +license="GPL-2" +distfiles="${CPAN_SITE}/DBI/DBI-$version.tar.gz" +checksum=46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52 + +perl-DBI_package() { + depends="perl" + pkg_install() { + vmove all + } +} From a4a6782594c2660ca63239ff001b525755b7faeb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 01:50:15 +0200 Subject: [PATCH 09/15] New package: perl-DBD-SQLite-1.40. --- srcpkgs/perl-DBD-SQLite/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/perl-DBD-SQLite/template diff --git a/srcpkgs/perl-DBD-SQLite/template b/srcpkgs/perl-DBD-SQLite/template new file mode 100644 index 00000000000..b9d1de50091 --- /dev/null +++ b/srcpkgs/perl-DBD-SQLite/template @@ -0,0 +1,21 @@ +# Template build file for 'perl-DBD-SQLite'. +pkgname=perl-DBD-SQLite +version=1.40 +revision=1 +wrksrc="DBD-SQLite-${version}" +build_style=perl-module +hostmakedepends="perl" +makedepends="perl-DBI" +short_desc="DBD::SQLite - Self-contained RDBMS in a DBI driver" +maintainer="Juan RP " +homepage="http://search.cpan.org/dist/DBD-SQLite" +license="GPL-2" +distfiles="${CPAN_SITE}/DBD/DBD-SQLite-$version.tar.gz" +checksum=21fb65e740b6265512c82232b4ad8f75c19ac84c216830112656274eb8e375fb + +perl-DBD-SQLite_package() { + depends="perl-DBI" + pkg_install() { + vmove all + } +} From 66412ad8de973e7428594573ac1c15ee4152bb8a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 02:36:09 +0200 Subject: [PATCH 10/15] New package: nix-1.6. --- srcpkgs/nix/files/nix-daemon.service | 10 +++++++ srcpkgs/nix/template | 42 ++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 srcpkgs/nix/files/nix-daemon.service create mode 100644 srcpkgs/nix/template diff --git a/srcpkgs/nix/files/nix-daemon.service b/srcpkgs/nix/files/nix-daemon.service new file mode 100644 index 00000000000..ee28209f090 --- /dev/null +++ b/srcpkgs/nix/files/nix-daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Helper daemon for managing secure, multi-user Nix stores +After=syslog.target + +[Service] +Type=simple +ExecStart=/usr/bin/nix-daemon + +[Install] +WantedBy=multi-user.target diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template new file mode 100644 index 00000000000..af9999c8f29 --- /dev/null +++ b/srcpkgs/nix/template @@ -0,0 +1,42 @@ +# Template file for 'nix' +pkgname=nix +version=1.6 +revision=1 +build_style=gnu-configure +# Use /nix/var as suggested by the official Manual. +configure_args="ac_cv_path_curl=/usr/bin/curl --localstatedir=/nix/var" +hostmakedepends="pkg-config flex" +makedepends="bzip2-devel openssl-devel sqlite-devel gc-devel perl-WWW-Curl perl-DBD-SQLite" +short_desc="A purely functional package manager" +maintainer="Juan RP " +license="MIT" +homepage="http://nixos.org/nix/" +distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz" +checksum=2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe + +post_install() { + # Remove unused stuff. + rm -rf ${DESTDIR}/usr/include ${DESTDIR}/nix ${DESTDIR}/etc/nix + # Let users interact with the nix-daemon by default. + vmkdir etc/profile.d + echo 'export NIX_REMOTE=daemon' > ${DESTDIR}/etc/profile.d/nix-daemon.sh + # Install nix-daemon systemd service. + vinstall ${FILESDIR}/nix-daemon.service 644 usr/lib/systemd/system +} + +nix_package() { + depends="perl-WWW-Curl perl-DBD-SQLite" + systemd_service="nix-daemon.service on" + make_dirs=" + /nix/var/log/nix/drvs 0755 root root + /nix/var/nix/profiles 0755 root root + /nix/var/nix/temproots 0755 root root + /nix/var/nix/gcroots 0755 root root + /nix/var/nix/manifests 0755 root root + /nix/var/nix/userpool 0755 root root + /nix/var/nix/db 0755 root root + /nix/store 0755 root root" + pkg_install() { + vmove all + } +} From e8f80c4bde052e128ac177f7887661fbe84b4af7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 03:04:19 +0200 Subject: [PATCH 11/15] nix: needs curl at run-time; create required build users; misc tweaks. --- srcpkgs/nix/template | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index af9999c8f29..e8990f50c3c 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -4,9 +4,9 @@ version=1.6 revision=1 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. -configure_args="ac_cv_path_curl=/usr/bin/curl --localstatedir=/nix/var" +configure_args="--localstatedir=/nix/var" hostmakedepends="pkg-config flex" -makedepends="bzip2-devel openssl-devel sqlite-devel gc-devel perl-WWW-Curl perl-DBD-SQLite" +makedepends="bzip2-devel openssl-devel sqlite-devel gc-devel curl perl-WWW-Curl perl-DBD-SQLite" short_desc="A purely functional package manager" maintainer="Juan RP " license="MIT" @@ -16,17 +16,29 @@ checksum=2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe post_install() { # Remove unused stuff. - rm -rf ${DESTDIR}/usr/include ${DESTDIR}/nix ${DESTDIR}/etc/nix + rm -rf ${DESTDIR}/usr/include ${DESTDIR}/nix # Let users interact with the nix-daemon by default. vmkdir etc/profile.d echo 'export NIX_REMOTE=daemon' > ${DESTDIR}/etc/profile.d/nix-daemon.sh # Install nix-daemon systemd service. vinstall ${FILESDIR}/nix-daemon.service 644 usr/lib/systemd/system + # Setup build users. + echo 'build-users-group = nixbld' > ${DESTDIR}/etc/nix/nix.conf } nix_package() { - depends="perl-WWW-Curl perl-DBD-SQLite" - systemd_service="nix-daemon.service on" + # Extra run-time dependencies. + depends="curl perl-WWW-Curl perl-DBD-SQLite" + # Create required build users/groups. + system_groups="nixbld" + for f in $(seq 10); do + system_accounts+=" nixbld${f}" + eval export nixbld\${f}_homedir="/var/empty" + eval export nixbld\${f}_groups="nixbld" + done + # Register systemd service by default. + systemd_services="nix-daemon.service on" + # Create required run-time directories. make_dirs=" /nix/var/log/nix/drvs 0755 root root /nix/var/nix/profiles 0755 root root @@ -35,7 +47,7 @@ nix_package() { /nix/var/nix/manifests 0755 root root /nix/var/nix/userpool 0755 root root /nix/var/nix/db 0755 root root - /nix/store 0755 root root" + /nix/store 1755 root nixbld" pkg_install() { vmove all } From f890802f71d519c974b729bed63396b340752a44 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 03:24:13 +0200 Subject: [PATCH 12/15] nix: /nix/store must be root:nixbld 1775. --- srcpkgs/nix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index e8990f50c3c..01dae113ead 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -47,7 +47,7 @@ nix_package() { /nix/var/nix/manifests 0755 root root /nix/var/nix/userpool 0755 root root /nix/var/nix/db 0755 root root - /nix/store 1755 root nixbld" + /nix/store 1775 root nixbld" pkg_install() { vmove all } From 321c3e92eaa2c21f683877f9f79f98ec8f294bee Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 03:25:38 +0200 Subject: [PATCH 13/15] nix: add /etc/nix/nix.conf to conf_files. --- srcpkgs/nix/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 01dae113ead..425e9ebec69 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -27,6 +27,8 @@ post_install() { } nix_package() { + # Default configuration file. + conf_files="/etc/nix/nix.conf" # Extra run-time dependencies. depends="curl perl-WWW-Curl perl-DBD-SQLite" # Create required build users/groups. From fc392038d8fe2957c272a088548c5ef82b6637e1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 03:33:33 +0200 Subject: [PATCH 14/15] nix: /nix/var/nix/profiles/per-user must be 1777. --- srcpkgs/nix/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 425e9ebec69..ca6b50ba647 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -44,6 +44,7 @@ nix_package() { make_dirs=" /nix/var/log/nix/drvs 0755 root root /nix/var/nix/profiles 0755 root root + /nix/var/nix/profiles/per-user 1777 root root /nix/var/nix/temproots 0755 root root /nix/var/nix/gcroots 0755 root root /nix/var/nix/manifests 0755 root root From a993062eaedd421a51c9b5e814c7435fcab57582 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Sep 2013 03:45:00 +0200 Subject: [PATCH 15/15] xbps-src: bump version (misc bugfix). --- srcpkgs/xbps-src/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template index e82235506c9..3dcc320310b 100644 --- a/srcpkgs/xbps-src/template +++ b/srcpkgs/xbps-src/template @@ -1,7 +1,7 @@ # Template file for 'xbps-src' pkgname=xbps-src -version=20130928 -revision=2 +version=20130930 +revision=1 build_style=gnu-makefile make_build_args="PREFIX=/usr ETCDIR=/etc/xbps" make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"