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

Merge recent master into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát 2014-07-17 19:30:56 +02:00
commit 16e35532e4
1528 changed files with 5660 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/maintainers.nix
View File

@ -26,6 +26,7 @@
bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
bodil = "Bodil Stokke <nix@bodil.org>";
bosu = "Boris Sukholitko <boriss@gmail.com>";
calrama = "Moritz Maxeiner <moritz@ucworks.org>";
cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
@ -77,6 +78,7 @@
qknight = "Joachim Schiele <js@lastlog.de>";
raskin = "Michael Raskin <7c6f434c@mail.ru>";
redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
refnil = "Martin Lavoie <broemartino@gmail.com>";
relrod = "Ricky Elrod <ricky@elrod.me>";
rickynils = "Rickard Nilsson <rickynils@gmail.com>";
rob = "Rob Vermaas <rob.vermaas@gmail.com>";
@ -94,6 +96,7 @@
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
tv = "Tomislav Viljetić <tv@shackspace.de>";
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
vcunat = "Vladimír Čunát <vcunat@gmail.com>";
@ -102,6 +105,7 @@
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
wjlroe = "William Roe <willroe@gmail.com>";
wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
zef = "Zef Hemel <zef@zef.me>";

1
nixos/modules/config/system-path.nix
View File

@ -110,6 +110,7 @@ in
"/man"
"/sbin"
"/share/emacs"
"/share/vim-plugins"
"/share/org"
"/share/info"
"/share/terminfo"

3
nixos/modules/misc/ids.nix
View File

@ -136,6 +136,7 @@
nsd = 126;
gitolite = 127;
znc = 128;
polipo = 129;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -244,7 +245,9 @@
teamspeak = 124;
influxdb = 125;
nsd = 126;
firebird = 127;
znc = 128;
polipo = 129;
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!

39
nixos/modules/misc/locate.nix
View File

@ -3,12 +3,8 @@
with lib;
let
locatedb = "/var/cache/locatedb";
in
{
cfg = config.services.locate;
in {
###### interface
@ -35,6 +31,31 @@ in
'';
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Extra flags to append to <command>updatedb</command>.
'';
};
output = mkOption {
type = types.path;
default = /var/cache/locatedb;
description = ''
The database file to build.
'';
};
localuser = mkOption {
type = types.str;
default = "nobody";
description = ''
The user to search non-network directories as, using
<command>su</command>.
'';
};
};
};
@ -48,8 +69,10 @@ in
path = [ pkgs.su ];
script =
''
mkdir -m 0755 -p $(dirname ${locatedb})
exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
mkdir -m 0755 -p $(dirname ${toString cfg.output})
exec updatedb \
--localuser=${cfg.localuser} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
'';
serviceConfig.Nice = 19;
serviceConfig.IOSchedulingClass = "idle";

51
nixos/modules/module-list.nix
View File

@ -14,17 +14,17 @@
./config/power-management.nix
./config/pulseaudio.nix
./config/shells-environment.nix
./config/system-environment.nix
./config/swap.nix
./config/sysctl.nix
./config/system-environment.nix
./config/system-path.nix
./config/timezone.nix
./config/unix-odbc-drivers.nix
./config/users-groups.nix
./config/zram.nix
./hardware/all-firmware.nix
./hardware/cpu/intel-microcode.nix
./hardware/cpu/amd-microcode.nix
./hardware/cpu/intel-microcode.nix
./hardware/network/b43.nix
./hardware/network/intel-2100bg.nix
./hardware/network/intel-2200bg.nix
@ -52,6 +52,7 @@
./programs/blcr.nix
./programs/environment.nix
./programs/info.nix
./programs/screen.nix
./programs/shadow.nix
./programs/shell.nix
./programs/ssh.nix
@ -59,7 +60,6 @@
./programs/venus.nix
./programs/wvdial.nix
./programs/zsh/zsh.nix
./programs/screen.nix
./rename.nix
./security/apparmor.nix
./security/apparmor-suid.nix
@ -92,15 +92,15 @@
./services/databases/4store.nix
./services/databases/couchdb.nix
./services/databases/firebird.nix
./services/databases/influxdb.nix
./services/databases/memcached.nix
./services/databases/monetdb.nix
./services/databases/mongodb.nix
./services/databases/redis.nix
./services/databases/mysql.nix
./services/databases/openldap.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/virtuoso.nix
./services/databases/monetdb.nix
./services/databases/influxdb.nix
./services/desktops/accountsservice.nix
./services/desktops/geoclue2.nix
./services/desktops/gnome3/at-spi2-core.nix
@ -124,16 +124,16 @@
./services/hardware/pcscd.nix
./services/hardware/pommed.nix
./services/hardware/sane.nix
./services/hardware/thinkfan.nix
./services/hardware/udev.nix
./services/hardware/udisks2.nix
./services/hardware/upower.nix
./services/hardware/thinkfan.nix
./services/logging/klogd.nix
./services/logging/logcheck.nix
./services/logging/logrotate.nix
./services/logging/logstash.nix
./services/logging/syslogd.nix
./services/logging/rsyslogd.nix
./services/logging/syslogd.nix
./services/mail/dovecot.nix
./services/mail/freepops.nix
./services/mail/mail.nix
@ -146,12 +146,12 @@
./services/misc/disnix.nix
./services/misc/felix.nix
./services/misc/folding-at-home.nix
./services/misc/gpsd.nix
./services/misc/gitolite.nix
./services/misc/gpsd.nix
./services/misc/nix-daemon.nix
./services/misc/nix-gc.nix
./services/misc/nix-ssh-serve.nix
./services/misc/nixos-manual.nix
./services/misc/nix-ssh-serve.nix
./services/misc/rippled.nix
./services/misc/rogue.nix
./services/misc/svnserve.nix
@ -179,24 +179,23 @@
./services/networking/bind.nix
./services/networking/bitlbee.nix
./services/networking/btsync.nix
./services/networking/cjdns.nix
./services/networking/connman.nix
./services/networking/cntlm.nix
./services/networking/chrony.nix
./services/networking/cjdns.nix
./services/networking/cntlm.nix
./services/networking/connman.nix
./services/networking/ddclient.nix
./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix
./services/networking/firewall.nix
./services/networking/haproxy.nix
./services/networking/tcpcrypt.nix
./services/networking/flashpolicyd.nix
./services/networking/freenet.nix
./services/networking/git-daemon.nix
./services/networking/gnunet.nix
./services/networking/gogoclient.nix
./services/networking/gvpe.nix
./services/networking/haproxy.nix
./services/networking/hostapd.nix
./services/networking/ifplugd.nix
./services/networking/iodined.nix
@ -214,6 +213,7 @@
./services/networking/oidentd.nix
./services/networking/openfire.nix
./services/networking/openvpn.nix
./services/networking/polipo.nix
./services/networking/prayer.nix
./services/networking/privoxy.nix
./services/networking/quassel.nix
@ -224,10 +224,11 @@
./services/networking/sabnzbd.nix
./services/networking/searx.nix
./services/networking/spiped.nix
./services/networking/supybot.nix
./services/networking/syncthing.nix
./services/networking/ssh/lshd.nix
./services/networking/ssh/sshd.nix
./services/networking/supybot.nix
./services/networking/syncthing.nix
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tftpd.nix
./services/networking/unbound.nix
@ -245,11 +246,11 @@
./services/search/elasticsearch.nix
./services/search/solr.nix
./services/security/clamav.nix
./services/security/haveged.nix
./services/security/fprot.nix
./services/security/frandom.nix
./services/security/tor.nix
./services/security/haveged.nix
./services/security/torify.nix
./services/security/tor.nix
./services/security/torsocks.nix
./services/system/dbus.nix
./services/system/kerberos.nix
@ -257,14 +258,14 @@
./services/system/uptimed.nix
./services/torrent/deluge.nix
./services/torrent/transmission.nix
./services/ttys/gpm.nix
./services/ttys/agetty.nix
./services/ttys/gpm.nix
./services/ttys/kmscon.nix
./services/web-servers/apache-httpd/default.nix
./services/web-servers/fcgiwrap.nix
./services/web-servers/jboss/default.nix
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/cgit.nix
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/gitweb.nix
./services/web-servers/nginx/default.nix
./services/web-servers/phpfpm.nix
@ -276,11 +277,12 @@
./services/x11/display-managers/auto.nix
./services/x11/display-managers/default.nix
./services/x11/display-managers/kdm.nix
./services/x11/display-managers/slim.nix
./services/x11/display-managers/lightdm.nix
./services/x11/display-managers/slim.nix
./services/x11/hardware/multitouch.nix
./services/x11/hardware/synaptics.nix
./services/x11/hardware/wacom.nix
./services/x11/redshift.nix
./services/x11/window-managers/awesome.nix
#./services/x11/window-managers/compiz.nix
./services/x11/window-managers/default.nix
@ -290,7 +292,6 @@
./services/x11/window-managers/twm.nix
./services/x11/window-managers/wmii.nix
./services/x11/window-managers/xmonad.nix
./services/x11/redshift.nix
./services/x11/xfs.nix
./services/x11/xserver.nix
./system/activation/activation-script.nix
@ -313,17 +314,17 @@
./system/etc/etc.nix
./system/upstart/upstart.nix
./tasks/cpu-freq.nix
./tasks/filesystems.nix
./tasks/encrypted-devices.nix
./tasks/filesystems/btrfs.nix
./tasks/filesystems/ext.nix
./tasks/filesystems/f2fs.nix
./tasks/filesystems/nfs.nix
./tasks/filesystems.nix
./tasks/filesystems/reiserfs.nix
./tasks/filesystems/unionfs-fuse.nix
./tasks/filesystems/vfat.nix
./tasks/filesystems/xfs.nix
./tasks/filesystems/zfs.nix
./tasks/encrypted-devices.nix
./tasks/kbd.nix
./tasks/lvm.nix
./tasks/network-interfaces.nix

