Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
e46f9075d6
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
"--without-powerman" # Until we have it ...
|
||||
"--without-cgi"
|
||||
"--without-hal"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-udev-dir=$(out)/etc/udev"
|
||||
];
|
||||
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnumeric-1.12.9";
|
||||
name = "gnumeric-1.12.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
|
||||
sha256 = "1rv2ifw6rp0iza4fkf3bffvdkyi77dwvzdnvcbpqcyn2kxfsvlsc";
|
||||
sha256 = "096i9x6b4i6x24vc4lsxx8fg2n2pjs2jb6x3bkg3ppa2c60w1jq0";
|
||||
};
|
||||
|
||||
preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs
|
||||
|
|
|
@ -1,19 +1,23 @@
|
|||
{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3
|
||||
, libgsf, libxml2, cairo, pango, librsvg, libspectre }:
|
||||
{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
|
||||
, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goffice-0.10.9";
|
||||
name = "goffice-0.10.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
|
||||
sha256 = "0xc82hymhkdglnksd3r7405p39d5ym826rwaa7dfkps5crjwq8cg";
|
||||
sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
|
||||
propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
|
||||
pkgconfig intltool bzip2 glib gdk_pixbuf gtk3
|
||||
libgsf libxml2 cairo pango librsvg libspectre
|
||||
glib gtk3 libxml2 cairo pango libgsf
|
||||
];
|
||||
|
||||
buildInputs = [ libxslt librsvg ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -56,7 +56,7 @@ let
|
|||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"--with-session-socket-dir=/tmp"
|
||||
"--with-systemdsystemunitdir=$(out)/lib/systemd"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
assert zlib != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpng-1.2.50";
|
||||
name = "libpng-1.2.51";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng/${name}.tar.xz";
|
||||
sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927";
|
||||
sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
assert zlib != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libpng-1.5.15";
|
||||
name = "libpng-1.5.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng/${name}.tar.xz";
|
||||
sha256 = "1iaplghmv5qhd4dgwfymhp42sh27vz6s2107jk698xm57z2v9hwm";
|
||||
sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zlib ];
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
assert zlib != null;
|
||||
|
||||
let
|
||||
version = "1.6.9";
|
||||
sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx";
|
||||
version = "1.6.10";
|
||||
sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0";
|
||||
patch_src = fetchurl {
|
||||
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
|
||||
sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1";
|
||||
sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8";
|
||||
};
|
||||
whenPatched = stdenv.lib.optionalString apngSupport;
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ in {
|
|||
|
||||
let
|
||||
inherit (stdenv.lib)
|
||||
hasAttr getAttr optional optionalString maintainers platforms;
|
||||
hasAttr getAttr optional optionalString optionalAttrs maintainers platforms;
|
||||
|
||||
installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
|
||||
#!${stdenv.shell} -e
|
||||
|
@ -73,9 +73,7 @@ let
|
|||
|
||||
installsFirmware = (config.isEnabled "FW_LOADER") &&
|
||||
(isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
|
||||
in {
|
||||
outputs = if isModular then [ "out" "dev" ] else null;
|
||||
|
||||
in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
|
||||
passthru = {
|
||||
inherit version modDirVersion config kernelPatches;
|
||||
};
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
, libxslt, docbook_xsl, utillinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "udisks-1.0.4";
|
||||
name = "udisks-1.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
|
||||
sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
|
||||
sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
|
||||
};
|
||||
|
||||
patches = [ ./purity.patch ./no-pci-db.patch ];
|
||||
|
@ -28,7 +28,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
configureFlags = "--localstatedir=/var --enable-lvm2";
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--enable-lvm2"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.freedesktop.org/wiki/Software/udisks;
|
||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
"--localstatedir=/var"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
];
|
||||
|
||||
|
|
|
@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = "--with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d --disable-bash-completion";
|
||||
configureFlags = [
|
||||
"--with-udevrulesdir=$out/lib/udev/rules.d"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--disable-bash-completion"
|
||||
];
|
||||
|
||||
buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
|
||||
bashCompletion ];
|
||||
|
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags =
|
||||
[ "--with-udev-rules"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
|
|
|
@ -5,20 +5,17 @@ stdenv.mkDerivation rec {
|
|||
name = "pcsclite-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.de.debian.org/debian/pool/main/p/pcsc-lite/pcsc-lite_${version}.orig.tar.bz2";
|
||||
url = "https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${version}.tar.bz2";
|
||||
sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30";
|
||||
};
|
||||
|
||||
# The OS should care on preparing the drivers into this location
|
||||
configureFlags = [
|
||||
"--enable-usbdropdir=/var/lib/pcsc/drivers"
|
||||
"--with-systemdsystemunitdir=$out/lib/systemd/system" # probably
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--enable-confdir=$(out)/etc"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags --enable-confdir=$out/etc"
|
||||
'';
|
||||
|
||||
buildInputs = [ udev dbus_libs perl ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
Loading…
Reference in a new issue