Merge remote-tracking branch 'upstream/master'
This commit is contained in:
_1126
commit
33e9f3192d
@ -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;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
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";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
};
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, filepath, lens, mtl, split, time, transformersBase, yi }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hoodle";
|
||||
version = "0.2.2.1";
|
||||
sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd";
|
||||
version = "0.3";
|
||||
sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
cmdargs configurator dyre filepath hoodleCore mtl
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://ianwookim.org/hoodle";
|
||||
description = "Executable for hoodle";
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, binary, bytestringProgress, deepseq, filepath
|
||||
, HUnit, libXScrnSaver, parsec, pcreLight, processExtras, strict
|
||||
, tasty, tastyGolden, tastyHunit, terminalProgressBar, time
|
||||
|
||||
@ -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";
|
||||
|
||||
|
||||
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;
|
||||
};
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cairo, dbus, dyre, filepath, gtk, gtkTraymanager
|
||||
, HStringTemplate, HTTP, mtl, network, parsec, split, stm, text
|
||||
, time, transformers, utf8String, X11, xdgBasedir, xmonad
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
|
||||
, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time
|
||||
, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, filepath, strict, time, xdgBasedir }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
let
|
||||
# -> http://get.adobe.com/flashplayer/
|
||||
version = "11.2.202.378";
|
||||
version = "11.2.202.394";
|
||||
|
||||
src =
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
@ -47,7 +47,7 @@ let
|
||||
else rec {
|
||||
inherit version;
|
||||
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
|
||||
sha256 = "08aw532k8y27s64ffdghz2k4zf0jsz65crvn3i9vxan29064la9c";
|
||||
sha256 = "1w82kmda91xdsrqpkrbcbrzswnbfszy0x9hvf9wf2h14isimdknx";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
if debug then {
|
||||
@ -58,7 +58,7 @@ let
|
||||
} else rec {
|
||||
inherit version;
|
||||
url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
|
||||
sha256 = "1njy2pnhgr2hjz6kp9vl4cgxxszw2k6gmhjz88hx92aijv7s93wz";
|
||||
sha256 = "0c8wp4qn6k224krihxb08g7727wlklk9bl4h7nqp3cpp85x9hg97";
|
||||
}
|
||||
else throw "Flash Player is not supported on this platform";
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, Cabal, hledgerLib, mtl, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, Cabal, hledgerLib, statistics, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative
|
||||
, terminalSize, text, time, zlib
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, curl, extensibleExceptions, filepath, hashedStorage
|
||||
, haskeline, html, HTTP, mmap, mtl, network, parsec, random
|
||||
, regexCompat, tar, terminfo, text, utf8String, vector, zlib
|
||||
@ -15,15 +17,15 @@ cabal.mkDerivation (self: {
|
||||
utf8String vector zlib
|
||||
];
|
||||
extraLibraries = [ curl ];
|
||||
jailbreak = true;
|
||||
doCheck = false;
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/bash_completion.d
|
||||
mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
|
||||
'';
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = http://darcs.net/;
|
||||
description = "A distributed, interactive, smart revision control system";
|
||||
homepage = "http://darcs.net/";
|
||||
description = "a distributed, interactive, smart revision control system";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
|
||||
, caseInsensitive, clientsession, cryptoApi, cryptohash, curl
|
||||
, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
|
||||
@ -10,13 +12,14 @@
|
||||
, 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
|
||||
, yesodCore, yesodDefault, yesodForm, yesodStatic
|
||||
, fsnotify
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "git-annex";
|
||||
version = "5.20140707";
|
||||
sha256 = "1m78125w6mq532ngfksrwj3s43qj7wyp756f6qxcqg1cl71xh34k";
|
||||
version = "5.20140709";
|
||||
sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
@ -31,13 +34,14 @@ cabal.mkDerivation (self: {
|
||||
tastyRerun text time transformers unixCompat utf8String uuid wai
|
||||
waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
|
||||
yesodForm yesodStatic
|
||||
] ++ (if (!self.stdenv.isDarwin) then [
|
||||
dbus fdoNotify hinotify
|
||||
] else [
|
||||
] ++ (if self.stdenv.isDarwin then [
|
||||
fsnotify
|
||||
] else [
|
||||
dbus fdoNotify hinotify
|
||||
]);
|
||||
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
|
||||
configureFlags = "-fAssistant -fProduction";
|
||||
configureFlags = "-fAssistant
|
||||
-fProduction";
|
||||
preConfigure = ''
|
||||
export HOME="$NIX_BUILD_TOP/tmp"
|
||||
mkdir "$HOME"
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, extensibleExceptions, filepath, git, github, hslogger
|
||||
, IfElse, MissingH, mtl, network, prettyShow, text, unixCompat
|
||||
, IfElse, MissingH, mtl, network, optparseApplicative, prettyShow
|
||||
, text, unixCompat
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "github-backup";
|
||||
version = "1.20131203";
|
||||
sha256 = "0156g7zbqsp58g8hniqsilyc79sam7plwhn3w56wbzf8m380mwba";
|
||||
version = "1.20140707";
|
||||
sha256 = "0c15gq91c36xza7yiimqvgk609p9xf9jlzy9683d9p9bx1khpadd";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
extensibleExceptions filepath github hslogger IfElse MissingH mtl
|
||||
network prettyShow text unixCompat
|
||||
network optparseApplicative prettyShow text unixCompat
|
||||
];
|
||||
buildTools = [ git ];
|
||||
meta = {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
@ -14,12 +16,10 @@ cabal.mkDerivation (self: {
|
||||
mkdir -p $out/share/man/man1
|
||||
mv "$out/"**"/man/"*.1 $out/share/man/man1/
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
|
||||
./xmonad_ghc_var_0.11.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://xmonad.org";
|
||||
description = "A tiling window manager";
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
|
||||
, xmonad
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, hint, libmpd, mtl, network, parsec, random, regexPosix
|
||||
, split, X11, xmonad, xmonadContrib
|
||||
}:
|
||||
|
||||
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} "$@"
|
||||
'';
|
||||
})
|
||||
@ -127,7 +127,7 @@ rec {
|
||||
ftp://mirror.csclub.uwaterloo.ca/nongnu/
|
||||
ftp://mirror.publicns.net/pub/nongnu/
|
||||
ftp://savannah.c3sl.ufpr.br/
|
||||
http://download.savannah.gnu.org/
|
||||
http://download.savannah.gnu.org/releases/
|
||||
http://ftp.cc.uoc.gr/mirrors/nongnu.org/
|
||||
http://ftp.twaren.net/Unix/NonGNU/
|
||||
http://mirror.csclub.uwaterloo.ca/nongnu/
|
||||
|
||||
@ -1582,22 +1582,22 @@ rec {
|
||||
debian70x86_64 = debian7x86_64;
|
||||
|
||||
debian7i386 = {
|
||||
name = "debian-7.5-wheezy-i386";
|
||||
fullName = "Debian 7.5 Wheezy (i386)";
|
||||
name = "debian-7.6-wheezy-i386";
|
||||
fullName = "Debian 7.6 Wheezy (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
|
||||
sha256 = "c4896c30c9a483354714d50f19d0779b72a218ce4f817f9ec8554f9664137993";
|
||||
sha256 = "773ba601513cd7ef1d5192ad8baa795fa050573d82568c577cdf79adade698a3";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian7x86_64 = {
|
||||
name = "debian-7.5-wheezy-amd64";
|
||||
fullName = "Debian 7.5 Wheezy (amd64)";
|
||||
name = "debian-7.6-wheezy-amd64";
|
||||
fullName = "Debian 7.6 Wheezy (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
|
||||
sha256 = "f3b78aac7d2bdfc3896fdd2087affd0e16bafbf35945106b196483f5fb303d52";
|
||||
sha256 = "11a8bd3648d51f51e56c9f5382168cc47267d67ef6a050826e1cd358ed46cc17";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer
|
||||
, unorderedContainers
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
|
||||
, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
|
||||
, filepath, gmp, happy, haskeline, languageJava, lens, libffi
|
||||
|
||||
@ -24,8 +24,7 @@ let
|
||||
echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
|
||||
|
||||
# Set JAVA_HOME automatically.
|
||||
mkdir -p $out/nix-support
|
||||
cat <<EOF > $out/nix-support/setup-hook
|
||||
cat <<EOF >> $out/nix-support/setup-hook
|
||||
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
|
||||
EOF
|
||||
'';
|
||||
|
||||
@ -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/;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cereal, monadsTf, random, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath
|
||||
, HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc
|
||||
, pandocCiteproc, pandocTypes, parsec, split, strict, temporary
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
|
||||
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck
|
||||
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
|
||||
, regexPosix, testFramework, testFrameworkHunit
|
||||
, testFrameworkQuickcheck2, time
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
|
||||
, regexPosix, testFramework, testFrameworkHunit
|
||||
, testFrameworkQuickcheck2, time
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cairo, Chart, colour, dataDefaultClass, lens, mtl
|
||||
, operational, time
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, blazeSvg, Chart, colour, dataDefaultClass, diagramsCore
|
||||
, diagramsLib, diagramsPostscript, diagramsSvg, lens, mtl
|
||||
, operational, SVGFonts, text, time
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, colour, dataDefaultClass, lens, mtl, operational, time }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, mtl, QuickCheck, random, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, MissingH, mtl, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, HTTP, HUnit, json, mtl, network, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, HUnit, QuickCheck, random }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, caseInsensitive, either, errors, httpClient, httpClientTls
|
||||
, httpTypes, lens, liftedBase, monadControl, mtl, network
|
||||
, optparseApplicative, transformers, transformersBase, xmlConduit
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cereal, cipherAes128, cryptoApi, cryptohashCryptoapi
|
||||
, entropy, mtl, parallel, prettyclass, tagged
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, monadControl, transformers, transformersBase }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck
|
||||
, random, regexCompat, time, Unixutils, zlib
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, HaXml, mtl, parsec, TableAlgebra }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, bindingsGLFW, HUnit, testFramework, testFrameworkHunit }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, libX11, mesa, OpenGL }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, mesa, OpenGLRaw }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, mesa, OpenGLRaw }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, StateVar, Tensor
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, OpenGLRaw, StateVar, Tensor
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, OpenGLRaw
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, OpenGLRaw
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw
|
||||
, transformers, vector
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, dlist, filepath, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, llvm }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, HDBC, mtl, odbc, time, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, convertible, HDBC, mtl, parsec, postgresql, time
|
||||
, utf8String
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, HDBC, mtl, sqlite, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, convertible, mtl, text, time, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, fuse }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
@ -7,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";
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl
|
||||
, syb, tagged
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, binary, mtl, random, vector, zlib }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text
|
||||
, time, utf8String, void
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
|
||||
, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
|
||||
, random, regexCompat, temporary, text, unorderedContainers, xmlgen
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, mtl, network, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, mtl, network, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, mtl, network, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, mtl, network, parsec }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, httpdShed, HUnit, mtl, network, parsec, split
|
||||
, testFramework, testFrameworkHunit
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed
|
||||
, httpTypes, HUnit, mtl, network, parsec, pureMD5, split
|
||||
, testFramework, testFrameworkHunit, wai, warp
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, httpdShed, HUnit, mtl, network, parsec, split
|
||||
, testFramework, testFrameworkHunit
|
||||
}:
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
|
||||
|
||||
{ cabal, httpdShed, HUnit, mtl, network, parsec, split
|
||||
, testFramework, testFrameworkHunit
|
||||
}:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user