8
nixos/modules/programs/info.nix
View File

@ -2,6 +2,8 @@
let
texinfo = pkgs.texinfoInteractive;
# Quick hack to make the `info' command work properly. `info' needs
# a "dir" file containing all the installed Info files, which we
# don't have (it would be impure to have a package installation
@ -22,15 +24,15 @@ let
for i in $(IFS=:; echo $INFOPATH); do
for j in $i/*.info; do
${pkgs.texinfo}/bin/install-info --quiet $j $dir/dir
${texinfo}/bin/install-info --quiet $j $dir/dir
done
done
INFOPATH=$dir:$INFOPATH ${pkgs.texinfo}/bin/info "$@"
INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@"
''; # */
in
{
environment.systemPackages = [ infoWrapper pkgs.texinfo ];
environment.systemPackages = [ infoWrapper texinfo ];
}

6
nixos/modules/security/grsecurity.nix
View File

@ -50,7 +50,7 @@ in
description = ''
grsecurity configuration mode. This specifies whether
grsecurity is auto-configured or otherwise completely
manually configured. Can either by
manually configured. Can either be
<literal>custom</literal> or <literal>auto</literal>.
<literal>auto</literal> is recommended.
@ -64,7 +64,7 @@ in
description = ''
grsecurity configuration priority. This specifies whether
the kernel configuration should emphasize speed or
security. Can either by <literal>security</literal> or
security. Can either be <literal>security</literal> or
<literal>performance</literal>.
'';
};
@ -76,7 +76,7 @@ in
description = ''
grsecurity system configuration. This specifies whether
the kernel configuration should be suitable for a Desktop
or a Server. Can either by <literal>server</literal> or
or a Server. Can either be <literal>server</literal> or
<literal>desktop</literal>.
'';
};

2
nixos/modules/services/databases/firebird.nix
View File

@ -159,5 +159,7 @@ in
uid = config.ids.uids.firebird;
};
users.extraGroups.firebird.gid = config.ids.gids.firebird;
};
}

35
nixos/modules/services/databases/redis.nix
View File

@ -38,86 +38,92 @@ in
services.redis = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable the Redis server.";
};
package = mkOption {
type = types.package;
default = pkgs.redis;
description = "Which Redis derivation to use.";
type = types.package;
};
user = mkOption {
type = types.str;
default = "redis";
description = "User account under which Redis runs.";
};
pidFile = mkOption {
type = types.path;
default = "/var/lib/redis/redis.pid";
description = "";
};
port = mkOption {
type = types.int;
default = 6379;
description = "The port for Redis to listen to.";
type = with types; int;
};
bind = mkOption {
type = with types; nullOr str;
default = null; # All interfaces
description = "The IP interface to bind to.";
example = "127.0.0.1";
};
unixSocket = mkOption {
type = with types; nullOr path;
default = null;
description = "The path to the socket to bind to.";
example = "/var/run/redis.sock";
};
logLevel = mkOption {
type = types.str;
default = "notice"; # debug, verbose, notice, warning
example = "debug";
description = "Specify the server verbosity level, options: debug, verbose, notice, warning.";
type = with types; string;
};
logfile = mkOption {
type = types.str;
default = "/dev/null";
description = "Specify the log file name. Also 'stdout' can be used to force Redis to log on the standard output.";
example = "/var/log/redis.log";
type = with types; string;
};
syslog = mkOption {
type = types.bool;
default = true;
description = "Enable logging to the system logger.";
type = with types; bool;
};
databases = mkOption {
type = types.int;
default = 16;
description = "Set the number of databases.";
type = with types; int;
};
save = mkOption {
type = with types; listOf (listOf int);
default = [ [900 1] [300 10] [60 10000] ];
description = "The schedule in which data is persisted to disk, represented as a list of lists where the first element represent the amount of seconds and the second the number of changes.";
example = [ [900 1] [300 10] [60 10000] ];
};
dbFilename = mkOption {
type = types.str;
default = "dump.rdb";
description = "The filename where to dump the DB.";
type = with types; string;
};
dbpath = mkOption {
type = types.path;
default = "/var/lib/redis";
description = "The DB will be written inside this directory, with the filename specified using the 'dbFilename' configuration.";
type = with types; string;
};
slaveOf = mkOption {
@ -135,46 +141,47 @@ in
};
requirePass = mkOption {
type = with types; nullOr str;
default = null;
description = "Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)";
example = "letmein!";
};
appendOnly = mkOption {
type = types.bool;
default = false;
description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence.";
type = with types; bool;
};
appendOnlyFilename = mkOption {
type = types.str;
default = "appendonly.aof";
description = "Filename for the append-only file (stored inside of dbpath)";
type = with types; string;
};
appendFsync = mkOption {
type = types.str;
default = "everysec"; # no, always, everysec
description = "How often to fsync the append-only log, options: no, always, everysec.";
type = with types; string;
};
slowLogLogSlowerThan = mkOption {
type = types.int;
default = 10000;
description = "Log queries whose execution take longer than X in milliseconds.";
example = 1000;
type = with types; int;
};
slowLogMaxLen = mkOption {
type = types.int;
default = 128;
description = "Maximum number of items to keep in slow log.";
type = with types; int;
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = "Extra configuration options for redis.conf.";
type = with types; string;
};
};

118
nixos/modules/services/networking/polipo.nix Normal file
View File

@ -0,0 +1,118 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.polipo;
polipoConfig = pkgs.writeText "polipo.conf" ''
proxyAddress = ${cfg.proxyAddress}
proxyPort = ${toString cfg.proxyPort}
allowedClients = ${concatStringsSep ", " cfg.allowedClients}
${optionalString (cfg.parentProxy != "") "parentProxy = ${cfg.parentProxy}" }
${optionalString (cfg.socksParentProxy != "") "socksParentProxy = ${cfg.socksParentProxy}" }
${config.services.polipo.extraConfig}
'';
in
{
options = {
services.polipo = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to run the polipo caching web proxy.";
};
proxyAddress = mkOption {
type = types.string;
default = "127.0.0.1";
description = "IP address on which Polipo will listen.";
};
proxyPort = mkOption {
type = types.int;
default = 8123;
description = "TCP port on which Polipo will listen.";
};
allowedClients = mkOption {
type = types.listOf types.string;
default = [ "127.0.0.1" "::1" ];
example = [ "127.0.0.1" "::1" "134.157.168.0/24" "2001:660:116::/48" ];
description = ''
List of IP addresses or network addresses that may connect to Polipo.
'';
};
parentProxy = mkOption {
type = types.string;
default = "";
example = "localhost:8124";
description = ''
Hostname and port number of an HTTP parent proxy;
it should have the form ‘host:port’.
'';
};
socksParentProxy = mkOption {
type = types.string;
default = "";
example = "localhost:9050";
description = ''
Hostname and port number of an SOCKS parent proxy;
it should have the form ‘host:port’.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Polio configuration. Contents will be added
verbatim to the configuration file.
'';
};
};
};
config = mkIf cfg.enable {
users.extraUsers = singleton
{ name = "polipo";
uid = config.ids.uids.polipo;
description = "Polipo caching proxy user";
home = "/var/cache/polipo";
createHome = true;
};
users.extraGroups = singleton
{ name = "polipo";
gid = config.ids.gids.polipo;
members = [ "polipo" ];
};
systemd.services.polipo = {
description = "caching web proxy";
after = [ "network.target" "nss-lookup.target" ];
wantedBy = [ "multi-user.target"];
preStart = ''
${pkgs.coreutils}/bin/chown polipo:polipo /var/cache/polipo -R
'';
serviceConfig = {
ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}";
ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
User = "polipo";
};
};
};
}

