public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jacob Hinkle 2014-03-13 22:12:55 -06:00
commit e46f9075d6
13 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/nut/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"--without-powerman" # Until we have it ... "--without-powerman" # Until we have it ...
"--without-cgi" "--without-cgi"
"--without-hal" "--without-hal"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udev-dir=$(out)/etc/udev" "--with-udev-dir=$(out)/etc/udev"
]; ];

4
pkgs/applications/office/gnumeric/default.nix
View File

@ -3,11 +3,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnumeric-1.12.9"; name = "gnumeric-1.12.12";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; 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 preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs

16
pkgs/desktops/gnome-3/misc/goffice/default.nix
View File

@ -1,19 +1,23 @@
{ fetchurl, stdenv, pkgconfig, intltool, bzip2, glib, gdk_pixbuf, gtk3 { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
, libgsf, libxml2, cairo, pango, librsvg, libspectre }: , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "goffice-0.10.9"; name = "goffice-0.10.12";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; 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? propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
pkgconfig intltool bzip2 glib gdk_pixbuf gtk3 glib gtk3 libxml2 cairo pango libgsf
libgsf libxml2 cairo pango librsvg libspectre
]; ];
buildInputs = [ libxslt librsvg ];
enableParallelBuilding = true;
doCheck = true; doCheck = true;
meta = { meta = {

2
pkgs/development/libraries/dbus/default.nix
View File

@ -56,7 +56,7 @@ let
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--with-session-socket-dir=/tmp" "--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/lib/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/libraries/libpng/12.nix
View File

@ -3,11 +3,11 @@
assert zlib != null; assert zlib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpng-1.2.50"; name = "libpng-1.2.51";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz"; url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927"; sha256 = "0jkdlmnvn72jwm94dp98pznm9fy7alvcr2zpfh2dgbr2n09vimy7";
}; };
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];

4
pkgs/development/libraries/libpng/15.nix
View File

@ -3,11 +3,11 @@
assert zlib != null; assert zlib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpng-1.5.15"; name = "libpng-1.5.18";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz"; url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1iaplghmv5qhd4dgwfymhp42sh27vz6s2107jk698xm57z2v9hwm"; sha256 = "119m71p60iq3yn2n8ckl4j4cxvbpddj6sgdpa6g05jzyg7vw54y0";
}; };
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];

6
pkgs/development/libraries/libpng/default.nix
View File

@ -3,11 +3,11 @@
assert zlib != null; assert zlib != null;
let let
version = "1.6.9"; version = "1.6.10";
sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx"; sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0";
patch_src = fetchurl { patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1"; sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8";
}; };
whenPatched = stdenv.lib.optionalString apngSupport; whenPatched = stdenv.lib.optionalString apngSupport;

6
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -38,7 +38,7 @@ in {
let let
inherit (stdenv.lib) inherit (stdenv.lib)
hasAttr getAttr optional optionalString maintainers platforms; hasAttr getAttr optional optionalString optionalAttrs maintainers platforms;
installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''
#!${stdenv.shell} -e #!${stdenv.shell} -e
@ -73,9 +73,7 @@ let
installsFirmware = (config.isEnabled "FW_LOADER") && installsFirmware = (config.isEnabled "FW_LOADER") &&
(isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
in { in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
outputs = if isModular then [ "out" "dev" ] else null;
passthru = { passthru = {
inherit version modDirVersion config kernelPatches; inherit version modDirVersion config kernelPatches;
}; };

10
pkgs/os-specific/linux/udisks/1-default.nix
View File

@ -3,11 +3,11 @@
, libxslt, docbook_xsl, utillinux }: , libxslt, docbook_xsl, utillinux }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "udisks-1.0.4"; name = "udisks-1.0.5";
src = fetchurl { src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j";
}; };
patches = [ ./purity.patch ./no-pci-db.patch ]; patches = [ ./purity.patch ./no-pci-db.patch ];
@ -28,7 +28,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
configureFlags = "--localstatedir=/var --enable-lvm2"; configureFlags = [
"--localstatedir=/var"
"--enable-lvm2"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
meta = { meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks; homepage = http://www.freedesktop.org/wiki/Software/udisks;

2
pkgs/os-specific/linux/udisks/2-default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=$(out)/lib/udev"
]; ];

6
pkgs/tools/misc/colord/default.nix
View File

@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; 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 buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
bashCompletion ]; bashCompletion ];

2
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--with-udev-rules" [ "--with-udev-rules"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
]; ];
postInstall = postInstall =

9
pkgs/tools/security/pcsclite/default.nix
View File

@ -5,20 +5,17 @@ stdenv.mkDerivation rec {
name = "pcsclite-${version}"; name = "pcsclite-${version}";
src = fetchurl { 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"; sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30";
}; };
# The OS should care on preparing the drivers into this location # The OS should care on preparing the drivers into this location
configureFlags = [ configureFlags = [
"--enable-usbdropdir=/var/lib/pcsc/drivers" "--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 ]; buildInputs = [ udev dbus_libs perl ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];