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

Merge remote-tracking branch 'central/master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
This commit is contained in:
Lluís Batlle i Rossell 2013-01-27 11:32:12 +01:00
commit 3b26ba7019
38 changed files with 283 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -2,10 +2,10 @@
pkgconfig, webkit }:
stdenv.mkDerivation {
name = "vimprobable2-1.0.2";
name = "vimprobable2-1.2.0";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.2.tar.bz2";
sha256 = "19gwlfv0lczbns73xg3637q7ixly62y3ijccnv0m1bqaqxjl4v8x";
url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2";
sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f";
};
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
installPhase = ''

8
pkgs/development/compilers/idris/default.nix
View File

@ -1,15 +1,15 @@
{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec
, transformers
, split, transformers
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.5.1";
sha256 = "0cy27b2kq696lw354y55mpx1gv66jdax1xjph989kxp0rd1v1sw9";
version = "0.9.6";
sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1";
isLibrary = false;
isExecutable = true;
buildDepends = [
binary Cabal filepath haskeline mtl parsec transformers
binary Cabal filepath haskeline mtl parsec split transformers
];
buildTools = [ happy ];
meta = {

4
pkgs/development/libraries/haskell/ansi-terminal/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ansi-terminal";
version = "0.5.5.1";
sha256 = "146kqp49dvsskws7pn54yynpac1sb1s51pbm4nkqj86wwp04f0lc";
version = "0.6";
sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg";
isLibrary = true;
isExecutable = true;
meta = {

4
pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ansi-wl-pprint";
version = "0.6.4";
sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0";
version = "0.6.6";
sha256 = "1zkbiv5cpdgjiyn2nrrha29r84al7jg6647flqmc8riz2nn91zqy";
isLibrary = true;
isExecutable = true;
buildDepends = [ ansiTerminal ];

4
pkgs/development/libraries/haskell/citeproc-hs/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "citeproc-hs";
version = "0.3.6";
sha256 = "0zxwca3i7gg1vhdvrxd15c8zgx1gy3y7zjj746bcvf8pwavkq5q2";
version = "0.3.7";
sha256 = "0ix9y7z8m8x4l10h96fgv820grywvwcp3019wxjja4y4w6irid3b";
buildDepends = [
filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
syb time utf8String

4
pkgs/development/libraries/haskell/diagrams/contrib.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "0.6.0.1";
sha256 = "1wrfdsfb2yj93wq2ykxjyg6g0q56bmxd2rc6r3gd0zcs8kiimaar";
version = "0.6.0.2";
sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng";
buildDepends = [
colour dataDefault diagramsLib forceLayout lens mtl vectorSpace
];

4
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-heist";
version = "0.5.1.1";
sha256 = "0jdg35xrikqg3r0rziv71g619vnmn8fzsv63b73m72fbj5xvy881";
version = "0.6.0.0";
sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk";
buildDepends = [ digestiveFunctors heist mtl text xmlhtml ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

4
pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-snap";
version = "0.5.0.2";
sha256 = "0xx5i09l8n1srdmslq0sq1h366cdq3xqxwjd3kp2ck9s6x65zyjz";
version = "0.6.0.0";
sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88";
buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

4
pkgs/development/libraries/haskell/digestive-functors/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors";
version = "0.5.0.4";
sha256 = "0diaj1pmfmhwbyjmw49kna59f7dckwrp16cbar5xpcn9k2pf19nv";
version = "0.6.0.0";
sha256 = "1h56nl1rszm098gwrdhm5w63mrnfjp1brfrk5hlj238nmj0djgcd";
buildDepends = [ mtl text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

4
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.1.2.0";
sha256 = "1kbilad4ry8lyfcygajaphkgragmq5js349mjmh1bjn04rhjm54c";
version = "4.1.2.1";
sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8";
isLibrary = true;
isExecutable = true;
buildDepends = [

1
pkgs/development/libraries/haskell/hspec/default.nix
View File

@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
silently time transformers
];
jailbreak = true;
meta = {
homepage = "http://hspec.github.com/";
description = "Behavior-Driven Development for Haskell";

24
pkgs/development/libraries/haskell/lens/default.nix
View File

@ -1,20 +1,22 @@
{ cabal, comonad, comonadsFd, comonadTransformers, filepath
, hashable, mtl, nats, parallel, semigroups, split, text
, transformers, transformersCompat, unorderedContainers, vector
{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers
, contravariant, distributive, filepath, genericDeriving, hashable
, MonadCatchIOTransformers, mtl, parallel, profunctorExtras
, profunctors, reflection, semigroupoids, semigroups, split, tagged
, text, transformers, transformersCompat, unorderedContainers
, vector
}:
cabal.mkDerivation (self: {
pname = "lens";
version = "3.7.3";
sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz";
version = "3.8.2";
sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m";
buildDepends = [
comonad comonadsFd comonadTransformers filepath hashable mtl nats
parallel semigroups split text transformers transformersCompat
unorderedContainers vector
bifunctors comonad comonadsFd comonadTransformers contravariant
distributive filepath genericDeriving hashable
MonadCatchIOTransformers mtl parallel profunctorExtras profunctors
reflection semigroupoids semigroups split tagged text transformers
transformersCompat unorderedContainers vector
];
patchPhase = ''
sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal
'';
meta = {
homepage = "http://github.com/ekmett/lens/";
description = "Lenses, Folds and Traversals";

4
pkgs/development/libraries/haskell/logict/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "logict";
version = "0.5.0.2";
sha256 = "0m0a55l061vbxdqw9h1780g893amdxs7glza4jd5jncjsv823s1z";
version = "0.6";
sha256 = "1np4wizvwlx458kq6mmdrh8qcp1794y1bs4mnnz951h6hay5z49f";
buildDepends = [ mtl ];
meta = {
homepage = "http://code.haskell.org/~dolio/logict";

1
pkgs/development/libraries/haskell/mpppc/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1.3";
sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi";
buildDepends = [ ansiTerminal split text ];
jailbreak = true;
meta = {
description = "Multi-dimensional parametric pretty-printer with color";
license = "GPL";

4
pkgs/development/libraries/haskell/pandoc/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.10.0.4";
sha256 = "1zwjwzxgip3zhbs7v7i981f5ch1rrd8i04cmn1gkfxnapbxx6z26";
version = "1.10.0.5";
sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54";
isLibrary = true;
isExecutable = true;
buildDepends = [

14
pkgs/development/libraries/haskell/reflection/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, tagged }:
cabal.mkDerivation (self: {
pname = "reflection";
version = "1.1.6";
sha256 = "1ihyx1a8pk1czam0qm1znl851dn4y6jip6s30girgghrvvxmblkw";
buildDepends = [ tagged ];
meta = {
homepage = "http://github.com/ekmett/reflection";
description = "Reifies arbitrary terms into types that can be reflected back into terms";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/zlib-bindings/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-bindings";
version = "0.1.1.2";
sha256 = "0p4713craq59vbyf3rr6kzv53rrfycbnlfs57i78fjrgwv6bd1ln";
version = "0.1.1.3";
sha256 = "18jhav7chbapakm9mwn7bn9lgvip7qaz61dw5gwv2nyalvm96qfr";
buildDepends = [ zlib ];
meta = {
homepage = "http://github.com/snoyberg/zlib-bindings";

61
pkgs/development/libraries/libspotify/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey }:
let version = "12.1.51"; in
if stdenv.system != "x86_64-linux" then throw ''
Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here
'' else stdenv.mkDerivation {
name = "libspotify-${version}";
src = fetchurl {
url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz";
sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3";
};
buildPhase = "true";
installFlags = "prefix=$(out)";
postInstall = "mv -v share $out";
patchPhase = "sed -i 's/ldconfig//' Makefile";
passthru = {
samples = if apiKey == null
then throw ''
Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly
'' else stdenv.mkDerivation {
name = "libspotify-samples-${version}";
src = libspotify.src;
buildInputs = [ pkgconfig libspotify alsaLib readline ];
postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
patchPhase = "cp ${apiKey} appkey.c";
installPhase = ''
mkdir -p $out/bin
install -m 755 jukebox/jukebox $out/bin
install -m 755 spshell/spshell $out/bin
install -m 755 localfiles/posix_stu $out/bin
'';
meta = libspotify.meta // { description = "Spotify API library samples"; };
};
inherit apiKey;
};
meta = {
description = "Spotify API library";
homepage = https://developer.spotify.com/technologies/libspotify;
maintainers = [ stdenv.lib.maintainers.shlevy ];
license = stdenv.lib.licenses.proprietary;
};
}

8
pkgs/development/tools/haskell/BNFC/default.nix
View File

@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "BNFC";
version = "2.4.2.1";
sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14";
isLibrary = false;
version = "2.6.0.3";
sha256 = "0i38rwslkvnicnlxbrxybnwkgfin04lnr4q12lcvli4ldp2ylfjq";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
meta = {
homepage = "http://www.cse.chalmers.se/research/group/Language-technology/BNFC/";
homepage = "http://bnfc.digitalgrammars.com/";
description = "A compiler front-end generator";
license = "GPL";
platforms = self.ghc.meta.platforms;

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.42";
sha256 = "02yg4lj2y272fvn79kgqccizs71xg5ifnjhpw4vhw5wya657a20w";
version = "1.43";
sha256 = "00blyn8hxj7d0ib7gg0a2gk36scm1isr5m4xsi9nvqay3261b068";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

4
pkgs/development/tools/haskell/hlint/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.41";
sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q";
version = "1.8.42";
sha256 = "03myq4wagx5d9g6v8znw4l67f1irami0fnlw48rxlqhfn33y5mgc";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/tools/misc/cpphs/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
version = "1.15";
sha256 = "1p2lf9zqiyydpq1vrqf8sw7mij5kw4pyggm41qgxn0a6lp6ni346";
version = "1.16";
sha256 = "1fv91s3h2s76h1hadb3mmnkg0rrfakmbfsrw6q522kshvpk2wmmp";
isLibrary = true;
isExecutable = true;
meta = {

4
pkgs/os-specific/linux/alsa-utils/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, alsaLib, gettext, ncurses}:
{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
stdenv.mkDerivation rec {
name = "alsa-utils-1.0.26";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq";
};
buildInputs = [ alsaLib ncurses ];
buildInputs = [ alsaLib ncurses libsamplerate ];
nativeBuildInputs = [ gettext ];
configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";

17
pkgs/os-specific/linux/pm-utils/default.nix
View File

@ -8,8 +8,8 @@ let
sbinPath = stdenv.lib.makeSearchPath "sbin"
[ procps ];
in
in
stdenv.mkDerivation rec {
name = "pm-utils-1.4.1";
@ -30,15 +30,26 @@ stdenv.mkDerivation rec {
substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH:${binPath}:${sbinPath}'
substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr '
substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)"
substituteInPlace pm/sleep.d/90clock --replace /sbin/hwclock hwclock
'';
postInstall =
''
# Remove some hooks that have doubtful usefulness. See
# http://zinc.canonical.com/~cking/power-benchmarking/pm-utils-results/results.txt.
# In particular, journal-commit breaks things if you have
# read-only bind mounts, since it ends up remounting the
# underlying filesystem read-only.
rm $out/lib/pm-utils/power.d/{journal-commit,readahead}
'';
meta = {
homepage = http://pm-utils.freedesktop.org/wiki/;
description = "A small collection of scripts that handle suspend and resume on behalf of HAL";
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
};
}

26
pkgs/os-specific/linux/procps-ng/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation {
name = "procps-ng-3.3.6";
src = fetchurl {
url = mirror://sourceforge/procps-ng/procps-ng-3.3.6.tar.xz;
sha256 = "0k0j3ilzfpw8n3y058ymgfmafdfqqqwpqm7nh7a35xlk6zgw96nh";
};
buildInputs = [ ncurses ];
makeFlags = "usrbin_execdir=$(out)/bin";
enableParallelBuilding = true;
crossAttrs = {
CC = stdenv.cross.config + "-gcc";
};
meta = {
homepage = http://sourceforge.net/projects/procps-ng/;
description = "Utilities that give information about processes using the /proc filesystem";
priority = 10; # less than coreutils, which also provides "kill" and "uptime"
};
}

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

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
./0004-Set-switch-to-configuration-hints-for-some-units.patch
./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
./0006-Don-t-call-plymouth-quit.patch
];
] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl

81
pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch Normal file
View File

@ -0,0 +1,81 @@
Based on a patch for udev in
nixpkgs(upstart)/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
It was taken from:
https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
Basically, ARM implemented accept4() only in 2.6.36. Nixpkgs now uses
linux headers from 2.6.35. And the particular nixpkgs glibc version had a bug,
not checking about 2.6.36 for accept4 on arm.
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 7b88f74..a9f7b62 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -347,10 +347,12 @@ int stdout_stream_new(Server *s) {
int fd, r;
socklen_t len;
struct epoll_event ev;
+ int flgs;
assert(s);
- fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
+ //fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
+ fd = accept(s->stdout_fd, NULL, NULL);
if (fd < 0) {
if (errno == EAGAIN)
return 0;
@@ -359,6 +361,11 @@ int stdout_stream_new(Server *s) {
return -errno;
}
+ // Since we don't have accept4
+ flgs = fcntl(fd, F_GETFL, NULL);
+ if(flgs >= 0) fcntl(fd, F_SETFL, flgs | O_NONBLOCK);
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+
if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) {
log_warning("Too many stdout streams, refusing connection.");
close_nointr_nofail(fd);
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index a235912..c05e4b4 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -15,6 +15,7 @@
#include <stddef.h>
#include <string.h>
#include <unistd.h>
+#include <fcntl.h>
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/socket.h>
@@ -181,6 +182,7 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
struct ucred ucred;
socklen_t slen;
const int on = 1;
+ int flgs;
conn = calloc(1, sizeof(struct udev_ctrl_connection));
if (conn == NULL)
@@ -188,13 +190,19 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
conn->refcount = 1;
conn->uctrl = uctrl;
- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
+ //conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
+ conn->sock = accept(uctrl->sock, NULL, NULL);
if (conn->sock < 0) {
if (errno != EINTR)
log_error("unable to receive ctrl connection: %m\n");
goto err;
}
+ // Since we don't have accept4
+ flgs = fcntl(conn->sock, F_GETFL, NULL);
+ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
+ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
+
/* check peer credential of connection */
slen = sizeof(ucred);
if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {

4
pkgs/os-specific/linux/upower/default.nix
View File

@ -6,11 +6,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "upower-0.9.18";
name = "upower-0.9.19";
src = fetchurl {
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1";
sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl";
};
buildInputs =

4
pkgs/servers/monitoring/zabbix/2.0.nix
View File

@ -2,11 +2,11 @@
let
version = "2.0.3";
version = "2.0.4";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
sha256 = "0r7pnfdgd3s2zqi2s7zlpjx521m3a6xy3g14q7ykxbz6fsmvxzmn";
sha256 = "0l8038j6ldsv0ywrs2j69ybjl2zv4qw42791glqvcabjj8x24m3m";
};
preConfigure =

2
pkgs/stdenv/generic/default.nix
View File

@ -41,7 +41,7 @@ let
# Add a utility function to produce derivations that use this
# stdenv and its shell.
mkDerivation = attrs:
if !allowUnfree && attrs.meta.license or "" == "unfree" then
if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then
throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
else
(derivation (

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

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r";
};
propagatedBuildInputs = [ pythonPackages.pycurl ];
buildInputs =
[ intltool pkgconfig glib udev libusb1 cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
];
pythonPath =
[ pythonDBus pycups pygobject ]
[ pythonDBus pycups pygobject pythonPackages.pycurl ]
++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
configureFlags =

2
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -26,6 +26,8 @@ stdenv.mkDerivation {
meta = {
homepage = "http://rg3.github.com/youtube-dl/";
description = "Command-line tool to download videos from YouTube.com and other sites";
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons ];
};
}

4
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -5,7 +5,7 @@
let
pn = "network-manager-applet";
major = "0.9";
version = "${major}.4.1";
version = "${major}.6.4";
in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
sha256 = "b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7";
sha256 = "0ha16wvp2jcl96849qahaagidhiyalbjzi3nxi235y7hcnqnfmmf";
};
buildInputs = [

6
pkgs/tools/package-management/nix/unstable.nix
View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.4pre3044_536c85e";
name = "nix-1.4pre3048_99ed558";
src = fetchurl {
url = "http://hydra.nixos.org/build/3794557/download/5/${name}.tar.xz";
sha256 = "d0f952ff3b4c0cf7f9682b45844ffb3686ff333d02be83341380186a97834f95";
url = "http://hydra.nixos.org/build/3851906/download/5/${name}.tar.xz";
sha256 = "4b2a75200d8b7ac21887f061b68b4e34d1edd69616916f86072d6f5bc7260d90";
};
nativeBuildInputs = [ perl pkgconfig ];

10
pkgs/tools/virtualization/ec2-ami-tools/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
stdenv.mkDerivation rec {
name = "ec2-ami-tools-1.4.0.7";
name = "ec2-ami-tools-1.4.0.9";
buildInputs = [ unzip makeWrapper ];
src = fetchurl {
url = "http://nixos.org/tarballs/${name}.zip";
sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip";
sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq";
};
# Amazon EC2 requires that disk images are writable. If they're
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
--set EC2_HOME $out \
--prefix PATH : ${ruby}/bin:${openssl}/bin
done
sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
''; # */

6
pkgs/top-level/all-packages.nix
View File

@ -6216,6 +6216,8 @@ let
procps = callPackage ../os-specific/linux/procps { };
"procps-ng" = callPackage ../os-specific/linux/procps-ng { };
pwdutils = callPackage ../os-specific/linux/pwdutils { };
qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
@ -7776,6 +7778,10 @@ let
spotify = callPackage ../applications/audio/spotify { };
libspotify = callPackage ../development/libraries/libspotify {
apiKey = config.libspotify.apiKey or null;
};
stalonetray = callPackage ../applications/window-managers/stalonetray {};
stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) {

2
pkgs/top-level/haskell-packages.nix
View File

@ -1457,6 +1457,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
recaptcha = callPackage ../development/libraries/haskell/recaptcha {};
reflection = callPackage ../development/libraries/haskell/reflection {};
regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {};
regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {};
regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {};

4
pkgs/top-level/python-packages.nix
View File

@ -3055,11 +3055,11 @@ pythonPackages = python.modules // rec {
# };
taskcoach = buildPythonPackage rec {
name = "TaskCoach-1.3.8";
name = "TaskCoach-1.3.22";
src = fetchurl {
url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
sha256 = "0gc277cgnw6f167lrbxlf7rmgyjxwzgkmi77qz9xwvnwcj2l94xn";
sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh";
};
propagatedBuildInputs = [ wxPython ];