22
nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
index f739d3b..fdd8db3 100644
--- a/includes/specials/SpecialActiveusers.php
+++ b/includes/specials/SpecialActiveusers.php
@@ -112,7 +112,7 @@ class ActiveUsersPager extends UsersPager {
return array(
'tables' => array( 'querycachetwo', 'user', 'recentchanges' ),
'fields' => array( 'user_name', 'user_id', 'recentedits' => 'COUNT(*)', 'qcc_title' ),
- 'options' => array( 'GROUP BY' => array( 'qcc_title' ) ),
+ 'options' => array( 'GROUP BY' => array( 'qcc_title', 'user_name', 'user_id' ) ),
'conds' => $conds
);
}
@@ -349,7 +349,7 @@ class SpecialActiveUsers extends SpecialPage {
__METHOD__,
array(
'GROUP BY' => array( 'rc_user_text' ),
- 'ORDER BY' => 'NULL' // avoid filesort
+ 'ORDER BY' => 'lastedittime DESC'
)
);
$names = array();

2
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
View File

@ -79,6 +79,8 @@ let
sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
};
patches = [ ./mediawiki-postgresql-fixes.patch ];
skins = config.skins;
buildPhase =

2
nixos/modules/system/boot/systemd.nix
View File

@ -824,5 +824,7 @@ in
systemd.services."user@".restartIfChanged = false;
systemd.services.systemd-remount-fs.restartIfChanged = false;
};
}

22
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -119,8 +119,10 @@ in
169.254.169.254 metadata.google.internal metadata
'';
systemd.services.fetch-root-authorized-keys =
{ description = "Fetch authorized_keys for root user";
networking.usePredictableInterfaceNames = false;
systemd.services.fetch-ssh-keys =
{ description = "Fetch host keys and authorized_keys for root user";
wantedBy = [ "multi-user.target" ];
before = [ "sshd.service" ];
@ -144,6 +146,22 @@ in
rm -f /root/key.pub /root/authorized-keys-metadata
fi
fi
echo "obtaining SSH private host key..."
curl -o /root/ssh_host_ecdsa_key http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key
if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key ]; then
mv -f /root/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key
echo "downloaded ssh_host_ecdsa_key"
chmod 600 /etc/ssh/ssh_host_ecdsa_key
fi
echo "obtaining SSH public host key..."
curl -o /root/ssh_host_ecdsa_key.pub http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub
if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key.pub ]; then
mv -f /root/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub
echo "downloaded ssh_host_ecdsa_key.pub"
chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub
fi
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;

3
nixos/modules/virtualisation/virtualbox-image.nix
View File

@ -51,6 +51,9 @@ with lib;
set -f
cp -prd $storePaths /mnt/nix/store/
mkdir -p /mnt/etc/nix
echo 'build-users-group = ' > /mnt/etc/nix/nix.conf
# Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
chroot /mnt ${config.nix.package}/bin/nix-store --load-db

24
pkgs/applications/audio/mopidy-spotify/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pythonPackages, mopidy }:
pythonPackages.buildPythonPackage rec {
name = "mopidy-spotify-${version}";
version = "1.1.3";
src = fetchurl {
url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
sha256 = "09s6841qb24nrmlc2izb8vxbgv185ddra6ndskrsw907hfli2kl6";
};
propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
doCheck = false;
meta = with stdenv.lib; {
homepage = http://www.mopidy.com/;
description = "Mopidy extension for playing music from Spotify.";
license = licenses.asl20;
maintainers = [ maintainers.rickynils ];
hydraPlatforms = [];
};
}

26
pkgs/applications/audio/mopidy/default.nix
View File

@ -5,39 +5,33 @@
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "0.15.0";
version = "0.18.3";
src = fetchurl {
url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
sha256 = "1fpnddcx6343wgxzh10s035w21g8jmfh2kzgx32w0xsshpra3gn1";
sha256 = "0b8ss6qjzj1pawd8469i5310ily3rad0ashfy87vdyj6xdyfyp0q";
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good
gst_python pygobject pykka cherrypy ws4py gst_plugins_base gst_plugins_good
];
# python zip complains about old timestamps
preConfigure = ''
find -print0 | xargs -0 touch
'';
# There are no tests
doCheck = false;
postInstall = ''
for p in $out/bin/mopidy $out/bin/mopidy-scan; do
wrapProgram $p \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
done
wrapProgram $out/bin/mopidy \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
'';
meta = {
meta = with stdenv.lib; {
homepage = http://www.mopidy.com/;
description = ''
A music server which can play music from Spotify and from your
local hard drive.
An extensible music server that plays music from local disk, Spotify,
SoundCloud, Google Play Music, and more.
'';
maintainers = [ stdenv.lib.maintainers.rickynils ];
license = licenses.asl20;
maintainers = [ maintainers.rickynils ];
hydraPlatforms = [];
};
}

20
pkgs/applications/audio/mp3splt/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ fetchurl, stdenv, libmp3splt, pkgconfig }:
stdenv.mkDerivation rec {
name = "mp3splt-2.6.1";
src = fetchurl {
url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz";
sha256 = "783a903fafbcf47f06673136a78b78d32a8e616a6ae06b79b459a32090dd14f7";
};
buildInputs = [ libmp3splt pkgconfig ];
meta = {
description = "utility to split mp3, ogg vorbis and FLAC files without decoding";
homepage = http://sourceforge.net/projects/mp3splt/;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.bosu ];
platforms = stdenv.lib.platforms.unix;
};
}

6
pkgs/applications/audio/ncmpc/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
stdenv.mkDerivation rec {
version = "0.21";
version = "0.22";
name = "ncmpc-${version}";
src = fetchurl {
url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.bz2";
sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07";
url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz";
sha256 = "a8d65f12653d9ce8bc4493aa1c5de09359c25bf3a22498d2ae797e7d41422211";
};
buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]

15
pkgs/applications/editors/eclipse/default.nix
View File

@ -238,4 +238,19 @@ in {
};
};
eclipse_sdk_44 = buildEclipse {
name = "eclipse-sdk-4.4";
description = "Eclipse Classic";
sources = {
"x86_64-linux" = fetchurl {
url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz;
sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2";
};
"i686-linux" = fetchurl {
url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz;
sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z";
};
};
};
}

4
pkgs/applications/editors/emacs-modes/org/default.nix
View File

