mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/misc/vim-plugins/default.nix
This commit is contained in:
Eelco Dolstra
commit
7f410ef923
@ -89,6 +89,7 @@
|
||||
sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
|
||||
shlevy = "Shea Levy <shea@shealevy.com>";
|
||||
simons = "Peter Simons <simons@cryp.to>";
|
||||
skeidel = "Sven Keidel <svenkeidel@gmail.com>";
|
||||
smironov = "Sergey Mironov <ierton@gmail.com>";
|
||||
sprock = "Roger Mason <rmason@mun.ca>";
|
||||
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
||||
|
||||
@ -320,7 +320,10 @@ changes:
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>You should boot the live CD in UEFI mode (consult your
|
||||
specific hardware's documentation for instructions).</para>
|
||||
specific hardware's documentation for instructions). You may find
|
||||
the <link
|
||||
xlink:href="http://www.rodsbooks.com/refind">rEFInd
|
||||
boot manager</link> useful.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>Instead of <command>fdisk</command>, you should use
|
||||
@ -335,6 +338,11 @@ changes:
|
||||
should do this automatically for new configurations when booted in
|
||||
UEFI mode.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>After having mounted your installation partition to
|
||||
<code>/mnt</code>, you must mount the <code>boot</code> partition
|
||||
to <code>/mnt/boot</code>.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>You may want to look at the options starting with
|
||||
<option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
|
||||
|
||||
@ -110,6 +110,7 @@ in
|
||||
"/man"
|
||||
"/sbin"
|
||||
"/share/emacs"
|
||||
"/share/vim-plugins"
|
||||
"/share/org"
|
||||
"/share/info"
|
||||
"/share/terminfo"
|
||||
|
||||
@ -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!
|
||||
|
||||
@ -246,6 +247,7 @@
|
||||
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!
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -69,9 +69,9 @@ in
|
||||
systemd.services.logstash = with pkgs; {
|
||||
description = "Logstash Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment = { JAVA_HOME = jre; };
|
||||
serviceConfig = {
|
||||
ExecStart = "${jre}/bin/java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
|
||||
ExecStart = "${logstash}/bin/logstash agent -f ${writeText "logstash.conf" ''
|
||||
input {
|
||||
${cfg.inputConfig}
|
||||
}
|
||||
|
||||
118
nixos/modules/services/networking/polipo.nix
Normal file
118
nixos/modules/services/networking/polipo.nix
Normal 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";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -17,7 +17,7 @@ in
|
||||
# Note: the order in which desktop manager modules are imported here
|
||||
# determines the default: later modules (if enabled) are preferred.
|
||||
# E.g., if KDE is enabled, it supersedes xterm.
|
||||
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
|
||||
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix ];
|
||||
|
||||
options = {
|
||||
|
||||
|
||||
40
nixos/modules/services/x11/desktop-managers/e18.nix
Normal file
40
nixos/modules/services/x11/desktop-managers/e18.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
|
||||
xcfg = config.services.xserver;
|
||||
cfg = xcfg.desktopManager.e18;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
|
||||
services.xserver.desktopManager.e18.enable = mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = "Enable the E18 desktop environment.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf (xcfg.enable && cfg.enable) {
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary pkgs.e18.enlightenment
|
||||
pkgs.e18.terminology pkgs.e18.econnman
|
||||
];
|
||||
|
||||
services.xserver.desktopManager.session = [
|
||||
{ name = "E18";
|
||||
start = ''
|
||||
${pkgs.e18.enlightenment}/bin/enlightenment_start
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -825,6 +825,7 @@ in
|
||||
systemd.services."user@".restartIfChanged = false;
|
||||
|
||||
systemd.services.systemd-remount-fs.restartIfChanged = false;
|
||||
systemd.services.systemd-journal-flush.restartIfChanged = false;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -121,12 +121,26 @@ in
|
||||
|
||||
networking.usePredictableInterfaceNames = false;
|
||||
|
||||
systemd.services.wait-metadata-online = {
|
||||
description = "Wait for GCE metadata server to become reachable";
|
||||
wantedBy = [ "network-online.target" ];
|
||||
before = [ "network-online.target" ];
|
||||
path = [ pkgs.netcat ];
|
||||
script = ''
|
||||
# wait for the metadata server to become available for up to 60 seconds
|
||||
for counter in {1..30}; do sleep 2 && nc -vzw 2 metadata 80 && break; done
|
||||
'';
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.RemainAfterExit = true;
|
||||
};
|
||||
|
||||
systemd.services.fetch-ssh-keys =
|
||||
{ description = "Fetch host keys and authorized_keys for root user";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = [ "sshd.service" ];
|
||||
before = [ "sshd.service" ];
|
||||
after = [ "network.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
|
||||
path = [ pkgs.curl ];
|
||||
script =
|
||||
@ -148,7 +162,7 @@ in
|
||||
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
|
||||
curl -o /root/ssh_host_ecdsa_key --retry-max-time 60 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"
|
||||
@ -156,7 +170,7 @@ in
|
||||
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
|
||||
curl -o /root/ssh_host_ecdsa_key.pub --retry-max-time 60 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"
|
||||
|
||||
@ -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
|
||||
|
||||
45
pkgs/applications/audio/gpodder/default.nix
Normal file
45
pkgs/applications/audio/gpodder/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool,
|
||||
ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "" }:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
|
||||
|
||||
in buildPythonPackage rec {
|
||||
name = "gpodder-3.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gpodder.org/src/${name}.tar.gz";
|
||||
sha256 = "fa90ef4bdd3fd9eef95404f7f43f70912ae3ab4f8d24078484a2f3e11b14dc47";
|
||||
};
|
||||
|
||||
buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool ];
|
||||
|
||||
propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ]
|
||||
++ stdenv.lib.optional ipodSupport libgpod;
|
||||
|
||||
postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile";
|
||||
|
||||
checkPhase = "make unittest";
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/gpodder \
|
||||
${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \
|
||||
${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"}
|
||||
'';
|
||||
|
||||
installPhase = "DESTDIR=/ PREFIX=$out make install";
|
||||
|
||||
meta = {
|
||||
description = "A podcatcher written in python";
|
||||
longDescription = ''
|
||||
gPodder downloads and manages free audio and video content (podcasts)
|
||||
for you. Listen directly on your computer or on your mobile devices.
|
||||
'';
|
||||
homepage = "http://gpodder.org/";
|
||||
license = "GPLv3";
|
||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
||||
maintainers = [ stdenv.lib.maintainers.skeidel ];
|
||||
};
|
||||
}
|
||||
@ -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 ];
|
||||
|
||||
58
pkgs/applications/editors/lighttable/default.nix
Normal file
58
pkgs/applications/editors/lighttable/default.nix
Normal 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 ];
|
||||
};
|
||||
}
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
@ -83,6 +83,21 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
focusblur = pluginDerivation rec {
|
||||
/* menu:
|
||||
Blur/Focus Blur
|
||||
*/
|
||||
name = "focusblur-3.2.6";
|
||||
buildInputs = [ gimp pkgconfig pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs;
|
||||
patches = [ ./patches/focusblur-glib.patch ];
|
||||
postInstall = "fail";
|
||||
installPhase = "installPlugins src/focusblur";
|
||||
src = fetchurl {
|
||||
url = "http://registry.gimp.org/files/${name}.tar.bz2";
|
||||
sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h";
|
||||
};
|
||||
};
|
||||
|
||||
resynthesizer = pluginDerivation {
|
||||
/* menu:
|
||||
Filters/Map/Resynthesize
|
||||
|
||||
@ -0,0 +1,200 @@
|
||||
ls diff --git focusblur-3.2.6/src/aaa.h focusblur-3.2.6/src/aaa.h
|
||||
index 4a6d90b..c74cab2 100644
|
||||
--- focusblur-3.2.6/src/aaa.h
|
||||
+++ focusblur-3.2.6/src/aaa.h
|
||||
@@ -19,8 +19,7 @@
|
||||
#ifndef __AAA_H__
|
||||
#define __AAA_H__
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
|
||||
G_BEGIN_DECLS
|
||||
diff --git focusblur-3.2.6/src/brush.h focusblur-3.2.6/src/brush.h
|
||||
index 685b253..8778fec 100644
|
||||
--- focusblur-3.2.6/src/brush.h
|
||||
+++ focusblur-3.2.6/src/brush.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_BRUSH_H__
|
||||
#define __FOCUSBLUR_BRUSH_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include "focusblurtypes.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
diff --git focusblur-3.2.6/src/depthmap.h focusblur-3.2.6/src/depthmap.h
|
||||
index 78f5e99..baee540 100644
|
||||
--- focusblur-3.2.6/src/depthmap.h
|
||||
+++ focusblur-3.2.6/src/depthmap.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_DEPTHMAP_H__
|
||||
#define __FOCUSBLUR_DEPTHMAP_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "focusblurtypes.h"
|
||||
#include "focusblurenums.h"
|
||||
diff --git focusblur-3.2.6/src/diffusion.h focusblur-3.2.6/src/diffusion.h
|
||||
index 07ffe4b..3c1e4b9 100644
|
||||
--- focusblur-3.2.6/src/diffusion.h
|
||||
+++ focusblur-3.2.6/src/diffusion.h
|
||||
@@ -23,7 +23,7 @@
|
||||
#define __FOCUSBLUR_DIFFUSION_H__
|
||||
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "focusblur.h"
|
||||
#include "focusblurtypes.h"
|
||||
diff --git focusblur-3.2.6/src/fftblur.h focusblur-3.2.6/src/fftblur.h
|
||||
index 124bcba..cd809fa 100644
|
||||
--- focusblur-3.2.6/src/fftblur.h
|
||||
+++ focusblur-3.2.6/src/fftblur.h
|
||||
@@ -23,8 +23,7 @@
|
||||
#define __FOCUSBLUR_FFTBLUR_H__
|
||||
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <libgimpwidgets/gimpwidgetstypes.h>
|
||||
|
||||
#include "focusblurparam.h"
|
||||
diff --git focusblur-3.2.6/src/fftblurbuffer.h focusblur-3.2.6/src/fftblurbuffer.h
|
||||
index b34d682..42e6380 100644
|
||||
--- focusblur-3.2.6/src/fftblurbuffer.h
|
||||
+++ focusblur-3.2.6/src/fftblurbuffer.h
|
||||
@@ -28,8 +28,7 @@
|
||||
#endif
|
||||
#include <fftw3.h>
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtkstyle.h>
|
||||
#include <libgimp/gimptypes.h>
|
||||
#include <libgimpwidgets/gimpwidgetstypes.h>
|
||||
diff --git focusblur-3.2.6/src/fftblurproc.h focusblur-3.2.6/src/fftblurproc.h
|
||||
index 495572d..10a34f4 100644
|
||||
--- focusblur-3.2.6/src/fftblurproc.h
|
||||
+++ focusblur-3.2.6/src/fftblurproc.h
|
||||
@@ -23,8 +23,7 @@
|
||||
#define __FOCUSBLUR_FFTBLUR_PROC_H__
|
||||
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "focusblurtypes.h"
|
||||
|
||||
diff --git focusblur-3.2.6/src/focusblur.h focusblur-3.2.6/src/focusblur.h
|
||||
index 54ca40a..d7e13a6 100644
|
||||
--- focusblur-3.2.6/src/focusblur.h
|
||||
+++ focusblur-3.2.6/src/focusblur.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_H__
|
||||
#define __FOCUSBLUR_H__
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
diff --git focusblur-3.2.6/src/focusblurparam.h focusblur-3.2.6/src/focusblurparam.h
|
||||
index 64c887b..32865b4 100644
|
||||
--- focusblur-3.2.6/src/focusblurparam.h
|
||||
+++ focusblur-3.2.6/src/focusblurparam.h
|
||||
@@ -22,8 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_PARAM_H__
|
||||
#define __FOCUSBLUR_PARAM_H__
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <gtk/gtkstyle.h>
|
||||
#include <libgimp/gimptypes.h>
|
||||
|
||||
diff --git focusblur-3.2.6/src/focusblurstock.h focusblur-3.2.6/src/focusblurstock.h
|
||||
index 15f3603..cfc0567 100644
|
||||
--- focusblur-3.2.6/src/focusblurstock.h
|
||||
+++ focusblur-3.2.6/src/focusblurstock.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_STOCK_H__
|
||||
#define __FOCUSBLUR_STOCK_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
diff --git focusblur-3.2.6/src/focusblurtypes.h focusblur-3.2.6/src/focusblurtypes.h
|
||||
index 0954c60..1531c84 100644
|
||||
--- focusblur-3.2.6/src/focusblurtypes.h
|
||||
+++ focusblur-3.2.6/src/focusblurtypes.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_TYPES_H__
|
||||
#define __FOCUSBLUR_TYPES_H__
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
+#include <glib.h>
|
||||
|
||||
|
||||
G_BEGIN_DECLS
|
||||
diff --git focusblur-3.2.6/src/interface.h focusblur-3.2.6/src/interface.h
|
||||
index 6defd27..e819c60 100644
|
||||
--- focusblur-3.2.6/src/interface.h
|
||||
+++ focusblur-3.2.6/src/interface.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_INTERFACE_H__
|
||||
#define __FOCUSBLUR_INTERFACE_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
|
||||
#include "focusblurtypes.h"
|
||||
|
||||
diff --git focusblur-3.2.6/src/render.h focusblur-3.2.6/src/render.h
|
||||
index febbd24..a501f1e 100644
|
||||
--- focusblur-3.2.6/src/render.h
|
||||
+++ focusblur-3.2.6/src/render.h
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
//#include <libgimp/gimp.h>
|
||||
#include <libgimp/gimpui.h>
|
||||
|
||||
diff --git focusblur-3.2.6/src/shine.h focusblur-3.2.6/src/shine.h
|
||||
index c5a3621..86b4c09 100644
|
||||
--- focusblur-3.2.6/src/shine.h
|
||||
+++ focusblur-3.2.6/src/shine.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifndef __FOCUSBLUR_SHINE_H__
|
||||
#define __FOCUSBLUR_SHINE_H__
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <libgimp/gimptypes.h>
|
||||
|
||||
#include "focusblurtypes.h"
|
||||
diff --git focusblur-3.2.6/src/source.h focusblur-3.2.6/src/source.h
|
||||
index 50d34ca..8eec35c 100644
|
||||
--- focusblur-3.2.6/src/source.h
|
||||
+++ focusblur-3.2.6/src/source.h
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
-#include <glib/gtypes.h>
|
||||
+#include <glib.h>
|
||||
#include <libgimp/gimptypes.h>
|
||||
|
||||
#include "focusblurtypes.h"
|
||||
@ -4,14 +4,13 @@
|
||||
|
||||
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";
|
||||
|
||||
@ -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,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calibre-1.44.0";
|
||||
name = "calibre-1.45.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/calibre/${name}.tar.xz";
|
||||
sha256 = "14k9rzp4rphls4zkzrdq8kk0mgzsh5sdmngxklb58r71xj2r995j";
|
||||
sha256 = "0g9fzpkjvi0h7h5azk3v425l8gxd8zidcz3nrzlg26hgvbkzpm20";
|
||||
};
|
||||
|
||||
inherit python;
|
||||
|
||||
60
pkgs/applications/misc/finalterm/default.nix
Normal file
60
pkgs/applications/misc/finalterm/default.nix
Normal 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,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kdeconnect-${version}";
|
||||
version = "0.7";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
|
||||
sha256 = "0a8g3avg9x5j07cf3c16i4w65q3fn1cbs8zxgq0vl14rzdy09q2j";
|
||||
sha256 = "1v7sicgy39n8pn7nzq9f7lkmwbcvavhy3b66agyhxwmyzz6mcd4g";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext kdelibs libXtst makeWrapper qca2 qca2_ossl qjson ];
|
||||
|
||||
@ -7,45 +7,41 @@
|
||||
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
|
||||
, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
|
||||
, 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
|
||||
, networkProtocolXmpp, openssh, optparseApplicative, pathPieces
|
||||
, 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.20140709";
|
||||
sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
|
||||
version = "5.20140717";
|
||||
sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
aeson async blazeBuilder bloomfilter byteable caseInsensitive
|
||||
clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
|
||||
dlist dns editDistance exceptions extensibleExceptions fdoNotify
|
||||
feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient
|
||||
clientsession cryptoApi cryptohash dataDefault dataenc DAV
|
||||
dlist dns editDistance exceptions extensibleExceptions
|
||||
feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
|
||||
httpConduit httpTypes IfElse json liftedBase MissingH monadControl
|
||||
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
|
||||
];
|
||||
optparseApplicative pathPieces 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 = "-fS3
|
||||
-fWebDAV
|
||||
-fInotify
|
||||
-fDbus
|
||||
-fAssistant
|
||||
-fWebapp
|
||||
-fPairing
|
||||
-fXMPP
|
||||
-fDNS
|
||||
-fProduction
|
||||
-fTDFA";
|
||||
configureFlags = "-fAssistant
|
||||
-fProduction";
|
||||
preConfigure = ''
|
||||
export HOME="$NIX_BUILD_TOP/tmp"
|
||||
mkdir "$HOME"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "1pylqr2qzndy92x3pq8hkwsb3garww2jxb167s6hshrva81s24mb";
|
||||
sha256 = "1hk9xxnqiyxii4cfl0j88kws5h1w8xavmfp8a2qb3as5jwnc5y5w";
|
||||
};
|
||||
|
||||
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];
|
||||
|
||||
19
pkgs/build-support/fetchgit/private.nix
Normal file
19
pkgs/build-support/fetchgit/private.nix
Normal 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} "$@"
|
||||
'';
|
||||
})
|
||||
@ -9,6 +9,6 @@ relpath="${path#$server}"
|
||||
|
||||
echo "URL: $url" >&2
|
||||
|
||||
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
|
||||
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
|
||||
sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \
|
||||
sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`"
|
||||
|
||||
16
pkgs/desktops/e18/default.nix
Normal file
16
pkgs/desktops/e18/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ callPackage, pkgs }:
|
||||
rec {
|
||||
#### CORE EFL
|
||||
efl = callPackage ./efl.nix { };
|
||||
evas = callPackage ./evas.nix { };
|
||||
emotion = callPackage ./emotion.nix { };
|
||||
elementary = callPackage ./elementary.nix { };
|
||||
|
||||
#### WINDOW MANAGER
|
||||
enlightenment = callPackage ./enlightenment.nix { };
|
||||
|
||||
#### APPLICATIONS
|
||||
econnman = callPackage ./econnman.nix { };
|
||||
terminology = callPackage ./terminology.nix { };
|
||||
|
||||
}
|
||||
23
pkgs/desktops/e18/econnman.nix
Normal file
23
pkgs/desktops/e18/econnman.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "econnman-${version}";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
|
||||
sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ];
|
||||
propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Econnman is a user interface for the connman network connection manager";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
};
|
||||
}
|
||||
23
pkgs/desktops/e18/efl.nix
Normal file
23
pkgs/desktops/e18/efl.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "efl-${version}";
|
||||
version = "1.10.2";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
|
||||
sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24";
|
||||
};
|
||||
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ];
|
||||
propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ];
|
||||
configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ];
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE"
|
||||
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
|
||||
'';
|
||||
meta = {
|
||||
description = "Enlightenment Core libraries";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
};
|
||||
}
|
||||
20
pkgs/desktops/e18/elementary.nix
Normal file
20
pkgs/desktops/e18/elementary.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18 }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "elementary-${version}";
|
||||
version = "1.10.2";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
|
||||
sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28";
|
||||
};
|
||||
buildInputs = [ pkgconfig e18.efl ];
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
meta = {
|
||||
description = "Widget set/toolkit";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.lgpl2;
|
||||
};
|
||||
}
|
||||
20
pkgs/desktops/e18/emotion.nix
Normal file
20
pkgs/desktops/e18/emotion.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18, vlc }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emotion_generic_players-${version}";
|
||||
version = "1.10.0";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
|
||||
sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc";
|
||||
};
|
||||
buildInputs = [ pkgconfig e18.efl vlc ];
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
meta = {
|
||||
description = "Extra video decoders";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
};
|
||||
}
|
||||
20
pkgs/desktops/e18/enlightenment.nix
Normal file
20
pkgs/desktops/e18/enlightenment.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enlightenment-${version}";
|
||||
version = "0.18.8";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz";
|
||||
sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l";
|
||||
};
|
||||
buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit ];
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
meta = {
|
||||
description = "The Compositing Window Manager and Desktop Shell";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
};
|
||||
}
|
||||
17
pkgs/desktops/e18/evas.nix
Normal file
17
pkgs/desktops/e18/evas.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18, zlib }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "evas_generic_loaders-${version}";
|
||||
version = "1.10.0";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
|
||||
sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm";
|
||||
};
|
||||
buildInputs = [ pkgconfig e18.efl zlib ];
|
||||
meta = {
|
||||
description = "Extra image decoders";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
23
pkgs/desktops/e18/terminology.nix
Normal file
23
pkgs/desktops/e18/terminology.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchurl, pkgconfig, e18 }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "terminology-${version}";
|
||||
version = "0.6.1";
|
||||
src = fetchurl {
|
||||
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
|
||||
sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x";
|
||||
};
|
||||
buildInputs = [ pkgconfig e18.efl e18.elementary ];
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
|
||||
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
meta = {
|
||||
description = "The best terminal emulator written with the EFL";
|
||||
homepage = http://enlightenment.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
};
|
||||
}
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hhvm-${version}";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/facebook/hhvm.git";
|
||||
rev = "71ecbd8fb5e94b2a008387a2b5e9a8df5c6f5c7b";
|
||||
sha256 = "1zv3k3bxahwyna2jgicwxm9lxs11jddpc9v41488rmzvfhdmzzkn";
|
||||
rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8";
|
||||
sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
||||
patchPhase = ''
|
||||
substituteInPlace hphp/util/generate-buildinfo.sh \
|
||||
--replace /bin/bash ${stdenv.shell}
|
||||
substituteInPlace ./configure \
|
||||
--replace "/usr/bin/env bash" ${stdenv.shell}
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
# 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
|
||||
, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative
|
||||
, parsers, split, text, time, transformers, trifecta
|
||||
, unorderedContainers, utf8String, vector, vectorBinaryInstances
|
||||
, xml, zlib
|
||||
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint
|
||||
, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal
|
||||
, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline
|
||||
, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl
|
||||
, network, optparseApplicative, parsers, split, text, time
|
||||
, transformers, trifecta, unorderedContainers, utf8String, vector
|
||||
, vectorBinaryInstances, xml, zlib
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "idris";
|
||||
version = "0.9.13.1";
|
||||
sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n";
|
||||
version = "0.9.14";
|
||||
sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml
|
||||
blazeMarkup Cabal cheapskate deepseq filepath haskeline
|
||||
languageJava lens libffi llvmGeneral llvmGeneralPure mtl network
|
||||
optparseApplicative parsers split text time transformers trifecta
|
||||
unorderedContainers utf8String vector vectorBinaryInstances xml
|
||||
zlib
|
||||
annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
|
||||
blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree
|
||||
haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl
|
||||
network optparseApplicative parsers split text time transformers
|
||||
trifecta unorderedContainers utf8String vector
|
||||
vectorBinaryInstances xml zlib
|
||||
];
|
||||
buildTools = [ happy ];
|
||||
extraLibraries = [ boehmgc gmp ];
|
||||
|
||||
@ -26,8 +26,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
|
||||
'';
|
||||
|
||||
@ -15,9 +15,9 @@ let
|
||||
else
|
||||
throw "openjdk requires i686-linux or x86_64 linux";
|
||||
|
||||
update = "60";
|
||||
update = "65";
|
||||
|
||||
build = "30";
|
||||
build = "32";
|
||||
|
||||
# On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
|
||||
paxflags = if stdenv.isi686 then "msp" else "m";
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz";
|
||||
sha256 = "08rp3bbbzk0p6226qayr1vmahhp41phm5g56dlb7d2hfp2cfpd81";
|
||||
sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx";
|
||||
};
|
||||
|
||||
outputs = [ "out" "jre" ];
|
||||
|
||||
@ -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
|
||||
@ -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";
|
||||
@ -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";
|
||||
@ -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/;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -9,11 +9,6 @@ cabal.mkDerivation (self: {
|
||||
extraLibraries = [ fuse ];
|
||||
preConfigure = ''
|
||||
sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal
|
||||
sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
|
||||
sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
|
||||
sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc
|
||||
sed -i -e "s/IO.catch/ E.catch/" System/Fuse.hsc
|
||||
sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc
|
||||
'';
|
||||
meta = {
|
||||
homepage = "https://github.com/m15k/hfuse";
|
||||
|
||||
@ -2,21 +2,23 @@
|
||||
|
||||
{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
|
||||
, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
|
||||
, random, regexCompat, temporary, text, unorderedContainers, xmlgen
|
||||
, random, regexCompat, temporary, text, time, unorderedContainers
|
||||
, vector, xmlgen
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HTF";
|
||||
version = "0.11.4.0";
|
||||
sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9";
|
||||
version = "0.12.0.0";
|
||||
sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase
|
||||
monadControl mtl QuickCheck random regexCompat text xmlgen
|
||||
monadControl mtl QuickCheck random regexCompat text time vector
|
||||
xmlgen
|
||||
];
|
||||
testDepends = [
|
||||
aeson filepath mtl random regexCompat temporary text
|
||||
aeson filepath HUnit mtl random regexCompat temporary text
|
||||
unorderedContainers
|
||||
];
|
||||
doCheck = false;
|
||||
|
||||
19
pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix
Normal file
19
pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix
Normal file
@ -0,0 +1,19 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, random, testFramework, tfRandom, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "QuickCheck";
|
||||
version = "2.7.6";
|
||||
sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40";
|
||||
buildDepends = [ random tfRandom transformers ];
|
||||
testDepends = [ testFramework ];
|
||||
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
|
||||
meta = {
|
||||
homepage = "https://github.com/nick8325/quickcheck";
|
||||
description = "Automatic testing of Haskell programs";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
15
pkgs/development/libraries/haskell/aeson-utils/default.nix
Normal file
15
pkgs/development/libraries/haskell/aeson-utils/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, attoparsec, scientific, text }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "aeson-utils";
|
||||
version = "0.2.2.1";
|
||||
sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd";
|
||||
buildDepends = [ aeson attoparsec scientific text ];
|
||||
meta = {
|
||||
description = "Utilities for working with Aeson";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
28
pkgs/development/libraries/haskell/aeson/0.8.0.0.nix
Normal file
28
pkgs/development/libraries/haskell/aeson/0.8.0.0.nix
Normal file
@ -0,0 +1,28 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
|
||||
, mtl, QuickCheck, scientific, syb, testFramework
|
||||
, testFrameworkHunit, testFrameworkQuickcheck2, text, time
|
||||
, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "aeson";
|
||||
version = "0.8.0.0";
|
||||
sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
|
||||
text time unorderedContainers vector
|
||||
];
|
||||
testDepends = [
|
||||
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
|
||||
testFrameworkQuickcheck2 text time unorderedContainers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/bos/aeson";
|
||||
description = "Fast JSON parsing and encoding";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,15 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, haskellSrcMeta }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "applicative-quoters";
|
||||
version = "0.1.0.8";
|
||||
sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
|
||||
buildDepends = [ haskellSrcMeta ];
|
||||
meta = {
|
||||
description = "Quasiquoters for idiom brackets and an applicative do-notation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,18 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, filepath, tagsoup }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "blaze-from-html";
|
||||
version = "0.3.2.1";
|
||||
sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ filepath tagsoup ];
|
||||
meta = {
|
||||
homepage = "http://jaspervdj.be/blaze";
|
||||
description = "Tool to convert HTML to BlazeHtml code";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
23
pkgs/development/libraries/haskell/cgrep/default.nix
Normal file
23
pkgs/development/libraries/haskell/cgrep/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, ansiTerminal, cmdargs, dlist, filepath, regexPosix, safe
|
||||
, split, stm, stringsearch, unorderedContainers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "cgrep";
|
||||
version = "6.4.3.1";
|
||||
sha256 = "0pqifapjgazz7wiydc775i4f6iixq8v87rzjgvvymdbdsn0sfa0r";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
ansiTerminal cmdargs dlist filepath regexPosix safe split stm
|
||||
stringsearch unorderedContainers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://awgn.github.io/cgrep/";
|
||||
description = "Command line tool";
|
||||
license = self.stdenv.lib.licenses.gpl2;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/code-builder/default.nix
Normal file
14
pkgs/development/libraries/haskell/code-builder/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "code-builder";
|
||||
version = "0.1.3";
|
||||
sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm";
|
||||
meta = {
|
||||
description = "Simple system for generating code";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,22 +1,22 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath
|
||||
, hspec, monadControl, network, primitive, resourcet
|
||||
{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions
|
||||
, filepath, hspec, monadControl, network, primitive, resourcet, stm
|
||||
, streamingCommons, text, transformers, transformersBase
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit-extra";
|
||||
version = "1.1.1";
|
||||
sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2";
|
||||
version = "1.1.2";
|
||||
sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder conduit filepath monadControl network
|
||||
primitive resourcet streamingCommons text transformers
|
||||
primitive resourcet stm streamingCommons text transformers
|
||||
transformersBase
|
||||
];
|
||||
testDepends = [
|
||||
attoparsec blazeBuilder conduit exceptions hspec resourcet text
|
||||
transformers transformersBase
|
||||
async attoparsec blazeBuilder conduit exceptions hspec resourcet
|
||||
stm text transformers transformersBase
|
||||
];
|
||||
noHaddock = true;
|
||||
meta = {
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "1.1.6";
|
||||
sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3";
|
||||
version = "1.1.7";
|
||||
sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6";
|
||||
buildDepends = [
|
||||
exceptions liftedBase mmorph monadControl mtl resourcet
|
||||
transformers transformersBase void
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "connection";
|
||||
version = "0.2.1";
|
||||
sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy";
|
||||
version = "0.2.3";
|
||||
sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb";
|
||||
buildDepends = [
|
||||
cprngAes dataDefaultClass network socks tls x509 x509Store
|
||||
x509System x509Validation
|
||||
|
||||
@ -6,12 +6,11 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "coroutine-object";
|
||||
version = "0.2.0.0";
|
||||
sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s";
|
||||
version = "0.3";
|
||||
sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r";
|
||||
buildDepends = [
|
||||
cereal either lens mtl safecopy transformers transformersFree uuid
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "Object-oriented programming realization using coroutine";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -8,6 +8,8 @@ cabal.mkDerivation (self: {
|
||||
sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
|
||||
buildDepends = [ deepseq ];
|
||||
testDepends = [ deepseq ];
|
||||
jailbreak = true;
|
||||
doCheck = false;
|
||||
meta = {
|
||||
description = "Template Haskell based deriver for optimised NFData instances";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ haskeline mtl ];
|
||||
preConfigure = self.stdenv.lib.optionalString self.stdenv.isDarwin ''
|
||||
sed -i 's/-Wall -optl-Wl/-Wall/' djinn.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://www.augustsson.net/Darcs/Djinn/";
|
||||
description = "Generate Haskell code from a type";
|
||||
|
||||
21
pkgs/development/libraries/haskell/ekg-carbon/default.nix
Normal file
21
pkgs/development/libraries/haskell/ekg-carbon/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, ekgCore, network, networkCarbon, text, time
|
||||
, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ekg-carbon";
|
||||
version = "1.0.0";
|
||||
sha256 = "0zcnh74z0n0xxxr6r0j3kgpbfwli58y714k0mwwc2wxjgcv6xiyc";
|
||||
buildDepends = [
|
||||
ekgCore network networkCarbon text time unorderedContainers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/ocharles/ekg-carbon";
|
||||
description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||
};
|
||||
})
|
||||
@ -1,11 +1,13 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, attoparsecEnumerator, engineIo, snapCore
|
||||
, unorderedContainers, websockets, websocketsSnap
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "engine-io-snap";
|
||||
version = "1.0.0";
|
||||
sha256 = "152hz2b9zbmjpp517g6kp7fs7kbvyil28dp6djqjlmp9fqkgckap";
|
||||
version = "1.0.1";
|
||||
sha256 = "1hw3gmi23fdcgvz817b95bf23wa7qyg10axsnvan5qxr73pwp5iv";
|
||||
buildDepends = [
|
||||
attoparsecEnumerator engineIo snapCore unorderedContainers
|
||||
websockets websocketsSnap
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "engine-io";
|
||||
version = "1.0.0";
|
||||
sha256 = "08gxhf9ihz32z5ayabxw7mn14rib2kyawrvfqzbdkw8vxgjiasv9";
|
||||
version = "1.1.0";
|
||||
sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh";
|
||||
buildDepends = [
|
||||
aeson async attoparsec base64Bytestring either monadLoops mwcRandom
|
||||
stm text transformers unorderedContainers vector websockets
|
||||
|
||||
16
pkgs/development/libraries/haskell/focus/default.nix
Normal file
16
pkgs/development/libraries/haskell/focus/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, lochTh, placeholders }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "focus";
|
||||
version = "0.1.1";
|
||||
sha256 = "0x158zqxgm8ys4mxs94zl811qfdcb06jqy5h99qc63r7snwnixmd";
|
||||
buildDepends = [ lochTh placeholders ];
|
||||
meta = {
|
||||
homepage = "https://github.com/nikita-volkov/focus";
|
||||
description = "A general abstraction for manipulating elements of container data structures";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
20
pkgs/development/libraries/haskell/generic-aeson/default.nix
Normal file
20
pkgs/development/libraries/haskell/generic-aeson/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, attoparsec, genericDeriving, HUnit, mtl, tagged
|
||||
, text, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "generic-aeson";
|
||||
version = "0.1.0.3";
|
||||
sha256 = "1svbjgd8g1ljximqb4pph9lvsswgvkj46jkqq8lzmh9ql385g2vp";
|
||||
buildDepends = [
|
||||
aeson attoparsec genericDeriving mtl tagged text vector
|
||||
];
|
||||
testDepends = [ aeson attoparsec HUnit ];
|
||||
meta = {
|
||||
description = "Derivation of Aeson instances using GHC generics";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,6 +1,6 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
|
||||
{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
|
||||
, pkgconfig
|
||||
}:
|
||||
|
||||
@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
|
||||
pname = "gtk";
|
||||
version = "0.12.5.7";
|
||||
sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
|
||||
buildDepends = [ cairo glib mtl pango ];
|
||||
buildDepends = [ cairo gio glib mtl pango ];
|
||||
buildTools = [ gtk2hsBuildtools ];
|
||||
extraLibraries = [ libc pkgconfig ];
|
||||
pkgconfigDepends = [ glib gtk ];
|
||||
|
||||
25
pkgs/development/libraries/haskell/hi/default.nix
Normal file
25
pkgs/development/libraries/haskell/hi/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, filepath, hspec, HUnit, parsec, split, template
|
||||
, temporaryRc, text, time
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hi";
|
||||
version = "0.0.8.1";
|
||||
sha256 = "14g1yfc6cv89whx6w0di5nayifc0xfvll9h07kkqxaajyfw6s32y";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
filepath parsec split template temporaryRc text time
|
||||
];
|
||||
testDepends = [
|
||||
filepath hspec HUnit parsec split template temporaryRc text time
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/fujimura/hi";
|
||||
description = "Generate scaffold for cabal project";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "highlighting-kate";
|
||||
version = "0.5.8.3";
|
||||
sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf";
|
||||
version = "0.5.8.4";
|
||||
sha256 = "018j5z4cl9iv5m9wzjykh2gcn5d4fi7vahj76jv0ah101g6fqvrh";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict
|
||||
, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle-builder";
|
||||
version = "0.2.2.0";
|
||||
sha256 = "0p123jpm39ggbjn1757nfygcgi324knin62cyggbq1hhhglkfxa2";
|
||||
version = "0.3";
|
||||
sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9";
|
||||
buildDepends = [
|
||||
blazeBuilder doubleConversion hoodleTypes lens strict
|
||||
blazeBuilder doubleConversion hoodleTypes lens strict text
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "text builder for hoodle file format";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -1,28 +1,29 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal
|
||||
, configurator, coroutineObject, dbus, Diff, dyre, either, errors
|
||||
, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser
|
||||
, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl
|
||||
, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm
|
||||
, strict, svgcairo, systemFilepath, text, time, transformers
|
||||
, transformersFree, uuid, xournalParser
|
||||
{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary
|
||||
, cairo, cereal, configurator, coroutineObject, dbus, Diff, dyre
|
||||
, either, errors, filepath, fsnotify, gd, gtk, hoodleBuilder
|
||||
, hoodleParser, hoodleRender, hoodleTypes, lens, libX11, libXi
|
||||
, monadLoops, mtl, network, networkInfo, networkSimple, pango
|
||||
, poppler, pureMD5, stm, strict, svgcairo, systemFilepath, text
|
||||
, time, transformers, transformersFree, unorderedContainers, uuid
|
||||
, vector, xournalParser
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle-core";
|
||||
version = "0.13.0.0";
|
||||
sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx";
|
||||
version = "0.14";
|
||||
sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8";
|
||||
buildDepends = [
|
||||
attoparsec base64Bytestring binary cairo cereal configurator
|
||||
coroutineObject dbus Diff dyre either errors filepath fsnotify gd
|
||||
gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens
|
||||
monadLoops mtl network networkInfo networkSimple pango poppler
|
||||
aeson aesonPretty attoparsec base64Bytestring binary cairo cereal
|
||||
configurator coroutineObject dbus Diff dyre either errors filepath
|
||||
fsnotify gd gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes
|
||||
lens monadLoops mtl network networkInfo networkSimple pango poppler
|
||||
pureMD5 stm strict svgcairo systemFilepath text time transformers
|
||||
transformersFree uuid xournalParser
|
||||
transformersFree unorderedContainers uuid vector xournalParser
|
||||
];
|
||||
extraLibraries = [ libX11 libXi ];
|
||||
jailbreak = true;
|
||||
noHaddock = true;
|
||||
meta = {
|
||||
homepage = "http://ianwookim.org/hoodle";
|
||||
description = "Core library for hoodle";
|
||||
|
||||
29
pkgs/development/libraries/haskell/hoodle-extra/default.nix
Normal file
29
pkgs/development/libraries/haskell/hoodle-extra/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary
|
||||
, cmdargs, conduit, either, filepath, hoodleParser, hoodleTypes
|
||||
, httpConduit, lens, monadLoops, mtl, networkSimple, pureMD5
|
||||
, resourcet, text, time, transformers, unorderedContainers
|
||||
, xournalParser
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle-extra";
|
||||
version = "0.1";
|
||||
sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
aeson aesonPretty attoparsec base64Bytestring binary cmdargs
|
||||
conduit either filepath hoodleParser hoodleTypes httpConduit lens
|
||||
monadLoops mtl networkSimple pureMD5 resourcet text time
|
||||
transformers unorderedContainers xournalParser
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://ianwookim.org/hoodle";
|
||||
description = "extra hoodle tools";
|
||||
license = self.stdenv.lib.licenses.gpl3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||
};
|
||||
})
|
||||
@ -6,13 +6,12 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle-parser";
|
||||
version = "0.2.2";
|
||||
sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm";
|
||||
version = "0.3";
|
||||
sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i";
|
||||
buildDepends = [
|
||||
attoparsec either hoodleTypes lens mtl strict text transformers
|
||||
xournalTypes
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://ianwookim.org/hoodle";
|
||||
description = "Hoodle file parser";
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens
|
||||
, monadLoops, mtl, poppler, strict, svgcairo, uuid
|
||||
{ cabal, base64Bytestring, cairo, filepath, gd, gtk, hoodleTypes
|
||||
, lens, monadLoops, mtl, poppler, stm, strict, svgcairo
|
||||
, transformers, unorderedContainers, uuid
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle-render";
|
||||
version = "0.3.2";
|
||||
sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg";
|
||||
version = "0.4";
|
||||
sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d";
|
||||
buildDepends = [
|
||||
base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl
|
||||
poppler strict svgcairo uuid
|
||||
base64Bytestring cairo filepath gd gtk hoodleTypes lens monadLoops
|
||||
mtl poppler stm strict svgcairo transformers unorderedContainers
|
||||
uuid
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
description = "Hoodle file renderer";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
license = self.stdenv.lib.licenses.gpl3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||
};
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cereal, lens, mtl, strict, uuid }:
|
||||
{ cabal, cereal, lens, mtl, strict, text, uuid }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle-types";
|
||||
version = "0.2.2";
|
||||
sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz";
|
||||
buildDepends = [ cereal lens mtl strict uuid ];
|
||||
jailbreak = true;
|
||||
version = "0.3";
|
||||
sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm";
|
||||
buildDepends = [ cereal lens mtl strict text uuid ];
|
||||
meta = {
|
||||
description = "Data types for programs for hoodle file format";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-client-tls";
|
||||
version = "0.2.1.2";
|
||||
sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy";
|
||||
version = "0.2.2";
|
||||
sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
|
||||
buildDepends = [
|
||||
connection dataDefaultClass httpClient network tls
|
||||
];
|
||||
|
||||
@ -8,8 +8,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-client";
|
||||
version = "0.3.4";
|
||||
sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4";
|
||||
version = "0.3.5";
|
||||
sha256 = "0ffr4xccm2yp5ikiz5dzzjm82vz7gab56l80ra9criry9qirmwqh";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder caseInsensitive cookie
|
||||
dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "2.1.2.3";
|
||||
sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl";
|
||||
version = "2.1.3";
|
||||
sha256 = "1z9i0b9kl1kqh3nvbhh5vmqyg19pkdpj4cbkfhj0r47rbcynhwlb";
|
||||
buildDepends = [
|
||||
conduit httpClient httpClientTls httpTypes liftedBase monadControl
|
||||
mtl resourcet transformers
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, hxt, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hxt-pickle-utils";
|
||||
version = "0.1.0.2";
|
||||
sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2";
|
||||
buildDepends = [ hxt mtl ];
|
||||
meta = {
|
||||
homepage = "https://github.com/silkapp/hxt-pickle-utils";
|
||||
description = "Utility functions for using HXT picklers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -23,6 +23,5 @@ cabal.mkDerivation (self: {
|
||||
description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
|
||||
license = "unknown";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "interpolate";
|
||||
version = "0.0.2";
|
||||
sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8";
|
||||
version = "0.0.3";
|
||||
sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw";
|
||||
buildDepends = [ haskellSrcMeta ];
|
||||
testDepends = [
|
||||
doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "iproute";
|
||||
version = "1.2.12";
|
||||
sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5";
|
||||
version = "1.3.0";
|
||||
sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p";
|
||||
buildDepends = [ appar byteorder network ];
|
||||
testDepends = [
|
||||
appar byteorder doctest hspec network QuickCheck safe
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, blazeHtml, happstackServer, jmacro, jmacroRpc, mtl
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "jmacro-rpc-happstack";
|
||||
version = "0.3";
|
||||
sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa";
|
||||
buildDepends = [
|
||||
aeson blazeHtml happstackServer jmacro jmacroRpc mtl
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
|
||||
description = "Happstack backend for jmacro-rpc";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, jmacro, jmacroRpc, mtl, snapCore }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "jmacro-rpc-snap";
|
||||
version = "0.3";
|
||||
sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8";
|
||||
buildDepends = [ aeson jmacro jmacroRpc mtl snapCore ];
|
||||
meta = {
|
||||
homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
|
||||
description = "Snap backend for jmacro-rpc";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/jmacro-rpc/default.nix
Normal file
21
pkgs/development/libraries/haskell/jmacro-rpc/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, attoparsec, blazeHtml, contravariant, jmacro, mtl
|
||||
, scientific, split, text, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "jmacro-rpc";
|
||||
version = "0.3";
|
||||
sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw";
|
||||
buildDepends = [
|
||||
aeson attoparsec blazeHtml contravariant jmacro mtl scientific
|
||||
split text unorderedContainers vector
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://hub.darcs.net/gershomb/jmacro";
|
||||
description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
23
pkgs/development/libraries/haskell/jmacro/default.nix
Normal file
23
pkgs/development/libraries/haskell/jmacro/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, haskellSrcExts, haskellSrcMeta, mtl, parseargs
|
||||
, parsec, regexPosix, safe, syb, text, unorderedContainers, vector
|
||||
, wlPprintText
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "jmacro";
|
||||
version = "0.6.9";
|
||||
sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
aeson haskellSrcExts haskellSrcMeta mtl parseargs parsec regexPosix
|
||||
safe syb text unorderedContainers vector wlPprintText
|
||||
];
|
||||
meta = {
|
||||
description = "QuasiQuotation library for programmatic generation of Javascript code";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
25
pkgs/development/libraries/haskell/json-schema/default.nix
Normal file
25
pkgs/development/libraries/haskell/json-schema/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, attoparsec, genericAeson, genericDeriving, HUnit
|
||||
, tagged, tasty, tastyHunit, tastyTh, text, time
|
||||
, unorderedContainers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "json-schema";
|
||||
version = "0.6";
|
||||
sha256 = "1rlx6r4ybbgz8q159mxh0hp3l0cc8q4nc1g7yd1ii1z4p9wjmnny";
|
||||
buildDepends = [
|
||||
aeson genericAeson genericDeriving tagged text time
|
||||
unorderedContainers vector
|
||||
];
|
||||
testDepends = [
|
||||
aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh
|
||||
text
|
||||
];
|
||||
meta = {
|
||||
description = "Types and type classes for defining JSON schemas";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
15
pkgs/development/libraries/haskell/loch-th/default.nix
Normal file
15
pkgs/development/libraries/haskell/loch-th/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "loch-th";
|
||||
version = "0.2.1";
|
||||
sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p";
|
||||
meta = {
|
||||
homepage = "https://github.com/liskin/loch-th";
|
||||
description = "Support for precise error locations in source files (Template Haskell version)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "monad-logger";
|
||||
version = "0.3.6.1";
|
||||
sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss";
|
||||
version = "0.3.7";
|
||||
sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58";
|
||||
buildDepends = [
|
||||
blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
|
||||
monadControl monadLoops mtl resourcet stm stmChans text
|
||||
|
||||
16
pkgs/development/libraries/haskell/multipart/default.nix
Normal file
16
pkgs/development/libraries/haskell/multipart/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "multipart";
|
||||
version = "0.1.1";
|
||||
sha256 = "12sxi21baq1wsa3z6qrczyk47finw85yiql26l90wxk99smm90pj";
|
||||
buildDepends = [ parsec ];
|
||||
meta = {
|
||||
homepage = "http://www.github.com/silkapp/multipart";
|
||||
description = "A partial fork of the cgi package exposing the multipart module";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,17 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, network, text, time, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "network-carbon";
|
||||
version = "1.0.0";
|
||||
sha256 = "13mbwbcas7g8dyvlcbbl20ryzjvz0grmlbhb5kf1gs957kmn1z52";
|
||||
buildDepends = [ network text time vector ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ocharles/network-carbon";
|
||||
description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||
};
|
||||
})
|
||||
23
pkgs/development/libraries/haskell/parsers/0.12.nix
Normal file
23
pkgs/development/libraries/haskell/parsers/0.12.nix
Normal file
@ -0,0 +1,23 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck
|
||||
, quickcheckInstances, text, transformers, unorderedContainers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "parsers";
|
||||
version = "0.12";
|
||||
sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3";
|
||||
buildDepends = [
|
||||
attoparsec charset parsec text transformers unorderedContainers
|
||||
];
|
||||
testDepends = [
|
||||
attoparsec doctest filepath parsec QuickCheck quickcheckInstances
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/parsers/";
|
||||
description = "Parsing combinators";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "path-pieces";
|
||||
version = "0.1.3.1";
|
||||
sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic";
|
||||
version = "0.1.4";
|
||||
sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v";
|
||||
buildDepends = [ text time ];
|
||||
testDepends = [ hspec HUnit QuickCheck text ];
|
||||
meta = {
|
||||
|
||||
15
pkgs/development/libraries/haskell/placeholders/default.nix
Normal file
15
pkgs/development/libraries/haskell/placeholders/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "placeholders";
|
||||
version = "0.1";
|
||||
sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
|
||||
meta = {
|
||||
homepage = "http://github.com/ahammar/placeholders";
|
||||
description = "Placeholders for use while developing Haskell code";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
16
pkgs/development/libraries/haskell/plugins/default.nix
Normal file
16
pkgs/development/libraries/haskell/plugins/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, Cabal, filepath, ghcPaths, haskellSrc, random }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "plugins";
|
||||
version = "1.5.4.0";
|
||||
sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8";
|
||||
buildDepends = [ Cabal filepath ghcPaths haskellSrc random ];
|
||||
meta = {
|
||||
homepage = "http://hub.darcs.net/stepcut/plugins";
|
||||
description = "Dynamic linking for Haskell and C objects";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@ -1,22 +1,22 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, conduit, controlMonadLoop, hspec, mtl, resourcet
|
||||
, shakespeare, shakespeareText, text
|
||||
{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl
|
||||
, resourcet, shakespeare, shakespeareText, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "process-conduit";
|
||||
version = "1.1.0.0";
|
||||
sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql";
|
||||
version = "1.2.0.1";
|
||||
sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
|
||||
buildDepends = [
|
||||
conduit controlMonadLoop mtl resourcet shakespeare shakespeareText
|
||||
text
|
||||
];
|
||||
testDepends = [ conduit hspec ];
|
||||
testDepends = [ conduit conduitExtra hspec resourcet ];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://github.com/tanakh/process-conduit";
|
||||
description = "Conduits for processes";
|
||||
homepage = "http://github.com/snoyberg/process-conduit";
|
||||
description = "Conduits for processes (deprecated)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "purescript";
|
||||
version = "0.5.2.6";
|
||||
sha256 = "0aszzaj3942xgq0nmql68s5cgplhkqrk0k6cfd1mx5lq5n0qxf94";
|
||||
version = "0.5.3";
|
||||
sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user