@ -2,11 +2,11 @@
, texLiveAggregationFun }:
stdenv.mkDerivation rec {
name = "org-8.2.7";
name = "org-8.2.7b";
src = fetchurl {
url = "http://orgmode.org/${name}.tar.gz";
sha256 = "1n864hnjvx5n2gfi7n0xbwvb1k8l5rdh4a3vpbhw23hy8rx3bvaw";
sha256 = "07hq2q126d967nj7xq46q4mkca5r2rw61bn8d6nzkhksghp8b2v1";
};
buildInputs = [ emacs ];

6
pkgs/applications/editors/idea/default.nix
View File

@ -49,7 +49,7 @@ let
--prefix IDEA_JDK : $jdk
mkdir -p $out/share/applications
cp ${ideaItem}/share/applications/* $out/share/applications
cp "${ideaItem}/share/applications/"* $out/share/applications
patchShebangs $out
'';
@ -64,7 +64,7 @@ let
in {
idea_community_1313 = buildIdea rec {
idea_community = buildIdea rec {
name = "idea-community-${version}";
version = "13.1.3";
build = "IC-135.909";
@ -76,7 +76,7 @@ in {
};
};
idea_ultimate_1313 = buildIdea rec {
idea_ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "13.1.3";
build = "IU-135.909";

58
pkgs/applications/editors/lighttable/default.nix Normal file
View File

@ -0,0 +1,58 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev
}:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
];
in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "LightTable-${version}";
version = "0.6.7";
src =
if stdenv.system == "i686-linux" then
fetchurl {
name = "LightTableLinux.tar.gz";
url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux.tar.gz;
sha256 = "3b09f9665ed1b4abb7c1ca16286ac7222caf6dc124059be6db4cb9f5fd041e73";
}
else
fetchurl {
name = "LightTableLinux64.tar.gz";
url = https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/0.6.7/LightTableLinux64.tar.gz;
sha256 = "710d670ccc30aadba521ccb723388679ee6404aac662297a005432c811d59e82";
};
buildInputs = [ makeWrapper ];
phases = [ "installPhase" ];
installPhase = ''
tar xvf ${src}
mkdir -p $out/bin
mv LightTable $out/
patchelf \
--interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$out/LightTable/ltbin
ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0
makeWrapper $out/LightTable/ltbin $out/bin/lighttable \
--prefix "LD_LIBRARY_PATH" : $out/LightTable
'';
meta = with stdenv.lib; {
description = "the next generation code editor";
homepage = http://www.lighttable.com/;
license = [ licenses.gpl3 ];
};
}

42
pkgs/applications/editors/vim/configurable.nix
View File

@ -1,9 +1,35 @@
# TODO tidy up eg The patchelf code is patching gvim even if you don't build it..
# but I have gvim with python support now :) - Marc
args@{source ? "default", ...}: with args;
args@{pkgs, source ? "default", ...}: with args;
let inherit (args.composableDerivation) composableDerivation edf; in
let inherit (args.composableDerivation) composableDerivation edf;
nixosRuntimepath = pkgs.writeText "nixos-vimrc" ''
set nocompatible
syntax on
function! NixosPluginPath()
let seen = {}
for p in reverse(split($NIX_PROFILES))
for d in split(glob(p . '/share/vim-plugins/*'))
let pluginname = substitute(d, ".*/", "", "")
if !has_key(seen, pluginname)
exec 'set runtimepath^='.d
let seen[pluginname] = 1
endif
endfor
endfor
endfunction
execute NixosPluginPath()
if filereadable("/etc/vimrc")
source /etc/vimrc
elseif filereadable("/etc/vim/vimrc")
source /etc/vim/vimrc
endif
'';
in
composableDerivation {
# use gccApple to compile on darwin
mkDerivation = ( if stdenv.isDarwin
@ -11,18 +37,18 @@ composableDerivation {
else stdenv ).mkDerivation;
} (fix: {
name = "vim_configurable-7.4.316";
name = "vim_configurable-7.4.335";
enableParallelBuilding = true; # test this
src =
src =
builtins.getAttr source {
"default" =
# latest release
args.fetchhg {
url = "https://vim.googlecode.com/hg/";
rev = "v7-4-316";
sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
rev = "v7-4-335";
sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj";
};
"vim-nox" =
@ -39,7 +65,7 @@ composableDerivation {
# if darwin support is enabled, we want to make sure we're not building with
# OS-installed python framework
patches = stdenv.lib.optionals
patches = stdenv.lib.optionals
(stdenv.isDarwin && (config.vim.darwin or true))
[ ./python_framework.patch ];
@ -145,6 +171,8 @@ composableDerivation {
echo $nativeBuildInputs
echo $rpath
patchelf --set-rpath $rpath $out/bin/{vim,gvim}
ln -sfn ${nixosRuntimepath} $out/share/vim/vimrc
'';
dontStrip = 1;

6
pkgs/applications/editors/vim/default.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "vim-${version}";
version = "7.4.316";
version = "7.4.335";
src = fetchhg {
url = "https://vim.googlecode.com/hg/";
rev = "v7-4-316";
sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
rev = "v7-4-335";
sha256 = "0qnpzfcbi6fhz82pj68l4vrnigca1akq2ksrxz6krwlfhns6jhhj";
};
enableParallelBuilding = true;

8
pkgs/applications/editors/vim/macvim.nix
View File

@ -6,13 +6,13 @@ let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation;
in mkDerivation rec {
name = "macvim-${version}";
version = "7.4-73";
version = "7.4.355";
src = fetchFromGitHub {
owner = "b4winckler";
owner = "genoma";
repo = "macvim";
rev = "snapshot-73";
sha256 = "0zv82y2wz8b482khkgbl08cnxq3pv5bm37c71wgfa0fzy3h12gcj";
rev = "c18a61f9723565664ffc2eda9179e96c95860e25";
sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf";
};
enableParallelBuilding = true;

30
pkgs/applications/editors/vim/macvim.patch
View File

@ -1,3 +1,33 @@
diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
index 1c5ff47..677a2cc 100644
--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
@@ -437,6 +437,8 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
@@ -632,6 +634,7 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = "";
ONLY_ACTIVE_ARCH = YES;
+ OTHER_LDFLAGS = "-headerpad_max_install_names";
PRODUCT_NAME = MacVim;
VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = "-Wall";
@@ -662,6 +665,7 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = "";
ONLY_ACTIVE_ARCH = YES;
+ OTHER_LDFLAGS = "-headerpad_max_install_names";
PRODUCT_NAME = MacVim;
VERSIONING_SYSTEM = "apple-generic";
WRAPPER_EXTENSION = app;
diff --git a/src/vimtutor b/src/vimtutor
index 70d9ec7..b565a1a 100755
--- a/src/vimtutor

32
pkgs/applications/editors/vim/wrapper.nix
View File

@ -1,32 +0,0 @@
{ stdenv, makeWrapper, writeText, vim, vimrc }:
let
vimrcfile = writeText "vimrc" vimrc;
p = builtins.parseDrvName vim.name;
in stdenv.mkDerivation rec {
name = "${p.name}-with-vimrc-${p.version}";
buildInputs = [ makeWrapper vim vimrcfile ];
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out
cp -r ${vim}/* $out/
chmod u+w $out/bin
chmod u+w $out/share/vim
ln -s ${vimrcfile} $out/share/vim/vimrc
wrapProgram $out/bin/vim --set VIM "$out/share/vim"
'';
meta = with stdenv.lib; {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;
platforms = platforms.unix;
};
}

2
pkgs/applications/editors/yi/yi-contrib.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, filepath, lens, mtl, split, time, transformersBase, yi }:
cabal.mkDerivation (self: {

7
pkgs/applications/graphics/hoodle/default.nix
View File

@ -1,15 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }:
cabal.mkDerivation (self: {
pname = "hoodle";
version = "0.2.2.1";
sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd";
version = "0.3";
sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5";
isLibrary = true;
isExecutable = true;
buildDepends = [
cmdargs configurator dyre filepath hoodleCore mtl
];
jailbreak = true;
meta = {
homepage = "http://ianwookim.org/hoodle";
description = "Executable for hoodle";

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

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, binary, bytestringProgress, deepseq, filepath
, HUnit, libXScrnSaver, parsec, pcreLight, processExtras, strict
, tasty, tastyGolden, tastyHunit, terminalProgressBar, time

25
pkgs/applications/misc/blender/default.nix
View File

@ -1,27 +1,35 @@
{ stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
, zlib
, zlib, fftw
, jackaudioSupport ? false, jackaudio
}:
with lib;
stdenv.mkDerivation rec {
name = "blender-2.70a";
name = "blender-2.71";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "1rgkijn1nirj3jwh058zv6piw8q4j5wwjapgbvh2hh6fpbj84bgb";
sha256 = "18pzcnrs4rcb6mf6aqr9xj2r05v8aay8daj31395ljfzw667zakx";
};
buildInputs =
[ SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
[ SDL boost cmake ffmpeg gettext glew ilmbase libXi
libjpeg libpng libsamplerate libsndfile libtiff mesa openal
opencolorio openexr openimageio openjpeg python zlib
] ++ stdenv.lib.optional jackaudioSupport jackaudio;
opencolorio openexr openimageio /* openjpeg */ python zlib fftw
] ++ optional jackaudioSupport jackaudio;
postUnpack =
''
substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
'';
cmakeFlags =
[ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
"-DWITH_OPENCOLLADA=OFF"
"-DWITH_MOD_OCEANSIM=ON"
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
@ -29,7 +37,8 @@ stdenv.mkDerivation rec {
"-DPYTHON_LIBPATH=${python}/lib"
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
"-DPYTHON_VERSION=${python.majorVersion}"
] ++ stdenv.lib.optional jackaudioSupport "-DWITH_JACK=ON";
]
++ optional jackaudioSupport "-DWITH_JACK=ON";
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";

4
pkgs/applications/misc/calibre/default.nix
View File

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-1.35.0";
name = "calibre-1.44.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0pzxp1f9d4pw7vksdfkdz6fdgrb8jfwgh4fckjfrarqs039422bi";
sha256 = "14k9rzp4rphls4zkzrdq8kk0mgzsh5sdmngxklb58r71xj2r995j";
};
inherit python;

16
pkgs/applications/misc/cdrtools/default.nix
View File

@ -2,9 +2,9 @@
stdenv.mkDerivation rec {
name = "cdrtools-2.01";
configurePhase = "prefix=$out";
configurePhase = "prefix=$out";
#hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script
preInstall = ''
mkdir "$TMP/bin"
@ -14,16 +14,18 @@ stdenv.mkDerivation rec {
PATH="$TMP/bin:$PATH"
done
'';
src = fetchurl {
url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
md5 = "d44a81460e97ae02931c31188fe8d3fd";
};
patches = [./cdrtools-2.01-install.patch];
meta = {
description = "Highly portable CD/DVD/BluRay command line recording software (deprecated; use cdrkit instead)";
homepage = http://sourceforge.net/projects/cdrtools/; # berlios shut down; I found no better link
homepage = http://sourceforge.net/projects/cdrtools/;
description = "Highly portable CD/DVD/BluRay command line recording software";
broken = true; # Build errors, probably because the source
# can't deal with recent versions of gcc.
};
}

60
pkgs/applications/misc/finalterm/default.nix Normal file
View File

@ -0,0 +1,60 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
, keybinder3, clutter_gtk, libnotify
, libxkbcommon, xlibs, udev
, bashInteractive
}:
let rev = "5ccde4e8f2c02a398f9172e07c25262ecf954626";
in stdenv.mkDerivation {
name = "finalterm-git-${builtins.substring 0 8 rev}";
src = fetchFromGitHub {
owner = "p-e-w";
repo = "finalterm";
inherit rev;
sha256 = "1gw6nc19whfjd4xj0lc0fmjypn8d7nasif79671859ymnfizyq4f";
};
buildInputs = [
pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence
libxkbcommon
] ++ lib.optionals stdenv.isLinux [
udev
];
preConfigure = ''
substituteInPlace data/org.gnome.finalterm.gschema.xml \
--replace "/bin/bash" "${bashInteractive}/bin/bash"
cmakeFlagsArray=(
-DMINIMAL_FLAGS=ON
)
'';
postFixup = ''
wrapProgram "$out/bin/finalterm" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with lib; {
homepage = "http://finalterm.org";
description = "A new breed of terminal emulator";
longDescription = ''
Final Term is a new breed of terminal emulator.
It goes beyond mere emulation and understands what is happening inside the shell it is hosting. This allows it to offer features no other terminal can, including:
- Semantic text menus
- Smart command completion
- GUI terminal controls
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux;
};
}

2
pkgs/applications/misc/nc-indicators/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
cabal.mkDerivation (self: {

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

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, dbus, dyre, filepath, gtk, gtkTraymanager
, HStringTemplate, HTTP, mtl, network, parsec, split, stm, text
, time, transformers, utf8String, X11, xdgBasedir, xmonad

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

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time
, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11

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

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, filepath, strict, time, xdgBasedir }:
cabal.mkDerivation (self: {

8
pkgs/applications/networking/browsers/dwb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c,
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls, json_c,
m4, glib_networking, gsettings_desktop_schemas, dconf }:
stdenv.mkDerivation {
@ -10,12 +10,10 @@ stdenv.mkDerivation {
sha256 = "04p9frsnh1qz067cw36anvr41an789fba839svdjrdva0f2751g8";
};
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ];
# There are Xlib and gtk warnings therefore I have set Wno-error
preBuild=''
makeFlagsArray=(CPPFLAGS="-Wno-error" GTK=3 PREFIX=$out);
'';
makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"'';
preFixup=''
wrapProgram "$out/bin/dwb" \

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -36,7 +36,7 @@
let
# -> http://get.adobe.com/flashplayer/
version = "11.2.202.378";
version = "11.2.202.394";
src =
if stdenv.system == "x86_64-linux" then
@ -47,7 +47,7 @@ let
else rec {
inherit version;
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
sha256 = "08aw532k8y27s64ffdghz2k4zf0jsz65crvn3i9vxan29064la9c";
sha256 = "1w82kmda91xdsrqpkrbcbrzswnbfszy0x9hvf9wf2h14isimdknx";
}
else if stdenv.system == "i686-linux" then
if debug then {
@ -58,7 +58,7 @@ let
} else rec {
inherit version;
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
sha256 = "1njy2pnhgr2hjz6kp9vl4cgxxszw2k6gmhjz88hx92aijv7s93wz";
sha256 = "0c8wp4qn6k224krihxb08g7727wlklk9bl4h7nqp3cpp85x9hg97";
}
else throw "Flash Player is not supported on this platform";

9
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -5,7 +5,7 @@
, ssl ? true # enable SSL support
, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name
, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
, stdenv, fetchurl, cmake, makeWrapper, qt4, kdelibs, automoc4, phonon, dconf }:
let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
@ -22,7 +22,7 @@ in with stdenv; mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ cmake qt4 ]
buildInputs = [ cmake makeWrapper qt4 ]
++ lib.optional withKDE kdelibs
++ lib.optional withKDE automoc4
++ lib.optional withKDE phonon;
@ -40,6 +40,11 @@ in with stdenv; mkDerivation rec {
++ edf ssl "WITH_OPENSSL"
++ edf previews "WITH_WEBKIT" ;
preFixup = ''
wrapProgram "$out/bin/quasselclient" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
'';
meta = with stdenv.lib; {
homepage = http://quassel-irc.org/;
description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon";

58
pkgs/applications/networking/p2p/retroshare/0.6.nix Normal file
View File

@ -0,0 +1,58 @@
{ stdenv, fetchsvn, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher }:
stdenv.mkDerivation {
name = "retroshare-0.6-svn-7445";
src = fetchsvn {
url = svn://svn.code.sf.net/p/retroshare/code/trunk;
rev = 7445;
sha256 = "1dqh65bn21g7ix752ddrr10kijjdwjgjipgysyxnm90zjmdlx3cc";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher";
patchPhase = ''
# Fix build error
sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
libretroshare/src/upnp/UPnPBase.cpp
# Extensions get installed
sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \
libretroshare/src/rsserver/rsinit.cc
# Where to find the bootstrap DHT bdboot.txt
sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \
libretroshare/src/rsserver/rsaccounts.cc
'';
# sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \
# retroshare-gui/src/retroshare-gui.pro \
# retroshare-nogui/src/retroshare-nogui.pro
buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig
protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher ];
configurePhase = ''
qmake PREFIX=$out DESTDIR=$out RetroShare.pro
'';
postInstall = ''
mkdir -p $out/bin
mv $out/retroshare-nogui $out/bin
mv $out/RetroShare $out/bin
# plugins
mkdir -p $out/share/retroshare
mv $out/lib* $out/share/retroshare
# BT DHT bootstrap
cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare
'';
meta = with stdenv.lib; {
description = "";
homepage = http://retroshare.sourceforge.net/;
#license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.iElectric ];
};
}

62
pkgs/applications/networking/p2p/twister/default.nix Normal file
View File

@ -0,0 +1,62 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python
, boost, db, openssl, geoip, libiconv, miniupnpc
, srcOnly, fetchgit
}:
let
twisterHTML = srcOnly {
name = "twister-html";
src = fetchgit {
url = "git://github.com/miguelfreitas/twister-html.git";
rev = "891f7bf24e1c3df7ec5e1db23c765df2d7c2d5a9";
sha256 = "0d96rfkpwxyiz32k2pd6a64r2kr3600qgp9v73ddcpq593wf11qb";
};
};
in stdenv.mkDerivation rec {
name = "twister-${version}";
version = "0.9.22";
src = fetchurl {
url = "https://github.com/miguelfreitas/twister-core/"
+ "archive/v${version}.tar.gz";
sha256 = "1haq0d7ypnazs599g4kcq1x914fslc04wazqj54rlvjdp7yx4j3f";
};
configureFlags = [
"--with-libgeoip"
"--with-libiconv"
"--with-boost=${boost}"
"--disable-deprecated-functions"
"--enable-tests"
"--enable-python-binding"
];
buildInputs = [
autoconf automake libtool pkgconfig python
boost db openssl geoip libiconv miniupnpc
];
postPatch = ''
sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \
src/init.cpp
sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \
src/util.cpp
'';
preConfigure = ''
sh autotool.sh
'';
installPhase = ''
install -vD twisterd "$out/bin/twisterd"
'';
enableParallelBuilding = true;
meta = {
homepage = "http://www.twister.net.co/";
description = "Peer-to-peer microblogging";
license = stdenv.lib.licenses.mit;
};
}

2
pkgs/applications/office/hledger-interest/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, hledgerLib, mtl, time }:
cabal.mkDerivation (self: {

2
pkgs/applications/office/hledger-irr/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, hledgerLib, statistics, time }:
cabal.mkDerivation (self: {

2
pkgs/applications/science/math/sloane/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative
, terminalSize, text, time, zlib
}:

8
pkgs/applications/version-management/darcs/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, curl, extensibleExceptions, filepath, hashedStorage
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
, regexCompat, tar, terminfo, text, utf8String, vector, zlib
@ -15,15 +17,15 @@ cabal.mkDerivation (self: {
utf8String vector zlib
];
extraLibraries = [ curl ];
jailbreak = true;
doCheck = false;
postInstall = ''
mkdir -p $out/etc/bash_completion.d
mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
'';
jailbreak = true;
meta = {
homepage = http://darcs.net/;
description = "A distributed, interactive, smart revision control system";
homepage = "http://darcs.net/";
description = "a distributed, interactive, smart revision control system";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

41
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -1,23 +1,25 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
, caseInsensitive, clientsession, cryptoApi, cryptohash, curl
, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
, monadControl, mtl, network, networkConduit, networkInfo
, networkMulticast, networkProtocolXmpp, openssh
, optparseApplicative, perl, QuickCheck, random, regexTdfa, rsync
, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty
, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers
, unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which
, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
, monadControl, mtl, network, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, optparseApplicative, perl
, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
, tastyRerun, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
, fsnotify
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140613";
sha256 = "01khqy68w1rqxic9lqal7902cv89d10xvbzmvlsx99g70ljqfafi";
version = "5.20140709";
sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -26,19 +28,20 @@ cabal.mkDerivation (self: {
dlist dns editDistance exceptions extensibleExceptions
feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
httpConduit httpTypes IfElse json liftedBase MissingH monadControl
mtl network networkConduit networkInfo networkMulticast
networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
] ++ (if (!self.stdenv.isDarwin) then [
dbus fdoNotify hinotify
] else [
mtl network networkInfo networkMulticast networkProtocolXmpp
optparseApplicative QuickCheck random regexTdfa SafeSemaphore
securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck
tastyRerun text time transformers unixCompat utf8String uuid wai
waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic
] ++ (if self.stdenv.isDarwin then [
fsnotify
] else [
dbus fdoNotify hinotify
]);
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fAssistant -fProduction";
configureFlags = "-fAssistant
-fProduction";
preConfigure = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"

11
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
View File

@ -1,16 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, extensibleExceptions, filepath, git, github, hslogger
, IfElse, MissingH, mtl, network, prettyShow, text, unixCompat
, IfElse, MissingH, mtl, network, optparseApplicative, prettyShow
, text, unixCompat
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20131203";
sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba";
version = "1.20140707";
sha256 = "0c15gq91c36xza7yiimqvgk609p9xf9jlzy9683d9p9bx1khpadd";
isLibrary = false;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath github hslogger IfElse MissingH mtl
network prettyShow text unixCompat
network optparseApplicative prettyShow text unixCompat
];
buildTools = [ git ];
meta = {

26
pkgs/applications/version-management/gitolite/default.nix
View File

@ -1,14 +1,12 @@
{ stdenv, fetchurl, perl, git, fetchgit }:
{ stdenv, fetchurl, perl, git }:
stdenv.mkDerivation rec {
name = "gitolite-${version}";
version = "3.6.1";
src = fetchgit {
url = "git://github.com/sitaramc/gitolite";
rev = "refs/tags/v${version}";
sha256 = "47e0e9c3137b05af96c091494ba918d61d1d3396749a04d63e7949ebcc6c6dca";
leaveDotGit = true;
src = fetchurl {
url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz";
sha256 = "0sizzv705aypasi9vf9kmdbzcl3gmyfxg9dwdl5prn64biqkvq3y";
};
buildInputs = [ perl git ];
@ -17,21 +15,21 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace ./install --replace " 2>/dev/null" ""
substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \
--replace /usr/bin/perl "/usr/bin/env perl"
--replace /usr/bin/perl "${perl}/bin/perl"
substituteInPlace src/lib/Gitolite/Hooks/Update.pm \
--replace /usr/bin/perl "/usr/bin/env perl"
--replace /usr/bin/perl "${perl}/bin/perl"
'';
installPhase = ''
mkdir -p $out/bin
git tag v${version} # Gitolite requires a tag for the version information :/
perl ./install -to $out/bin
'';
meta = {
meta = with stdenv.lib; {
description = "Finely-grained git repository hosting";
homepage = "http://gitolite.com/gitolite/index.html";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
homepage = http://gitolite.com/gitolite/index.html;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.thoughtpolice ];
};
}

4
pkgs/applications/window-managers/xmonad/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
cabal.mkDerivation (self: {
@ -14,12 +16,10 @@ cabal.mkDerivation (self: {
mkdir -p $out/share/man/man1
mv "$out/"**"/man/"*.1 $out/share/man/man1/
'';
patches = [
# Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
./xmonad_ghc_var_0.11.patch
];
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";

2
pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
, xmonad
}:

2
pkgs/applications/window-managers/xmonad/xmonad-extras.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, hint, libmpd, mtl, network, parsec, random, regexPosix
, split, X11, xmonad, xmonadContrib
}:

4
pkgs/build-support/buildenv/default.nix
View File

@ -23,10 +23,12 @@
, # Shell command to run after building the symlink tree.
postBuild ? ""
, passthru ? {}
}:
runCommand name
{ inherit manifest paths ignoreCollisions pathsToLink postBuild;
{ inherit manifest paths ignoreCollisions passthru pathsToLink postBuild;
preferLocalBuild = true;
}
''

2
pkgs/build-support/cabal/default.nix
View File

@ -29,7 +29,7 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
# Pure shared library builds don't work before GHC 7.8.x.
assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
{

19
pkgs/build-support/fetchgit/private.nix Normal file
View File

@ -0,0 +1,19 @@
{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
then builtins.toString <ssh-auth-sock>
else null;
GIT_SSH = writeScript "fetchgit-ssh" ''
#! ${stdenv.shell}
exec -a ssh ${openssh}/bin/ssh -F ${let
sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
then <ssh-config-file>
else builtins.trace ''
Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
'' "/var/lib/empty/config";
in builtins.toString sshConfigFile} "$@"
'';
})

3
pkgs/build-support/fetchurl/mirrors.nix
View File

@ -127,7 +127,7 @@ rec {
ftp://mirror.csclub.uwaterloo.ca/nongnu/
ftp://mirror.publicns.net/pub/nongnu/
ftp://savannah.c3sl.ufpr.br/
http://download.savannah.gnu.org/
http://download.savannah.gnu.org/releases/
http://ftp.cc.uoc.gr/mirrors/nongnu.org/
http://ftp.twaren.net/Unix/NonGNU/
http://mirror.csclub.uwaterloo.ca/nongnu/
@ -305,7 +305,6 @@ rec {
http://dirichlet.mat.puc.cl/
http://ftp.ctex.org/mirrors/CRAN/
http://mirror.bjtu.edu.cn/cran
http://cran.dataguru.cn/
http://mirrors.ustc.edu.cn/CRAN/
http://mirrors.xmu.edu.cn/CRAN/
http://www.laqee.unal.edu.co/CRAN/

12
pkgs/build-support/vm/default.nix
View File

@ -1582,22 +1582,22 @@ rec {
debian70x86_64 = debian7x86_64;
debian7i386 = {
name = "debian-7.5-wheezy-i386";
fullName = "Debian 7.5 Wheezy (i386)";
name = "debian-7.6-wheezy-i386";
fullName = "Debian 7.6 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
sha256 = "c4896c30c9a483354714d50f19d0779b72a218ce4f817f9ec8554f9664137993";
sha256 = "773ba601513cd7ef1d5192ad8baa795fa050573d82568c577cdf79adade698a3";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian7x86_64 = {
name = "debian-7.5-wheezy-amd64";
fullName = "Debian 7.5 Wheezy (amd64)";
name = "debian-7.6-wheezy-amd64";
fullName = "Debian 7.6 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
sha256 = "f3b78aac7d2bdfc3896fdd2087affd0e16bafbf35945106b196483f5fb303d52";
sha256 = "11a8bd3648d51f51e56c9f5382168cc47267d67ef6a050826e1cd358ed46cc17";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

6
pkgs/data/misc/tzdata/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
let version = "2014b"; in
let version = "2014e"; in
stdenv.mkDerivation rec {
name = "tzdata-${version}";
@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
srcs =
[ (fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
sha256 = "1d8w5g7fy8nrdj092cwmxdxw6rk3bzwpxqpz6l5sra2kqbhg7qfi";
sha256 = "1ic63ykplnrvh9704j6l089rais0nxw1lcf1dbc3iy2ij2kl7qh8";
})
(fetchurl {
url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
sha256 = "12x7ahbjxc3sj4ykcvx5c7kw1nbn6ywm8wzq6303y3l8qyqd7nmm";
sha256 = "074c98vmdgysgkksaqwkn1gbrlnzk8l28zs8lhif44a9mckc9ss3";
})
];

4
pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, gconf, libuuid
, desktop_file_utils, itstool, ncurses, makeWrapper }:
, desktop_file_utils, itstool, makeWrapper }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
gnome3.dconf gnome3.gconf itstool makeWrapper ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];

16
pkgs/desktops/gnome-3/3.10/core/vte/default.nix
View File

@ -15,9 +15,15 @@ stdenv.mkDerivation rec {
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = ''--enable-introspection'';
configureFlags = [ "--enable-introspection" ];
meta = {
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
'';
meta = with stdenv.lib; {
homepage = http://www.gnome.org/;
description = "A library implementing a terminal emulator widget for GTK+";
longDescription = ''
@ -28,8 +34,8 @@ stdenv.mkDerivation rec {
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = "LGPLv2";
maintainers = with stdenv.lib.maintainers; [ astsmtl antono ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
platforms = platforms.linux;
};
}

10
pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
, attr, bzip2, acl, makeWrapper }:
, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "file-roller-${version}";
@ -16,15 +16,19 @@ stdenv.mkDerivation rec {
# it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
attr bzip2 acl makeWrapper ];
hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
preFixup = ''
wrapProgram "$out/bin/file-roller" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/FileRoller;
description = "Archive manager for the GNOME desktop environment";
platforms = platforms.linux;
maintainers = [ maintainers.lethalman ];
};
}

2
pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
--prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {

47
pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
}:
# TODO: ovirt (optional)
stdenv.mkDerivation rec {
name = "gnome-boxes-3.12.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz";
sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8";
};
enableParallelBuilding = true;
doCheck = true;
buildInputs = [
makeWrapper pkgconfig intltool itstool libvirt-glib glib
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
librsvg hicolor_icon_theme desktop_file_utils
];
preFixup = ''
for prog in "$out/bin/"*; do
wrapProgram "$prog" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
done
rm "$out/share/icons/hicolor/icon-theme.cache"
'';
meta = with stdenv.lib; {
description = "Simple GNOME 3 application to access remote or virtual systems";
homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor ];
};
}

4
pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, libuuid
, desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }:
, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
gnome3.dconf itstool ncurses makeWrapper gnome3.nautilus ];
gnome3.dconf itstool makeWrapper gnome3.nautilus ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];

7
pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
View File

@ -13,7 +13,14 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig atk cairo glib gtk3 pango
libxml2Python perl intltool gettext ];
preBuild = ''
substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
'';
patches = [ ./nix_share_path.patch ];
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = [ maintainers.lethalman ];
};
}

11
pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200
+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200
@@ -68,6 +68,8 @@
basename,
NULL));
+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
+
g_ptr_array_add (dirs, NULL);
return (gchar**) g_ptr_array_free (dirs, FALSE);

16
pkgs/desktops/gnome-3/3.12/core/vte/default.nix
View File

@ -15,9 +15,15 @@ stdenv.mkDerivation rec {
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
configureFlags = ''--enable-introspection'';
configureFlags = [ "--enable-introspection" ];
meta = {
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
'';
meta = with stdenv.lib; {
homepage = http://www.gnome.org/;
description = "A library implementing a terminal emulator widget for GTK+";
longDescription = ''
@ -28,8 +34,8 @@ stdenv.mkDerivation rec {
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = "LGPLv2";
maintainers = with stdenv.lib.maintainers; [ astsmtl antono ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
platforms = platforms.linux;
};
}

5
pkgs/desktops/gnome-3/3.12/default.nix
View File

@ -195,6 +195,11 @@ rec {
glade = callPackage ./apps/glade { };
gnome-boxes = callPackage ./apps/gnome-boxes {
gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
};
gnome-clocks = callPackage ./apps/gnome-clocks { };
gnome-documents = callPackage ./apps/gnome-documents { };

4
pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
p_name = "xfce4-xkb-plugin";
ver_maj = "0.5";
ver_min = "4.3";
ver_min = "6";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "0v9r0w9m5lxrzmz12f8w67l781lsywy9p1vixgn4xq6z5sxh2j6a";
sha256 = "198q6flrajbscwwywqq8yv6hdcwifahhj9i526vyfz4q6cq65r09";
};
buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk

4
pkgs/development/compilers/agda/stdlib-0.8.nix
View File

@ -16,8 +16,8 @@ cabal.mkDerivation (self: rec {
postInstall = ''
mkdir -p $out/share
cd ..
runhaskell GenerateEverything
agda -i . -i src Everything.agda
${self.ghc.ghc}/bin/runhaskell GenerateEverything
${Agda}/bin/agda -i . -i src Everything.agda
cp -pR src $out/share/agda
'';

2
pkgs/development/compilers/elm/elm-server.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer
, unorderedContainers
}:

2
pkgs/development/compilers/epic/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
cabal.mkDerivation (self: {

1
pkgs/development/compilers/ghc/7.0.2.nix
View File

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
];
inherit (ghc.meta) license platforms;
broken = true;
};
}

1
pkgs/development/compilers/ghc/7.0.3.nix
View File

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
];
inherit (ghc.meta) license platforms;
broken = true;
};
}

6
pkgs/development/compilers/ghc/7.8.2.nix → pkgs/development/compilers/ghc/7.8.3.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.8.2";
version = "7.8.3";
name = "ghc-${version}";
src = fetchurl {
url = "http://www.haskell.org/ghc/dist/7.8.2/${name}-src.tar.xz";
sha256 = "15kyz98zq22sgwkzy2bkx0yz98qkrzgdigz919vafd7fxnkf3la5";
url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz";
sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh";
};
buildInputs = [ ghc perl gmp ncurses ];

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

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
, filepath, gmp, happy, haskeline, languageJava, lens, libffi

5
pkgs/development/compilers/openjdk-darwin/default.nix
View File

@ -4,7 +4,7 @@ let
name = "openjdk6-b16-24_apr_2009-r1";
src = fetchurl {
url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
url = http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2;
sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v";
};
@ -24,8 +24,7 @@ let
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';

29
pkgs/development/compilers/openjdk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype
, which, jdk, nettools, xorg, file
, fontconfig, cpio, cacert, perl, setJavaClassPath }:
@ -15,21 +15,26 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";
update = "40";
update = "65";
build = "43";
build = "32";
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
paxflags = if stdenv.isi686 then "msp" else "m";
cupsSrc = fetchurl {
url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2;
md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
};
in
stdenv.mkDerivation rec {
name = "openjdk-7u${update}b${build}";
src = fetchurl {
url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz";
sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx";
};
outputs = [ "out" "jre" ];
@ -46,10 +51,14 @@ stdenv.mkDerivation rec {
postUnpack = ''
sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
-e "s@/bin/ls@${coreutils}/bin/ls@" \
openjdk/hotspot/make/linux/makefiles/sa.make
openjdk*/hotspot/make/linux/makefiles/sa.make
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk
tar xf ${cupsSrc}
cupsDir=$(echo $(pwd)/cups-*)
makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir)
'';
patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ];
@ -61,9 +70,8 @@ stdenv.mkDerivation rec {
"ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
"FREETYPE_HEADERS_PATH=${freetype}/include"
"FREETYPE_LIB_PATH=${freetype}/lib"
"MILESTONE=release"
"MILESTONE=u${update}"
"BUILD_NUMBER=b${build}"
"CUPS_HEADERS_PATH=${cups}/include"
"USRBIN_PATH="
"COMPILER_PATH="
"DEVTOOLS_PATH="
@ -71,6 +79,7 @@ stdenv.mkDerivation rec {
"BOOTDIR=${jdk}"
"STATIC_CXX=false"
"UNLIMITED_CRYPTO=1"
"FULL_DEBUG_SYMBOLS=0"
];
configurePhase = "true";
@ -158,7 +167,7 @@ stdenv.mkDerivation rec {
homepage = http://openjdk.java.net/;
license = "GPLv2";
description = "The open-source Java Development Kit";
maintainers = [ stdenv.lib.maintainers.shlevy ];
maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};

0
pkgs/development/compilers/jdk/dlj-bundle-builder.sh → pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
View File

24
pkgs/development/compilers/jdk/jdk-linux-base.nix → pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -30,6 +30,7 @@
, alsaLib
, atk
, gdk_pixbuf
, setJavaClassPath
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -59,9 +60,9 @@ let
"";
in
stdenv.mkDerivation rec {
let result = stdenv.mkDerivation rec {
name =
if installjdk then "jdk-1.${productVersion}.0_${patchVersion}" else "jre-1.${productVersion}.0_${patchVersion}";
if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}";
src =
if stdenv.system == "i686-linux" then
@ -71,7 +72,6 @@ stdenv.mkDerivation rec {
sha256 = sha256_i686;
}
else if stdenv.system == "x86_64-linux" then
requireFile {
name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz";
url = downloadUrl;
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
installPhase = ''
cd ..
@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt
rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
# set all the dynamic linkers
find $out -type f -perm +100 \
-exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
@ -157,6 +157,14 @@ stdenv.mkDerivation rec {
mkdir $jrePath/lib/${architecture}/plugins
ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
mkdir -p $out/nix-support
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
inherit installjdk pluginSupport;
@ -170,6 +178,8 @@ stdenv.mkDerivation rec {
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
meta.license = "unfree";
}
passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
meta.license = "unfree";
}; in result

0
pkgs/development/compilers/jdk/jdk6-construct.sh → pkgs/development/compilers/oraclejdk/jdk6-construct.sh
View File

0
pkgs/development/compilers/jdk/jdk6-linux.nix → pkgs/development/compilers/oraclejdk/jdk6-linux.nix
View File

6
pkgs/development/compilers/jdk/jdk7-linux.nix → pkgs/development/compilers/oraclejdk/jdk7-linux.nix
View File

@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "7";
patchVersion = "60";
patchVersion = "65";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
sha256_i686 = "d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48";
sha256_x86_64 = "c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8";
sha256_i686 = "e3032c561deb237c033b485a358cc429ec83b621303bc6b31768855778a9eaa0";
sha256_x86_64 = "33fac9630ca8c2d374247abc5c010ac8d2875a3384968aa3e74448361808e4b7";
jceName = "UnlimitedJCEPolicyJDK7.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";

6
pkgs/development/compilers/jdk/jdk8-linux.nix → pkgs/development/compilers/oraclejdk/jdk8-linux.nix
View File

@ -1,9 +1,9 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "5";
patchVersion = "11";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256_i686 = "779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9";
sha256_x86_64 = "44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc";
sha256_i686 = "3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1";
sha256_x86_64 = "f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59";

4
pkgs/development/interpreters/lua-5/5.1.nix
View File

@ -23,10 +23,10 @@ stdenv.mkDerivation rec {
configurePhase =
if stdenv.isDarwin
then ''
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDLAGS="" )
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' )
'' else ''
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDLAGS="-fPIC" )
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' )
'';

4
pkgs/development/interpreters/lua-5/5.2.nix
View File

@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
configurePhase =
if stdenv.isDarwin
then ''
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
'' else ''
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' )
'';

27
pkgs/development/interpreters/lua-5/sec.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, lua5, lua5_sockets, openssl }:
stdenv.mkDerivation rec {
version = "0.5";
name = "lua-sec-${version}";
src = fetchurl {
url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz";
sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034";
};
buildInputs = [ lua5 openssl ];
preBuild = ''
makeFlagsArray=(
linux
LUAPATH="$out/lib/lua/${lua5.luaversion}"
LUACPATH="$out/lib/lua/${lua5.luaversion}"
INC_PATH="-I${lua5}/include"
LIB_PATH="-L$out/lib");
'';
meta = {
homepage = "https://github.com/brunoos/luasec";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.flosse ];
};
}

7
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -71,10 +71,13 @@ let
ln -s $out/share/man/man1/{python2.6.1,python.1}
'';
passthru = {
passthru = rec {
inherit zlibSupport;
isPy2 = true;
isPy26 = true;
libPrefix = "python${majorVersion}";
executable = "python2.6";
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true;

7
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -85,10 +85,13 @@ let
paxmark E $out/bin/python${majorVersion}
'';
passthru = {
passthru = rec {
inherit zlibSupport;
isPy2 = true;
isPy27 = true;
libPrefix = "python${majorVersion}";
executable = "python2.7";
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true;

11
pkgs/development/interpreters/python/3.2/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation {
configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
@ -60,7 +60,7 @@ stdenv.mkDerivation {
ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
'';
passthru = {
passthru = rec {
zlibSupport = zlib != null;
sqliteSupport = sqlite != null;
dbSupport = db != null;
@ -69,7 +69,10 @@ stdenv.mkDerivation {
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
libPrefix = "python${majorVersion}";
executable = "python3.2m";
is_py3k = true;
isPy3 = true;
isPy32 = true;
is_py3k = true; # deprecated
sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true;
@ -88,6 +91,6 @@ stdenv.mkDerivation {
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
};
}

13
pkgs/development/interpreters/python/3.3/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation {
configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
@ -57,7 +57,7 @@ stdenv.mkDerivation {
paxmark E $out/bin/python${majorVersion}
'';
passthru = {
passthru = rec {
zlibSupport = zlib != null;
sqliteSupport = sqlite != null;
dbSupport = db != null;
@ -66,7 +66,10 @@ stdenv.mkDerivation {
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
libPrefix = "python${majorVersion}";
executable = "python3.3m";
is_py3k = true;
isPy3 = true;
isPy33 = true;
is_py3k = true; # deprecated
sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true;
@ -84,7 +87,7 @@ stdenv.mkDerivation {
high level dynamic data types.
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
};
}

13
pkgs/development/interpreters/python/3.4/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
configureFlagsArray=( --enable-shared --with-threads
CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}"
LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
)
'';
@ -58,7 +58,7 @@ stdenv.mkDerivation {
paxmark E $out/bin/python${majorVersion}
'';
passthru = {
passthru = rec {
zlibSupport = zlib != null;
sqliteSupport = sqlite != null;
dbSupport = db != null;
@ -67,7 +67,10 @@ stdenv.mkDerivation {
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
libPrefix = "python${majorVersion}";
executable = "python3.4m";
is_py3k = true;
isPy3 = true;
isPy34 = true;
is_py3k = true; # deprecated
sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true;
@ -85,7 +88,7 @@ stdenv.mkDerivation {
high level dynamic data types.
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
};
}

50
pkgs/development/libraries/fftw/default.nix
View File

@ -1,39 +1,31 @@
{ fetchurl, stdenv, builderDefs, precision ? "double" }:
{ fetchurl, stdenv, lib, precision ? "double" }:
assert stdenv.lib.elem precision [ "single" "double" "long-double" "quad-precision" ];
with lib;
with { inherit (stdenv.lib) optional; };
assert elem precision [ "single" "double" "long-double" "quad-precision" ];
let
version = "3.3.3";
localDefs = builderDefs.passthru.function {
src =
fetchurl {
url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
sha256 = "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5";
};
buildInputs = [];
configureFlags = [
"--enable-shared" "--disable-static"
"--enable-threads" "--enable-openmp" # very small wrappers
]
++ optional (precision != "double") "--enable-${precision}"
# all x86_64 have sse2
++ optional stdenv.isx86_64 "--enable-sse2";
};
in with localDefs;
let version = "3.3.4"; in
stdenv.mkDerivation rec {
name = "fftw-${precision}-${version}";
builder = writeScript "${name}-builder"
(textClosure localDefs [doConfigure doMakeInstall doForceShare]);
src = fetchurl {
url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
};
configureFlags =
[ "--enable-shared" "--disable-static"
"--enable-threads" "--enable-openmp" # very small wrappers
]
++ optional (precision != "double") "--enable-${precision}"
# all x86_64 have sse2
++ optional stdenv.isx86_64 "--enable-sse2";
enableParallelBuilding = true;
meta = {
description = "Fastest Fourier Transform in the West library";
};
passthru = {
# Allow instantiating "-A fftw.src"
inherit src;
homepage = http://www.fftw.org/;
};
}

15
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, m4, cxx ? true }:
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:
with { inherit (stdenv.lib) optional; };
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "gmp-5.1.3";
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
homepage = "http://gmplib.org/";
description = "GMP, the GNU multiple precision arithmetic library";
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
longDescription =
'' GMP is a free library for arbitrary precision arithmetic, operating
@ -54,7 +54,10 @@ stdenv.mkDerivation rec {
asymptotically faster algorithms.
'';
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = platforms.all;
maintainers = [ maintainers.simons ];
};
}
// stdenv.lib.optionalAttrs withStatic { dontDisableStatic = true; }
)

2
pkgs/development/libraries/haskell/AC-Vector/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {

2
pkgs/development/libraries/haskell/AES/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cereal, monadsTf, random, transformers }:
cabal.mkDerivation (self: {

2
pkgs/development/libraries/haskell/BlogLiterately/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath
, HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc
, pandocCiteproc, pandocTypes, parsec, split, strict, temporary

2
pkgs/development/libraries/haskell/Boolean/default.nix
View File

@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {

Some files were not shown because too many files have changed in this diff Show More