diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 65e04703223f..6110b74933b3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -26,6 +26,7 @@ bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; bodil = "Bodil Stokke "; + bosu = "Boris Sukholitko "; calrama = "Moritz Maxeiner "; cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; @@ -77,6 +78,7 @@ qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; redbaron = "Maxim Ivanov "; + refnil = "Martin Lavoie "; relrod = "Ricky Elrod "; rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; @@ -94,6 +96,7 @@ thoughtpolice = "Austin Seipp "; tomberek = "Thomas Bereknyei "; ttuegel = "Thomas Tuegel "; + tv = "Tomislav Viljetić "; urkud = "Yury G. Kudryashov "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; @@ -102,6 +105,7 @@ vlstill = "Vladimír Štill "; winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; + wjlroe = "William Roe "; wmertens = "Wout Mertens "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 2ea998bbb635..6b4c38172e95 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -110,6 +110,7 @@ in "/man" "/sbin" "/share/emacs" + "/share/vim-plugins" "/share/org" "/share/info" "/share/terminfo" diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 79c1c1e000ca..a71f5152bd15 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -136,6 +136,7 @@ nsd = 126; gitolite = 127; znc = 128; + polipo = 129; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -244,7 +245,9 @@ teamspeak = 124; influxdb = 125; nsd = 126; + firebird = 127; znc = 128; + polipo = 129; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 45da0df7967c..7de63c606492 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -3,12 +3,8 @@ with lib; let - - locatedb = "/var/cache/locatedb"; - -in - -{ + cfg = config.services.locate; +in { ###### interface @@ -35,6 +31,31 @@ in ''; }; + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Extra flags to append to updatedb. + ''; + }; + + output = mkOption { + type = types.path; + default = /var/cache/locatedb; + description = '' + The database file to build. + ''; + }; + + localuser = mkOption { + type = types.str; + default = "nobody"; + description = '' + The user to search non-network directories as, using + su. + ''; + }; + }; }; @@ -48,8 +69,10 @@ in path = [ pkgs.su ]; script = '' - mkdir -m 0755 -p $(dirname ${locatedb}) - exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run' + mkdir -m 0755 -p $(dirname ${toString cfg.output}) + exec updatedb \ + --localuser=${cfg.localuser} \ + --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; serviceConfig.Nice = 19; serviceConfig.IOSchedulingClass = "idle"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a9039eea71d4..68971551d89e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -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 diff --git a/nixos/modules/programs/info.nix b/nixos/modules/programs/info.nix index 30c25cf34206..253f9e877693 100644 --- a/nixos/modules/programs/info.nix +++ b/nixos/modules/programs/info.nix @@ -2,6 +2,8 @@ let + texinfo = pkgs.texinfoInteractive; + # Quick hack to make the `info' command work properly. `info' needs # a "dir" file containing all the installed Info files, which we # don't have (it would be impure to have a package installation @@ -22,15 +24,15 @@ let for i in $(IFS=:; echo $INFOPATH); do for j in $i/*.info; do - ${pkgs.texinfo}/bin/install-info --quiet $j $dir/dir + ${texinfo}/bin/install-info --quiet $j $dir/dir done done - INFOPATH=$dir:$INFOPATH ${pkgs.texinfo}/bin/info "$@" + INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@" ''; # */ in { - environment.systemPackages = [ infoWrapper pkgs.texinfo ]; + environment.systemPackages = [ infoWrapper texinfo ]; } diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 3bd58218c99d..9e5983691370 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -50,7 +50,7 @@ in description = '' grsecurity configuration mode. This specifies whether grsecurity is auto-configured or otherwise completely - manually configured. Can either by + manually configured. Can either be custom or auto. auto is recommended. @@ -64,7 +64,7 @@ in description = '' grsecurity configuration priority. This specifies whether the kernel configuration should emphasize speed or - security. Can either by security or + security. Can either be security or performance. ''; }; @@ -76,7 +76,7 @@ in description = '' grsecurity system configuration. This specifies whether the kernel configuration should be suitable for a Desktop - or a Server. Can either by server or + or a Server. Can either be server or desktop. ''; }; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 83dd4951170a..c874b218a5e7 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -159,5 +159,7 @@ in uid = config.ids.uids.firebird; }; + users.extraGroups.firebird.gid = config.ids.gids.firebird; + }; } diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 2521e356bf39..b91c389e90a2 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.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; }; }; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix new file mode 100644 index 000000000000..05ded84625d0 --- /dev/null +++ b/nixos/modules/services/networking/polipo.nix @@ -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"; + }; + }; + + }; + +} \ No newline at end of file diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch b/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch new file mode 100644 index 000000000000..c46d492dc7a9 --- /dev/null +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki-postgresql-fixes.patch @@ -0,0 +1,22 @@ +diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php +index f739d3b..fdd8db3 100644 +--- a/includes/specials/SpecialActiveusers.php ++++ b/includes/specials/SpecialActiveusers.php +@@ -112,7 +112,7 @@ class ActiveUsersPager extends UsersPager { + return array( + 'tables' => array( 'querycachetwo', 'user', 'recentchanges' ), + 'fields' => array( 'user_name', 'user_id', 'recentedits' => 'COUNT(*)', 'qcc_title' ), +- 'options' => array( 'GROUP BY' => array( 'qcc_title' ) ), ++ 'options' => array( 'GROUP BY' => array( 'qcc_title', 'user_name', 'user_id' ) ), + 'conds' => $conds + ); + } +@@ -349,7 +349,7 @@ class SpecialActiveUsers extends SpecialPage { + __METHOD__, + array( + 'GROUP BY' => array( 'rc_user_text' ), +- 'ORDER BY' => 'NULL' // avoid filesort ++ 'ORDER BY' => 'lastedittime DESC' + ) + ); + $names = array(); diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 7984294e6315..fa65ec0ef700 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -79,6 +79,8 @@ let sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl"; }; + patches = [ ./mediawiki-postgresql-fixes.patch ]; + skins = config.skins; buildPhase = diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 51ebca7dd43c..c6c0021ba6d3 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -824,5 +824,7 @@ in systemd.services."user@".restartIfChanged = false; + systemd.services.systemd-remount-fs.restartIfChanged = false; + }; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index d55b74202436..215ae1468984 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -119,8 +119,10 @@ in 169.254.169.254 metadata.google.internal metadata ''; - systemd.services.fetch-root-authorized-keys = - { description = "Fetch authorized_keys for root user"; + networking.usePredictableInterfaceNames = false; + + systemd.services.fetch-ssh-keys = + { description = "Fetch host keys and authorized_keys for root user"; wantedBy = [ "multi-user.target" ]; before = [ "sshd.service" ]; @@ -144,6 +146,22 @@ in rm -f /root/key.pub /root/authorized-keys-metadata fi fi + + echo "obtaining SSH private host key..." + curl -o /root/ssh_host_ecdsa_key http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key + if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key ]; then + mv -f /root/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key + echo "downloaded ssh_host_ecdsa_key" + chmod 600 /etc/ssh/ssh_host_ecdsa_key + fi + + echo "obtaining SSH public host key..." + curl -o /root/ssh_host_ecdsa_key.pub http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub + if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key.pub ]; then + mv -f /root/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub + echo "downloaded ssh_host_ecdsa_key.pub" + chmod 644 /etc/ssh/ssh_host_ecdsa_key.pub + fi ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 594b3e93ffeb..2e30f4c62f97 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -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 diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix new file mode 100644 index 000000000000..5c78ef6ba14c --- /dev/null +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-spotify-${version}"; + + version = "1.1.3"; + + src = fetchurl { + url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; + sha256 = "09s6841qb24nrmlc2izb8vxbgv185ddra6ndskrsw907hfli2kl6"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://www.mopidy.com/; + description = "Mopidy extension for playing music from Spotify."; + license = licenses.asl20; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 04393372cf30..65487bac8232 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,39 +5,33 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.15.0"; + version = "0.18.3"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "1fpnddcx6343wgxzh10s035w21g8jmfh2kzgx32w0xsshpra3gn1"; + sha256 = "0b8ss6qjzj1pawd8469i5310ily3rad0ashfy87vdyj6xdyfyp0q"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good + gst_python pygobject pykka cherrypy ws4py gst_plugins_base gst_plugins_good ]; - # python zip complains about old timestamps - preConfigure = '' - find -print0 | xargs -0 touch - ''; - # There are no tests doCheck = false; postInstall = '' - for p in $out/bin/mopidy $out/bin/mopidy-scan; do - wrapProgram $p \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" - done + wrapProgram $out/bin/mopidy \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.mopidy.com/; description = '' - A music server which can play music from Spotify and from your - local hard drive. + An extensible music server that plays music from local disk, Spotify, + SoundCloud, Google Play Music, and more. ''; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + license = licenses.asl20; + maintainers = [ maintainers.rickynils ]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix new file mode 100644 index 000000000000..b1970a998d50 --- /dev/null +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, libmp3splt, pkgconfig }: + +stdenv.mkDerivation rec { + name = "mp3splt-2.6.1"; + + src = fetchurl { + url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz"; + sha256 = "783a903fafbcf47f06673136a78b78d32a8e616a6ae06b79b459a32090dd14f7"; + }; + + buildInputs = [ libmp3splt pkgconfig ]; + + meta = { + description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; + homepage = http://sourceforge.net/projects/mp3splt/; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.bosu ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 3b1b3154eda1..937a030f3e53 100755 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "0.21"; + version = "0.22"; name = "ncmpc-${version}"; src = fetchurl { - url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.bz2"; - sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07"; + url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"; + sha256 = "a8d65f12653d9ce8bc4493aa1c5de09359c25bf3a22498d2ae797e7d41422211"; }; buildInputs = [ pkgconfig glib ncurses mpd_clientlib ] diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 24ba2461027f..b32981ccb944 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -238,4 +238,19 @@ in { }; }; + eclipse_sdk_44 = buildEclipse { + name = "eclipse-sdk-4.4"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk-x86_64.tar.gz; + sha256 = "14hdkijsjq0hhzi9ijpwjjkhz7wm0pry86l3dniy5snlh3l5bsb2"; + }; + "i686-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz; + sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z"; + }; + }; + }; + } diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index e52011547c7a..ba2437f1a2b8 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -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 ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 9296b294940f..165510f39336 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -49,7 +49,7 @@ let --prefix IDEA_JDK : $jdk mkdir -p $out/share/applications - cp ${ideaItem}/share/applications/* $out/share/applications + cp "${ideaItem}/share/applications/"* $out/share/applications patchShebangs $out ''; @@ -64,7 +64,7 @@ let in { - idea_community_1313 = buildIdea rec { + idea_community = buildIdea rec { name = "idea-community-${version}"; version = "13.1.3"; build = "IC-135.909"; @@ -76,7 +76,7 @@ in { }; }; - idea_ultimate_1313 = buildIdea rec { + idea_ultimate = buildIdea rec { name = "idea-ultimate-${version}"; version = "13.1.3"; build = "IU-135.909"; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix new file mode 100644 index 000000000000..b5ab1950e2b6 --- /dev/null +++ b/pkgs/applications/editors/lighttable/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e0d8de157b09..710ceb7d31f1 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -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; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index bf9472801731..95f654eb8cac 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -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; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index e48cb2590f9c..2390a390854e 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,13 +6,13 @@ let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; in mkDerivation rec { name = "macvim-${version}"; - version = "7.4-73"; + version = "7.4.355"; src = fetchFromGitHub { - owner = "b4winckler"; + owner = "genoma"; repo = "macvim"; - rev = "snapshot-73"; - sha256 = "0zv82y2wz8b482khkgbl08cnxq3pv5bm37c71wgfa0fzy3h12gcj"; + rev = "c18a61f9723565664ffc2eda9179e96c95860e25"; + sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index c721bbe149a3..a789b9952d2b 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,3 +1,33 @@ +diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj +index 1c5ff47..677a2cc 100644 +--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj ++++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj +@@ -437,6 +437,8 @@ + /* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; ++ attributes = { ++ }; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; +@@ -632,6 +634,7 @@ + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = ""; + ONLY_ACTIVE_ARCH = YES; ++ OTHER_LDFLAGS = "-headerpad_max_install_names"; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WARNING_CFLAGS = "-Wall"; +@@ -662,6 +665,7 @@ + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = ""; + ONLY_ACTIVE_ARCH = YES; ++ OTHER_LDFLAGS = "-headerpad_max_install_names"; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WRAPPER_EXTENSION = app; + diff --git a/src/vimtutor b/src/vimtutor index 70d9ec7..b565a1a 100755 --- a/src/vimtutor diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix deleted file mode 100644 index 72e868050537..000000000000 --- a/pkgs/applications/editors/vim/wrapper.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index c7d3f0940164..14231e03582e 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -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: { diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix index e553875f756c..8223b2c5ad90 100644 --- a/pkgs/applications/graphics/hoodle/default.nix +++ b/pkgs/applications/graphics/hoodle/default.nix @@ -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"; diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 91053e57f12e..0c3939b5c256 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -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 diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 930a48a617fd..c6a6fa7861ca 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -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"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 6c25a67147af..14843595d4e7 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.35.0"; + name = "calibre-1.44.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0pzxp1f9d4pw7vksdfkdz6fdgrb8jfwgh4fckjfrarqs039422bi"; + sha256 = "14k9rzp4rphls4zkzrdq8kk0mgzsh5sdmngxklb58r71xj2r995j"; }; inherit python; diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 455ff8d46b82..d1b3b2840526 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "cdrtools-2.01"; - - configurePhase = "prefix=$out"; - + + configurePhase = "prefix=$out"; + #hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script preInstall = '' mkdir "$TMP/bin" @@ -14,16 +14,18 @@ stdenv.mkDerivation rec { PATH="$TMP/bin:$PATH" done ''; - + src = fetchurl { url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; md5 = "d44a81460e97ae02931c31188fe8d3fd"; }; - + patches = [./cdrtools-2.01-install.patch]; meta = { - description = "Highly portable CD/DVD/BluRay command line recording software (deprecated; use cdrkit instead)"; - homepage = http://sourceforge.net/projects/cdrtools/; # berlios shut down; I found no better link + homepage = http://sourceforge.net/projects/cdrtools/; + description = "Highly portable CD/DVD/BluRay command line recording software"; + broken = true; # Build errors, probably because the source + # can't deal with recent versions of gcc. }; } diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix new file mode 100644 index 000000000000..0c084f9d018c --- /dev/null +++ b/pkgs/applications/misc/finalterm/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix index e3a1708326cd..026485c771b3 100644 --- a/pkgs/applications/misc/nc-indicators/default.nix +++ b/pkgs/applications/misc/nc-indicators/default.nix @@ -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: { diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index a92e7e32f048..d2e7d84e3144 100644 --- a/pkgs/applications/misc/taffybar/default.nix +++ b/pkgs/applications/misc/taffybar/default.nix @@ -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 diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 5cb8fc0fd943..7bd405f90a03 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -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 diff --git a/pkgs/applications/misc/yeganesh/default.nix b/pkgs/applications/misc/yeganesh/default.nix index 36a5817772d5..f26d315fce2c 100644 --- a/pkgs/applications/misc/yeganesh/default.nix +++ b/pkgs/applications/misc/yeganesh/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, strict, time, xdgBasedir }: cabal.mkDerivation (self: { diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 855593ec11d6..438710f10245 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c, +{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: stdenv.mkDerivation { @@ -10,12 +10,10 @@ stdenv.mkDerivation { sha256 = "04p9frsnh1qz067cw36anvr41an789fba839svdjrdva0f2751g8"; }; - buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; + buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error - preBuild='' - makeFlagsArray=(CPPFLAGS="-Wno-error" GTK=3 PREFIX=$out); - ''; + makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"''; preFixup='' wrapProgram "$out/bin/dwb" \ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 438a53b4f8a3..617d307b7835 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -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"; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 57cfc928afb9..2a5be53619d7 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: +, stdenv, fetchurl, cmake, makeWrapper, qt4, kdelibs, automoc4, phonon, dconf }: let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; @@ -22,7 +22,7 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qt4 ] + buildInputs = [ cmake makeWrapper qt4 ] ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 ++ lib.optional withKDE phonon; @@ -40,6 +40,11 @@ in with stdenv; mkDerivation rec { ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; + preFixup = '' + wrapProgram "$out/bin/quasselclient" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + ''; + meta = with stdenv.lib; { homepage = http://quassel-irc.org/; description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon"; diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix new file mode 100644 index 000000000000..6ea7089b3fb0 --- /dev/null +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchsvn, cmake, qt, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher }: + +stdenv.mkDerivation { + name = "retroshare-0.6-svn-7445"; + + src = fetchsvn { + url = svn://svn.code.sf.net/p/retroshare/code/trunk; + rev = 7445; + sha256 = "1dqh65bn21g7ix752ddrr10kijjdwjgjipgysyxnm90zjmdlx3cc"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher"; + + patchPhase = '' + # Fix build error + sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ + libretroshare/src/upnp/UPnPBase.cpp + # Extensions get installed + sed -i "s,/usr/lib/retroshare/extensions6/,$out/share/retroshare," \ + libretroshare/src/rsserver/rsinit.cc + # Where to find the bootstrap DHT bdboot.txt + sed -i "s,/usr/share/RetroShare,$out/share/retroshare," \ + libretroshare/src/rsserver/rsaccounts.cc + ''; + + # sed -i "s,LIBS +=.*sqlcipher.*,LIBS += -lsqlcipher," \ + # retroshare-gui/src/retroshare-gui.pro \ + # retroshare-nogui/src/retroshare-nogui.pro + + buildInputs = [ speex qt libupnp gpgme gnome3.libgnome_keyring glib libssh pkgconfig + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher ]; + + configurePhase = '' + qmake PREFIX=$out DESTDIR=$out RetroShare.pro + ''; + + postInstall = '' + mkdir -p $out/bin + mv $out/retroshare-nogui $out/bin + mv $out/RetroShare $out/bin + + # plugins + mkdir -p $out/share/retroshare + mv $out/lib* $out/share/retroshare + + # BT DHT bootstrap + cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare + ''; + + meta = with stdenv.lib; { + description = ""; + homepage = http://retroshare.sourceforge.net/; + #license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix new file mode 100644 index 000000000000..36f83a0611bf --- /dev/null +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python +, boost, db, openssl, geoip, libiconv, miniupnpc +, srcOnly, fetchgit +}: + +let + twisterHTML = srcOnly { + name = "twister-html"; + src = fetchgit { + url = "git://github.com/miguelfreitas/twister-html.git"; + rev = "891f7bf24e1c3df7ec5e1db23c765df2d7c2d5a9"; + sha256 = "0d96rfkpwxyiz32k2pd6a64r2kr3600qgp9v73ddcpq593wf11qb"; + }; + }; + +in stdenv.mkDerivation rec { + name = "twister-${version}"; + version = "0.9.22"; + + src = fetchurl { + url = "https://github.com/miguelfreitas/twister-core/" + + "archive/v${version}.tar.gz"; + sha256 = "1haq0d7ypnazs599g4kcq1x914fslc04wazqj54rlvjdp7yx4j3f"; + }; + + configureFlags = [ + "--with-libgeoip" + "--with-libiconv" + "--with-boost=${boost}" + "--disable-deprecated-functions" + "--enable-tests" + "--enable-python-binding" + ]; + + buildInputs = [ + autoconf automake libtool pkgconfig python + boost db openssl geoip libiconv miniupnpc + ]; + + postPatch = '' + sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ + src/init.cpp + sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \ + src/util.cpp + ''; + + preConfigure = '' + sh autotool.sh + ''; + + installPhase = '' + install -vD twisterd "$out/bin/twisterd" + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://www.twister.net.co/"; + description = "Peer-to-peer microblogging"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index d53a8fe63e29..9c0672e2ee0c 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, hledgerLib, mtl, time }: cabal.mkDerivation (self: { diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix index 303c64863812..e7ca2a6462b1 100644 --- a/pkgs/applications/office/hledger-irr/default.nix +++ b/pkgs/applications/office/hledger-irr/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, hledgerLib, statistics, time }: cabal.mkDerivation (self: { diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix index bf2cf32d6465..72c2028e63c9 100644 --- a/pkgs/applications/science/math/sloane/default.nix +++ b/pkgs/applications/science/math/sloane/default.nix @@ -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 }: diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index b564242c9467..d53b38c28c32 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 8c2ee6a49448..0983ca913865 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,23 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance , exceptions, extensibleExceptions, fdoNotify, feed, filepath, git , gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient , httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH -, monadControl, mtl, network, networkConduit, networkInfo -, networkMulticast, networkProtocolXmpp, openssh -, optparseApplicative, perl, QuickCheck, random, regexTdfa, rsync -, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty -, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which -, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic +, monadControl, mtl, network, networkInfo, networkMulticast +, networkProtocolXmpp, openssh, optparseApplicative, perl +, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem +, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck +, tastyRerun, text, time, transformers, unixCompat, utf8String +, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod +, yesodCore, yesodDefault, yesodForm, yesodStatic , fsnotify }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140613"; - sha256 = "01khqy68w1rqxic9lqal7902cv89d10xvbzmvlsx99g70ljqfafi"; + version = "5.20140709"; + sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26,19 +28,20 @@ cabal.mkDerivation (self: { dlist dns editDistance exceptions extensibleExceptions feed filepath gnutls hamlet hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse json liftedBase MissingH monadControl - mtl network networkConduit networkInfo networkMulticast - networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa - SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit - tastyQuickcheck tastyRerun text time transformers unixCompat - utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore - yesodDefault yesodForm yesodStatic - ] ++ (if (!self.stdenv.isDarwin) then [ - dbus fdoNotify hinotify - ] else [ + mtl network networkInfo networkMulticast networkProtocolXmpp + optparseApplicative QuickCheck random regexTdfa SafeSemaphore + securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck + tastyRerun text time transformers unixCompat utf8String uuid wai + waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault + yesodForm yesodStatic + ] ++ (if self.stdenv.isDarwin then [ fsnotify + ] else [ + dbus fdoNotify hinotify ]); buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fAssistant -fProduction"; + configureFlags = "-fAssistant + -fProduction"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index e7501baf9b41..f9d43037f6a1 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -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 = { diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 2dcb13e5db5e..67e3cba70ca0 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, perl, git, fetchgit }: +{ stdenv, fetchurl, perl, git }: stdenv.mkDerivation rec { name = "gitolite-${version}"; version = "3.6.1"; - src = fetchgit { - url = "git://github.com/sitaramc/gitolite"; - rev = "refs/tags/v${version}"; - sha256 = "47e0e9c3137b05af96c091494ba918d61d1d3396749a04d63e7949ebcc6c6dca"; - leaveDotGit = true; + src = fetchurl { + url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz"; + sha256 = "0sizzv705aypasi9vf9kmdbzcl3gmyfxg9dwdl5prn64biqkvq3y"; }; buildInputs = [ perl git ]; @@ -17,21 +15,21 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace ./install --replace " 2>/dev/null" "" substituteInPlace src/lib/Gitolite/Hooks/PostUpdate.pm \ - --replace /usr/bin/perl "/usr/bin/env perl" + --replace /usr/bin/perl "${perl}/bin/perl" substituteInPlace src/lib/Gitolite/Hooks/Update.pm \ - --replace /usr/bin/perl "/usr/bin/env perl" + --replace /usr/bin/perl "${perl}/bin/perl" ''; + installPhase = '' mkdir -p $out/bin - git tag v${version} # Gitolite requires a tag for the version information :/ perl ./install -to $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "Finely-grained git repository hosting"; - homepage = "http://gitolite.com/gitolite/index.html"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = http://gitolite.com/gitolite/index.html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index c80c8f1c9db0..08b85a5530fd 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -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"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index ca2e9e34e141..48b0cf417f08 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft , xmonad }: diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 1976e393baad..b64cc244d651 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -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 }: diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 63e4481e4e34..293291dc1dad 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -23,10 +23,12 @@ , # Shell command to run after building the symlink tree. postBuild ? "" + +, passthru ? {} }: runCommand name - { inherit manifest paths ignoreCollisions pathsToLink postBuild; + { inherit manifest paths ignoreCollisions passthru pathsToLink postBuild; preferLocalBuild = true; } '' diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index bb349b3a1f57..6c806c4bf1fb 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -29,7 +29,7 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version; # Our GHC 6.10.x builds do not provide sharable versions of their core libraries. assert enableSharedLibraries -> versionOlder "6.12" ghc.version; -# Our GHC 6.10.x builds do not provide sharable versions of their core libraries. +# Pure shared library builds don't work before GHC 7.8.x. assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; { diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix new file mode 100644 index 000000000000..dd3a8c1cb417 --- /dev/null +++ b/pkgs/build-support/fetchgit/private.nix @@ -0,0 +1,19 @@ +{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { + SSH_AUTH_SOCK = if (builtins.tryEval ).success + then builtins.toString + else null; + GIT_SSH = writeScript "fetchgit-ssh" '' + #! ${stdenv.shell} + exec -a ssh ${openssh}/bin/ssh -F ${let + sshConfigFile = if (builtins.tryEval ).success + then + 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} "$@" + ''; +}) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 38d3353202b1..b9e62355a01c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -127,7 +127,7 @@ rec { ftp://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.publicns.net/pub/nongnu/ ftp://savannah.c3sl.ufpr.br/ - http://download.savannah.gnu.org/ + http://download.savannah.gnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ @@ -305,7 +305,6 @@ rec { http://dirichlet.mat.puc.cl/ http://ftp.ctex.org/mirrors/CRAN/ http://mirror.bjtu.edu.cn/cran - http://cran.dataguru.cn/ http://mirrors.ustc.edu.cn/CRAN/ http://mirrors.xmu.edu.cn/CRAN/ http://www.laqee.unal.edu.co/CRAN/ diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a717561d8dad..2994802c5e3b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -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; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index afee316d0bf8..332c9de18373 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014b"; in +let version = "2014e"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "1d8w5g7fy8nrdj092cwmxdxw6rk3bzwpxqpz6l5sra2kqbhg7qfi"; + sha256 = "1ic63ykplnrvh9704j6l089rais0nxw1lcf1dbc3iy2ij2kl7qh8"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "12x7ahbjxc3sj4ykcvx5c7kw1nbn6ywm8wzq6303y3l8qyqd7nmm"; + sha256 = "074c98vmdgysgkksaqwkn1gbrlnzk8l28zs8lhif44a9mckc9ss3"; }) ]; diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix index 541db5720db4..1b17cbc3d78d 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango , gnome_doc_utils, intltool, libX11, which, gconf, libuuid -, desktop_file_utils, itstool, ncurses, makeWrapper }: +, desktop_file_utils, itstool, makeWrapper }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte - gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ]; + gnome3.dconf gnome3.gconf itstool makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix index d98ddc716dec..c916be6c9a72 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix @@ -15,9 +15,15 @@ stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - configureFlags = ''--enable-introspection''; + configureFlags = [ "--enable-introspection" ]; - meta = { + enableParallelBuilding = true; + + postInstall = '' + substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" + ''; + + meta = with stdenv.lib; { homepage = http://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' @@ -28,8 +34,8 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = "LGPLv2"; - maintainers = with stdenv.lib.maintainers; [ astsmtl antono ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.lgpl2; + maintainers = with maintainers; [ astsmtl antono lethalman ]; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix index ced915e7f8f6..a761c13e9595 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper }: +, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "file-roller-${version}"; @@ -16,15 +16,19 @@ stdenv.mkDerivation rec { # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - attr bzip2 acl makeWrapper ]; + hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + attr bzip2 acl gdk_pixbuf librsvg makeWrapper ]; preFixup = '' wrapProgram "$out/bin/file-roller" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/FileRoller; + description = "Archive manager for the GNOME desktop environment"; platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix index 0e00b50f47d6..0909a4239db5 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix new file mode 100644 index 000000000000..cbb53eedd4c7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk +, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala +, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg +, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio +}: + +# TODO: ovirt (optional) + +stdenv.mkDerivation rec { + name = "gnome-boxes-3.12.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz"; + sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8"; + }; + + enableParallelBuilding = true; + + doCheck = true; + + buildInputs = [ + makeWrapper pkgconfig intltool itstool libvirt-glib glib + gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol + libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp + gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + librsvg hicolor_icon_theme desktop_file_utils + ]; + + preFixup = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" + done + rm "$out/share/icons/hicolor/icon-theme.cache" + ''; + + meta = with stdenv.lib; { + description = "Simple GNOME 3 application to access remote or virtual systems"; + homepage = https://wiki.gnome.org/action/show/Apps/Boxes; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix index a5b3fb739439..057ef191a6f4 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango , gnome_doc_utils, intltool, libX11, which, libuuid -, desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }: +, desktop_file_utils, itstool, makeWrapper, appdata-tools }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool ncurses makeWrapper gnome3.nautilus ]; + gnome3.dconf itstool makeWrapper gnome3.nautilus ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix index a0669957af60..4564b0d21e17 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix @@ -13,7 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig atk cairo glib gtk3 pango libxml2Python perl intltool gettext ]; + preBuild = '' + substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" + ''; + + patches = [ ./nix_share_path.patch ]; + meta = with stdenv.lib; { platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch new file mode 100644 index 000000000000..c87350167c25 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch @@ -0,0 +1,11 @@ +--- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 ++++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 +@@ -68,6 +68,8 @@ + basename, + NULL)); + ++ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); ++ + g_ptr_array_add (dirs, NULL); + + return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 53ce47cca54b..70c860849e08 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -15,9 +15,15 @@ stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - configureFlags = ''--enable-introspection''; + configureFlags = [ "--enable-introspection" ]; - meta = { + enableParallelBuilding = true; + + postInstall = '' + substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" + ''; + + meta = with stdenv.lib; { homepage = http://www.gnome.org/; description = "A library implementing a terminal emulator widget for GTK+"; longDescription = '' @@ -28,8 +34,8 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = "LGPLv2"; - maintainers = with stdenv.lib.maintainers; [ astsmtl antono ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.lgpl2; + maintainers = with maintainers; [ astsmtl antono lethalman ]; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index f5369b2a3c32..1bb197338ec2 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -195,6 +195,11 @@ rec { glade = callPackage ./apps/glade { }; + gnome-boxes = callPackage ./apps/gnome-boxes { + gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; + spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; + }; + gnome-clocks = callPackage ./apps/gnome-clocks { }; gnome-documents = callPackage ./apps/gnome-documents { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix index 51f30ed796ee..37962a205623 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { p_name = "xfce4-xkb-plugin"; ver_maj = "0.5"; - ver_min = "4.3"; + ver_min = "6"; name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0v9r0w9m5lxrzmz12f8w67l781lsywy9p1vixgn4xq6z5sxh2j6a"; + sha256 = "198q6flrajbscwwywqq8yv6hdcwifahhj9i526vyfz4q6cq65r09"; }; buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk diff --git a/pkgs/development/compilers/agda/stdlib-0.8.nix b/pkgs/development/compilers/agda/stdlib-0.8.nix index 9a78744ca299..913ae5cd90fc 100644 --- a/pkgs/development/compilers/agda/stdlib-0.8.nix +++ b/pkgs/development/compilers/agda/stdlib-0.8.nix @@ -16,8 +16,8 @@ cabal.mkDerivation (self: rec { postInstall = '' mkdir -p $out/share cd .. - runhaskell GenerateEverything - agda -i . -i src Everything.agda + ${self.ghc.ghc}/bin/runhaskell GenerateEverything + ${Agda}/bin/agda -i . -i src Everything.agda cp -pR src $out/share/agda ''; diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index 5f389d48c8ed..264c75ee7af9 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer , unorderedContainers }: diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 1767a61a7d19..af6382906101 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -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: { diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index 6706b99e2034..5dd2e14b0c6f 100644 --- a/pkgs/development/compilers/ghc/7.0.2.nix +++ b/pkgs/development/compilers/ghc/7.0.2.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres ]; inherit (ghc.meta) license platforms; + broken = true; }; } diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index 0b422043ae28..c8d4b2648048 100644 --- a/pkgs/development/compilers/ghc/7.0.3.nix +++ b/pkgs/development/compilers/ghc/7.0.3.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres ]; inherit (ghc.meta) license platforms; + broken = true; }; } diff --git a/pkgs/development/compilers/ghc/7.8.2.nix b/pkgs/development/compilers/ghc/7.8.3.nix similarity index 88% rename from pkgs/development/compilers/ghc/7.8.2.nix rename to pkgs/development/compilers/ghc/7.8.3.nix index 8200c8c759e7..dbcba36fa8ff 100644 --- a/pkgs/development/compilers/ghc/7.8.2.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.8.2"; + version = "7.8.3"; name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.2/${name}-src.tar.xz"; - sha256 = "15kyz98zq22sgwkzy2bkx0yz98qkrzgdigz919vafd7fxnkf3la5"; + url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz"; + sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 27dcf9f03a6e..d2bf006285d0 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -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 diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 3e4835c8b531..68708726c852 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -4,7 +4,7 @@ let name = "openjdk6-b16-24_apr_2009-r1"; src = fetchurl { - url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; + url = http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v"; }; @@ -24,8 +24,7 @@ let echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook + cat <> $out/nix-support/setup-hook if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF ''; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index fbbae4956661..6fd7ad9d65b1 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups +{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype , which, jdk, nettools, xorg, file , fontconfig, cpio, cacert, perl, setJavaClassPath }: @@ -15,21 +15,26 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "40"; + update = "65"; - build = "43"; + build = "32"; # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. paxflags = if stdenv.isi686 then "msp" else "m"; + cupsSrc = fetchurl { + url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2; + md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; + }; + in stdenv.mkDerivation rec { name = "openjdk-7u${update}b${build}"; src = fetchurl { - url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; - sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; + url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz"; + sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx"; }; outputs = [ "out" "jre" ]; @@ -46,10 +51,14 @@ stdenv.mkDerivation rec { postUnpack = '' sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ - openjdk/hotspot/make/linux/makefiles/sa.make + openjdk*/hotspot/make/linux/makefiles/sa.make sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk + openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk + + tar xf ${cupsSrc} + cupsDir=$(echo $(pwd)/cups-*) + makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; @@ -61,9 +70,8 @@ stdenv.mkDerivation rec { "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" "FREETYPE_HEADERS_PATH=${freetype}/include" "FREETYPE_LIB_PATH=${freetype}/lib" - "MILESTONE=release" + "MILESTONE=u${update}" "BUILD_NUMBER=b${build}" - "CUPS_HEADERS_PATH=${cups}/include" "USRBIN_PATH=" "COMPILER_PATH=" "DEVTOOLS_PATH=" @@ -71,6 +79,7 @@ stdenv.mkDerivation rec { "BOOTDIR=${jdk}" "STATIC_CXX=false" "UNLIMITED_CRYPTO=1" + "FULL_DEBUG_SYMBOLS=0" ]; configurePhase = "true"; @@ -158,7 +167,7 @@ stdenv.mkDerivation rec { homepage = http://openjdk.java.net/; license = "GPLv2"; description = "The open-source Java Development Kit"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh similarity index 100% rename from pkgs/development/compilers/jdk/dlj-bundle-builder.sh rename to pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh diff --git a/pkgs/development/compilers/jdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix similarity index 88% rename from pkgs/development/compilers/jdk/jdk-linux-base.nix rename to pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index b29ae826d888..90a64ecd5217 100644 --- a/pkgs/development/compilers/jdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -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 <> $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 diff --git a/pkgs/development/compilers/jdk/jdk6-construct.sh b/pkgs/development/compilers/oraclejdk/jdk6-construct.sh similarity index 100% rename from pkgs/development/compilers/jdk/jdk6-construct.sh rename to pkgs/development/compilers/oraclejdk/jdk6-construct.sh diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix similarity index 100% rename from pkgs/development/compilers/jdk/jdk6-linux.nix rename to pkgs/development/compilers/oraclejdk/jdk6-linux.nix diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix similarity index 66% rename from pkgs/development/compilers/jdk/jdk7-linux.nix rename to pkgs/development/compilers/oraclejdk/jdk7-linux.nix index 46544dc390f2..55e8ad45085f 100644 --- a/pkgs/development/compilers/jdk/jdk7-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix @@ -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"; diff --git a/pkgs/development/compilers/jdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix similarity index 65% rename from pkgs/development/compilers/jdk/jdk8-linux.nix rename to pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 0c3eed75f4c2..63af45643749 100644 --- a/pkgs/development/compilers/jdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -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"; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index ee5dac265bc7..303ea1d74711 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDLAGS="" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDLAGS="-fPIC" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) ''; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index f346b1b09868..3bcc85fb4342 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix new file mode 100644 index 000000000000..97e9f51ac1bf --- /dev/null +++ b/pkgs/development/interpreters/lua-5/sec.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lua5, lua5_sockets, openssl }: + +stdenv.mkDerivation rec { + version = "0.5"; + name = "lua-sec-${version}"; + src = fetchurl { + url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"; + sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034"; + }; + + buildInputs = [ lua5 openssl ]; + + preBuild = '' + makeFlagsArray=( + linux + LUAPATH="$out/lib/lua/${lua5.luaversion}" + LUACPATH="$out/lib/lua/${lua5.luaversion}" + INC_PATH="-I${lua5}/include" + LIB_PATH="-L$out/lib"); + ''; + + meta = { + homepage = "https://github.com/brunoos/luasec"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index d51838af5ad5..940b667e86a8 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -71,10 +71,13 @@ let ln -s $out/share/man/man1/{python2.6.1,python.1} ''; - passthru = { + passthru = rec { inherit zlibSupport; + isPy2 = true; + isPy26 = true; libPrefix = "python${majorVersion}"; - executable = "python2.6"; + executable = libPrefix; + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 388a0c9b1346..c19430862c21 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -85,10 +85,13 @@ let paxmark E $out/bin/python${majorVersion} ''; - passthru = { + passthru = rec { inherit zlibSupport; + isPy2 = true; + isPy27 = true; libPrefix = "python${majorVersion}"; - executable = "python2.7"; + executable = libPrefix; + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index c103b0f59cde..489d0509c1a4 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" - LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ''; - passthru = { + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; @@ -69,7 +69,10 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.2m"; - is_py3k = true; + isPy3 = true; + isPy32 = true; + is_py3k = true; # deprecated + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; @@ -88,6 +91,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index f9f68b9323e1..fcc033803498 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" - LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation { paxmark E $out/bin/python${majorVersion} ''; - passthru = { + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; @@ -66,7 +66,10 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; - is_py3k = true; + isPy3 = true; + isPy33 = true; + is_py3k = true; # deprecated + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; @@ -84,7 +87,7 @@ stdenv.mkDerivation { high level dynamic data types. ''; license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index c8d4b69b4309..3477cedf4b74 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" - LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -58,7 +58,7 @@ stdenv.mkDerivation { paxmark E $out/bin/python${majorVersion} ''; - passthru = { + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; @@ -67,7 +67,10 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.4m"; - is_py3k = true; + isPy3 = true; + isPy34 = true; + is_py3k = true; # deprecated + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; @@ -85,7 +88,7 @@ stdenv.mkDerivation { high level dynamic data types. ''; license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ]; }; } diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 97043f11f50f..83735376b987 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -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/; }; } - diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index cba8d394c2ba..9e28334804bd 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, m4, cxx ? true }: +{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: with { inherit (stdenv.lib) optional; }; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gmp-5.1.3"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = "http://gmplib.org/"; description = "GMP, the GNU multiple precision arithmetic library"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating @@ -54,7 +54,10 @@ stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } + // stdenv.lib.optionalAttrs withStatic { dontDisableStatic = true; } +) + diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index bbcfd4a0c921..4dd3e78652c3 100644 --- a/pkgs/development/libraries/haskell/AC-Vector/default.nix +++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/AES/default.nix b/pkgs/development/libraries/haskell/AES/default.nix index 6ffa795929f9..263f2a5d5826 100644 --- a/pkgs/development/libraries/haskell/AES/default.nix +++ b/pkgs/development/libraries/haskell/AES/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, monadsTf, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix index 7d5c01f64bf6..9937b1029a6f 100644 --- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix +++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index bb226733f8a5..e07436c22561 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix index 0d049c848500..1f4af9d6f713 100644 --- a/pkgs/development/libraries/haskell/BoundedChan/default.nix +++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/CC-delcont/default.nix b/pkgs/development/libraries/haskell/CC-delcont/default.nix index e13344034ca1..459c338b80d2 100644 --- a/pkgs/development/libraries/haskell/CC-delcont/default.nix +++ b/pkgs/development/libraries/haskell/CC-delcont/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix index 7b666a1cf6e0..45af5f985860 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, filepath, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index c1689817dcc9..be54e41eb20f 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, filepath, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix index 0ef09dc49b15..8df99f7c900e 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix index ee7f363318eb..67faefb7a67b 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index 90c5ce7ec65a..eb0d5127c855 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index 4d63040f14b6..34cbb5511ab2 100644 --- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix +++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 3c5785ff945f..0b281026b185 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index f9bac323db8e..fbadacf2e60a 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index b22272a77033..34087a5836bb 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, random, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index b0c77eb11165..d7a33dab28e5 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MissingH, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index ac8ab3d77286..a7035aa70338 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index c7d10d0160d8..f2ee437d1af9 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index ac5a6636e76d..c75b82dcf15d 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix index 81f0455bd5a5..c192ad4302ef 100644 --- a/pkgs/development/libraries/haskell/DRBG/default.nix +++ b/pkgs/development/libraries/haskell/DRBG/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 04149400ff8c..a556dc8958da 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix index cb2195ef6aba..4e8074409c8d 100644 --- a/pkgs/development/libraries/haskell/EitherT/default.nix +++ b/pkgs/development/libraries/haskell/EitherT/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monadControl, transformers, transformersBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra/default.nix index 2634f8491141..0db01edcc61c 100644 --- a/pkgs/development/libraries/haskell/Extra/default.nix +++ b/pkgs/development/libraries/haskell/Extra/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix index daef52bec752..6b1b71a22f1e 100644 --- a/pkgs/development/libraries/haskell/FerryCore/default.nix +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HaXml, mtl, parsec, TableAlgebra }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLFW-b/default.nix b/pkgs/development/libraries/haskell/GLFW-b/default.nix index 5dea14a106df..f3bdfebbe675 100644 --- a/pkgs/development/libraries/haskell/GLFW-b/default.nix +++ b/pkgs/development/libraries/haskell/GLFW-b/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsGLFW, HUnit, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 26a132ae0286..4abea15c51d7 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix index d719e8179d45..16bd7641ad72 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix index 1da2b743687a..1241b88cb991 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index 32e45aebeb27..1b3741fad0de 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index 64bc7feaf176..c69c8b282a4a 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix index 2b9a0fadfc92..af1eac9e43d7 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index e5ff3951d3c3..c284ec40ad5c 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix index d65dfa15c6f3..e8bd96f755a3 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix index a7a7e7f371ad..22ac715557a4 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix index 79112138b4ac..592de68432ef 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index 3e14151f61a0..10ab2bf69e6c 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw , transformers, vector }: diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index 85fe7f2e88e4..565f213c42ba 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix index 93d4bb8a6dab..9eefd570146b 100644 --- a/pkgs/development/libraries/haskell/GlomeVec/default.nix +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, llvm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index 16df77a939eb..0a95e90ef4b3 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix index 94fcd71adbd2..5ec440e9e348 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, convertible, HDBC, mtl, parsec, postgresql, time , utf8String }: diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index 783c4c186e2c..14ed9499b137 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HDBC, mtl, sqlite, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 08134abf8438..97cb81415e28 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -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: { diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 03ef1f714eeb..04ebefd37fac 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -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"; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 15a7741d3351..5b971657484d 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix new file mode 100644 index 000000000000..7dcdbaa8cf99 --- /dev/null +++ b/pkgs/development/libraries/haskell/HPDF/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, mtl, random, vector, zlib }: + +cabal.mkDerivation (self: { + pname = "HPDF"; + version = "1.4.6"; + sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9"; + buildDepends = [ binary mtl random vector zlib ]; + meta = { + homepage = "http://www.alpheccar.org"; + description = "Generation of PDF documents"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0f02d96fcd40..46a6ec75c6a0 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix index 0514db9e3238..7667dd3d5422 100644 --- a/pkgs/development/libraries/haskell/HTF/default.nix +++ b/pkgs/development/libraries/haskell/HTF/default.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index ac4ac232edf8..7eee53b85390 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 0beebbfe2944..022a9129522c 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index 31cfdddac79e..da0db5169af9 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index 8d4a39526b2a..109746cff975 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index f3da4a5ccf22..91b2428ee66e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix index 583517260acf..ce90b9a9426a 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix @@ -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 diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index e6238a5e738f..68d4e17f9c2f 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index d9e422f9e895..fc04221eaac4 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -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 }: diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index 93ba5e949db8..dc85bffd6434 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes , HUnit, mtl, network, parsec, pureMD5, split, testFramework , testFrameworkHunit, wai, warp diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 09f0b25910b9..32692c47c423 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes , HUnit, mtl, network, parsec, pureMD5, split, testFramework , testFrameworkHunit, wai, warp diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix index 01130de10cd9..2e317dddfc07 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index e14aad1a015c..01ed60616e6b 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix index 2cb9f859f462..302e54fff723 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix index 8ad518ee1f6d..05006588a525 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix index 9ac01e70865d..9d299a9d36ea 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix index 06ac5fa1bbf6..aafabf991e93 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix index b94e0f20733b..8883796942ba 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index 996437cbeac2..54ec9d87d138 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, polyparse, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix index f20efdae4cfe..cbf5e87bcccb 100644 --- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix +++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, hxt, hxtHttp, MaybeT, mtl, network, parsec , transformers }: diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 417ded6da54f..2d540e735814 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index f7ebac247e5e..d8d4ee2ece12 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network, openssl, time }: cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.4"; - sha256 = "1vpidm3jfwlyf61r0g9fks445w4w0kxk3g37fw4slfb1q3xknq2r"; + version = "0.11"; + sha256 = "000c1589yf1lzvw32hh2jacq1da6k2vynh5rymw3rlapxq7skyyr"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/HsSyck/0.51.nix b/pkgs/development/libraries/haskell/HsSyck/0.51.nix index 3033eb7b19d3..63c771af7a93 100644 --- a/pkgs/development/libraries/haskell/HsSyck/0.51.nix +++ b/pkgs/development/libraries/haskell/HsSyck/0.51.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashtables, syb, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HsSyck/0.52.nix b/pkgs/development/libraries/haskell/HsSyck/0.52.nix index 2340c339ea7c..c430c7929ef4 100644 --- a/pkgs/development/libraries/haskell/HsSyck/0.52.nix +++ b/pkgs/development/libraries/haskell/HsSyck/0.52.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashtables, syb, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix index 8025ef13bc28..8b673dc56beb 100644 --- a/pkgs/development/libraries/haskell/IORefCAS/default.nix +++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bitsAtomic, HUnit, QuickCheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix index 84b5f6fe6107..6d9a542f9f16 100644 --- a/pkgs/development/libraries/haskell/IOSpec/default.nix +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, Stream }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix index 960868e3ab0a..d2bef1cafa1b 100644 --- a/pkgs/development/libraries/haskell/IfElse/default.nix +++ b/pkgs/development/libraries/haskell/IfElse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix index e2b94abd7c8d..8df2f0815dbf 100644 --- a/pkgs/development/libraries/haskell/IntervalMap/default.nix +++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix index 844d512c62f3..4e680b26caed 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, JuicyPixels, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 414118f33c98..36347cb45528 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, deepseq, mtl, primitive, transformers, vector , zlib }: diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix index 65c90c0824ea..7fef71551908 100644 --- a/pkgs/development/libraries/haskell/List/default.nix +++ b/pkgs/development/libraries/haskell/List/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 03c8853cfd71..bec9203c0eed 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix index d7307bde5d71..0f3edbaf5f2a 100644 --- a/pkgs/development/libraries/haskell/ListZipper/default.nix +++ b/pkgs/development/libraries/haskell/ListZipper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index fe96af2de9e5..4a8f7a91bbab 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession , conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes , monadloc, mtl, parsec, random, RefSerialize, stm, TCache, text diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix index a29997f9de95..069675c2e6a9 100644 --- a/pkgs/development/libraries/haskell/MaybeT/default.nix +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index 5d8fc314819e..15569acf0402 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, void }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 303a4852649e..0c8e7a699e58 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, errorcallEqInstance, filepath, hslogger, HUnit, mtl , network, parsec, QuickCheck, random, regexCompat, testpack, time }: diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index 4ae0212d6ef5..eb5232fabcf3 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, MonadCatchIOTransformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index a37d4bc673b1..9f928bea9de3 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, monadsTf, transformers }: cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.3.1.1"; - sha256 = "1kfq9py053zic69f25gcsm802dhk7y5k01ipsf2jvl8d4r5iw5kk"; + version = "0.3.1.2"; + sha256 = "1r5c4qz6yp1qrsmk9di35d5kk2dcnaxh2mg3n5kdim991ydzsi1d"; buildDepends = [ extensibleExceptions monadsTf transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix index 6d8e66952e40..005af6b99f59 100644 --- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 3eac88d8880d..6ff8afc58f30 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index d276697a6d95..2b3746d4973c 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index 27f9b444a711..bda33cee85a3 100644 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix index 945e12438b58..9fcc2cbf2538 100644 --- a/pkgs/development/libraries/haskell/OneTuple/default.nix +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index 36d3b41583fb..e303d1771511 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, openal, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix index 2e4ac90c79e1..05de2f88b977 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index 25133657ccb4..887b01afde93 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix index 33e9c4d21a0a..a07fa3ec763d 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index c8cfd796afd0..fecdfca2566b 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar , Tensor }: diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix index 318bdf197486..0506cc608c16 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar , Tensor }: diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix index 72183c86192c..a88cb3633396 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, OpenGLRaw }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix index c012c65d5228..01af37baaeb6 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, OpenGLRaw, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix index a6a45bf5b248..ed604b6a1e2e 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix index 1145c16b4f8b..c32598e24b07 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix index f0e6c7ac7adb..fd0331a7311e 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix index 32497935cdbe..885b0380367d 100644 --- a/pkgs/development/libraries/haskell/PSQueue/default.nix +++ b/pkgs/development/libraries/haskell/PSQueue/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix index 3cf80d93336e..2c0fb559a165 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix index 6ba32ce71c0b..6fce5e94da5f 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix index 2f305b8a23ce..c7080090aee4 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix index 4e634078a7d8..29944bb6852d 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix index e2d274dca05c..43275b145be1 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index b3202cdc4b93..1196d5463f5b 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix index 24e16a4955f5..a31a5e5d585d 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix index 39c97859e657..ff46b19063e5 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix index 8dff2162c2d8..2ebd4d2bb010 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random, testFramework, tfRandom, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 883e7767c6d3..60fb815aae2b 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG , monadcryptorandom, pureMD5, QuickCheck, SHA, tagged , testFramework, testFrameworkQuickcheck2 @@ -5,10 +7,13 @@ cabal.mkDerivation (self: { pname = "RSA"; - version = "2.0"; - sha256 = "170bjcqd6q8q0c0idjpm9vgn02ifwxz1xvwp1l30qdf56293p4bq"; + version = "2.0.0"; + sha256 = "1v2d6sxpqr0lmiqdr3ym5qzp3p1y57yj6939vdlsac6k6ifj6pwq"; + isLibrary = true; + isExecutable = true; buildDepends = [ - binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA + binary cryptoApi cryptoPubkeyTypes DRBG monadcryptorandom pureMD5 + QuickCheck SHA tagged testFramework testFrameworkQuickcheck2 ]; testDepends = [ binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix index e65752e35b4c..b438964e3c54 100644 --- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 12c3e34571e8..484aacb91f02 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix index a16ce1332ed2..e1d0e4fd953a 100644 --- a/pkgs/development/libraries/haskell/RefSerialize/default.nix +++ b/pkgs/development/libraries/haskell/RefSerialize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, hashtables, stringsearch }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 769a1d534ba4..bdbae9681515 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, typeEquality }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index 6c61813ac308..22a17103c5dc 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL, SDL_image }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index 8690d7e89163..d4635565216b 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL, SDL_mixer }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index f1a0489167e5..b835d5c56511 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL, SDL_ttf }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 2fd9c3e0fb6f..a42ee72559d2 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 9b51a3167f75..b57065a36bbb 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SHA2/default.nix b/pkgs/development/libraries/haskell/SHA2/default.nix index f02a7458a2f7..769192146ae5 100644 --- a/pkgs/development/libraries/haskell/SHA2/default.nix +++ b/pkgs/development/libraries/haskell/SHA2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, AES, monadsTf, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 91c128756f42..7bbb957cb128 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, hsemail, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/STMonadTrans/default.nix b/pkgs/development/libraries/haskell/STMonadTrans/default.nix index d533c167f6c1..34ef6152cd27 100644 --- a/pkgs/development/libraries/haskell/STMonadTrans/default.nix +++ b/pkgs/development/libraries/haskell/STMonadTrans/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix index e617190b7619..a4bb78eca681 100644 --- a/pkgs/development/libraries/haskell/SVGFonts/default.nix +++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeMarkup, blazeSvg, dataDefaultClass , diagramsLib, parsec, split, text, tuple, vector, vectorSpace, xml }: diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix index 6e5e0bf4038d..577af377488d 100644 --- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix +++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index e6f3caac45b9..902516ba6e6f 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index 3b27022bea07..d0797aa2f48c 100644 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix index 3bcdb30fd129..99d58423d3b4 100644 --- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix +++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix index 3e622ba28530..2e774ee98c42 100644 --- a/pkgs/development/libraries/haskell/Stream/default.nix +++ b/pkgs/development/libraries/haskell/Stream/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lazysmallcheck, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix index cec80a16d300..5f281ecfb659 100644 --- a/pkgs/development/libraries/haskell/TCache/default.nix +++ b/pkgs/development/libraries/haskell/TCache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashtables, mtl, RefSerialize, stm, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix index c4960813f3eb..5bcbe2784815 100644 --- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HaXml, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index d62b42833a3e..bfcd2722b014 100644 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix index c1e6ef6df2d4..6e37fe2ca494 100644 --- a/pkgs/development/libraries/haskell/Thrift/default.nix +++ b/pkgs/development/libraries/haskell/Thrift/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, HTTP, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix index 083f438e170d..3d52abc656c2 100644 --- a/pkgs/development/libraries/haskell/TypeCompose/default.nix +++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix index 37c1aaf6cef0..baabbbc6546f 100644 --- a/pkgs/development/libraries/haskell/Unixutils/default.nix +++ b/pkgs/development/libraries/haskell/Unixutils/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, pureMD5, regexTdfa, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 85fdcfd0b4af..bc4b7eb14542 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix index 20a304386814..0dbbc1ef5db0 100644 --- a/pkgs/development/libraries/haskell/Workflow/default.nix +++ b/pkgs/development/libraries/haskell/Workflow/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, exceptions, extensibleExceptions, mtl , RefSerialize, stm, TCache, vector }: diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index 1690ec9031e6..4925014517c0 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11 }: diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 64c6d50c6091..7a8195c21be7 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, libX11, libXext, libXinerama, libXrandr , libXrender }: diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix index 7d941101eb36..a4d1ea666a2d 100644 --- a/pkgs/development/libraries/haskell/Yampa/default.nix +++ b/pkgs/development/libraries/haskell/Yampa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix index 66db8b44dc52..a5d171f177b1 100644 --- a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractDeque, HUnit, random, testFramework , testFrameworkHunit, time }: diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index c9df3b5c86a9..6102e2f40360 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix index 537df70390ca..dd8539533794 100644 --- a/pkgs/development/libraries/haskell/abstract-par/default.nix +++ b/pkgs/development/libraries/haskell/abstract-par/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 129c0a81570f..5ed99a644f7b 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath , hashable, hashtables, languageCQuote, mainlandPretty, mtl , SafeSemaphore, srcloc, text, transformers, unorderedContainers diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 963a55d2942d..cd1b03316397 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, accelerateCuda, accelerateFft, accelerateIo , attoparsec, bmp, bytestringLexing, cereal, criterion, ekg , fclabels, filepath, gloss, glossAccelerate, glossRasterAccelerate diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index 7869b9867096..e2f4fade7361 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, accelerateCuda, cuda, cufft }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index 457a2313f6f0..8d89d9e7ce0c 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, bmp, repa, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index 3d60cfddb6c6..a32d5fed11c5 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fclabels, hashable, hashtables, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index 066532d117a9..c7067dd66020 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, extensibleExceptions, filepath, mtl, network , safecopy, stm }: diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 01441a39ce79..a13113cde4e2 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, newtype, QuickCheck, semigroupoids, semigroups , vectorSpace }: diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index 74e564af62a6..5b9cb5703d62 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, contravariant, distributive, free, mtl , profunctors, semigroupoids, semigroups, tagged, transformers , void diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix index 1b568541a133..7bc2beb3b301 100644 --- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix +++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, cmdargs, text, unorderedContainers , vector }: diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix index 04156f656b6d..2090a20fa8df 100644 --- a/pkgs/development/libraries/haskell/aeson-qq/default.nix +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, haskellSrcMeta, hspec, parsec, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix index b5c959bb6176..d6cdf9a0d2a2 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix @@ -1,3 +1,5 @@ +# 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 diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix index 96a93b40195f..955248de5b31 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix @@ -1,3 +1,5 @@ +# 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 diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix index f38082fba88b..84f1485856f5 100644 --- a/pkgs/development/libraries/haskell/alsa-core/default.nix +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alsaLib, extensibleExceptions }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix index 2b3961f5cf15..0e097223f846 100644 --- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix +++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alsaCore, alsaLib, c2hs }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 24869fc99982..e1ac0ea257eb 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alsaCore, alsaLib, extensibleExceptions, sampleFrame , storableRecord }: diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index d151128213e6..2fefde3a8caa 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, clock, connection, dataBinaryIeee754, hspec , hspecExpectations, monadControl, network, split, text, vector , xml diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix index f084fda35c57..efefdc78f0d8 100644 --- a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 59eb51845b8b..aeaae88f17fd 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 51034652e1ee..5291fa8dc0f7 100644 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix index 4c2f5a9ce464..ef135f57766c 100644 --- a/pkgs/development/libraries/haskell/appar/default.nix +++ b/pkgs/development/libraries/haskell/appar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index 5baf9f63326b..dc3acd668edf 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bert, Cabal, haskellNames, haskellPackages, haskellSrcExts , mtl, utf8String }: diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix index c027a92c38d4..91797435ceb1 100644 --- a/pkgs/development/libraries/haskell/arithmoi/default.nix +++ b/pkgs/development/libraries/haskell/arithmoi/default.nix @@ -1,10 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, random }: cabal.mkDerivation (self: { pname = "arithmoi"; - version = "0.4.1.0"; - sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq"; + version = "0.4.1.1"; + sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; buildDepends = [ mtl random ]; + configureFlags = "-f-llvm"; jailbreak = true; meta = { homepage = "https://bitbucket.org/dafis/arithmoi"; diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix index 149f5f951e5d..e60c580347f4 100644 --- a/pkgs/development/libraries/haskell/arrows/default.nix +++ b/pkgs/development/libraries/haskell/arrows/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Stream }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index a90e8e769e23..8b813fc02dcc 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix index 623657ee762b..1cc87f5ce5e8 100644 --- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix +++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Types, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix index 16386d939e46..5786823ce7b8 100644 --- a/pkgs/development/libraries/haskell/asn1-parse/default.nix +++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index 8b259e7aada1..ad9492bf3fad 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix index b5cc0bdc4460..2ba1b50c5ca0 100644 --- a/pkgs/development/libraries/haskell/assert-failure/default.nix +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, prettyShow, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix index a17e1fb86864..e63a201b1e05 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix index 24fa64931a37..0813579c0b7b 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix index d3340fb3678a..7f3003de568c 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.5.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 59d02ce76492..127ee2b326c2 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix index 2546748ee1ed..30fd30b35d1c 100644 --- a/pkgs/development/libraries/haskell/attempt/default.nix +++ b/pkgs/development/libraries/haskell/attempt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, failure }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index 4f0bffa5020e..9ee9ecd7a28c 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit , testFramework, testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix index 623ae1040901..e0950ef517bb 100644 --- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 21a15ea80e72..0f240f8d31ff 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix index 98f8f426ba38..ceea762f7de1 100644 --- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, enumerator, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix index c352ce7ca8ec..235f0f2c8b75 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix index 84e7f6147a73..8a1a341ceb25 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, scientific, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix index 4af501e7dca6..ebb1f33f29e2 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, scientific, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix index 72a58b1cce65..e17fd13741af 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, scientific, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 364e81d9ee38..8f6c15bdd714 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit , cryptoPubkeyTypes, dataDefault, httpClient, httpTypes, random , RSA, SHA, time, transformers diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 884f4175ba5b..381f9d81d013 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit , httpConduit, httpTypes, monadControl, network, resourcet , tagstreamConduit, text, transformers, unorderedContainers diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 7394583c6674..b50a61f9157f 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder , byteable, caseInsensitive, cereal, conduit, conduitExtra , cryptohash, dataDefault, filepath, httpConduit, httpTypes @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.9"; - sha256 = "07sdz179vqfdcnm6rrdg068xdyqw8m2565bdba5a1s987vdvps21"; + version = "0.9.1"; + sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index 83cde5c05125..6714ad547de3 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, errorcallEqInstance, hspec, QuickCheck, setenv }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 3eccd0a4ffac..679235a49b37 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 3de2bdf60ff2..29dedfe95f91 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 6b753f7b9800..6ab860e09ab7 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 0fa5a02d5a5c..a71d12824436 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, conduit, hspec, QuickCheck, transformers }: diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix index 9e0a781039b1..f68c53d36016 100644 --- a/pkgs/development/libraries/haskell/base64-string/default.nix +++ b/pkgs/development/libraries/haskell/base64-string/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index b923e444b1ec..ab462229aa5d 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, liftedBase, ReadArgs, safe, systemFilepath, text , transformers, unorderedContainers, vector }: diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 9218e50b7672..d502e0919ccb 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix index 96c421b708dd..217966c1426e 100644 --- a/pkgs/development/libraries/haskell/bert/default.nix +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, binary, binaryConduit, conduit, conduitExtra, mtl , network, parsec, smallcheck, tasty, tastyHunit, tastySmallcheck , time, void diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index df15bd93a40d..8bbfddd781a2 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroupoids, semigroups, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix index 98814e75a9d5..3550581d4d10 100644 --- a/pkgs/development/libraries/haskell/bimap/default.nix +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix index c51f68e3182f..6ee88b981bb2 100644 --- a/pkgs/development/libraries/haskell/binary-conduit/default.nix +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions , resourcet, vector }: diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 4033565684d0..bf2d662a5893 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix index f378b8d7c414..6366ecf67602 100644 --- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix +++ b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix index bf91922835d6..fbb640d5b410 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HUnit, QuickCheck, random, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix index 223760b291aa..846f5d6486d1 100644 --- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix +++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix index a5fef2474a72..0ed43d795379 100644 --- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix +++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi , libXrandr, libXxf86vm, mesa, testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix index aeea654577a2..1c2538dba170 100644 --- a/pkgs/development/libraries/haskell/bindings-libusb/default.nix +++ b/pkgs/development/libraries/haskell/bindings-libusb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL, libusb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 8bdf30e36d19..49caa0e491ea 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix index edda97480d8c..2a01ea92a08e 100644 --- a/pkgs/development/libraries/haskell/bitarray/default.nix +++ b/pkgs/development/libraries/haskell/bitarray/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index b120c8cf9537..790b068b3d60 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix index e6add5883aaa..4d5b0909b76e 100644 --- a/pkgs/development/libraries/haskell/bits-atomic/default.nix +++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix index 70369034eaad..a070bb2b197a 100644 --- a/pkgs/development/libraries/haskell/bktrees/default.nix +++ b/pkgs/development/libraries/haskell/bktrees/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 1c6670f17ab6..554328275f5d 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index d08edb48b0ed..261935d5c23f 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, enumerator, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 51dda936687d..4672a3f34cf0 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-from-html/default.nix b/pkgs/development/libraries/haskell/blaze-from-html/default.nix new file mode 100644 index 000000000000..4897e7505560 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-from-html/default.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index d061ecf5486e..c470f1f55ca6 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, blazeMarkup, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 07dfe2eb4778..eecb8cef2725 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix index 92a25e5e3b4a..bf5bc4c262c6 100644 --- a/pkgs/development/libraries/haskell/blaze-svg/default.nix +++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeMarkup, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 508e68fa045a..a6228000b121 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, doubleConversion, QuickCheck, testFramework , testFrameworkQuickcheck2, text, time, vector }: diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix index 7c8c2d348498..6eae9a30da68 100644 --- a/pkgs/development/libraries/haskell/bloomfilter/default.nix +++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix @@ -1,10 +1,17 @@ -{ cabal, deepseq }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, QuickCheck, random, testFramework +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "bloomfilter"; - version = "1.2.6.10"; - sha256 = "162vp9riwf5q2l1hnw3g157fpwnw185fk41hkgyf8qaavcrz6slv"; + version = "2.0.0.0"; + sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f"; buildDepends = [ deepseq ]; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/bloomfilter"; description = "Pure and impure Bloom Filter implementations"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 63a86d82bb6b..6d04a1ce6af8 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bool-extras/default.nix b/pkgs/development/libraries/haskell/bool-extras/default.nix index 20185638b592..f180670f9b9e 100644 --- a/pkgs/development/libraries/haskell/bool-extras/default.nix +++ b/pkgs/development/libraries/haskell/bool-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 2099f1b521a0..b5d5bc74f802 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix index 3dfd986ee62b..ed291fcbbc5d 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, linear, QuickCheck, random, testFramework , testFrameworkQuickcheck2, testFrameworkTh }: diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix index 44c8b3fee6f4..686f4ffbbabe 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, linear, QuickCheck, random, testFramework , testFrameworkQuickcheck2, testFrameworkTh }: diff --git a/pkgs/development/libraries/haskell/boxes/default.nix b/pkgs/development/libraries/haskell/boxes/default.nix index 008a8f3b5655..aa2a95b621d6 100644 --- a/pkgs/development/libraries/haskell/boxes/default.nix +++ b/pkgs/development/libraries/haskell/boxes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, split }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix index a406d1fa5000..9b0d2eb12bfd 100644 --- a/pkgs/development/libraries/haskell/brainfuck/default.nix +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 028b2e7d969f..f46809f69155 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptohash, dataBinaryIeee754, mtl, network , QuickCheck, testFramework, testFrameworkQuickcheck2, text, time }: diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix index d99779f8cd43..a5583e5b3431 100644 --- a/pkgs/development/libraries/haskell/bv/default.nix +++ b/pkgs/development/libraries/haskell/bv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix index 6e527cc9958a..9adc98599e59 100644 --- a/pkgs/development/libraries/haskell/byteable/default.nix +++ b/pkgs/development/libraries/haskell/byteable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytedump/default.nix b/pkgs/development/libraries/haskell/bytedump/default.nix index 8290717fa4bb..3031f53d839f 100644 --- a/pkgs/development/libraries/haskell/bytedump/default.nix +++ b/pkgs/development/libraries/haskell/bytedump/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index 86de1da9328c..99bfd6c21406 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix index cb647f2cb162..fac15f1d4b81 100644 --- a/pkgs/development/libraries/haskell/bytes/default.nix +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, doctest, filepath, mtl, text, time , transformers, transformersCompat, void }: diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 9a013c9f2453..0ac2f1c63a8d 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix index 5f9e322fbf0b..4486ae8da454 100644 --- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index e78a64781518..400529b026a6 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix index e9bb268b9fce..33d6a17b0293 100644 --- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, terminalProgressBar, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-show/default.nix b/pkgs/development/libraries/haskell/bytestring-show/default.nix index 19b8f15bc6db..c36bf611ab47 100644 --- a/pkgs/development/libraries/haskell/bytestring-show/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-show/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index 41c31b1fed5c..b827c831ffa3 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bzlib/default.nix b/pkgs/development/libraries/haskell/bzlib/default.nix index cc9f244261b0..9699cd8cad60 100644 --- a/pkgs/development/libraries/haskell/bzlib/default.nix +++ b/pkgs/development/libraries/haskell/bzlib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bzip2 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index efde2daedeba..bd86e705e7da 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, HUnit, languageC, shelly, testFramework , testFrameworkHunit, text, yaml }: diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/libraries/haskell/c2hsc/default.nix index ac52a88e63b9..cf56c0bf545f 100644 --- a/pkgs/development/libraries/haskell/c2hsc/default.nix +++ b/pkgs/development/libraries/haskell/c2hsc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, filepath, HStringTemplate, languageC, mtl, split , transformers }: diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 9ba31d333bb6..4e891196a501 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens , strict, systemFileio, systemFilepath, tasty, tastyGolden, text , transformers, unorderedContainers diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 55b4fea36fec..53a9794883a1 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index bd14dd1c0895..79693a7139f6 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, lens, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index be59a3897c23..7eb365510171 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, fgl, filepath, parsec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 25029618b235..b46b8508e9ac 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String , zlib }: diff --git a/pkgs/development/libraries/haskell/carray/default.nix b/pkgs/development/libraries/haskell/carray/default.nix index 7fa22dfa2eb1..42fbad8b07d4 100644 --- a/pkgs/development/libraries/haskell/carray/default.nix +++ b/pkgs/development/libraries/haskell/carray/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, ixShapable, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix index ede59ad22cda..6e6cca30c9ab 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix index 083fa7df3703..ef1e11126017 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix index 45cc7c11fc28..08340bbb9765 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix index aa8996b0fc3f..c8c544610e3b 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix index 745969058f0b..ab93dc441960 100644 --- a/pkgs/development/libraries/haskell/cassava/default.nix +++ b/pkgs/development/libraries/haskell/cassava/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text , unorderedContainers, vector diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix index 54483f177011..e8ff4f3e6a51 100644 --- a/pkgs/development/libraries/haskell/categories/default.nix +++ b/pkgs/development/libraries/haskell/categories/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, void }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index 44ed255bb634..ff13129c2cff 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index 56c4a01d9d89..e15d10bd45b3 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 94b5033e7efa..99b77033a966 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 95b990b464b4..06363b8e3351 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Data, cryptohash, cryptoPubkeyTypes, filepath, mtl , pem, time }: diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix index 60669590c2f9..0373daf9fa72 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix index bf1920d434df..16322e0f74c6 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix index c1dc7076c77d..2d1866040336 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix index 97e5556bacd5..82ba74c14aa4 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix index 284c1ee2c055..2c9e4248e1ca 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix index 0e6a6a71ae9f..f01feb3edf69 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix index 8a0f1e62179c..1b37fd77bd98 100644 --- a/pkgs/development/libraries/haskell/charset/default.nix +++ b/pkgs/development/libraries/haskell/charset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroups, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix index 0ef18440e373..9ad35360fe64 100644 --- a/pkgs/development/libraries/haskell/cheapskate/default.nix +++ b/pkgs/development/libraries/haskell/cheapskate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate , xssSanitize }: diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix index 06b89ba85b42..fb7e86fc75f1 100644 --- a/pkgs/development/libraries/haskell/checkers/default.nix +++ b/pkgs/development/libraries/haskell/checkers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix index bc5b0b4ffba5..498bcaf2bf64 100644 --- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix index cab43842f73c..2b6c4e61bf9f 100644 --- a/pkgs/development/libraries/haskell/chell/default.nix +++ b/pkgs/development/libraries/haskell/chell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, options, patience, random, text , transformers }: diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix index 2705aee7aabd..2db35213a1a6 100644 --- a/pkgs/development/libraries/haskell/chunked-data/default.nix +++ b/pkgs/development/libraries/haskell/chunked-data/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath , text, transformers, vector }: diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index 0c250ed5feb1..7edfe750d373 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix index 6bae5a99808d..ce9253611434 100644 --- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes128/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix index 44a7d96907aa..3f2619c70e83 100644 --- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix +++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2, vector }: diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix index 52217751d27a..7e83f50568db 100644 --- a/pkgs/development/libraries/haskell/cipher-camellia/default.nix +++ b/pkgs/development/libraries/haskell/cipher-camellia/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2, vector }: diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix index fdc30278425c..7309586e1c69 100644 --- a/pkgs/development/libraries/haskell/cipher-des/default.nix +++ b/pkgs/development/libraries/haskell/cipher-des/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 6485487a0e58..4951584e395b 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix index 8fa1eb5ca42b..82ee642a9baf 100644 --- a/pkgs/development/libraries/haskell/circle-packing/default.nix +++ b/pkgs/development/libraries/haskell/circle-packing/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index bdc78984c7bd..ddda7015e47e 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hexpat, hsBibutils, HTTP, json, mtl, network , pandocTypes, parsec, syb, time, utf8String }: diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index a5bc5316b7fc..d6f67674db48 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, classyPrelude, conduit, conduitCombinators, hspec , monadControl, QuickCheck, resourcet, systemFileio, transformers , void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 8b740ded6e75..273147fcc62f 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions , hashable, hspec, liftedBase, monoTraversable, QuickCheck , semigroups, stm, systemFilepath, text, time, transformers diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix new file mode 100644 index 000000000000..8eafd67cadbe --- /dev/null +++ b/pkgs/development/libraries/haskell/clay/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: + +cabal.mkDerivation (self: { + pname = "clay"; + version = "0.9.0.1"; + sha256 = "1w2617kpj6rblmycqb97gyshwbvzp5w2h4xh494mvdzi3bkahqpn"; + buildDepends = [ mtl text ]; + testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; + meta = { + homepage = "http://fvisser.nl/clay"; + description = "CSS preprocessor as embedded Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 00df46640e15..5066ad84d866 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi , cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged , transformers diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix index 65bfffec52ea..3c064d1db2d3 100644 --- a/pkgs/development/libraries/haskell/clock/default.nix +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 7678849930e4..d58885f8226d 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index 0a71649f0e91..9263f3da099c 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, split, syb, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix index c49093f68596..6e38361b8226 100644 --- a/pkgs/development/libraries/haskell/cmdtheline/default.nix +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit , transformers }: diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix index 1ee26a80d0b9..f1f3bd0a04bf 100644 --- a/pkgs/development/libraries/haskell/codec-image-devil/default.nix +++ b/pkgs/development/libraries/haskell/codec-image-devil/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libdevil }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix index fa2b98801233..dd46e7ef09f3 100644 --- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix +++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, haskellLexer }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix index 245ea3ef30e0..2d4db2cdc4dd 100644 --- a/pkgs/development/libraries/haskell/colors/default.nix +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, profunctors }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 06bcc8ed9819..c967bb65600a 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/command-qq/default.nix b/pkgs/development/libraries/haskell/command-qq/default.nix index c48701efe0ef..961506b6a819 100644 --- a/pkgs/development/libraries/haskell/command-qq/default.nix +++ b/pkgs/development/libraries/haskell/command-qq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, hspec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index 943a0718e03d..b27dc1ee6d79 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 00b970ea112f..da9908175443 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, contravariant, distributive, doctest, filepath, semigroups , tagged, transformers }: diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index f55123f8fe18..8c009b8b501c 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix index fb0b6a1f1cba..421bc79893d7 100644 --- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index edb44d45d1c8..6b569858c536 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns , transformers, treeView diff --git a/pkgs/development/libraries/haskell/composition/default.nix b/pkgs/development/libraries/haskell/composition/default.nix index 0a870c5b353e..bf86e11cc813 100644 --- a/pkgs/development/libraries/haskell/composition/default.nix +++ b/pkgs/development/libraries/haskell/composition/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/compressed/default.nix b/pkgs/development/libraries/haskell/compressed/default.nix index 40e82f62f695..9ef921a616f8 100644 --- a/pkgs/development/libraries/haskell/compressed/default.nix +++ b/pkgs/development/libraries/haskell/compressed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, fingertree, hashable, keys, pointed, reducers , semigroupoids, semigroups, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix index 34344c1566bd..9762ffc5fc83 100644 --- a/pkgs/development/libraries/haskell/concatenative/default.nix +++ b/pkgs/development/libraries/haskell/concatenative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix index 20894b844ac6..896496dc4a39 100644 --- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix +++ b/pkgs/development/libraries/haskell/concreteTyperep/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, hashable, QuickCheck, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 29520fddd0ca..34bcfdea1a48 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, baseUnicodeSymbols, HUnit, random, stm , testFramework, testFrameworkHunit, unboundedDelays }: diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix index 58efe5dd29de..64b62db5ba8f 100644 --- a/pkgs/development/libraries/haskell/cond/default.nix +++ b/pkgs/development/libraries/haskell/cond/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 7ee4fd476a9f..c1396751f108 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit , conduitExtra, hspec, monadControl, monoTraversable, mwcRandom , primitive, resourcet, silently, systemFileio, systemFilepath diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index eb4f926e72c4..00bb1f5bdcb3 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath , hspec, monadControl, network, primitive, resourcet , streamingCommons, text, transformers, transformersBase diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 630e9610bbb1..c48108d20352 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl , QuickCheck, resourcet, transformers, transformersBase, void }: diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix index 21c15306de8a..3ea53f686c9a 100644 --- a/pkgs/development/libraries/haskell/configurator/default.nix +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, filepath, hashable, HUnit, testFramework , testFrameworkHunit, text, unixCompat, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix index 4a2c8ff77920..2430496dbab7 100644 --- a/pkgs/development/libraries/haskell/connection/default.nix +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cprngAes, dataDefaultClass, network, socks, tls, x509 , x509Store, x509System, x509Validation }: diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 333d8e6601d2..4ca94f8d2f2e 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, newtype }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 095d0a179846..45c92acc0687 100644 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index f1372d7630b0..b3c549ecef86 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix index 4fe9a975f41d..12f9b287d1bb 100644 --- a/pkgs/development/libraries/haskell/control-bool/default.nix +++ b/pkgs/development/libraries/haskell/control-bool/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix index 93fed5fae060..e2768a9cf557 100644 --- a/pkgs/development/libraries/haskell/control-monad-free/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/control-monad-loop/default.nix b/pkgs/development/libraries/haskell/control-monad-loop/default.nix index 561564093b94..40d7e5a1e338 100644 --- a/pkgs/development/libraries/haskell/control-monad-loop/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-loop/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers, transformersBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix index 50d95cb88511..83302876e441 100644 --- a/pkgs/development/libraries/haskell/converge/default.nix +++ b/pkgs/development/libraries/haskell/converge/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix index 8a79e50527d8..cf65b0f936c5 100644 --- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix +++ b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix index 78be057c2011..ea8091426ee5 100644 --- a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 423cf4c156b8..6a35f3d55238 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, dataDefault, deepseq, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix index ea316fd29e12..63448e3a633e 100644 --- a/pkgs/development/libraries/haskell/coroutine-object/default.nix +++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix @@ -1,15 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, either, lens, mtl, safecopy, transformers , transformersFree, uuid }: 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; diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 9425ec375477..de3b33a07096 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cipherAes, cryptoRandom, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index 3d8ba2784f59..5a8d70217657 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index f1965012946f..35d6d74c73c8 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl , mwcRandom, parsec, statistics, text, time, transformers, vector , vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 5741d4b3c2e7..10bcb3d16b0a 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, entropy, tagged, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index 3c5149364682..04b1b1918783 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck , securemem, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index 8f52f724bcd6..63431431bf73 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, securemem }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index bcc357fbed3c..63f6f119e5d9 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, conduit, conduitExtra, cryptoApi, cryptocipher , cryptohashCryptoapi, hspec, resourcet, skein, transformers }: cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.3"; - sha256 = "1xvjfkwd4rqlgyz172s2mihfqz1pac84qhc72c4zw1nwadsh6dgl"; + version = "0.5.4"; + sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n"; buildDepends = [ cereal conduit conduitExtra cryptoApi resourcet transformers ]; @@ -16,7 +18,7 @@ cabal.mkDerivation (self: { jailbreak = true; doCheck = false; meta = { - homepage = "https://github.com/meteficha/crypto-conduit"; + homepage = "https://github.com/prowdsponsor/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index b3f0b205af5b..d101d9af197a 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoRandom, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector }: diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 264c420842a5..e8eeed95aecf 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Types }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index b321c231bb40..bd4b4f9639fd 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptohash, cryptoNumbers, cryptoPubkeyTypes , cryptoRandom, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix index 7c3b10a38386..674c2e870136 100644 --- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random-api/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, entropy }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix index 1b5e2aa32387..878eb3d2c71f 100644 --- a/pkgs/development/libraries/haskell/crypto-random/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, securemem, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 7d3ddf57e529..29d2dd1b31d5 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cipherAes, cipherBlowfish, cipherCamellia, cipherDes , cipherRc4, cryptoCipherTypes }: diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix index 78c0c1016592..c9476bae647d 100644 --- a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, cryptohash, resourcet, transformers }: diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix index 020b34298ade..a1ff03e4c49d 100644 --- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cryptoApi, cryptohash, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index ebfff759595e..a1d6b32411c7 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit , tastyQuickcheck }: diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 9ab9b9f5d2da..ea5e823f14e1 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, hspec, QuickCheck, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix index f56a9b89423c..70c469cdb1b4 100644 --- a/pkgs/development/libraries/haskell/csv/default.nix +++ b/pkgs/development/libraries/haskell/csv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 71825f5fbd6e..3abc6443c6e3 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, cudatoolkit, nvidia_x11 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index ec23761003c0..d24af97f4f24 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, cuda }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index a530044ca6ed..39a72e3fe978 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, curl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix index cc3b7ed39a2a..2f514295786a 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index 89658ead4d58..9a6fd160ca82 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, utilityHt }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix index 600b72614e2a..c25d8d98cb90 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 8e685a047793..4ea654e1eb53 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index db9b90574e4b..730bf84abb1d 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix index 429f9da92bf3..790e22d5cfa6 100644 --- a/pkgs/development/libraries/haskell/data-checked/default.nix +++ b/pkgs/development/libraries/haskell/data-checked/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix index 1db4468a6ded..646f73a2aa96 100644 --- a/pkgs/development/libraries/haskell/data-default-class/default.nix +++ b/pkgs/development/libraries/haskell/data-default-class/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix index 5fc59b232a4d..992a5e012dd2 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix index 6ac626b70792..49752fd50553 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix index a89da0c84f5b..753d91b8a4d8 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, dlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix index b1b7742692a7..0da8199f3aea 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index e4340c7ec322..77d7d336fe5c 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale diff --git a/pkgs/development/libraries/haskell/data-fix/default.nix b/pkgs/development/libraries/haskell/data-fix/default.nix new file mode 100644 index 000000000000..ab029a7d1c9e --- /dev/null +++ b/pkgs/development/libraries/haskell/data-fix/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "data-fix"; + version = "0.0.1"; + sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr"; + meta = { + homepage = "https://github.com/anton-k/data-fix"; + description = "Fixpoint data types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-hash/default.nix b/pkgs/development/libraries/haskell/data-hash/default.nix index c8e4887063c4..a2c6adeedf99 100644 --- a/pkgs/development/libraries/haskell/data-hash/default.nix +++ b/pkgs/development/libraries/haskell/data-hash/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index ec3cf7ca6495..09cd0cb75d84 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index a5681fe123ef..2eca446c714c 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index 67bd753b3025..d167e8051cd4 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataLens }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index 24755738fdbb..a880db50a161 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, semigroupoids, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index 3bdaf941c837..a53e093a85cd 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataInttrie }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix index 1de089386806..959eb57e7791 100644 --- a/pkgs/development/libraries/haskell/data-ordlist/default.nix +++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix index 08202a26b713..d082cbae510c 100644 --- a/pkgs/development/libraries/haskell/data-pprint/default.nix +++ b/pkgs/development/libraries/haskell/data-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, mtl, parallel, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix index 6599d25f68eb..666b92dbdb52 100644 --- a/pkgs/development/libraries/haskell/data-reify/default.nix +++ b/pkgs/development/libraries/haskell/data-reify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 8c7303776f80..190baa101637 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix index a460dcbdafc5..bacf480a262d 100644 --- a/pkgs/development/libraries/haskell/date-cache/default.nix +++ b/pkgs/development/libraries/haskell/date-cache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index faf0b40b94d1..d2ed2532d235 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix index f8efb9537991..e142d7b31728 100644 --- a/pkgs/development/libraries/haskell/dbmigrations/default.nix +++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, configurator, fgl, filepath, HDBC, HDBCPostgresql , HDBCSqlite3, HUnit, mtl, random, text, time, yamlLight }: diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index d2700195b108..81aee9c42b44 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, chell, chellQuickcheck, filepath, libxmlSax , network, parsec, QuickCheck, random, text, transformers, vector , xmlTypes diff --git a/pkgs/development/libraries/haskell/deepseq-generics/default.nix b/pkgs/development/libraries/haskell/deepseq-generics/default.nix index 6b3edd59ab27..0ee12f4b4653 100644 --- a/pkgs/development/libraries/haskell/deepseq-generics/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-generics/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 228fcd28c785..efa3057291d6 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { @@ -6,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; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix index c13abe9e31c9..bc49aafd5cfa 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix index 99db69e612aa..e30a2e35cde6 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix index f4ef61cbbffc..7a2d61de0691 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix index 3c6ce781dc29..1dd3e7f09ba9 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix index f8af7c8e42e8..0270139c3831 100644 --- a/pkgs/development/libraries/haskell/dependent-map/default.nix +++ b/pkgs/development/libraries/haskell/dependent-map/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dependentSum }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix index 2ea45097d3fb..614a3fdf72d2 100644 --- a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix +++ b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dependentSum, thExtras }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix index 9e7b2ef0cc08..9f0922a8dfa8 100644 --- a/pkgs/development/libraries/haskell/dependent-sum/default.nix +++ b/pkgs/development/libraries/haskell/dependent-sum/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 5dba1b6af561..eb1b1ce31623 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, syb, transformers, uniplate }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix index ca702b60356c..668ea96abbb3 100644 --- a/pkgs/development/libraries/haskell/derp/default.nix +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 33e27cd9ff85..da842c656e19 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib , filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative , pango, split, statestack, time, transformers, vector diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a433284ef7a6..2dcc86d5c9b4 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, arithmoi, circlePacking, colour, dataDefault , dataDefaultClass, diagramsCore, diagramsLib, forceLayout, HUnit , lens, MonadRandom, mtl, parsec, QuickCheck, semigroups, split diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 153f109d14bf..9a1245d04d0a 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dualTree, lens, MemoTrie, monoidExtras, newtype , semigroups, vectorSpace, vectorSpacePoints }: diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 5f94e2922a12..268bdce42792 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, diagramsContrib, diagramsCore, diagramsLib, diagramsSvg }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 03d6ad9f396f..77047d982917 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, active, colour, dataDefaultClass, diagramsCore, dualTree , filepath, fingertree, hashable, intervals, JuicyPixels, lens , MemoTrie, monoidExtras, optparseApplicative, safe, semigroups diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 29dbafb890fd..1ded949e7cee 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, diagramsCore, diagramsLib, dlist , filepath, hashable, lens, monoidExtras, mtl, semigroups, split , vectorSpace diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index dbc148abaeea..f982f427863b 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeMarkup, blazeSvg, colour , diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens , monoidExtras, mtl, split, time, vectorSpace diff --git a/pkgs/development/libraries/haskell/dice/default.nix b/pkgs/development/libraries/haskell/dice/default.nix index 23d3339d348c..1e3b448f4496 100644 --- a/pkgs/development/libraries/haskell/dice/default.nix +++ b/pkgs/development/libraries/haskell/dice/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec, randomFu, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix index 60f27e89d58f..f010f1a194a0 100644 --- a/pkgs/development/libraries/haskell/diff3/default.nix +++ b/pkgs/development/libraries/haskell/diff3/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Diff, QuickCheck, testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index c315c0813eb9..523c2e91c5b5 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 1b29c506c14e..2613899d5973 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe , scientific, tasty, tastyHunit, text, vector }: cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.9"; - sha256 = "0lm6byv5vayzg2jp0fqkbi4wkbhvnjw5sl61qnvpa1pqk6p64mrm"; + version = "1.1.10"; + sha256 = "0ar165rksnj09sb58qx5hm71kn8gzm936ixmfhf7sqbw2kcbw4nx"; buildDepends = [ aeson digestiveFunctors lens safe text vector ]; testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 86a6a8560fbd..aae120d56818 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, digestiveFunctors, heist, mtl, text, xmlhtml }: diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 4c678da12b9e..e5a3e0a44c64 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, digestiveFunctors, filepath, mtl, snapCore, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 8764f3e2b6c9..03448a3fe679 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, text, time }: diff --git a/pkgs/development/libraries/haskell/digits/default.nix b/pkgs/development/libraries/haskell/digits/default.nix index 3c7c08cd2968..988c0016f514 100644 --- a/pkgs/development/libraries/haskell/digits/default.nix +++ b/pkgs/development/libraries/haskell/digits/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix index 4b7117a0e4c2..c93a564c3e31 100644 --- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, numtypeTf, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index f3444703c3df..1450b7706ca0 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, numtype, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix index 5d4adbc60dfe..07eca858972a 100644 --- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base16Bytestring, HUnit, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 343aeb014ad1..6a3382741801 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 80458c808a8d..e4a02faa60f0 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, dataAccessor, deepseq, distributedStatic, hashable , mtl, networkTransport, random, rank1dynamic, stm, syb, time , transformers diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 8f7dd0d8cddd..f1003927f385 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, rank1dynamic }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index 10f763ffa834..9bb64ee4c59b 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, filepath, tagged, transformers , transformersCompat }: diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix index 6e8a52bb78b0..fbe450df19a9 100644 --- a/pkgs/development/libraries/haskell/djinn/default.nix +++ b/pkgs/development/libraries/haskell/djinn/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskeline, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix index d168c4b35831..29910a22381f 100644 --- a/pkgs/development/libraries/haskell/dlist-instances/default.nix +++ b/pkgs/development/libraries/haskell/dlist-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index 144ac45c7d87..69e95efa7043 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 8cbd44b7dbc0..8da6475cfb6c 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra , doctest, hspec, iproute, mtl, network, random, resourcet }: diff --git a/pkgs/development/libraries/haskell/doctest-prop/default.nix b/pkgs/development/libraries/haskell/doctest-prop/default.nix index 05376ee6bbcb..bca82f78bcf4 100644 --- a/pkgs/development/libraries/haskell/doctest-prop/default.nix +++ b/pkgs/development/libraries/haskell/doctest-prop/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index ad7bcfe62409..018fac066702 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit , QuickCheck, setenv, silently, stringbuilder, syb, transformers }: diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix index a7fe5b791f0d..5e1037c4c5f5 100644 --- a/pkgs/development/libraries/haskell/dotgen/default.nix +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index cad61e52ee0c..6d8bdee480f9 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, testFramework, testFrameworkQuickcheck2, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index 6b9f1e2108bd..054491704a34 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, curl, feed, tagsoup, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index 06c34bf9acb0..3428e8ea3623 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, feed, tagsoup, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix index c16a6888b6b7..9b038d047f9f 100644 --- a/pkgs/development/libraries/haskell/dsp/default.nix +++ b/pkgs/development/libraries/haskell/dsp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index 4b5dd2b38883..ee4cc6b48a43 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, dlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 2f47a96b8534..f9cf3b13b413 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monoidExtras, newtype, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix index c2ecb09824fc..18dd0e2b8254 100644 --- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix +++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, doctest, filepath, ghcPaths, haskellGenerate , haskellSrcExts, HUnit, tasty, tastyHunit, tastyTh, time, void }: diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix index 178f01952ea4..0d47a68d06d9 100644 --- a/pkgs/development/libraries/haskell/dyre/default.nix +++ b/pkgs/development/libraries/haskell/dyre/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, executablePath, filepath, ghcPaths, ioStorage , time, xdgBasedir }: diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index 22f5953b7e04..b1ee00fd7a71 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix index 7e6262423c6d..55b1e685d6da 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libedit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix index cf9f1e099a2a..efb41f546b22 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libedit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index e7bbb47a47f0..6d55afd41d6f 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, free, monadControl, MonadRandom, mtl , semigroupoids, semigroups, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix new file mode 100644 index 000000000000..12c29f0d56e5 --- /dev/null +++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix index 759a60407462..2bdf088aea3d 100644 --- a/pkgs/development/libraries/haskell/ekg-core/default.nix +++ b/pkgs/development/libraries/haskell/ekg-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index 3f564a72a0a3..beb92ef51fe7 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, ekgCore, filepath, network, snapCore, snapServer , text, time, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.0"; - sha256 = "1w448w17yp80zmb27yl90k3gz0nx3wxj52488lclmiapr6q4fgp8"; + version = "0.4.0.1"; + sha256 = "09pjsd9jr91whdhv36fkb36ivvvcr415g90a798i86vl8mklgnyx"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix index 8ba4687d3e3b..ff6e4819283c 100644 --- a/pkgs/development/libraries/haskell/elerea/default.nix +++ b/pkgs/development/libraries/haskell/elerea/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index a1b094337823..793184e21014 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix index 5def0b895f04..3470aab9b2b3 100644 --- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, deepseq, hspec, liftedBase, monadControl , QuickCheck, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix index d9f8710f7c51..5ec0f1502c38 100644 --- a/pkgs/development/libraries/haskell/encoding/default.nix +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, extensibleExceptions, HaXml, mtl, regexCompat }: cabal.mkDerivation (self: { pname = "encoding"; - version = "0.7.0.1"; - sha256 = "18s6cfcjwjx5dja14rf35rx71cbpr8ylg4x29ffx2blsk8ib9zxh"; + version = "0.7.0.2"; + sha256 = "14l3dx7ayvp2dm37c3h7p63zfzmhwpx1hirbkm04idhi3906lxps"; buildDepends = [ binary extensibleExceptions HaXml mtl regexCompat ]; diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix new file mode 100644 index 000000000000..07ccb6c71520 --- /dev/null +++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix @@ -0,0 +1,20 @@ +# 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"; + buildDepends = [ + attoparsecEnumerator engineIo snapCore unorderedContainers + websockets websocketsSnap + ]; + meta = { + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix new file mode 100644 index 000000000000..d9a48cd80dd0 --- /dev/null +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, async, attoparsec, base64Bytestring, either +, monadLoops, mwcRandom, stm, text, transformers +, unorderedContainers, vector, websockets +}: + +cabal.mkDerivation (self: { + pname = "engine-io"; + version = "1.0.1"; + sha256 = "1wwh9p08dnjhixlli2wibqvwprz8cc5m0c4m17a4klcawr7kb3r6"; + buildDepends = [ + aeson async attoparsec base64Bytestring either monadLoops mwcRandom + stm text transformers unorderedContainers vector websockets + ]; + meta = { + homepage = "http://github.com/ocharles/engine.io"; + description = "A Haskell implementation of Engine.IO"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 5c494f4a45df..46020b7c9113 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 4dfa4e573dd9..1418274271fd 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix index a675d4d74ea6..9b24980b5b9f 100644 --- a/pkgs/development/libraries/haskell/enummapset-th/default.nix +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix index 2bd953e65e87..d5a0249e5289 100644 --- a/pkgs/development/libraries/haskell/enummapset/default.nix +++ b/pkgs/development/libraries/haskell/enummapset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix index 0bb03c678981..fefb424d495d 100644 --- a/pkgs/development/libraries/haskell/enumset/default.nix +++ b/pkgs/development/libraries/haskell/enumset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, storableRecord }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/default.nix index c25deac82c39..934468212244 100644 --- a/pkgs/development/libraries/haskell/equivalence/default.nix +++ b/pkgs/development/libraries/haskell/equivalence/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, STMonadTrans, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix index 1a6331bcd6f1..6904bdadb96c 100644 --- a/pkgs/development/libraries/haskell/erf/default.nix +++ b/pkgs/development/libraries/haskell/erf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix index e3bfa5c569ea..69949aeb575c 100644 --- a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix +++ b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 21ed85bb91f4..d61bef4102de 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, either, safe, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 0538e2f1899c..09edb8c12148 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, hspec, HUnit, monadControl, monadLogger , persistent, persistentSqlite, persistentTemplate, QuickCheck , resourcet, tagged, text, transformers, unorderedContainers @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.4.1.2"; - sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2"; + version = "1.4.4"; + sha256 = "00s52f8l5pbsab83fq8d03xhispyp9mqsh5vvzwiki6kspkj26a0"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers @@ -17,7 +19,7 @@ cabal.mkDerivation (self: { transformers ]; meta = { - homepage = "https://github.com/meteficha/esqueleto"; + homepage = "https://github.com/prowdsponsor/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix index 5305cd87d7df..99f48cb9a280 100644 --- a/pkgs/development/libraries/haskell/event-list/default.nix +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, nonNegative, QuickCheck, random, transformers, utilityHt }: diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix index b8e4e024afc3..e3fc6cee6502 100644 --- a/pkgs/development/libraries/haskell/ex-pool/default.nix +++ b/pkgs/development/libraries/haskell/ex-pool/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, hashable, stm, time, transformers, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index 5799a94334e3..c19a98771385 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptionTransformers, mtl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index a4d0cfd247a1..bedbb527ff35 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index 1cde47f48e19..1a56adb219cc 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2 , transformers }: diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix index 5c69969c20d2..93df3c3814f6 100644 --- a/pkgs/development/libraries/haskell/executable-path/default.nix +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 16f9ae1ad61d..2cc0d456b17f 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index a4c4f8ecc7c7..72167d2d3a7a 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix index 0eca0eb78eec..4f1cd630596a 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix index 946a808ddc52..279118e13013 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix index 577f7d4657a5..9afa901de4fd 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix index 2ca255d29997..2315d336ff9e 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index 4181883f7b01..d8cd530075aa 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 9c9cae45b4b6..6a1aa3dfb3c5 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, filepath, hspec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fastcgi/default.nix b/pkgs/development/libraries/haskell/fastcgi/default.nix index 365be55c7bbc..c1faf9ce96b9 100644 --- a/pkgs/development/libraries/haskell/fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/fastcgi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cgi, fcgi }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 417a0516bd83..9dd38ecda4be 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fay }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index c8d9188d421f..68bbe884e874 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fay, fayBase, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index f253d3a927be..10eafa70753f 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom , haskellNames, haskellPackages, haskellSrcExts, languageEcmascript , mtl, optparseApplicative, safe, sourcemap, split, spoon, syb diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 1604d2c8e095..51a6ea84c50c 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base16Bytestring, base64Bytestring , cereal, conduit, conduitExtra, cryptoApi, cryptohash , cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 26029ed2c21c..a7753f1a70da 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, transformers }: cabal.mkDerivation (self: { pname = "fclabels"; - version = "2.0.1.1"; - sha256 = "1r798fbdk4xzw649la9disnk1kngy3cmzbi3k8afiy8q6v1fbpwh"; + version = "2.0.2"; + sha256 = "108ad6l8ibz44n000hlywqpqslsz1czmsal7qvbd53chmmm4xgdp"; buildDepends = [ mtl transformers ]; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; diff --git a/pkgs/development/libraries/haskell/fdo-notify/default.nix b/pkgs/development/libraries/haskell/fdo-notify/default.nix index 86f3d7e0d1de..170cf7b33951 100644 --- a/pkgs/development/libraries/haskell/fdo-notify/default.nix +++ b/pkgs/development/libraries/haskell/fdo-notify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dbus }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 817276497da1..3a5ec2ad1af4 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time, utf8String, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix index c446ae8545dd..1f31985d9286 100644 --- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix +++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dotgen, fgl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix index c367b74f6a3f..dc7fc6e4457d 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix index 8691d10c684e..be83763d1d9d 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix index 6a7aa22cef10..973fc415e0c7 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix index d475a9cb3128..3bc1c39ba7cd 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix +++ b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix index b9a582fd7b55..2e1bb2364b4a 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix +++ b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index a42e963d5582..02eb043cc3a2 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, HUnit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix index 8a28d0b27fb1..6cff9640cdf4 100644 --- a/pkgs/development/libraries/haskell/file-location/default.nix +++ b/pkgs/development/libraries/haskell/file-location/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, liftedBase, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/filemanip/default.nix b/pkgs/development/libraries/haskell/filemanip/default.nix index 94fa68977bb7..38fc115141bd 100644 --- a/pkgs/development/libraries/haskell/filemanip/default.nix +++ b/pkgs/development/libraries/haskell/filemanip/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, unixCompat }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix b/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix index 7a2b9e75e7f9..e8bca5c63cf3 100644 --- a/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix +++ b/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 4aebded770e4..fd33af07ee37 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Diff, filepath, HUnit, mtl, parsec, split, time , utf8String, xml }: diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index 3d7a1300b58a..ecf9ae65e2eb 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, hspec, QuickCheck, systemFileio , systemFilepath, text, transformers }: diff --git a/pkgs/development/libraries/haskell/final/default.nix b/pkgs/development/libraries/haskell/final/default.nix index 632261741187..3669d7e36490 100644 --- a/pkgs/development/libraries/haskell/final/default.nix +++ b/pkgs/development/libraries/haskell/final/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index f48e1c4002e6..4ea7f2ecd9e1 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 7be21dbbf347..d127225ffab8 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, thExtras, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix index 8dcbb7fff181..1fbdedf76be3 100644 --- a/pkgs/development/libraries/haskell/fmlist/default.nix +++ b/pkgs/development/libraries/haskell/fmlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index e19eff2a631f..5952e335f43c 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, primitive, text, transformers, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix index 6317182f3050..41a834dbd845 100644 --- a/pkgs/development/libraries/haskell/folds/default.nix +++ b/pkgs/development/libraries/haskell/folds/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, contravariant, deepseq, doctest, filepath, hlint , lens, mtl, pointed, profunctors, reflection, semigroupoids , semigroups, tagged, transformers, vector diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 55437747f8bf..99cd863b7c48 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, lens, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { @@ -7,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix index efe269db26c5..16ee51d139fc 100644 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boundingboxes, colors, controlBool, filepath, free , freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix index b19e32027412..76139aa7e5d4 100644 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boundingboxes, colors, controlBool, filepath, free , freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index b445bf494488..8aea1b312a03 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bifunctors, comonad, distributive, mtl, preludeExtras , profunctors, semigroupoids, semigroups, transformers }: diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix index 145ae4a2d792..d5fdc8f926eb 100644 --- a/pkgs/development/libraries/haskell/freetype2/default.nix +++ b/pkgs/development/libraries/haskell/freetype2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ftphs/default.nix b/pkgs/development/libraries/haskell/ftphs/default.nix index c682c593ea63..ac96b094799c 100644 --- a/pkgs/development/libraries/haskell/ftphs/default.nix +++ b/pkgs/development/libraries/haskell/ftphs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hslogger, MissingH, mtl, network, parsec, regexCompat }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index d17ca718f0ae..1e0ee45de591 100644 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix index a1da7f8ebbf0..171a501667fc 100644 --- a/pkgs/development/libraries/haskell/fuzzcheck/default.nix +++ b/pkgs/development/libraries/haskell/fuzzcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl , QuickCheck, random, transformers }: diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 8fbdb57d48bf..c2117bffa7ed 100644 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, continuedFractions, converge, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index 27423ce4ecd4..bf4827800602 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix index e14857aaa5b7..3d34f388fb31 100644 --- a/pkgs/development/libraries/haskell/gdiff/default.nix +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 9b1d911638ff..c1e3ee5caad5 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix index bebc611ddaa2..9ab6d2df7095 100644 --- a/pkgs/development/libraries/haskell/geniplate/default.nix +++ b/pkgs/development/libraries/haskell/geniplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix index 8c2f481122bc..60a2284fa7a5 100644 --- a/pkgs/development/libraries/haskell/ghc-core/default.nix +++ b/pkgs/development/libraries/haskell/ghc-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, colorizeHaskell, filepath, pcreLight }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 4f908200c88e..46dfa17063ab 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 679ced622d9b..c32d3be53080 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index ee2cbdbd2032..b5ed78d7212f 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, convertible, deepseq, doctest, emacs, filepath , ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "4.1.3"; - sha256 = "0n7nbjbiiphlasqfcxx15fa8axwd9csq2nh3r0wvkrgpsazdlw8c"; + version = "4.1.5"; + sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,13 +23,11 @@ cabal.mkDerivation (self: { configureFlags = "--datasubdir=${self.pname}-${self.version}"; postInstall = '' cd $out/share/$pname-$version - sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el make rm Makefile cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod < $out/bin/ghc-modi <" ]; }; -}) \ No newline at end of file +}) diff --git a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch deleted file mode 100644 index afe72bc83e7a..000000000000 --- a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch +++ /dev/null @@ -1,73 +0,0 @@ -# HG changeset patch -# User Daniel Bergey -# Date 1398284724 0 -# Wed Apr 23 20:25:24 2014 +0000 -# Node ID 4cc692e7acc4f21ffab9e5572d286495791d22d1 -# Parent 31e3ba1aaaf9efdce66e8ef5c192d0f4214150f4 -Update for feed-0.3.9.2, http-conduit-2.0, tls-1.2 - -diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/Error.hs ---- a/Imm/Error.hs Sun Jun 16 12:23:40 2013 +0200 -+++ b/Imm/Error.hs Wed Apr 23 20:25:24 2014 +0000 -@@ -41,7 +41,7 @@ - data ImmError = - OtherError String - | HTTPError HttpException -- | TLSError HandshakeFailed -+ | TLSError TLSException - | UnicodeError UnicodeException - | ParseUriError String - | ParseTimeError String -@@ -63,7 +63,7 @@ - "/!\\ Cannot parse date from item: ", - " title: " ++ (show $ getItemTitle item), - " link:" ++ (show $ getItemLink item), -- " publish date:" ++ (show $ getItemPublishDate item), -+ " publish date:" ++ (show (getItemPublishDate item :: Maybe (Maybe UTCTime))), - " date:" ++ (show $ getItemDate item)] - show (ParseTimeError raw) = "/!\\ Cannot parse time: " ++ raw - show (ParseFeedError raw) = "/!\\ Cannot parse feed: " ++ raw -diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/HTTP.hs ---- a/Imm/HTTP.hs Sun Jun 16 12:23:40 2013 +0200 -+++ b/Imm/HTTP.hs Wed Apr 23 20:25:24 2014 +0000 -@@ -50,13 +50,13 @@ - either throwError return res - - -- | Monad-agnostic version of 'parseUrl' --parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request m') -+parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m Request - parseURL uri = do - result <- io $ (Right <$> parseUrl uri) `catch` (return . Left . HTTPError) - either throwError return result - - -- | Build an HTTP request for given URI --request :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request a) -+request :: (MonadBase IO m, MonadError ImmError m) => String -> m Request - request uri = do - req <- parseURL uri - return $ req { requestHeaders = [ -diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 imm.cabal ---- a/imm.cabal Sun Jun 16 12:23:40 2013 +0200 -+++ b/imm.cabal Wed Apr 23 20:25:24 2014 +0000 -@@ -46,10 +46,10 @@ - data-default, - directory, - dyre, -- feed, -+ feed == 0.3.9.2, - filepath, - hslogger, -- http-conduit >= 1.9.0, -+ http-conduit >= 2.0 && < 2.2, - http-types, - lens, - mime-mail, -@@ -66,7 +66,7 @@ - transformers, - time, - timerep >= 1.0.3, -- tls, -+ tls >= 1.2 && < 1.3, - utf8-string, - xdg-basedir, - xml diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix index 84a19f541ee0..111268cc9f3f 100644 --- a/pkgs/development/libraries/haskell/indents/default.nix +++ b/pkgs/development/libraries/haskell/indents/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, concatenative, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/indexed-free/default.nix b/pkgs/development/libraries/haskell/indexed-free/default.nix index 557154d391ac..60d3330239e7 100644 --- a/pkgs/development/libraries/haskell/indexed-free/default.nix +++ b/pkgs/development/libraries/haskell/indexed-free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, indexed }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/indexed/default.nix b/pkgs/development/libraries/haskell/indexed/default.nix index c31fa6691d8f..f1c1c1fba4ec 100644 --- a/pkgs/development/libraries/haskell/indexed/default.nix +++ b/pkgs/development/libraries/haskell/indexed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 8337fe516554..7a4b6ca38aca 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/interlude/default.nix b/pkgs/development/libraries/haskell/interlude/default.nix index 71b875ba7912..c4c0ae2a1df3 100644 --- a/pkgs/development/libraries/haskell/interlude/default.nix +++ b/pkgs/development/libraries/haskell/interlude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index 6b0ee4b6e363..6367c93fd322 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, haskellSrcMeta, hspec, QuickCheck , quickcheckInstances, text }: diff --git a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix index 63ea81058e53..b24a79e62d98 100644 --- a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix +++ b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcMeta, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 73e1d2d71971..962f30de8a09 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, distributive, doctest, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index 4cceb87c97e0..5a88300ace7f 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, liftedBase, monadControl, transformers , transformersBase }: diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix index 2699666cedda..625d689cd40d 100644 --- a/pkgs/development/libraries/haskell/io-memoize/default.nix +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix index 32e60325acc9..7380dc0d4148 100644 --- a/pkgs/development/libraries/haskell/io-storage/default.nix +++ b/pkgs/development/libraries/haskell/io-storage/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 864c0cdddaea..633389a0a3f4 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, filepath, HUnit, mtl , network, primitive, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, text, time, transformers, vector, zlib diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix index e648ae19c3dc..d9037a8229b3 100644 --- a/pkgs/development/libraries/haskell/ipprint/default.nix +++ b/pkgs/development/libraries/haskell/ipprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Extra, haskellSrc }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 89a576141609..9d4ff61bd419 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, appar, byteorder, doctest, hspec, network, QuickCheck , safe }: diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 49f732e857c1..c2ba34c880a5 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index f0772ca4db13..419bc590f5e7 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, HUnit, ListLike, monadControl, mtl, parallel , QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, transformersBase diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix index d062ec298690..901328080e35 100644 --- a/pkgs/development/libraries/haskell/ivor/default.nix +++ b/pkgs/development/libraries/haskell/ivor/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ix-shapable/default.nix b/pkgs/development/libraries/haskell/ix-shapable/default.nix index 056e308b4ac3..965257832e08 100644 --- a/pkgs/development/libraries/haskell/ix-shapable/default.nix +++ b/pkgs/development/libraries/haskell/ix-shapable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix index 8e4a92f6dcae..25b4ebed648d 100644 --- a/pkgs/development/libraries/haskell/ixdopp/default.nix +++ b/pkgs/development/libraries/haskell/ixdopp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, preprocessorTools, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix index f45e95b5e86f..c77950c68f09 100644 --- a/pkgs/development/libraries/haskell/ixset/default.nix +++ b/pkgs/development/libraries/haskell/ixset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, safecopy, syb, sybWithClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix index 05ca90a1b046..acb4b0b7e570 100644 --- a/pkgs/development/libraries/haskell/jack/default.nix +++ b/pkgs/development/libraries/haskell/jack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, enumset, eventList, explicitException, jackaudio, midi , nonNegative, transformers }: diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix new file mode 100644 index 000000000000..c8c7c503ea93 --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix new file mode 100644 index 000000000000..9ff082e3239f --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix new file mode 100644 index 000000000000..d1e302b1bc9f --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix new file mode 100644 index 000000000000..32d4d3747ef9 --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro/default.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix index c93aa0411d40..9b750e606096 100644 --- a/pkgs/development/libraries/haskell/jpeg/default.nix +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 2713dc919c51..7601cab340d8 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, indexed, indexedFree, lens, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 9a56f412fe2b..3c86f08a4d2a 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix index dd6c3eb058f2..7b950b862254 100644 --- a/pkgs/development/libraries/haskell/jsonTypes/default.nix +++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index fae884b29226..5f9aadd69697 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, adjunctions, comonad, contravariant, distributive, free , mtl, pointed, semigroupoids, speculation, transformers }: diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix index 6ae0447b1fe6..55f7dfa595a6 100644 --- a/pkgs/development/libraries/haskell/kansas-lava/default.nix +++ b/pkgs/development/libraries/haskell/kansas-lava/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, dataDefault, dataReify, dotgen, filepath, netlist , netlistToVhdl, random, sizedTypes, strict }: diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix index d97066e57c76..196da768e062 100644 --- a/pkgs/development/libraries/haskell/keys/default.nix +++ b/pkgs/development/libraries/haskell/keys/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, free, semigroupoids, semigroups, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/knob/default.nix b/pkgs/development/libraries/haskell/knob/default.nix index acaf8def0046..7ad084e06b74 100644 --- a/pkgs/development/libraries/haskell/knob/default.nix +++ b/pkgs/development/libraries/haskell/knob/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index 51db50a75b76..6edfac72bf03 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, haskellSrc, mtl, network, random, regexCompat , regexPosix, syb, tagsoup, utf8String, zlib }: diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index bbf13bd3fe9e..9294c019cbd8 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, arrows, binary, brainfuck, dataMemocombinators , dependentMap, dependentSum, dependentSumTemplate, dice , editDistance, filepath, haskeline, haskellSrcExts, hoogle diff --git a/pkgs/development/libraries/haskell/lambdabot/wrapper.nix b/pkgs/development/libraries/haskell/lambdabot/wrapper.nix new file mode 100644 index 000000000000..c60d86a02adb --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot/wrapper.nix @@ -0,0 +1,19 @@ +{ stdenv, lambdabot, mueval, ghc, makeWrapper }: + +stdenv.mkDerivation { + name = "lambdabot-wrapper"; + + buildInputs = [ makeWrapper ]; + + buildCommand = '' + makeWrapper "${lambdabot}/bin/lambdabot" "$out/bin/lambdabot" \ + --prefix PATH : "${ghc}/bin:${mueval}/bin" + ''; + + preferLocalBuild = true; + + meta = { + description = lambdabot.meta.description; + }; +} + diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix index f3c9a8af4eab..169660d27c37 100644 --- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix +++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw , stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive }: diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index 1aef92fe6789..d76235342780 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, languageCQuote, mainlandPretty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index aa6c03e53508..4e7f9a7570a5 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy , haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol , testFramework, testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix index 7607b3bf3aa2..94d8b8e4f477 100644 --- a/pkgs/development/libraries/haskell/language-c/default.nix +++ b/pkgs/development/libraries/haskell/language-c/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, filepath, happy, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 9d47c07554cb..f2f77fb9dd37 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec , QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix index bdde61739e35..f3a2015ede0f 100644 --- a/pkgs/development/libraries/haskell/language-glsl/default.nix +++ b/pkgs/development/libraries/haskell/language-glsl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, prettyclass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index a77040a5578c..f261a9be7a5a 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index 8486841a5f6a..6811b0db547c 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 8b83b64f9c98..d65bc5032c89 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck , testFramework, testFrameworkHunit, utf8Light, utf8String }: diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 814fe50bca71..a644e7fdf793 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix index f409d99987d9..dc0fee0762c2 100644 --- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix +++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix index 72781f39cdbc..23084746ea23 100644 --- a/pkgs/development/libraries/haskell/lens-datetime/default.nix +++ b/pkgs/development/libraries/haskell/lens-datetime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix index ebd1ba8e088a..a5c9e65f8a45 100644 --- a/pkgs/development/libraries/haskell/lens-family-core/default.nix +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index f6f91da7083e..9b769d41ab52 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, bifunctors, comonad, contravariant , deepseq, distributive, doctest, exceptions, filepath, free , genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel @@ -10,8 +12,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.2"; - sha256 = "0aqhr8akb7wg270jxi1ns3mrpv42cfssi3g2kzyhkjmb39qxpp2w"; + version = "4.3"; + sha256 = "0wvsf0vkqjmmgl3p5lxbypn4p126l927ip7l2iisqzwyk87zfqqy"; buildDepends = [ aeson attoparsec bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive diff --git a/pkgs/development/libraries/haskell/lenses/default.nix b/pkgs/development/libraries/haskell/lenses/default.nix index aa560fbda06f..debe3061798e 100644 --- a/pkgs/development/libraries/haskell/lenses/default.nix +++ b/pkgs/development/libraries/haskell/lenses/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix index becd68ba9157..8d4f854a9934 100644 --- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, dataDefault, filepath, leveldb, resourcet , transformers }: diff --git a/pkgs/development/libraries/haskell/libffi/default.nix b/pkgs/development/libraries/haskell/libffi/default.nix index da87fc01bc62..6b5892bce459 100644 --- a/pkgs/development/libraries/haskell/libffi/default.nix +++ b/pkgs/development/libraries/haskell/libffi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libffi }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index fc7c8b37323b..0411cb93063f 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, conduit, doctest, filepath, free, hspec , hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens , monadControl, network, resourcet, text, transformers, xmlConduit diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index 1103651f0d0c..ea4febaf1d1a 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, cereal, contravariant, cryptoApi, httpConduit , httpTypes, network, pureMD5, semigroups, tagged, text, void }: diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index e760421d4ebf..43459ed091d8 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl , network, QuickCheck, text, time, utf8String }: cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.4"; - sha256 = "0dk723zly9dkwpgp4157d3a559g9j0ndxfdyp85yqcsr987wplqb"; + version = "0.8.0.5"; + sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; buildDepends = [ attoparsec dataDefault filepath mtl network text time utf8String ]; diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix index a7eadddac3d6..1bb1bcacca3b 100644 --- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text , transformers, uniplate, unixBytestring, unorderedContainers, uuid , vector diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix index 320a6f20699d..43f4e19029bd 100644 --- a/pkgs/development/libraries/haskell/libxml-sax/default.nix +++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libxml2, text, xmlTypes }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index f65c35fb2ae7..f5b6f711ab83 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, HUnit, liftedBase, monadControl, mtl, tasty , tastyHunit, tastyTh, transformersBase }: diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 9dcce135eb6c..62b8bdaa8f3a 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, monadControl, testFramework, testFrameworkHunit , transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index ce9fe66a1262..4d99fdd92492 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, adjunctions, binary, distributive, doctest, filepath , hashable, HUnit, lens, reflection, semigroupoids, semigroups , simpleReflect, tagged, testFramework, testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix index a7d2a963e0de..3f332dd4083e 100644 --- a/pkgs/development/libraries/haskell/list-tries/default.nix +++ b/pkgs/development/libraries/haskell/list-tries/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, dlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/listExtras/default.nix b/pkgs/development/libraries/haskell/listExtras/default.nix index 21e1a7d7c698..2da3060202cb 100644 --- a/pkgs/development/libraries/haskell/listExtras/default.nix +++ b/pkgs/development/libraries/haskell/listExtras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lists/default.nix b/pkgs/development/libraries/haskell/lists/default.nix index d7574da0fa73..358d33e35d71 100644 --- a/pkgs/development/libraries/haskell/lists/default.nix +++ b/pkgs/development/libraries/haskell/lists/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, listExtras, split }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix index 0a8f455d9713..8b6f3e453d6a 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, transformers }: diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix index bfa0ed43d0e2..c8601d844ca1 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, transformers }: diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix index 2eb0a2c5d206..fce7847dac73 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec , QuickCheck, setenv, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, utf8String diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix index 43a346ebf191..25993bb9fd00 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec , QuickCheck, setenv, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, utf8String diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix index a5106d910f3f..822cfb29c1d7 100644 --- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix +++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractDeque, abstractDequeTests, atomicPrimops, HUnit , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix index 3088004d0a88..a0b2024abc86 100644 --- a/pkgs/development/libraries/haskell/logfloat/default.nix +++ b/pkgs/development/libraries/haskell/logfloat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix index 7fa30c1cb3ac..83ee93f84635 100644 --- a/pkgs/development/libraries/haskell/logging/default.nix +++ b/pkgs/development/libraries/haskell/logging/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, fastLogger, hspec, liftedBase, monadControl , monadLogger, pcreLight, text, time, transformers, vectorSpace }: diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix index b0768708429f..78912a9ed38d 100644 --- a/pkgs/development/libraries/haskell/logict/default.nix +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index 43fdd6caf992..6c28b6c8cd53 100644 --- a/pkgs/development/libraries/haskell/lrucache/default.nix +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix index bf05cd5e63d0..f7f8997480aa 100644 --- a/pkgs/development/libraries/haskell/lushtags/default.nix +++ b/pkgs/development/libraries/haskell/lushtags/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix index f931262a91e3..34604a6fc66b 100644 --- a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL, enumerator, HUnit, lzma, mtl, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix index 6109f33f82fe..24be1424c99a 100644 --- a/pkgs/development/libraries/haskell/maccatcher/default.nix +++ b/pkgs/development/libraries/haskell/maccatcher/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index cd69d9133a6c..1b391739c202 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, doctest, filepath, free, mtl, pointed , profunctors, semigroups, transformers, void }: diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 60990d2dbcac..b8797be54103 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, srcloc, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index e09feb10d905..226a4efa8c7f 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck, silently, stringbuilder }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix index 5907fce4f176..8b8138d1dd1a 100644 --- a/pkgs/development/libraries/haskell/markov-chain/default.nix +++ b/pkgs/development/libraries/haskell/markov-chain/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index b14449626c87..8fce8ec4f09e 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, erf, HUnit, ieee754, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector , vectorThUnbox diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index 84f0d83a9242..3c9cd2590adb 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, processExtras, temporary, text, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix index 97f163f5735f..b10c70093cee 100644 --- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix index c7f104640ced..864d3c5c427b 100644 --- a/pkgs/development/libraries/haskell/midi/default.nix +++ b/pkgs/development/libraries/haskell/midi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, eventList, explicitException, monoidTransformer , nonNegative, QuickCheck, random, transformers, utilityHt }: diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 88eabe59e3f1..96daa23df7a9 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, filepath, hspec, random , sendmail ? "sendmail", text }: diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 50c25ada340f..774b4472b167 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix index 6e1a3482c042..288890b89d8e 100644 --- a/pkgs/development/libraries/haskell/mime/default.nix +++ b/pkgs/development/libraries/haskell/mime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix index 08865132701b..c0593855644f 100644 --- a/pkgs/development/libraries/haskell/minimorph/default.nix +++ b/pkgs/development/libraries/haskell/minimorph/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix index 99cae442c3bb..a426927e318c 100644 --- a/pkgs/development/libraries/haskell/minioperational/default.nix +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 5c242f9493d4..2400721a6561 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, HUnit, minimorph, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/misfortune/default.nix b/pkgs/development/libraries/haskell/misfortune/default.nix index 5fe26fff7441..cc6192882139 100644 --- a/pkgs/development/libraries/haskell/misfortune/default.nix +++ b/pkgs/development/libraries/haskell/misfortune/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, filepath, knob, monadLoops, randomFu, regexBase , regexPcre, semigroups, text, utf8String, vector }: diff --git a/pkgs/development/libraries/haskell/missing-foreign/default.nix b/pkgs/development/libraries/haskell/missing-foreign/default.nix index 9ffbc37468a7..928cf73d457b 100644 --- a/pkgs/development/libraries/haskell/missing-foreign/default.nix +++ b/pkgs/development/libraries/haskell/missing-foreign/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix index 53785f45c221..36b4470203c9 100644 --- a/pkgs/development/libraries/haskell/mmap/default.nix +++ b/pkgs/development/libraries/haskell/mmap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix index 4b3e687fd8f3..b13eeeb5d83e 100644 --- a/pkgs/development/libraries/haskell/mmorph/default.nix +++ b/pkgs/development/libraries/haskell/mmorph/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix index 6a6a7c99d704..614fe145bea4 100644 --- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix +++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index c865d964c544..3641f259b990 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers, transformersBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-coroutine/default.nix b/pkgs/development/libraries/haskell/monad-coroutine/default.nix index 6ddf872a6da8..9bcfcc6d4b09 100644 --- a/pkgs/development/libraries/haskell/monad-coroutine/default.nix +++ b/pkgs/development/libraries/haskell/monad-coroutine/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monadParallel, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix index e8a7af286133..3be5d8298565 100644 --- a/pkgs/development/libraries/haskell/monad-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mmorph, monadControl, stm, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index e0902b7d4f7c..e50835a43fa9 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, conduitExtra, exceptions , fastLogger, liftedBase, monadControl, monadLoops, mtl, resourcet , stm, stmChans, text, transformers, transformersBase diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix index 350397f719df..f08363edbde2 100644 --- a/pkgs/development/libraries/haskell/monad-loops/default.nix +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix index 6b9ca0e75534..95336d28e3d8 100644 --- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractPar, cereal, deepseq, mtl, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix index 8692d6267cbe..fe89beb0deaa 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix index 911d984a88c0..daf625218117 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras , mtl, mwcRandom, parallel, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix index 1ee628cb36a6..db53712d4ef1 100644 --- a/pkgs/development/libraries/haskell/monad-parallel/default.nix +++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parallel, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix index 39f911dae938..37cd3f74c537 100644 --- a/pkgs/development/libraries/haskell/monad-peel/default.nix +++ b/pkgs/development/libraries/haskell/monad-peel/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-stm/default.nix b/pkgs/development/libraries/haskell/monad-stm/default.nix index 5f923f5110a7..5418817160f9 100644 --- a/pkgs/development/libraries/haskell/monad-stm/default.nix +++ b/pkgs/development/libraries/haskell/monad-stm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix index 7ee1f8c87040..f4fac043ea19 100644 --- a/pkgs/development/libraries/haskell/monad-unify/default.nix +++ b/pkgs/development/libraries/haskell/monad-unify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index 87bd36503e18..e6388ebfa367 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cryptoApi, mtl, tagged, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadlib/default.nix b/pkgs/development/libraries/haskell/monadlib/default.nix index a893eb6f4e40..0ada70b47145 100644 --- a/pkgs/development/libraries/haskell/monadlib/default.nix +++ b/pkgs/development/libraries/haskell/monadlib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix index 5ec05316ba0f..661781415cb3 100644 --- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix +++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, monadloc, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadloc/default.nix b/pkgs/development/libraries/haskell/monadloc/default.nix index 9ff7383565e1..4d99a61335cf 100644 --- a/pkgs/development/libraries/haskell/monadloc/default.nix +++ b/pkgs/development/libraries/haskell/monadloc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix index b57a432fcab0..e18b1e711c9e 100644 --- a/pkgs/development/libraries/haskell/monads-tf/default.nix +++ b/pkgs/development/libraries/haskell/monads-tf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index c97676b64d8b..73d8f5ccf94c 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bson, cryptohash, hashtables, liftedBase , monadControl, mtl, network, parsec, random, randomShuffle, text , transformersBase diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index a6066c580f2e..73685698f5e6 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec , QuickCheck, semigroupoids, semigroups, text, transformers , unorderedContainers, vector, vectorAlgorithms, vectorInstances @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.3"; - sha256 = "1zg8hig4wgbiswb0sppjiga1r6sw7fjkxfiwlck4bwvghpyr5bp3"; + version = "0.6.0.4"; + sha256 = "1svqxc96n2andxcgrv8s29hkq6nw1qigv5p0dw9vx2ynk68pfhww"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index dc4bb6dbb661..3c0a742a1f3d 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, groups, semigroupoids, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix index 5894eccd4b7b..147045287dd2 100644 --- a/pkgs/development/libraries/haskell/monoid-transformer/default.nix +++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix index 543578211718..d33225c21f12 100644 --- a/pkgs/development/libraries/haskell/mpppc/default.nix +++ b/pkgs/development/libraries/haskell/mpppc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, split, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/msgpack/default.nix b/pkgs/development/libraries/haskell/msgpack/default.nix index 4f84537e72ec..b2a626621fe2 100644 --- a/pkgs/development/libraries/haskell/msgpack/default.nix +++ b/pkgs/development/libraries/haskell/msgpack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, hashable, mtl , QuickCheck, testFramework, testFrameworkQuickcheck2, text , unorderedContainers, vector diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix index fc8fdaef7525..b6185d5d5691 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix index 3c91b65efa04..d4f6505f357d 100644 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix index b9298325c207..ccc23775d946 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix index c10f526acf21..ab512d5713bf 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix index 649ce5162869..2864c9b1d2aa 100644 --- a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.2.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.1.nix index e7147b28767a..6589488edc09 100644 --- a/pkgs/development/libraries/haskell/mtl/2.2.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix index 37be70cebcb1..7b5993e0dc0e 100644 --- a/pkgs/development/libraries/haskell/mtlparse/default.nix +++ b/pkgs/development/libraries/haskell/mtlparse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix index 06d2f58ce171..225994a32e5c 100644 --- a/pkgs/development/libraries/haskell/mueval/default.nix +++ b/pkgs/development/libraries/haskell/mueval/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, extensibleExceptions, filepath, hint, mtl, show , simpleReflect, utf8String }: diff --git a/pkgs/development/libraries/haskell/mueval/wrapper.nix b/pkgs/development/libraries/haskell/mueval/wrapper.nix new file mode 100644 index 000000000000..6c3beb4da8be --- /dev/null +++ b/pkgs/development/libraries/haskell/mueval/wrapper.nix @@ -0,0 +1,33 @@ +{ stdenv, mueval, makeWrapper, ghc +, show, simpleReflect, mtl, random, QuickCheck +, additionalPackages ? [] }: + +stdenv.mkDerivation { + name = "mueval-wrapper"; + + buildInputs = [ makeWrapper show simpleReflect mtl random QuickCheck ] + ++ additionalPackages; + + ghcVersion = ghc.version; + + buildCommand = '' + PKGPATH="" + for p in $nativePkgs; do + for i in "$p/lib/ghc-$ghcVersion/package.conf.d/"*.installedconf; do + PKGPATH=$PKGPATH''${PKGPATH:+:}$i + done + done + + makeWrapper "${mueval}/bin/mueval" "$out/bin/mueval" \ + --prefix PATH : "${mueval}/bin" \ + --prefix GHC_PACKAGE_PATH : "$PKGPATH" \ + --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages + ''; + + preferLocalBuild = true; + + meta = { + description = mueval.meta.description; + }; +} + diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index e8e608f0e0b1..2df62aa1e778 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bifunctors, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multimap/default.nix b/pkgs/development/libraries/haskell/multimap/default.nix index 27283ad6a651..15764392bf13 100644 --- a/pkgs/development/libraries/haskell/multimap/default.nix +++ b/pkgs/development/libraries/haskell/multimap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index 32626ae68e6c..7cec18ddf3de 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 85c2a671dbf3..0d1d434db1d2 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix index 16fcf155747d..72c172d659a5 100644 --- a/pkgs/development/libraries/haskell/multiset/default.nix +++ b/pkgs/development/libraries/haskell/multiset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index 12d5d550d100..c983e00fa66e 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index b8543d2b3761..fad0f0de0cba 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, primitive, QuickCheck, statistics, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, time, vector }: diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix index e61d493cdbec..3698b727fe01 100644 --- a/pkgs/development/libraries/haskell/mysql-simple/default.nix +++ b/pkgs/development/libraries/haskell/mysql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual , mysql, pcreLight, text, time }: diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix index 4deec5bb7676..a9801f6415fd 100644 --- a/pkgs/development/libraries/haskell/mysql/default.nix +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mysqlConfig, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix index 367d24f32263..156e0c04a0a2 100644 --- a/pkgs/development/libraries/haskell/nanospec/default.nix +++ b/pkgs/development/libraries/haskell/nanospec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, silently }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix index 3ad4240e2892..e3b55592204c 100644 --- a/pkgs/development/libraries/haskell/nat/default.nix +++ b/pkgs/development/libraries/haskell/nat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index 74303667a07c..e870d171383b 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix index 787ac70ffa96..f4ed7dd2a123 100644 --- a/pkgs/development/libraries/haskell/naturals/default.nix +++ b/pkgs/development/libraries/haskell/naturals/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index 2b566f79a98a..7e9ac0ddd95e 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, ncurses, text, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix index ff9ed1ac0bfa..6794ce4f37f6 100644 --- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix +++ b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, netlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix index 57550dcb3d86..70d993cf8e48 100644 --- a/pkgs/development/libraries/haskell/netlist/default.nix +++ b/pkgs/development/libraries/haskell/netlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix index a2b2810f6f95..7321c3e88e8e 100644 --- a/pkgs/development/libraries/haskell/netwire/default.nix +++ b/pkgs/development/libraries/haskell/netwire/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, parallel, random, semigroups, time, transformers }: diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix new file mode 100644 index 000000000000..d5a4c64cff8a --- /dev/null +++ b/pkgs/development/libraries/haskell/network-carbon/default.nix @@ -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 ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index e4c5bb7ab6b1..45d912da07a5 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, connection, cprngAes, dataDefault , HUnit, monadControl, mtl, network, streamingCommons, systemFileio , systemFilepath, tls, transformers diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 1f252c03660d..0ab913c1e852 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix index 2b16cc7d2941..df584710c142 100644 --- a/pkgs/development/libraries/haskell/network-info/default.nix +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-metrics/default.nix b/pkgs/development/libraries/haskell/network-metrics/default.nix index f9f92170b578..024192a06a89 100644 --- a/pkgs/development/libraries/haskell/network-metrics/default.nix +++ b/pkgs/development/libraries/haskell/network-metrics/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, dataDefault, network, random, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix index 78d1b36f34df..00c2980462da 100644 --- a/pkgs/development/libraries/haskell/network-multicast/default.nix +++ b/pkgs/development/libraries/haskell/network-multicast/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix index cd56082d8b54..90d9becb8048 100644 --- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix +++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, gnuidn, gnutls, gsasl, libxmlSax, monadsTf, network, text , transformers, xmlTypes }: diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index c50afdb21201..6795da96450b 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, network, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 728a40d8d3e6..b4a70eb68436 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, network, networkTransport , networkTransportTests }: diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index 7aedea7995b7..15d54633b502 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, mtl, networkTransport, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index 032cb043faba..00c15e2721fe 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, hashable, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix index 68c7937497c4..9023e5601255 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix index f66d81f79f45..e05266da9a2e 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix index 834b7872c6b2..57ebe9c8e0ce 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix index a1a9a36d7382..b59ad26dfad3 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix index 9434d83d7f01..b435cf231540 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix index dc0c1811e591..9bbd354196d0 100644 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix index 6f245cf18400..7d8fd561c113 100644 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix index f042b4b70082..5a485b27762d 100644 --- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/network/2.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix index 40354c9472ce..14105ed7349e 100644 --- a/pkgs/development/libraries/haskell/newtype/default.nix +++ b/pkgs/development/libraries/haskell/newtype/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index ae025f6cc64e..92d1cf77c639 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, utilityHt }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 902ea9ce8809..b47b93395965 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix index 76783dceb494..918427d0fa0f 100644 --- a/pkgs/development/libraries/haskell/numeric-extras/default.nix +++ b/pkgs/development/libraries/haskell/numeric-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 4fac81b01f93..a58b3885f518 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, nonNegative, parsec, QuickCheck, random , storableRecord, utilityHt }: diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix index d317f57efcea..3b6c777efbfb 100644 --- a/pkgs/development/libraries/haskell/numtype-tf/default.nix +++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix index 25e0a61beb92..fcef793fe704 100644 --- a/pkgs/development/libraries/haskell/numtype/default.nix +++ b/pkgs/development/libraries/haskell/numtype/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index e7da848e4b22..b58df3be3148 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix index 33b48d1f1216..28609f9e0f66 100644 --- a/pkgs/development/libraries/haskell/openssl-streams/default.nix +++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HsOpenSSL, HUnit, ioStreams, network, testFramework , testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix index 2fbe5a7f2107..d3359a3377e9 100644 --- a/pkgs/development/libraries/haskell/operational/default.nix +++ b/pkgs/development/libraries/haskell/operational/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/opml/default.nix b/pkgs/development/libraries/haskell/opml/default.nix index be7cb0606eeb..a44954c10cda 100644 --- a/pkgs/development/libraries/haskell/opml/default.nix +++ b/pkgs/development/libraries/haskell/opml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix index f89cdd5045fe..721de1e600e1 100644 --- a/pkgs/development/libraries/haskell/options/default.nix +++ b/pkgs/development/libraries/haskell/options/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, chellQuickcheck, monadsTf, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index bad23a102ee2..191efd723f79 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiWlPprint, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 , testFrameworkThPrime, transformers, transformersCompat diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix index 9738ad9e19ca..48a45e560973 100644 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, aesonPretty, attoparsec, filepath, hexpat , hsBibutils, HTTP, mtl, network, pandoc, pandocTypes, parsec , rfc5051, split, syb, tagsoup, temporary, texmath, text, time diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 28b4acbfe1d1..7ca48e390bac 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 04738c0c00ed..6247ed1aee08 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, alex, ansiTerminal, attoparsec, base64Bytestring , binary, blazeHtml, blazeMarkup, dataDefault, Diff , extensibleExceptions, filepath, happy, highlightingKate, hslua diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 84823b90e470..765f4c7a3fce 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig }: diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index 56c1a1306964..b9f6eda669e8 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix index 5212e6b2847a..6a4f20a43c0e 100644 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix index 9fb661fd481f..b48676419fe7 100644 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix index 83283c2317b0..07320ea8d3f3 100644 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 365ed1968419..50a574deded5 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix index e089c8dce8ea..e66e5ba69183 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix index 4f255e893af5..c2df1e52d10e 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index a421338624cd..516bc5bd9855 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix index 17c046a06e1d..ffbab8a942a3 100644 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix index 62c5b67b0e9a..0f56abc58352 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix index d043fde01201..eb1fb4699b0c 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix index 209021621693..78ff6eceb28d 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.5.nix b/pkgs/development/libraries/haskell/parsec/3.1.5.nix index 9d1174db056f..d3dd8bf37911 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.5.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix index 84e5619167ab..7f1ea0824cdc 100644 --- a/pkgs/development/libraries/haskell/parsers/0.10.3.nix +++ b/pkgs/development/libraries/haskell/parsers/0.10.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, charset, doctest, filepath, parsec, text, transformers , unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix b/pkgs/development/libraries/haskell/parsers/0.11.0.3.nix similarity index 74% rename from pkgs/development/libraries/haskell/parsers/0.11.0.2.nix rename to pkgs/development/libraries/haskell/parsers/0.11.0.3.nix index 36c5f2ae998d..42f51f00659c 100644 --- a/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix +++ b/pkgs/development/libraries/haskell/parsers/0.11.0.3.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, charset, doctest, filepath, parsec, text , transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "parsers"; - version = "0.11.0.2"; - sha256 = "0b2qb6lhn647926s2g7qrzhnvnym5dr7fny784bv19mfvimwi81c"; + version = "0.11.0.3"; + sha256 = "0cwjzk76i7isg7h1xl9iv6x87vfw3x2x5jaacx85g8v45lv7g88s"; buildDepends = [ attoparsec charset parsec text transformers unorderedContainers ]; diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix index 4245fcf7f40b..45fad0d66285 100644 --- a/pkgs/development/libraries/haskell/parsimony/default.nix +++ b/pkgs/development/libraries/haskell/parsimony/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index b29527488436..4b5bb612b716 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, QuickCheck, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index f0be81e64ae3..eb6fb43e8d6f 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/pkgs/development/libraries/haskell/pathtype/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/patience/default.nix b/pkgs/development/libraries/haskell/patience/default.nix index 0f65e3eceed5..6f70eb1e14d1 100644 --- a/pkgs/development/libraries/haskell/patience/default.nix +++ b/pkgs/development/libraries/haskell/patience/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix index a73432fe62bb..43ef906aad26 100644 --- a/pkgs/development/libraries/haskell/pattern-arrows/default.nix +++ b/pkgs/development/libraries/haskell/pattern-arrows/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pbkdf/default.nix b/pkgs/development/libraries/haskell/pbkdf/default.nix index 29ccc2b63dac..6f30043ee3b7 100644 --- a/pkgs/development/libraries/haskell/pbkdf/default.nix +++ b/pkgs/development/libraries/haskell/pbkdf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, byteable, bytedump, cryptohash, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix index 2a86ebb72297..f7480295f6d4 100644 --- a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, enumerator, pcap, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pcap/default.nix b/pkgs/development/libraries/haskell/pcap/default.nix index 876905a4a5ab..56e2e71969cd 100644 --- a/pkgs/development/libraries/haskell/pcap/default.nix +++ b/pkgs/development/libraries/haskell/pcap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libpcap, network, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix index 33333e2d6981..5e29497196cf 100644 --- a/pkgs/development/libraries/haskell/pcre-light/default.nix +++ b/pkgs/development/libraries/haskell/pcre-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pcre }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 410d9c3d4c44..df43a297c71f 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, HUnit, mtl, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix index f44ab16f5637..0f907f9e121f 100644 --- a/pkgs/development/libraries/haskell/permutation/default.nix +++ b/pkgs/development/libraries/haskell/permutation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix index 7ff8a9de430e..beb2ca94263a 100644 --- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeBuilder, conduit, monadControl, mysql , mysqlSimple, persistent, resourcet, text, transformers }: diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 49a505e8dd17..93488c74063d 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeBuilder, conduit, monadControl, persistent , postgresqlLibpq, postgresqlSimple, resourcet, text, time , transformers diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index cb12d9cbe843..dbb5e6767790 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, conduit, monadControl, monadLogger, persistent , resourcet, text, transformers }: diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index b967e17f8f74..a1dfa4fcc298 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, hspec, monadControl, monadLogger, persistent , QuickCheck, text, transformers, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index dd37b96c2d86..3647431bbb15 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base64Bytestring, blazeHtml , blazeMarkup, conduit, exceptions, hspec, liftedBase, monadControl , monadLogger, pathPieces, resourcePool, resourcet, scientific diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix index 560826a08b21..b8a8a22a4626 100644 --- a/pkgs/development/libraries/haskell/pgm/default.nix +++ b/pkgs/development/libraries/haskell/pgm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index 2f4bd30994a2..96044afae0e9 100644 --- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesBytestring , pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-aeson"; - version = "0.4.1"; - sha256 = "06fxl4az5brbivc5db498fc3yawrc2rwnrn20rbssihd0lp9xm1i"; + version = "0.4.1.1"; + sha256 = "1z520c9l2wqjcv5lb997n3zfks7p0z7dlwgqm74dcwnnfy3mfp9j"; buildDepends = [ aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse transformers diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 04efb0cee738..9a304a7b3ec4 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, tasty , tastyHunit, text, transformers }: diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix index 55a332a6c298..94f899c6a8d4 100644 --- a/pkgs/development/libraries/haskell/pipes-binary/default.nix +++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse , smallcheck, tasty, tastyHunit, tastySmallcheck, transformers }: cabal.mkDerivation (self: { pname = "pipes-binary"; - version = "0.4.0.1"; - sha256 = "1vwsr446b3ysjm86bmpmq8pg2badx9xn0iyr17r4mby0bxvvld33"; + version = "0.4.0.2"; + sha256 = "1lbz2hybglkmm7dawg16pma2yr732yy1agh5b9vwlw2ik92hrm58"; buildDepends = [ binary pipes pipesBytestring pipesParse transformers ]; diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 4fc5b1993a3a..34fd47a8ed65 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, pipesGroup, pipesParse, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index 00336e8077d0..826a594757ea 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, pipes, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix index e35c62d5cd3c..c18d2297f675 100644 --- a/pkgs/development/libraries/haskell/pipes-csv/default.nix +++ b/pkgs/development/libraries/haskell/pipes-csv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, cassava, HUnit, pipes, pipesBytestring , testFramework, testFrameworkHunit, unorderedContainers, vector }: diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix index 5fd5d7e1251d..584713352bac 100644 --- a/pkgs/development/libraries/haskell/pipes-group/default.nix +++ b/pkgs/development/libraries/haskell/pipes-group/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, free, pipes, pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-group"; - version = "1.0.0"; - sha256 = "1izc2z3cwz7dihhfrngjyiaxmcpp794ragbl6v17y8c2pj0s34kh"; + version = "1.0.1"; + sha256 = "19caih65hsvnvkwv8dlrrf961aw6k0zr9yx78cia1padslidxlbw"; buildDepends = [ free pipes pipesParse transformers ]; meta = { description = "Group streams into substreams"; diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix index b9c8c57510fe..285d1405191d 100644 --- a/pkgs/development/libraries/haskell/pipes-http/default.nix +++ b/pkgs/development/libraries/haskell/pipes-http/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, httpClient, httpClientTls, pipes }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index 5ec70a010a5e..fcd194026484 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network, networkSimple, pipes, pipesSafe, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 5f5dec485b62..fa54300fe204 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix index 830f188fed89..61440c534a8e 100644 --- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, exceptions, mtl, pipes, pipesConcurrency, pipesSafe , postgresqlSimple, stm, text, transformers }: diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix index 2e664631f1f1..7867e5f2a3c4 100644 --- a/pkgs/development/libraries/haskell/pipes-safe/default.nix +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, pipes, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index ad6babc3e50c..deef6e0fdb66 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe , streamingCommons, text, transformers }: diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix index 67d08ebcb4a8..5b471fd55a33 100644 --- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix +++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, transformers, zlib, zlibBindings }: cabal.mkDerivation (self: { pname = "pipes-zlib"; - version = "0.4.0"; - sha256 = "1xi8x7cfzr7042x5jq8b6xqdhffh1jgprk90yzsfjldllck9z5ia"; + version = "0.4.0.1"; + sha256 = "1k91q5hci4hk2kzaqfvg1nwbklqyg83wwhm3sdfhdn2famj0mls0"; buildDepends = [ pipes transformers zlib zlibBindings ]; meta = { homepage = "https://github.com/k0001/pipes-zlib"; diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 21f349768c01..d6d8c4daf968 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mmorph, mtl, QuickCheck, testFramework , testFrameworkQuickcheck2, transformers }: diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index 7a02d5850d2b..f486737765ed 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm , tagged, transformers }: diff --git a/pkgs/development/libraries/haskell/pointedlist/default.nix b/pkgs/development/libraries/haskell/pointedlist/default.nix index a7b23cd85afb..8acb4bac6b17 100644 --- a/pkgs/development/libraries/haskell/pointedlist/default.nix +++ b/pkgs/development/libraries/haskell/pointedlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index 45b994026c2f..5b6029261eba 100644 --- a/pkgs/development/libraries/haskell/polyparse/default.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index cb1682673af8..f5cc7fe0b8bb 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monadControl, resourcePool, resourcet, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pop3-client/default.nix b/pkgs/development/libraries/haskell/pop3-client/default.nix index 6656814f64ff..e0f1edad52e3 100644 --- a/pkgs/development/libraries/haskell/pop3-client/default.nix +++ b/pkgs/development/libraries/haskell/pop3-client/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index aecd54c39986..064153599d02 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, gdk_pixbuf, glib, gtk, gtk2hsBuildtools, libc, mtl , pango, popplerGlib }: diff --git a/pkgs/development/libraries/haskell/posix-paths/default.nix b/pkgs/development/libraries/haskell/posix-paths/default.nix index 96775121acb8..3a49c84b7834 100644 --- a/pkgs/development/libraries/haskell/posix-paths/default.nix +++ b/pkgs/development/libraries/haskell/posix-paths/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 40acabad1cd4..b0a1ccb17849 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, postgresql }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index c88ba4e845da..58b6948dd983 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder , blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq , scientific, text, time, transformers, uuid, vector @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.2.3"; - sha256 = "1rg6virvz4nr0m39sr72h23yks5f8ih9nimgacx30zw7xvnx942p"; + version = "0.4.3.0"; + sha256 = "16i1qzshbscnbjb4rxz5hl1iaxjmsc21878prj5pp33zbm53dlcm"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix index c55fc0226e9c..8cda8613cdaa 100644 --- a/pkgs/development/libraries/haskell/ppm/default.nix +++ b/pkgs/development/libraries/haskell/ppm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix index 8634c4143183..fdf153c5a262 100644 --- a/pkgs/development/libraries/haskell/pqueue/default.nix +++ b/pkgs/development/libraries/haskell/pqueue/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/prelude-extras/default.nix b/pkgs/development/libraries/haskell/prelude-extras/default.nix index 33275952e0d1..40cbfef908a3 100644 --- a/pkgs/development/libraries/haskell/prelude-extras/default.nix +++ b/pkgs/development/libraries/haskell/prelude-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix index 7b96ba87a8e8..8e2ba95e9931 100644 --- a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix +++ b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix index c8a01b35a973..021becccfa1f 100644 --- a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix +++ b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix index f266cf6cdab0..e7a116b2133b 100644 --- a/pkgs/development/libraries/haskell/presburger/default.nix +++ b/pkgs/development/libraries/haskell/presburger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 56126a42cb36..51f9c8d09708 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, happy, haskellLexer }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/prettyclass/default.nix b/pkgs/development/libraries/haskell/prettyclass/default.nix index af4e4d7beaa0..a81d734aaa9b 100644 --- a/pkgs/development/libraries/haskell/prettyclass/default.nix +++ b/pkgs/development/libraries/haskell/prettyclass/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix index af6778ccd141..6f0cdc2e0bd0 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix index ff62216b3f4a..1fe7ceaf9c90 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix index 8f1090c09b1e..df7ebb170994 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix index a22ea14cd531..4f93724c3fe1 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix index aea29a4d02bf..6cf6a7aac17e 100644 --- a/pkgs/development/libraries/haskell/process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, controlMonadLoop, hspec, mtl, resourcet , shakespeare, shakespeareText, text }: diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix index 1d9cb4f80620..ae4f2d65c1c1 100644 --- a/pkgs/development/libraries/haskell/process-extras/default.nix +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/process/1.2.0.0.nix b/pkgs/development/libraries/haskell/process/1.2.0.0.nix index f3ae03da7c41..76a00ce0262d 100644 --- a/pkgs/development/libraries/haskell/process/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/process/1.2.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix index bf7e6ab71212..657d7312e82f 100644 --- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, profunctors }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index f8d2e727353c..f9aa0481d43c 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, semigroupoids, tagged, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 58dc06e6aa58..9aa8dff59aa3 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, conduit, conduitExtra, hspec, mtl , QuickCheck, resourcet, systemFileio, systemFilepath, text , transformers diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix index 98b65bb59f02..49239e8a8298 100644 --- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fgl, graphviz, mtl, prolog, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix index 8016095a4020..c45e5e20d9cb 100644 --- a/pkgs/development/libraries/haskell/prolog-graph/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text }: diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix index b1e6e1d4e303..aaf4dbdbcd8e 100644 --- a/pkgs/development/libraries/haskell/prolog/default.nix +++ b/pkgs/development/libraries/haskell/prolog/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb, thLift, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix index 7b14fabd8b15..a3550417ccdb 100644 --- a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix +++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, protocolBuffers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix index bf74e4fc4d63..9435c664b66e 100644 --- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix +++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, filepath, mtl, syb, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix index ea1bb7164c8d..2a2d8fcd0985 100644 --- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, dataDefault, HUnit, idna, text, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix index a4ad760d8ffe..3a07d382754f 100644 --- a/pkgs/development/libraries/haskell/punycode/default.nix +++ b/pkgs/development/libraries/haskell/punycode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, encoding, HUnit, mtl, QuickCheck, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index 8e66b2c3c037..7df0bdbec77c 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index f4df50aa6b18..a178dce43d12 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec , patternArrows, time, transformers, unorderedContainers , utf8String, xdgBasedir @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.5"; - sha256 = "17qbgdfhq9k4y7z3c879hkw22jcq86myd9xhs4saaa4xh3ix50x0"; + version = "0.5.2.6"; + sha256 = "0aszzaj3942xgq0nmql68s5cgplhkqrk0k6cfd1mx5lq5n0qxf94"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index 42aaeba82a8d..ff6f2004d98e 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, binary, cryptohash, random, SHA }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix index bd46bb9b4158..89defe86bada 100644 --- a/pkgs/development/libraries/haskell/qrencode/default.nix +++ b/pkgs/development/libraries/haskell/qrencode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, qrencode }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix index 90d26883d985..68189f7ae761 100644 --- a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, ieee754, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index b45fab000ca5..9454a1a23b23 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, QuickCheck, text, time, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix index 9e345f800531..d96131c53320 100644 --- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix index 0c9a22b5974f..d8b8d4719797 100644 --- a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, either, filepath, QuickCheck, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index ca2237d33f07..d4a561b2973d 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, erf, mathFunctions, monadLoops, mtl, randomShuffle , randomSource, rvar, syb, transformers, vector }: diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix index 1104091ae57f..c4f3ce565ddf 100644 --- a/pkgs/development/libraries/haskell/random-shuffle/default.nix +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MonadRandom, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index 895a001d46f8..6b5856f16508 100644 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom , random, stateref, syb, thExtras }: diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index 1f4901a4d91d..b14d850e44a3 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix index 2182e6410b53..a12ea697a482 100644 --- a/pkgs/development/libraries/haskell/ranges/default.nix +++ b/pkgs/development/libraries/haskell/ranges/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index a62fe8d0c8b8..456b92332c1d 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index c224da3a339b..43c2f16cf992 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cabalMacosx, reactiveBanana, wx, wxcore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index e2cda01ee40b..464a333f04e0 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit , transformers, unorderedContainers, vault }: diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix index 6090fc8578a2..9a05fed7e125 100644 --- a/pkgs/development/libraries/haskell/readline/default.nix +++ b/pkgs/development/libraries/haskell/readline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, readline, ncurses }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 2d3fb430fe27..f97b8e3168bc 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, network, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix index 1d6f5934ba70..e846d69d0dba 100644 --- a/pkgs/development/libraries/haskell/recursion-schemes/default.nix +++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, free, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index ac00a1ca5c19..bfa8a063b8e9 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, fingertree, hashable, keys, pointed , semigroupoids, semigroups, text, transformers , unorderedContainers diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index a02a7ec69075..67827299280a 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-applicative/default.nix b/pkgs/development/libraries/haskell/regex-applicative/default.nix index 5cb6485ec71f..4da323419a15 100644 --- a/pkgs/development/libraries/haskell/regex-applicative/default.nix +++ b/pkgs/development/libraries/haskell/regex-applicative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, smallcheck, tasty, tastyHunit, tastySmallcheck , transformers }: diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix index e94a233d9f16..691bee5e1aca 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix index 5a49d2b6407c..93243aecb57d 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix index 1dc559e63702..662a06b94e18 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix index 6a45c87d9a6e..b364f3714a68 100644 --- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexTdfa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix index 623db0cc48b9..de895393452d 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix index 8b9e666d6aee..3e7d58d6c9be 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix index df3a7abf13f0..47d15fed0c43 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix index 52c28d8b800b..e984a69ad819 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 2b7f53e4572a..83984e08e2e1 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pcre, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix index f1f6a89dc3d9..58d788e2959e 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix index 662d8236c45a..b3cb528e21a4 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix index 11e02b398b5c..3598d91fb3dc 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix index 42ee42ba7ef7..81d337871d6b 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix index 58106bc8b741..1f9a44acfb03 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix index 6d7fac51658e..7db5ede5a02e 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix new file mode 100644 index 000000000000..0e5bb61bfeda --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, parsec, regexBase }: + +cabal.mkDerivation (self: { + pname = "regex-tdfa-rc"; + version = "1.1.8.3"; + sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3"; + buildDepends = [ mtl parsec regexBase ]; + meta = { + homepage = "http://hackage.haskell.org/package/regex-tdfa"; + description = "Replaces/Enhances Text.Regex"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix index 1a329c25b2d1..b532234312aa 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexTdfa, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 7f9bce42cf67..2c07d8488204 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix index c5389a7b6636..3b2e70478de5 100644 --- a/pkgs/development/libraries/haskell/regexpr/default.nix +++ b/pkgs/development/libraries/haskell/regexpr/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, mtlparse }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 979207805334..eaf4044831a5 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix index 3e160130ea8f..b1a7f8af9c29 100644 --- a/pkgs/development/libraries/haskell/remote/default.nix +++ b/pkgs/development/libraries/haskell/remote/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, filepath, mtl, network, pureMD5, stm, syb, time , utf8String }: diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 06725444e866..8e9d668e389f 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, llvm, repa, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 571ef7f3d160..48678480a355 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, llvm, QuickCheck, random, repa, repaAlgorithms, repaIo , vector }: diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 563fe84193b1..b42d165c5129 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bmp, repa, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index ceb6fcadb0fd..627b0572d981 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index c44735eda00b..96a460fcb187 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, dstring, random, stringCombinators }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix index 97b90714e1e9..47950176a49f 100644 --- a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, MonadCatchIOTransformers, stm, time , transformers, transformersBase, vector }: diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 72178ddc1cf1..f88203b1ce2d 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, monadControl, stm, time, transformers , transformersBase, vector }: diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 60358a228d2a..39ea2050cca1 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl , transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix index f262663205ab..00453628d338 100644 --- a/pkgs/development/libraries/haskell/rethinkdb/default.nix +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, dataDefault, mtl, network , protocolBuffers, protocolBuffersDescriptor, text, time , unorderedContainers, utf8String, vector diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix index b78fc66ca06e..f3fe5343e523 100644 --- a/pkgs/development/libraries/haskell/retry/default.nix +++ b/pkgs/development/libraries/haskell/retry/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, exceptions, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rex/default.nix b/pkgs/development/libraries/haskell/rex/default.nix index c590b6023c04..2f2d3ca89e51 100644 --- a/pkgs/development/libraries/haskell/rex/default.nix +++ b/pkgs/development/libraries/haskell/rex/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, haskellSrcMeta, pcreLight }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rfc5051/default.nix b/pkgs/development/libraries/haskell/rfc5051/default.nix index 09b5d3e229ee..45a7f3c3da38 100644 --- a/pkgs/development/libraries/haskell/rfc5051/default.nix +++ b/pkgs/development/libraries/haskell/rfc5051/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix index f15391ec5e15..c6534ff0cf40 100644 --- a/pkgs/development/libraries/haskell/robots-txt/default.nix +++ b/pkgs/development/libraries/haskell/robots-txt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, heredoc, hspec, QuickCheck, time, transformers }: diff --git a/pkgs/development/libraries/haskell/rosezipper/default.nix b/pkgs/development/libraries/haskell/rosezipper/default.nix index 3c25392e7c94..736deff0db01 100644 --- a/pkgs/development/libraries/haskell/rosezipper/default.nix +++ b/pkgs/development/libraries/haskell/rosezipper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix index 6f2ed95ab636..a0d4342d269b 100644 --- a/pkgs/development/libraries/haskell/rvar/default.nix +++ b/pkgs/development/libraries/haskell/rvar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MonadPrompt, mtl, randomSource, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index bfde39349c4e..f6eaed8f3b56 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "safe"; - version = "0.3.5"; - sha256 = "0xv409ps1h1b28v8rkg59a09z001nmpvqvwf3mdkzkyzmxfgq30j"; + version = "0.3.6"; + sha256 = "03fjasjw8mh8c15xg8dncdn9g8scr427889vchcckilll40kvzvm"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library of safe (exception free) functions"; diff --git a/pkgs/development/libraries/haskell/safecopy/default.nix b/pkgs/development/libraries/haskell/safecopy/default.nix index 5d761c693498..6faa46d20bbc 100644 --- a/pkgs/development/libraries/haskell/safecopy/default.nix +++ b/pkgs/development/libraries/haskell/safecopy/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, lens, quickcheckInstances, tasty, tastyQuickcheck , text, time, vector }: diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix index 8e9478ed5e2a..18fcb238726b 100644 --- a/pkgs/development/libraries/haskell/sample-frame/default.nix +++ b/pkgs/development/libraries/haskell/sample-frame/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, storableRecord }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index a4450bdc8924..0a21f13dbc2a 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -1,13 +1,17 @@ -{ cabal, deepseq, filepath, HUnit, mtl, QuickCheck, random, syb }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, deepseq, filepath, HUnit, mtl, QuickCheck, random +, syb +}: cabal.mkDerivation (self: { pname = "sbv"; - version = "3.0"; - sha256 = "16k9f0x4amg7mm8ib22nyk1rngrbf9311gl2m15hbdq49jp8ik9i"; + version = "3.1"; + sha256 = "19rn5ynqqjz0zw7gcb0y4clzxxnmq56a2qx369mz283455l86h5j"; isLibrary = true; isExecutable = true; buildDepends = [ - deepseq filepath HUnit mtl QuickCheck random syb + async deepseq filepath HUnit mtl QuickCheck random syb ]; testDepends = [ filepath HUnit syb ]; meta = { diff --git a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix index 523bfce62b5d..c3f9a7e7a3ac 100644 --- a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix +++ b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck , text }: diff --git a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix similarity index 63% rename from pkgs/development/libraries/haskell/scientific/0.3.2.1.nix rename to pkgs/development/libraries/haskell/scientific/0.3.3.0.nix index 467f2f1d1608..c2563259ce09 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix @@ -1,14 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, QuickCheck, smallcheck, tasty -, tastyAntXml, tastyQuickcheck, tastySmallcheck, text +, tastyAntXml, tastyHunit, tastyQuickcheck, tastySmallcheck, text }: cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.2.1"; - sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s"; + version = "0.3.3.0"; + sha256 = "1kj49ibq53m7cfs9pq396l4fbqnarqzay7a65rmsrzi2vz15parv"; buildDepends = [ deepseq hashable text ]; testDepends = [ - QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck + QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck tastySmallcheck text ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/scotty-hastache/default.nix b/pkgs/development/libraries/haskell/scotty-hastache/default.nix index 7f10ad2d68f1..9f5c652d22c5 100644 --- a/pkgs/development/libraries/haskell/scotty-hastache/default.nix +++ b/pkgs/development/libraries/haskell/scotty-hastache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hastache, httpTypes, mtl, scotty, text, wai , warp }: diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 02f63cbf9a17..4555f5af9d5b 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault , hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat , text, transformers, transformersBase, wai, waiExtra, warp diff --git a/pkgs/development/libraries/haskell/scrypt/default.nix b/pkgs/development/libraries/haskell/scrypt/default.nix index 6caf51edc1ed..c0d9e2df2e8b 100644 --- a/pkgs/development/libraries/haskell/scrypt/default.nix +++ b/pkgs/development/libraries/haskell/scrypt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, entropy, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix index 5b6fc4e95ca7..fddba1934571 100644 --- a/pkgs/development/libraries/haskell/securemem/default.nix +++ b/pkgs/development/libraries/haskell/securemem/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix index cb8ed865da3d..a12c8c449c57 100644 --- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroupoids }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 455396564ec8..97389362682b 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, contravariant, distributive, semigroups , transformers }: diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 1e8fc38f3a3d..4d39b97bbae7 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, nats, text, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index dc1f24757af2..abc80aa17f8b 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index 4b3e75a17313..567c50ecb2ab 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix index 09ffc7159a4a..4094fc221107 100644 --- a/pkgs/development/libraries/haskell/setlocale/default.nix +++ b/pkgs/development/libraries/haskell/setlocale/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index deb7b65beba9..610c7c22590b 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, deepseq, filepath, hashable, QuickCheck, random , time, transformers, unorderedContainers, utf8String }: diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 349b5d6cdbdb..0fdba4233329 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 43af98f65aa2..7ea060c5b7f1 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 40e7cd17b233..c3437690d8ce 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index b299b7c70305..8acba44ed0f1 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 850fe6b75dcb..de6855ee19ed 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeHtml, blazeMarkup, exceptions, hspec, HUnit , parsec, systemFileio, systemFilepath, text, time, transformers }: diff --git a/pkgs/development/libraries/haskell/shellish/default.nix b/pkgs/development/libraries/haskell/shellish/default.nix new file mode 100644 index 000000000000..cdf2e3a3463e --- /dev/null +++ b/pkgs/development/libraries/haskell/shellish/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, mtl, strict, time, unixCompat }: + +cabal.mkDerivation (self: { + pname = "shellish"; + version = "0.1.4"; + sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan"; + buildDepends = [ filepath mtl strict time unixCompat ]; + meta = { + homepage = "http://repos.mornfall.net/shellish"; + description = "shell-/perl- like (systems) programming in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix index 37383792de1f..6f059a75352b 100644 --- a/pkgs/development/libraries/haskell/shellmate/default.nix +++ b/pkgs/development/libraries/haskell/shellmate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, temporary, time, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix index d3ef289042df..05757172d9a3 100644 --- a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix +++ b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text , time, unixCompat }: diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 7f021e82ad6c..49bbcdd67e47 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, enclosedExceptions, exceptions, liftedAsync , liftedBase, monadControl, mtl, systemFileio, systemFilepath, text , time, transformers, transformersBase, unixCompat diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 28ed4371264b..2ea6186cab18 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index fcd7a0a872a5..619f8614f099 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, nanospec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix new file mode 100644 index 000000000000..a55267d426b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-conduit/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, chunkedData, either, exceptions, filepath +, free, liftedAsync, liftedBase, mmorph, monadControl +, monoTraversable, mtl, mwcRandom, primitive, semigroups, stm +, streamingCommons, text, transformers, transformersBase, vector +}: + +cabal.mkDerivation (self: { + pname = "simple-conduit"; + version = "0.5.0"; + sha256 = "0fbm1nv9190p1b038p6zxmw042cgm5jgkfbhscw1fslgzja90iyz"; + buildDepends = [ + bifunctors chunkedData either exceptions filepath free liftedAsync + liftedBase mmorph monadControl monoTraversable mtl mwcRandom + primitive semigroups stm streamingCommons text transformers + transformersBase vector + ]; + meta = { + homepage = "http://github.com/jwiegley/simple-conduit"; + description = "A simple streaming I/O library based on monadic folds"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix index 121677b79f19..6ff9d26dc742 100644 --- a/pkgs/development/libraries/haskell/simple-reflect/default.nix +++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 604f3f065a9f..ea5ffdc45613 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, hspec, HUnit, network , networkConduit, resourcet }: diff --git a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix index 30c3ce4b1053..71cd2f4bbd72 100644 --- a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix +++ b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix index aeace4d3fceb..c4074b9d62c3 100644 --- a/pkgs/development/libraries/haskell/singletons/default.nix +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden , thDesugar }: diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix index 3fc69552e113..23f4fa7fa1c3 100644 --- a/pkgs/development/libraries/haskell/sized-types/default.nix +++ b/pkgs/development/libraries/haskell/sized-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, singletons }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 2824c1c8f1c8..817c3acb8284 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cryptoApi, filepath, hspec, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index e81a8872f7ac..a3f7d335e89c 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, logict, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/smtLib/default.nix b/pkgs/development/libraries/haskell/smtLib/default.nix index e1363d9063ac..49443a76c2e4 100644 --- a/pkgs/development/libraries/haskell/smtLib/default.nix +++ b/pkgs/development/libraries/haskell/smtLib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix index 80f18da4c564..ab97608541dd 100644 --- a/pkgs/development/libraries/haskell/smtp-mail/default.nix +++ b/pkgs/development/libraries/haskell/smtp-mail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base16Bytestring, base64Bytestring, cryptohash, filepath , mimeMail, network, text }: diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix index 2618b77be28c..fbab444444b9 100644 --- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix +++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, cprngAes, dataDefault, filepath , mimeMail, network, stringsearch, text, tls }: diff --git a/pkgs/development/libraries/haskell/snap-blaze/default.nix b/pkgs/development/libraries/haskell/snap-blaze/default.nix index 2b7444cd154e..9dd9bf382bd3 100644 --- a/pkgs/development/libraries/haskell/snap-blaze/default.nix +++ b/pkgs/development/libraries/haskell/snap-blaze/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, snapCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index 5f694b45d981..f62b484328c3 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, caseInsensitive, hashable, network, snap, text , transformers, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix index dd1096a3a235..71b8c3c49da3 100644 --- a/pkgs/development/libraries/haskell/snap-web-routes/default.nix +++ b/pkgs/development/libraries/haskell/snap-web-routes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, heist, mtl, snap, snapCore, text, webRoutes, xmlhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index d208cadf8cf1..a839afdebe7d 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq , enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix index f6dbf7332652..3b59fb5ef559 100644 --- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, directoryTree, hint, mtl, snapCore, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix index c7fb496c036e..4b74ed294dc3 100644 --- a/pkgs/development/libraries/haskell/snap/loader-static.nix +++ b/pkgs/development/libraries/haskell/snap/loader-static.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index b72020b7f861..d2278f329f42 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, caseInsensitive, enumerator, HsOpenSSL , MonadCatchIOTransformers, mtl, network, snapCore, text, time @@ -14,6 +16,9 @@ cabal.mkDerivation (self: { network snapCore text time unixCompat ]; configureFlags = "-fopenssl"; + patchPhase = '' + sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' snap-server.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 435bccd9cb5d..189750bd4464 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, cereal, clientsession, comonad , configurator, directoryTree, dlist, errors, filepath, hashable , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom @@ -8,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.7"; - sha256 = "1vw8c48rb1clahm1yw951si9dv9mk0gfldxvk3jd7rvsfzg97s4z"; + version = "0.13.2.8"; + sha256 = "1jrnh1raw2jrl04l54f5w5xfp9yyb9bj0ly9v1baqkiggswacbzg"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 4d66f69acd64..cdbca7265748 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, acidState, snap, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix index 468d725479b3..e30a2c98dd45 100644 --- a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, clientsession, configurator, errors , MonadCatchIOTransformers, mtl, postgresqlSimple , resourcePoolCatchio, snap, text, transformers diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index 00617f517286..e0cb67e120a1 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, configurator, hedis, lens, mtl, network, snap , transformers }: diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix index 1f74f646cae7..1024b2ac4ee3 100644 --- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, configurator, heist, mtl, snap, stripe, text, textFormat , transformers, xmlhtml }: diff --git a/pkgs/development/libraries/haskell/snowball/default.nix b/pkgs/development/libraries/haskell/snowball/default.nix index 36a4231109df..d24b27f781ed 100644 --- a/pkgs/development/libraries/haskell/snowball/default.nix +++ b/pkgs/development/libraries/haskell/snowball/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, quickcheckInstances, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, text, textIcu }: diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix index 741b12bf4631..affc683e18ad 100644 --- a/pkgs/development/libraries/haskell/socket-activation/default.nix +++ b/pkgs/development/libraries/haskell/socket-activation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix new file mode 100644 index 000000000000..324a2b046162 --- /dev/null +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, engineIo, mtl, stm, text, transformers +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "socket-io"; + version = "1.0.0"; + sha256 = "1xvj2x6nr14wna0plivzbzkca2y4xw6bxhvc5mqjh664197r9jsx"; + buildDepends = [ + aeson attoparsec engineIo mtl stm text transformers + unorderedContainers vector + ]; + meta = { + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 1953e3436eed..d0233753532c 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix index ce0c89d4596d..e108bb590bb7 100644 --- a/pkgs/development/libraries/haskell/sourcemap/default.nix +++ b/pkgs/development/libraries/haskell/sourcemap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, text, unorderedContainers, utf8String }: diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix index f498da219395..c2fbf368f535 100644 --- a/pkgs/development/libraries/haskell/sparse/default.nix +++ b/pkgs/development/libraries/haskell/sparse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, contravariant, deepseq, doctest, filepath, hlint , hybridVectors, lens, linear, mtl, primitive, QuickCheck , semigroups, simpleReflect, testFramework diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix index a69b7fd26419..010f51a5251a 100644 --- a/pkgs/development/libraries/haskell/spawn/default.nix +++ b/pkgs/development/libraries/haskell/spawn/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/speculation/default.nix b/pkgs/development/libraries/haskell/speculation/default.nix index 2cbad477b043..2386d0ad54f6 100644 --- a/pkgs/development/libraries/haskell/speculation/default.nix +++ b/pkgs/development/libraries/haskell/speculation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix index ad0df5c2cb02..d9a39e984360 100644 --- a/pkgs/development/libraries/haskell/split/0.1.4.3.nix +++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix index 0fb28b53ac94..13146b02bac4 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix index 2d768e2e71d7..fb7fce607d80 100644 --- a/pkgs/development/libraries/haskell/split/0.2.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/spoon/default.nix b/pkgs/development/libraries/haskell/spoon/default.nix index bc631e69d523..436291cf8dc0 100644 --- a/pkgs/development/libraries/haskell/spoon/default.nix +++ b/pkgs/development/libraries/haskell/spoon/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix index 515f22834ae3..94d8d4409c9e 100644 --- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix +++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual , directSqlite, HUnit, text, time, transformers }: diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index f652ed001e40..5e4010920803 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix index bc3913f6726d..0534835c2b10 100644 --- a/pkgs/development/libraries/haskell/stateref/default.nix +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix index c073e00be17c..dac89bd2ef9a 100644 --- a/pkgs/development/libraries/haskell/statestack/default.nix +++ b/pkgs/development/libraries/haskell/statestack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 485a5fe0c304..857614ce751e 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions , monadPar, mwcRandom, primitive, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix index 604edc831395..bb1ebb1b9d8f 100644 --- a/pkgs/development/libraries/haskell/statvfs/default.nix +++ b/pkgs/development/libraries/haskell/statvfs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index 1b1f1ba705bf..e27c08848355 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bitmap }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix index 2b8c9d1080ae..8455aca477bc 100644 --- a/pkgs/development/libraries/haskell/stm-chans/default.nix +++ b/pkgs/development/libraries/haskell/stm-chans/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index deb76355f4a7..77d2771ed88d 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, cereal, cerealConduit, conduit, conduitExtra, HUnit , liftedAsync, liftedBase, monadControl, monadLoops, QuickCheck , resourcet, stm, stmChans, testFramework, testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/stm-stats/default.nix b/pkgs/development/libraries/haskell/stm-stats/default.nix index e7f40a26320c..4f58e73248ca 100644 --- a/pkgs/development/libraries/haskell/stm-stats/default.nix +++ b/pkgs/development/libraries/haskell/stm-stats/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix index fe308211ebb5..06d4bb209155 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix index 492fb6e3557f..c1569687888a 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix index fc33a979adff..e3a1893ba15e 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix index 4057b1f7fb3c..bfa9b7dcb6f9 100644 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix index a3fa76e4a519..7fc8b440935d 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix index 28c3da5cba23..028ab0545977 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix index a949474cef12..91fdea09202f 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix index 4450308a9107..84073b8e223d 100644 --- a/pkgs/development/libraries/haskell/storable-complex/default.nix +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index d0818808b0cb..f818545d2f80 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers, utilityHt }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index 1a17cd5f14f5..763476dd1c08 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck , random, text, transformers, zlib }: cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.3"; - sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3"; + version = "0.1.3.1"; + sha256 = "0ryj9pp681f1pqvcyy5ci2zng6ax93j5navm886k095wxmamhzmf"; buildDepends = [ blazeBuilder network random text transformers zlib ]; diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 2b37be487e6a..b1e03c382509 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix index 61b34efbe451..c7d9e7c154ba 100644 --- a/pkgs/development/libraries/haskell/strict/default.nix +++ b/pkgs/development/libraries/haskell/strict/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 915fad7006a4..ec6791e1dda5 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 1f6cf569b566..cbc40aec5645 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix index efab2ee40bb4..5176cad03cd3 100644 --- a/pkgs/development/libraries/haskell/string-conversions/default.nix +++ b/pkgs/development/libraries/haskell/string-conversions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix index 78fe1c3930f7..ac0e12811e0c 100644 --- a/pkgs/development/libraries/haskell/string-qq/default.nix +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stringable/default.nix b/pkgs/development/libraries/haskell/stringable/default.nix index 8e955f10f196..f7de2335ad25 100644 --- a/pkgs/development/libraries/haskell/stringable/default.nix +++ b/pkgs/development/libraries/haskell/stringable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix index efe0956afc0f..e75bc82159f4 100644 --- a/pkgs/development/libraries/haskell/stringbuilder/default.nix +++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix index 3fbdf196d5e5..28a5660b1e77 100644 --- a/pkgs/development/libraries/haskell/stringprep/default.nix +++ b/pkgs/development/libraries/haskell/stringprep/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, tasty, tastyQuickcheck, tastyTh, text, textIcu }: diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index 12f19c836f3d..709030bb2e74 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix index 36a7f9d2d66b..83846eef2a8f 100644 --- a/pkgs/development/libraries/haskell/stripe/default.nix +++ b/pkgs/development/libraries/haskell/stripe/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, httpConduit, httpTypes, mtl, text, time , unorderedContainers, utf8String }: diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix index c092f0c0d15b..a5975aaddc6c 100644 --- a/pkgs/development/libraries/haskell/strptime/default.nix +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 31501e26a809..8fc02625bb86 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, cmdargs, filepath, haskellSrcExts, HUnit, mtl , strict, syb, testFramework, testFrameworkHunit, yaml }: diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 248987d0c3b3..01c6e4d999f5 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix index 7caf5908a2dc..c51e561fa2e8 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix index 7638ab3332f2..61bebdb27f26 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix index 44a16e0bf5ca..1b22446ea6c8 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix index 4b999a94416d..e24ec591a041 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix index 7408d0ac5375..c6322d397a4f 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.0.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.4.2.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix index fd67f63ced5c..288cb0bc2f7d 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix index 0cf40a87d417..9477ba0f6fcd 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, sybWithClass, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 9d6136017041..f97221f51507 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index e5564b758ad0..7fd90f55d66e 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix index a25c8beda387..a2a33e89e151 100644 --- a/pkgs/development/libraries/haskell/syntactic/default.nix +++ b/pkgs/development/libraries/haskell/syntactic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, constraints, dataHash, mtl, QuickCheck, safe, tagged , tasty, tastyGolden, tastyQuickcheck, tastyTh, treeView , utf8String diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index bd0654f728a3..ad66c0eb720f 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, systemFilepath, temporary, text, time, transformers }: diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 6bc7805cef6f..e064ebe73579 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, chellQuickcheck, deepseq, QuickCheck, text }: cabal.mkDerivation (self: { @@ -6,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2"; buildDepends = [ deepseq text ]; testDepends = [ chell chellQuickcheck QuickCheck text ]; + doCheck = false; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix index b0ccd4b4d848..748a69a20a4e 100644 --- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix index 230dc5fd6d18..e9e01fb78fbc 100644 --- a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix +++ b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syz/default.nix b/pkgs/development/libraries/haskell/syz/default.nix index 67e6bc58436a..e8c6075ffd27 100644 --- a/pkgs/development/libraries/haskell/syz/default.nix +++ b/pkgs/development/libraries/haskell/syz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix index f97512c7f7f7..53b178066eb7 100644 --- a/pkgs/development/libraries/haskell/tables/default.nix +++ b/pkgs/development/libraries/haskell/tables/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, comonad, deepseq, doctest, filepath , hashable, lens, profunctors, safecopy, transformers , transformersCompat, unorderedContainers diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index 10f78671013f..a2f4c9fe2707 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, csv, html, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 48a963dc8691..f0256e49f9bc 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/taggy-lens/default.nix b/pkgs/development/libraries/haskell/taggy-lens/default.nix new file mode 100644 index 000000000000..fe8344ba73de --- /dev/null +++ b/pkgs/development/libraries/haskell/taggy-lens/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, hspec, lens, taggy, text, unorderedContainers }: + +cabal.mkDerivation (self: { + pname = "taggy-lens"; + version = "0.1.2"; + sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib"; + buildDepends = [ lens taggy text unorderedContainers ]; + testDepends = [ + doctest hspec lens taggy text unorderedContainers + ]; + meta = { + homepage = "http://github.com/alpmestan/taggy-lens"; + description = "Lenses for the taggy html/xml parser"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix new file mode 100644 index 000000000000..81bc5a2981aa --- /dev/null +++ b/pkgs/development/libraries/haskell/taggy/default.nix @@ -0,0 +1,26 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, blazeHtml, blazeMarkup, hspec, hspecAttoparsec +, text, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "taggy"; + version = "0.1"; + sha256 = "0qqz5h706k96i7gl8vvn4c044cd5wj1zjlr6cnlxxpii0pyiiwh1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec blazeHtml blazeMarkup text unorderedContainers vector + ]; + testDepends = [ + attoparsec blazeHtml blazeMarkup hspec hspecAttoparsec text + unorderedContainers vector + ]; + meta = { + homepage = "http://github.com/alpmestan/taggy"; + description = "Efficient and simple HTML/XML parsing library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix index be56d518121b..dbd88393c34a 100644 --- a/pkgs/development/libraries/haskell/tagshare/default.nix +++ b/pkgs/development/libraries/haskell/tagshare/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index b51541d56f6b..a235aa1dff63 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index ecdcbb1b63c1..ee7218362456 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, conduitExtra , dataDefault, hspec, HUnit, QuickCheck, resourcet, text diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix index 41ea62d81262..e863832ea08c 100644 --- a/pkgs/development/libraries/haskell/tar/default.nix +++ b/pkgs/development/libraries/haskell/tar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 2551b642fb1c..b892344dc7c3 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, genericDeriving, mtl, reducers, stm, tagged, tasty , transformers, xml }: diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index a5a8e9c3851f..ea81aa6bea5b 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -1,13 +1,16 @@ -{ cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty -, tastyHunit, temporaryRc +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, deepseq, filepath, mtl, optparseApplicative, tagged +, tasty, tastyHunit, temporaryRc }: cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2.2.3"; - sha256 = "0vphim4qbx0g53xvh8x90k0l5r6afivbb4y31nvbq2avmrm1i82w"; + version = "2.2.2.4"; + sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c"; buildDepends = [ - deepseq filepath mtl optparseApplicative tagged tasty temporaryRc + async deepseq filepath mtl optparseApplicative tagged tasty + temporaryRc ]; testDepends = [ filepath tasty tastyHunit temporaryRc ]; meta = { diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 196788059008..aad94da7c5e9 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 44efd6080022..2492f673441d 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index d4eb45eaa08a..8a5c1b5d7992 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, tagged, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index 65d0c73473ad..6893bccee425 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, optparseApplicative, reducers, split, stm, tagged , tasty, transformers }: diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index 40a30a6d24f5..5df9ad4ee410 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, smallcheck, tagged, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix index 883f25f94680..7c9bcbbce00d 100644 --- a/pkgs/development/libraries/haskell/tasty-th/default.nix +++ b/pkgs/development/libraries/haskell/tasty-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, languageHaskellExtract, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 1120413cb988..661bc739e90b 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,13 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative -, regexTdfa, stm, tagged, unboundedDelays +, regexTdfaRc, stm, tagged, unboundedDelays }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8.1.2"; - sha256 = "07pxnm9cx28vlfypa4psnnxcfx1i4qwimkf0nkfzqkhzqb85a58s"; + version = "0.8.1.3"; + sha256 = "0hc030ms89w3cl1k3r8nrym3g7sg2n66ch2ljg6d7fwhrsgxnagf"; buildDepends = [ - ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm + ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm tagged unboundedDelays ]; meta = { diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix index b223f6b36555..37d7fef05afe 100644 --- a/pkgs/development/libraries/haskell/tcache-AWS/default.nix +++ b/pkgs/development/libraries/haskell/tcache-AWS/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aws, conduit, httpConduit, network, TCache, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/template-default/default.nix b/pkgs/development/libraries/haskell/template-default/default.nix index a450b09b551f..3a7e3f05bdd2 100644 --- a/pkgs/development/libraries/haskell/template-default/default.nix +++ b/pkgs/development/libraries/haskell/template-default/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault }: cabal.mkDerivation (self: { @@ -5,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.1"; sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd"; buildDepends = [ dataDefault ]; + jailbreak = true; meta = { homepage = "https://github.com/haskell-pkg-janitors/template-default"; description = "declaring Default instances just got even easier"; diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix new file mode 100644 index 000000000000..f51ae4f0a3d1 --- /dev/null +++ b/pkgs/development/libraries/haskell/template/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "template"; + version = "0.2.0.9"; + sha256 = "0i1xq6nj240gddbd8d5m42gzix16k81wqmirpy5a4fssnkpwjqnb"; + buildDepends = [ mtl text ]; + meta = { + description = "Simple string substitution"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/temporary-rc/default.nix b/pkgs/development/libraries/haskell/temporary-rc/default.nix index 2f8cc9fad843..62931e168af9 100644 --- a/pkgs/development/libraries/haskell/temporary-rc/default.nix +++ b/pkgs/development/libraries/haskell/temporary-rc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index 4db5446bce0b..3845fe791989 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix index 3691615d0168..89cf249ecd40 100644 --- a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix +++ b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, HUnit, stm, stmChans, testFramework , testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix index d33bc7d43173..4387ceb423ea 100644 --- a/pkgs/development/libraries/haskell/terminal-size/default.nix +++ b/pkgs/development/libraries/haskell/terminal-size/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix index f772de7c8a1d..6f00bffc3934 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix +++ b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ncurses }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix index 2e8c76ae2e5b..d806680420dd 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix +++ b/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ncurses }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index 9efcff9a6d1e..a62d4cf115d4 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, HUnit, testFramework }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index cabc0fe1d0a4..a328edfab3ec 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, extensibleExceptions, QuickCheck, random , testFramework }: diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index a832664b28a8..70c2e0c36c9f 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, QuickCheck, random, testFramework }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix index 120425e8c017..5837ea46741e 100644 --- a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, smallcheck, testFramework, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix index 43791413a7f9..f53c68e5e7fb 100644 --- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs, haskellSrcExts, testFramework }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix index f70e522a2ce4..a90c3117cd4d 100644 --- a/pkgs/development/libraries/haskell/test-framework-th/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, languageHaskellExtract, regexPosix , testFramework }: diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 735666734e3b..4f204bb308de 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, ansiWlPprint, hostname, random, regexPosix , time, xml }: diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix index c0e463608808..e45d49fb5a87 100644 --- a/pkgs/development/libraries/haskell/testing-feat/default.nix +++ b/pkgs/development/libraries/haskell/testing-feat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, tagshare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 76963ae36c53..dac1add7cb96 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pandocTypes, parsec, syb, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text-format/default.nix b/pkgs/development/libraries/haskell/text-format/default.nix index b478fb7c515d..c1bc8c8bc8e2 100644 --- a/pkgs/development/libraries/haskell/text-format/default.nix +++ b/pkgs/development/libraries/haskell/text-format/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doubleConversion, text, time, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix index 222475b24bb9..4a7db1560ea7 100644 --- a/pkgs/development/libraries/haskell/text-icu/default.nix +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, icu, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix index 0530804d84b1..2f34dbb0b467 100644 --- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix +++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hspec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index 59644d057201..fbd0b62607f3 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 04fd250dfe9f..eab5417a0a62 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 03c2d90ff8da..52a935faa722 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index ab784807bfa2..8ab44a1372d3 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index afa0e7eb5d3d..ac7b4714fdc2 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix index 6bbab990b8a9..67f322e6990f 100644 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/text/0.11.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix index 0df511231c8f..d130219667da 100644 --- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix +++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix index 79e27f87fc69..4b123bc31643 100644 --- a/pkgs/development/libraries/haskell/tf-random/default.nix +++ b/pkgs/development/libraries/haskell/tf-random/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, primitive, random, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix index 5781e0f8655f..c6493736001d 100644 --- a/pkgs/development/libraries/haskell/th-desugar/default.nix +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, mtl, syb }: cabal.mkDerivation (self: { pname = "th-desugar"; - version = "1.4.1"; - sha256 = "1pjv301bshdmn3s5nrmmcx5d1b80c410lml73sai68dhx7v64vw2"; + version = "1.4.2"; + sha256 = "16l0khjx2wppnm9spp6mg659m95hxjkzfv3pjw5ays3z6clhx8b9"; buildDepends = [ mtl syb ]; testDepends = [ hspec HUnit mtl syb ]; meta = { diff --git a/pkgs/development/libraries/haskell/th-expand-syns/default.nix b/pkgs/development/libraries/haskell/th-expand-syns/default.nix index 9874fc6e13ae..5cb842ab3882 100644 --- a/pkgs/development/libraries/haskell/th-expand-syns/default.nix +++ b/pkgs/development/libraries/haskell/th-expand-syns/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index 3475ccb804a0..2bc598005f49 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix index 32354eabd4a6..0ecd9d70989a 100644 --- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, filepath, QuickCheck, text, thLift, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index 04c8b0bd51a0..9ca43633ead1 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9a8d22423a37..d93be541aee5 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, thLift }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/these/default.nix b/pkgs/development/libraries/haskell/these/default.nix index f41f8a4f3022..7b989c7ad387 100644 --- a/pkgs/development/libraries/haskell/these/default.nix +++ b/pkgs/development/libraries/haskell/these/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bifunctors, mtl, profunctors, semigroupoids, semigroups , transformers, vector }: diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix index aa848e4aa087..22861c4a9082 100644 --- a/pkgs/development/libraries/haskell/thespian/default.nix +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index e4a82835c55e..320b750cb330 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index 48b4ee2fb11a..96b6fbb172a4 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, concurrentExtra, HUnit, stm , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index ea655ab91c14..d31c43538d31 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsecEnumerator, dataDefault, deepseq , filepath, hashable, MonadCatchIOTransformers, network, safe , snapCore, snapServer, stm, text, time, transformers diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index c127116ffca3..b646fe4d1559 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl , profunctors, QuickCheck, random, systemPosixRedirect, text, time , vector, vectorSpace, vectorThUnbox @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.1"; - sha256 = "0v3aq7zv4fnkjhfc7mm6vx2wb5dh2npf2lsgpvcrdpy5zlfsrx50"; + version = "0.3.5.2"; + sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix index fa7c3ff41855..ed9da18c39ab 100644 --- a/pkgs/development/libraries/haskell/time-compat/default.nix +++ b/pkgs/development/libraries/haskell/time-compat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/time-recurrence/default.nix b/pkgs/development/libraries/haskell/time-recurrence/default.nix index 0e23f84ebfc2..8f0aa7111515 100644 --- a/pkgs/development/libraries/haskell/time-recurrence/default.nix +++ b/pkgs/development/libraries/haskell/time-recurrence/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataOrdlist, HUnit, mtl, testFramework, testFrameworkHunit , time }: diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix index 56072676b67b..b2fffb39cd3c 100644 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix index ff9818a387d6..ba986cf76abd 100644 --- a/pkgs/development/libraries/haskell/time/1.4.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, QuickCheck, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/timeparsers/default.nix b/pkgs/development/libraries/haskell/timeparsers/default.nix index 4920c0b3adbc..3259d706a68f 100644 --- a/pkgs/development/libraries/haskell/timeparsers/default.nix +++ b/pkgs/development/libraries/haskell/timeparsers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, convertible, mtl, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix index 24bd1c017aa1..aea0fe91208e 100644 --- a/pkgs/development/libraries/haskell/timerep/default.nix +++ b/pkgs/development/libraries/haskell/timerep/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index 6a0e81383f74..cfd4c7fa7f59 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, extensibleExceptions, time, timezoneSeries }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix index cb7e40243ffe..2092c176de76 100644 --- a/pkgs/development/libraries/haskell/timezone-series/default.nix +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 0fdcaf71d517..0d5c97433b2a 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, certificate, cipherAes, cipherRc4, cryptohash , cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector }: diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix index 0f354d8b77e5..747f2edfc43d 100644 --- a/pkgs/development/libraries/haskell/tls/1.1.5.nix +++ b/pkgs/development/libraries/haskell/tls/1.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey , cryptoRandom, mtl, network, QuickCheck, testFramework , testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/tls/1.2.8.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix index 8bba66b6c92e..5c1098be62f3 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.8.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.8.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes , cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash , cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index ea48a566dc0c..ec3f740b66e6 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix index 4647bbe2980b..6ee2a6a25afb 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix index dfe9e2ef0d65..b16522891c0a 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix index da05e122e529..929b41fdefe7 100644 --- a/pkgs/development/libraries/haskell/transformers-free/default.nix +++ b/pkgs/development/libraries/haskell/transformers-free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index 6d2e374687fc..941de0d077d4 100644 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix index ec1b85248d9c..8c994468dba7 100644 --- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix index dd3789e58022..85fee8ad79fb 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix index 12a6f393bc60..f36be260c550 100644 --- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix +++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tree-view/default.nix b/pkgs/development/libraries/haskell/tree-view/default.nix index 7ceefb815d8d..6c3adfdb9f46 100644 --- a/pkgs/development/libraries/haskell/tree-view/default.nix +++ b/pkgs/development/libraries/haskell/tree-view/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 09f3b112c1b7..192164c3189e 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml , blazeMarkup, charset, comonad, deepseq, doctest, filepath , fingertree, hashable, lens, mtl, parsers, reducers, semigroups diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index 90441f31867c..332e38305e7a 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, OneTuple }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 972633a93556..11ca4f491a88 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive , conduit, conduitExtra, dataDefault, doctest, filepath, hlint , hspec, httpClient, httpConduit, httpTypes, lens, monadControl @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.5.1"; - sha256 = "0wmr5124s6n0xdilzh2cd693ar2i0mwkgsik9ns1d34ibnvfibgv"; + version = "0.0.5.2"; + sha256 = "0kcdf440fy998qy232mg8k9i97lwvgwzzv990a07m4hj771pp3fh"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 6783993f7188..f87230271f13 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, httpTypes, HUnit, shakespeare , testFramework, testFrameworkHunit, testFrameworkThPrime, text , unorderedContainers diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix index 55bc6b03a95b..0a5de6fa9fcb 100644 --- a/pkgs/development/libraries/haskell/type-eq/default.nix +++ b/pkgs/development/libraries/haskell/type-eq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index ee90387b6370..2bcdc0e58972 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix index 62690186ee8f..7bc0c31b86dc 100644 --- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix +++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix index 95cd928a99e9..3de1fafd5821 100644 --- a/pkgs/development/libraries/haskell/tz/default.nix +++ b/pkgs/development/libraries/haskell/tz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bindingsPosix, deepseq, HUnit, pkgs_tzdata , QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, time, tzdata, vector @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "tz"; - version = "0.0.0.5"; - sha256 = "03s5vs08dj3r7rq78ncya6x6dazvr93gfylyynwybpai09l2y89v"; + version = "0.0.0.6"; + sha256 = "0yn2c016fzqwbgdrqp5hjn95gzp4w3gqjgax1w6wkg97bksdlq27"; buildDepends = [ binary deepseq time tzdata vector ]; testDepends = [ bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix index 10d4f87141d9..b149a59489ab 100644 --- a/pkgs/development/libraries/haskell/tzdata/default.nix +++ b/pkgs/development/libraries/haskell/tzdata/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filemanip, filepath, HUnit, MissingH, testFramework , testFrameworkHunit, testFrameworkTh, vector }: diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 761246b396c3..e8fc81254d11 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl, RepLib, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix index 78484a2a75ab..af3dd417a995 100644 --- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix index b50713d5291e..f17b08b3ab6f 100644 --- a/pkgs/development/libraries/haskell/union-find/default.nix +++ b/pkgs/development/libraries/haskell/union-find/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index ab9471bc3f28..17ab561e71de 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, syb, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix index 399ac02e3ce2..076601b1f85c 100644 --- a/pkgs/development/libraries/haskell/uniqueid/default.nix +++ b/pkgs/development/libraries/haskell/uniqueid/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix index a386257eaee3..6508cc7edb74 100644 --- a/pkgs/development/libraries/haskell/units/default.nix +++ b/pkgs/development/libraries/haskell/units/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, singletons }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix index 484ab6148a2a..4219611f9107 100644 --- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index a43da3b71948..8d1657b7f1ab 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix index d4c65ff0475a..caaf6c1bde5f 100644 --- a/pkgs/development/libraries/haskell/unix-memory/default.nix +++ b/pkgs/development/libraries/haskell/unix-memory/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 73343bf307bc..ff2104ff4398 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, filepath, hspec, stm, time, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index e329c1ef4067..43f3fe706290 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -1,11 +1,13 @@ -{ cabal, doctest, hspec, QuickCheck, time }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, doctest, hspec, QuickCheck, time }: cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.2.2"; - sha256 = "0xnl12mscc5nwjl9s2lx4xr8q8agzcpxh3bmxxidfjrg19drfwrm"; + version = "0.3.1"; + sha256 = "1r7glbcr3108zrlpy2d09jyk1gv9k90d5saajipmb1f5l45rdhnj"; + buildDepends = [ binary ]; testDepends = [ doctest hspec QuickCheck time ]; - configureFlags = self.stdenv.lib.optionalString self.enableSharedLibraries "--ghc-option=-fPIC"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index 474bb1a8b092..ea4c0f8cd635 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { @@ -7,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + hyperlinkSource = false; meta = { description = "Unlambda interpreter"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix index a8f1ae922ee1..ccbf8c25e2d2 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix index 80d4686fef3b..228e11ded3e9 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix new file mode 100644 index 000000000000..70f00b68d422 --- /dev/null +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "unordered-containers"; + version = "0.2.5.0"; + sha256 = "0y85a9zg77h05c5ajchvfazg84ksvyi92r6bbmh09qzlf7mlb4bj"; + buildDepends = [ deepseq hashable ]; + testDepends = [ + ChasingBottoms hashable HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix index aa94c931e541..11276f2bc4ae 100644 --- a/pkgs/development/libraries/haskell/uri/default.nix +++ b/pkgs/development/libraries/haskell/uri/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec, safe, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix index 5353895815d9..c71e39768ac3 100644 --- a/pkgs/development/libraries/haskell/url/default.nix +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index 05bd2ab09bbd..74ae443f8a6c 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, split }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix index a023a682a921..5f57d42a2b6a 100644 --- a/pkgs/development/libraries/haskell/usb/default.nix +++ b/pkgs/development/libraries/haskell/usb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsLibusb, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index 1c2e1f5c116b..85c87a670231 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index 1233ce8806d3..405dbecb6ba4 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 3a407cc4b59f..ee5e8de92b1e 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uu-interleaved/default.nix b/pkgs/development/libraries/haskell/uu-interleaved/default.nix index a71111282fad..63873ab18c5f 100644 --- a/pkgs/development/libraries/haskell/uu-interleaved/default.nix +++ b/pkgs/development/libraries/haskell/uu-interleaved/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uu-options/default.nix b/pkgs/development/libraries/haskell/uu-options/default.nix index 651cd9fe450a..e20058de46d7 100644 --- a/pkgs/development/libraries/haskell/uu-options/default.nix +++ b/pkgs/development/libraries/haskell/uu-options/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lenses, mtl, transformers, uuInterleaved, uuParsinglib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 2a115b8b217e..9b601102d8a7 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ListLike, time, uuInterleaved }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index a38a108bc033..eb36f5555aee 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptohash, deepseq, hashable, HUnit, networkInfo , QuickCheck, random, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 0f7ec86e2461..ed92081d6cc4 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index 5ab1d4f85464..b3579d341587 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo, vacuum }: diff --git a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix index 2db9e3c83c12..9c719605537b 100644 --- a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, graphviz, vacuum }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index fa37f089348d..d9df682143fe 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ghcPaths }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix index 45e9524657a9..6c6860935024 100644 --- a/pkgs/development/libraries/haskell/vado/default.nix +++ b/pkgs/development/libraries/haskell/vado/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, filepath, QuickCheck, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 8786838ab3db..4fad4a003637 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix index 64402ea84643..804ee0191f30 100644 --- a/pkgs/development/libraries/haskell/vcs-revision/default.nix +++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index b639527520b9..0a8d8a4caada 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, gtk3, mtl, vcswrapper }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index d23620d9d680..75336ef88169 100644 --- a/pkgs/development/libraries/haskell/vcswrapper/default.nix +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hxt, mtl, parsec, split, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix index 2d81a0131766..00ee6dacb9e4 100644 --- a/pkgs/development/libraries/haskell/vect/default.nix +++ b/pkgs/development/libraries/haskell/vect/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 74b098a3a7f1..00258e7f3f61 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, mwcRandom, primitive, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.6.0.1"; - sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5"; + version = "0.6.0.2"; + sha256 = "1gn2pvgvm9g0dajx2wv305fxwhkpdj9pybrwrm3j2frl4dnj7dcq"; isLibrary = true; isExecutable = true; buildDepends = [ mtl mwcRandom primitive vector ]; diff --git a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix index 62d1c0506ed3..1ef75f14a778 100644 --- a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix +++ b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-instances/default.nix b/pkgs/development/libraries/haskell/vector-instances/default.nix index c6ff62f86cdd..c39dc6c371b9 100644 --- a/pkgs/development/libraries/haskell/vector-instances/default.nix +++ b/pkgs/development/libraries/haskell/vector-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, keys, pointed, semigroupoids, semigroups, vector }: diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index ca9218bf42c0..e7eb15d6556d 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, vectorSpace }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 8badc0d9c510..5eb4ed5ff2ab 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Boolean, MemoTrie, NumInstances }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix index b9da8408c550..8fdb0f1b2543 100644 --- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix +++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix index 7acc89d6a91c..8951bf64fe28 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix index 1b8cb381f0bc..05ac573abb2d 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix index b9a7df50ba6e..0ccaec71a86b 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index bac5d880ba32..b0c57672e0d6 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, lens, singletons }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 39cdcd8407f4..a14775aaeb85 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 032726d978d6..e8775c7d112c 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text , time, vector, vty }: diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix index 8a8ed40adb44..36b6b78f65c0 100644 --- a/pkgs/development/libraries/haskell/vty/4.7.5.nix +++ b/pkgs/development/libraries/haskell/vty/4.7.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random , stringQq, terminfo, utf8String, vector }: diff --git a/pkgs/development/libraries/haskell/vty/5.1.0.nix b/pkgs/development/libraries/haskell/vty/5.1.1.nix similarity index 87% rename from pkgs/development/libraries/haskell/vty/5.1.0.nix rename to pkgs/development/libraries/haskell/vty/5.1.1.nix index b04f7ff33eda..708eb9581c61 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.0.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, Cabal, dataDefault, deepseq, filepath , hashable, HUnit, lens, mtl, parallel, parsec, QuickCheck , quickcheckAssertions, random, smallcheck, stringQq, terminfo @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.0"; - sha256 = "0cq9y802z9wq69yw1yy916xsz6j7v8208k5mxixp41375cdm141x"; + version = "5.1.1"; + sha256 = "043vrazb8w6ljq14i390cwcmavgmbnjbs6sl6w0yx8cwb4f7djr5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 093fbb76f84d..d22e57c576ad 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup , byteable, cryptohash, cryptohashConduit, fileEmbed, filepath , hspec, httpDate, httpTypes, mimeTypes, network diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix index 10517e13d9c5..6174784a134e 100644 --- a/pkgs/development/libraries/haskell/wai-conduit/default.nix +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, httpTypes, transformers, wai }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 45d4177305ab..76094cd0c0e9 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, base64Bytestring, blazeBuilder , caseInsensitive, dataDefault, dataDefaultClass, deepseq , fastLogger, hspec, httpTypes, HUnit, liftedBase, network @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.0.1"; - sha256 = "0i28d3pwz2fskg94xlkapdw07zkq3acnqk21kpgm5ffbj6qvbvsg"; + version = "3.0.1"; + sha256 = "1k6d9p93r7r95i5yi7mvhix94qigkzanqjq5qa6k7qfpnjj727id"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix index 7ecc3a347585..7e457ac30146 100644 --- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fcgi, wai, waiExtra }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index d103b54ec6dc..e37df498ac8c 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, httpTypes, streamingCommons, transformers , wai, warp }: diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 35b044bdfb48..b7c62845cb97 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, byteorder, caseInsensitive, doctest , fastLogger, httpTypes, network, unixTime, wai, waiTest }: diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 9ca7992db686..4c89a25dae83 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, httpTypes, mtl, text, wai }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 5d1cecc2e508..8e08180b9e17 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, wai }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index d0973881657f..cb88d7ab6e69 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes , ioStreams, network, text, transformers, wai, waiAppStatic, warp , websockets diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 887b004b93ab..4a67a8001096 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, hspec, httpTypes, network, text, vault }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index ca20fe2d6bfc..4eca4c8c1920 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cprngAes, dataDefaultClass, network, streamingCommons, tls , wai, warp }: diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0ccbcfceb39b..3065c52c0f9f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, blazeBuilder, caseInsensitive, doctest, hashable , hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase, network , QuickCheck, simpleSendfile, streamingCommons, text, time @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.0.3"; - sha256 = "0lhmhgbza49lkbay6ydj5h1g04qzs4jx2wyq4bhddjrpmxsdsy2y"; + version = "3.0.0.4"; + sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v"; buildDepends = [ blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix index 0307642f62ba..a3285791b6c1 100644 --- a/pkgs/development/libraries/haskell/wcwidth/default.nix +++ b/pkgs/development/libraries/haskell/wcwidth/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, setlocale, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index ab89944d60fa..110ee086c9be 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boomerang, mtl, parsec, text, webRoutes }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 3cc7869a2914..4eb4445d54d3 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck , split, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, text, utf8String diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix index d5adf04f1dad..fd01f1c75e6b 100644 --- a/pkgs/development/libraries/haskell/webdriver/default.nix +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault , directoryTree, exceptions, filepath, HTTP, liftedBase , monadControl, mtl, network, parallel, scientific, temporary, text diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix index dfb4e3a110f1..29fcc454112c 100644 --- a/pkgs/development/libraries/haskell/websockets-snap/default.nix +++ b/pkgs/development/libraries/haskell/websockets-snap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, enumerator, ioStreams, mtl, snapCore , snapServer, websockets }: diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 37241a8f1f8f..782b3bdfc757 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base64Bytestring, binary, blazeBuilder , caseInsensitive, entropy, HUnit, ioStreams, mtl, network , QuickCheck, random, SHA, testFramework, testFrameworkHunit @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.2.5"; - sha256 = "1d8r9mrkwvac05gblxrnxdnnyqqidjcfv5j3njbb9dgzdj56gb1y"; + version = "0.8.2.6"; + sha256 = "074d0wkxy2qyi8w9cjgbalqi8b21wf5ak71lcnh94iw76dfxbizf"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix index 08c88138101b..ce1dd5796973 100644 --- a/pkgs/development/libraries/haskell/wizards/default.nix +++ b/pkgs/development/libraries/haskell/wizards/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, controlMonadFree, haskeline, mtl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index dd32750ffe91..ac8d69ebd3f9 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, nats, semigroupoids, semigroups, testFramework , testFrameworkHunit, text, utf8String }: diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 9bb8e57172db..5a3c75f61657 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, nats, semigroups, terminfo, text, transformers , wlPprintExtras }: diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index e951163fc8a0..cb2d02d43dd4 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix index 9849d4fab0e5..a0ee669395d2 100644 --- a/pkgs/development/libraries/haskell/wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index 535f4103d126..7ffbbf7cba7e 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec }: cabal.mkDerivation (self: { pname = "word8"; - version = "0.0.4"; - sha256 = "1jrys2crl1yfkgwc4ny6x1kr24kx8j3zsy0zql5ms19rfb0rnkki"; + version = "0.1.0"; + sha256 = "1729ip83wyw8w3v8mzmazaw5b9l81zg95hrkmfq3qjk5gz1s75s0"; testDepends = [ hspec ]; meta = { description = "Word8 library"; diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 30fa943d085e..8e95e3c8238f 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, doctest, exceptions, filepath , httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes , temporary, testFramework, testFrameworkHunit, text, time diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 90bfdc5ca0a3..c10897b4b11c 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, wxcore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index b816c3007f99..4026a892f6ed 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa, wxdirect, wxGTK }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index d404099bf53f..8fc4df1a0ce1 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect , wxGTK }: diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index b369fe407dad..1362b423753b 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, parsec, strict, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix index 100b5ca28356..9b060630edb7 100644 --- a/pkgs/development/libraries/haskell/x509-store/default.nix +++ b/pkgs/development/libraries/haskell/x509-store/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl , pem, time, x509 }: diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix index c54677222943..b36b8c9cdfbb 100644 --- a/pkgs/development/libraries/haskell/x509-system/default.nix +++ b/pkgs/development/libraries/haskell/x509-system/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, pem, time, x509, x509Store }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix index 27f5d6ecbbe0..32176c8f4b8f 100644 --- a/pkgs/development/libraries/haskell/x509-validation/default.nix +++ b/pkgs/development/libraries/haskell/x509-validation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, byteable, cryptohash , cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl , network, pem, time, x509, x509Store diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index d8fd7030f14f..4c8eb53c9956 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash , cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix index 3a12faf07c9e..bc92d97b1ca5 100644 --- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix +++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 78a9d921ff6c..6080afac5d56 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, graphviz, gtk, mtl, polyparse, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix index 605339d0811f..d828ba1a57c9 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index 3a72cb8fba0b..134c423eca1d 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix index 05e13b4a7b33..2b375904ed05 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix index 66196c806acc..45304858b15c 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 4f3e7fcebb7a..f46361a14514 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit , conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.0.2"; - sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z"; + version = "1.2.0.3"; + sha256 = "0bb4nc9nwq4z6vdsiqs0zk8k8yvmyxdrya5fz2h8z8ng66xaq4k1"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 16e4abfa2cdb..e1c0c8620784 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, parsec, shakespeare, text, xmlConduit }: cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.8"; - sha256 = "10hc4a6lqifiinm9rf1ziw35bjnjgkd5mhagg9anvz35hhr7bbrr"; + version = "0.4.0.9"; + sha256 = "0vm4jhvjf53a33sisnhghg0m9pcv2fx676rl90vbm2xcd9rqlj82"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix index 7c4496f974f4..fd9609ec25f7 100644 --- a/pkgs/development/libraries/haskell/xml-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, text, xmlConduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index 94a7d3f7dfff..e9cfd5e6b28e 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 072e5d8bc1cc..3081f085509c 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix index c466ddb1d55c..9f4b08d5bbcf 100644 --- a/pkgs/development/libraries/haskell/xmlgen/default.nix +++ b/pkgs/development/libraries/haskell/xmlgen/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, filepath, HUnit, hxt, mtl, QuickCheck, text }: diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index 659da9c8baac..794808eed0d0 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text , unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix index d874543a967a..68f10cc566b6 100644 --- a/pkgs/development/libraries/haskell/xournal-parser/default.nix +++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix @@ -1,17 +1,19 @@ -{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict -, text, transformers, xmlConduit, xmlTypes, xournalTypes -, zlibConduit +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, attoparsecConduit, conduit, conduitExtra +, exceptions, lens, mtl, strict, text, transformers, xmlConduit +, xmlTypes, xournalTypes, zlibConduit }: cabal.mkDerivation (self: { pname = "xournal-parser"; - version = "0.5.0.2"; - sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin"; + version = "0.5.0.3"; + sha256 = "1r99xv7w2gxms1ff5qpj36dcb3gb5lpccr1mjjdnkcij81i748ly"; buildDepends = [ - attoparsec attoparsecConduit conduit lens mtl strict text - transformers xmlConduit xmlTypes xournalTypes zlibConduit + attoparsec attoparsecConduit conduit conduitExtra exceptions lens + mtl strict text transformers xmlConduit xmlTypes xournalTypes + zlibConduit ]; - jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Xournal file parser"; diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix index 2281520703f2..7d6eb7e6efb7 100644 --- a/pkgs/development/libraries/haskell/xournal-types/default.nix +++ b/pkgs/development/libraries/haskell/xournal-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, lens, strict, TypeCompose }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 31f7a06c1fe2..4c48eeeb0620 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, cssText, hspec, HUnit, network, tagsoup, text , utf8String }: diff --git a/pkgs/development/libraries/haskell/xtest/default.nix b/pkgs/development/libraries/haskell/xtest/default.nix index d9ce47647cad..dd381439d678 100644 --- a/pkgs/development/libraries/haskell/xtest/default.nix +++ b/pkgs/development/libraries/haskell/xtest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libXtst, X11 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yaml-light/default.nix b/pkgs/development/libraries/haskell/yaml-light/default.nix index 7999075f89e9..26e698b1dbfe 100644 --- a/pkgs/development/libraries/haskell/yaml-light/default.nix +++ b/pkgs/development/libraries/haskell/yaml-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HsSyck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 502a11e81251..92e44ae92b6e 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet , scientific, text, transformers, unorderedContainers, vector }: diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index e21948de9748..c7eb1f180e48 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ae3c3cd8a008..b439d24afe6c 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsecConduit, authenticate, base16Bytestring , base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup , byteable, conduit, conduitExtra, cryptohash, dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 30a75724e0ec..4e02a157e342 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit , conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 45bcf97f942f..96995f24d31d 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml , blazeMarkup, caseInsensitive, cereal, clientsession, conduit , conduitExtra, cookie, dataDefault, deepseq, exceptions diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 58ea0b10a22f..578ec4f58a16 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, yesodCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 0c045be968a8..26f0735f723d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , byteable, dataDefault, emailValidate, hamlet, hspec, network , persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 780444bd8616..53c5d2c7e859 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, yesodCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index f5189caa46fb..ce13f78b31b4 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite , persistentTemplate, resourcePool, resourcet, text, transformers , waiExtra, waiTest, yesodCore diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index d13372484152..f537a119a455 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, pathPieces, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index d5a0c1c4c7d4..7b118711cced 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, attoparsec, base64Bytestring, blazeBuilder , byteable, conduit, conduitExtra, cryptohash, cryptohashConduit , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index d1a3b6ab63e9..41f8f694ca15 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, text, time, transformers, wai diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 8e3873df2ae6..d43100901cce 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,20 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault , fastLogger, hamlet, monadControl, monadLogger, networkConduit -, safe, shakespeare, shakespeareCss, shakespeareJs, text -, transformers, unorderedContainers, wai, waiExtra, warp, yaml -, yesodAuth, yesodCore, yesodForm, yesodPersistent +, safe, shakespeare, shakespeareCss, shakespeareJs +, streamingCommons, text, transformers, unorderedContainers, wai +, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.6"; - sha256 = "0rw46zznczdzg2wvbgp5kpq3yrl6w40vbbs7zyvqpcf6m82jsfz0"; + version = "1.2.6.1"; + sha256 = "1xiqpbcjxisc4lic7ls03rz184d95vkh4kb3ampwbx463qbj9im2"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger hamlet monadControl monadLogger networkConduit safe shakespeare - shakespeareCss shakespeareJs text transformers unorderedContainers - wai waiExtra warp yaml yesodAuth yesodCore yesodForm - yesodPersistent + shakespeareCss shakespeareJs streamingCommons text transformers + unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore + yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 8b381bd214e4..9597861c6fe7 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate , pandoc, parsec, scientific, split, text, time , unorderedContainers, xhtml, yaml diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index 20d414ac6b14..c7be4e280dc1 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 , zeromq }: diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 820f174e1295..f4449cdc8563 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers , QuickCheck, semigroups, transformers, zeromq }: diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix index abe8cd3430c2..0e2cf67a19f9 100644 --- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, exceptions, QuickCheck, semigroups, tasty , tastyHunit, tastyQuickcheck, transformers, zeromq }: diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix index 44a14259b40b..422d81e6707d 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix index f1a36feda904..20795a15a987 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 5ff1da422efa..4c31b2c2d01c 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, multirec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zippers/default.nix b/pkgs/development/libraries/haskell/zippers/default.nix new file mode 100644 index 000000000000..939de519fb10 --- /dev/null +++ b/pkgs/development/libraries/haskell/zippers/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, filepath, lens, profunctors, semigroupoids }: + +cabal.mkDerivation (self: { + pname = "zippers"; + version = "0.2"; + sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls"; + buildDepends = [ lens profunctors semigroupoids ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/ekmett/zippers/"; + description = "Traversal based zippers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index ba4751af2fe3..9dd91fa1f72c 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 3029cc8c3b61..596dbdfb21ea 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 7dc700b3532f..928511be957f 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, enumerator, transformers, zlibBindings }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix index 28f109e8c364..6e44732abec2 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index 6a917af1fe7a..190c2b0cc725 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix index f13b9f7b1d48..73e6e42f7015 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index bba9e1a13fe4..8902e9f75e39 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix index abeed295e035..cabb6875a0d5 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix index c1fa7d78d0a9..90c693376b9b 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix new file mode 100644 index 000000000000..75704848f7f3 --- /dev/null +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk +, gtk_doc, gtk3, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "keybinder3-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "engla"; + repo = "keybinder"; + rev = "keybinder-3.0-v${version}"; + sha256 = "1jdcrfhvqffhc2h69197wkpc5j5synk5mm8rqhz27qfrfhh4vf0q"; + }; + + buildInputs = [ + autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc + libX11 libXext libXrender gobjectIntrospection gtk3 + ]; + + preConfigure = '' + ./autogen.sh --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "Library for registering global key bindings"; + homepage = https://github.com/engla/keybinder/; + license = licenses.mit; + platform = platforms.linux; + maintainers = [ maintainers.cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 97dda155dc19..f1f1c7dd9092 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: stdenv.mkDerivation rec { - name = "lensfun-0.2.7"; + name = "lensfun-0.2.8"; src = fetchurl { url = "mirror://sourceforge/lensfun/${name}.tar.bz2"; - sha256 = "0xv4h219zn0ldhhjnjc1q2bgpbfqzpd4b31gf9yyrwbapm3hgprx"; + sha256 = "0j0smagnksdm9gjnk13w200hjxshmxf2kvyxxnra4nc2qzxrg3zq"; }; patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix new file mode 100644 index 000000000000..036c918b32db --- /dev/null +++ b/pkgs/development/libraries/libcredis/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libcredis-0.2.3"; + + src = fetchurl { + url = "https://credis.googlecode.com/files/credis-0.2.3.tar.gz"; + sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; + }; + + # credis build system has no install actions, provide our own. + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + mkdir -p "$out/include" + + cp -v credis-test "$out/bin/" + cp -v *.a *.so "$out/lib/" + cp -v *.h "$out/include/" + ''; + + meta = with stdenv.lib; { + description = "C client library for Redis (key-value database)"; + homepage = https://code.google.com/p/credis/; + license = licenses.bsd3; # from homepage + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix new file mode 100644 index 000000000000..3ebfb5d8cfcf --- /dev/null +++ b/pkgs/development/libraries/libivykis/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: + +stdenv.mkDerivation rec { + name = "libivykis-${version}"; + + version = "0.39"; + + src = fetchurl { + url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; + sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; + + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = '' + A thin wrapper over various OS'es implementation of I/O readiness + notification facilities + ''; + license = licenses.zlib; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix new file mode 100644 index 000000000000..7a754a28e3d1 --- /dev/null +++ b/pkgs/development/libraries/liblogging/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, systemd }: + +stdenv.mkDerivation rec { + name = "liblogging-1.0.4"; + + src = fetchurl { + url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; + sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc"; + }; + + buildInputs = [ pkgconfig systemd ]; + + meta = { + description = "Lightweight signal-safe logging library"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index ebd0d08717de..16196c9abc93 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -8,11 +8,17 @@ stdenv.mkDerivation rec { sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; + # Fix linking against libpthread (patch from Fedora) + # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 + # https://bugs.launchpad.net/libmemcached/+bug/1281907 + patches = [ ./libmemcached-fix-linking-with-libpthread.patch ]; + buildInputs = [ cyrus_sasl libevent ]; - meta = { + meta = with stdenv.lib; { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; - license = "BSD"; + license = licenses.bsd3; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch new file mode 100644 index 000000000000..e5e21c433587 --- /dev/null +++ b/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch @@ -0,0 +1,19 @@ +diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh +--- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100 ++++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 +@@ -5664,6 +5664,15 @@ func_mode_link () + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; + diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix new file mode 100644 index 000000000000..9ad2498dfa0f --- /dev/null +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, libtool, libmad }: + +stdenv.mkDerivation rec { + name = "libmp3splt-0.9.1"; + + src = fetchurl { + url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz"; + sha256 = "17ar9d669cnirkz1kdrim687wzi36y8inapnj4svlsvr00vdzfxa"; + }; + + buildInputs = [ libtool libmad ]; + + configureFlags = "--disable-pcre"; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/mp3splt/; + description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; + maintainers = with maintainers; [ bosu ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix new file mode 100644 index 000000000000..0eb735900b33 --- /dev/null +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup +, libxslt, check, vala ? null +}: + +stdenv.mkDerivation rec { + name = "libosinfo-0.2.10"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; + sha256 = "564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d"; + }; + + buildInputs = [ + pkgconfig intltool gobjectIntrospection libsoup libxslt check vala + ]; + + meta = with stdenv.lib; { + description = "Info about OSs, hypervisors and (virtual) hardware devices"; + homepage = http://libosinfo.org/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 18f57473fb91..d69276a070bb 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2 -, libICE, glib, libxkbfile, isocodes, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg +, glib, isocodes, gobjectIntrospection }: let version = "5.3"; @@ -13,18 +13,22 @@ stdenv.mkDerivation rec { }; # TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; + propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gobjectIntrospection ]; - configureFlags = '' - --with-xkb-base=${xkeyboard_config}/etc/X11/xkb - --disable-xmodmap-support - ''; + configureFlags = [ + "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" + "--with-xkb-bin-base=${xorg.xkbcomp}/bin" + "--disable-xmodmap-support" + ]; - meta = { + meta = with stdenv.lib; { + description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = http://freedesktop.org/wiki/Software/LibXklavier; + license = licenses.lgpl2Plus; }; } + diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index b235c746e1a0..7e3ee3e9adc7 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -4,8 +4,12 @@ assert pythonSupport -> python != null; #TODO: share most stuff between python and non-python builds, perhaps via multiple-output +let + version = "2.9.1"; +in + stdenv.mkDerivation (rec { - name = "libxml2-2.9.1"; + name = "libxml2-${version}"; src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; @@ -22,7 +26,7 @@ stdenv.mkDerivation (rec { setupHook = ./setup-hook.sh; - passthru = { inherit pythonSupport; }; + passthru = { inherit pythonSupport version; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 159b8e6e8386..17f9c973fd0b 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,9 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "szip-2.1"; - src = fetchurl { - url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; - sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; - }; + name = "szip-2.1"; + src = fetchurl { + url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; + sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; + }; + + meta = { + description = " + Szip is a compression library that can be used with the hdf5 library. + "; + homepage = http://www.hdfgroup.org/doc_resource/SZIP/; + license = stdenv.lib.licenses.unfree; + }; } diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 1e32cce9c722..6f6d5f3d9f6b 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else - ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''} + ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''} '' else if target == "iphone" then '' diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 18b76bc3bbdf..463a773537c2 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -29,7 +29,8 @@ rec { titaniumsdk = let titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix - else if tiVersion == "3.2.2.GA" then ./titaniumsdk-3.2.nix + else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix + else if tiVersion == "3.3.0.RC2" then ./titaniumsdk-3.3.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 556b96975b4e..e5b439364535 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,7 +1,7 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "5.0" -, tiVersion ? "3.2.2.GA" +, tiVersion ? "3.2.3.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 95dd09be30dc..1725c826a52a 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,4 +1,4 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], tiVersion ? "3.2.1.GA", release ? false +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null }: @@ -7,8 +7,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; - rev = "0b8175f20f0aa71f93921025dec5d0f3299960ae"; - sha256 = "0b2p4wbnlp46wpanqj5h3yfb2hdbh20nxbis8zscj4qlgrnyjdjz"; + rev = "37d766ef9cba6a2d0b22634d3edc1fa8402109a0"; + sha256 = "1d4x9zwq92p1krds52bd41qqsnsnb3a7x74bysbiphrvrphz80kk"; }; # Rename the bundle id to something else diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix index 1f0d53e99fe5..2ac4040714b0 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-3.2.2.v20140305122111"; + name = "mobilesdk-3.2.3.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-linux.zip; - sha1 = "12dc1bfe8dd73db0650a235492f5f50c7b816d69"; + url = http://builds.appcelerator.com/mobile/3.2.3/mobilesdk-3.2.3.GA-linux.zip; + sha1 = "303e6d19a0ca099d47f6862c00b261c6d0206cea"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-osx.zip; - sha1 = "9875b59faf0ab92e8996b58476466405ed60f6e2"; + url = http://builds.appcelerator.com/mobile/3.2.3/mobilesdk-3.2.3.GA-osx.zip; + sha1 = "8c358cbd8624ffe3dfbd0283738105157067e0fb"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -28,8 +28,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - mv 3.2.2.v20140305122111 3.2.2.GA - cd 3.2.2.GA + cd 3.2.3.GA # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that # Yes, I know it's nasty :-) diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix new file mode 100644 index 000000000000..641d83bb4658 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix @@ -0,0 +1,77 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.3.0.RC2"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.RC2-linux.zip; + sha1 = "ad4d0003b81ffc5947c1961548ad4b8591aaec5b"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.RC2-osx.zip; + sha1 = "621080fdd48801bfec7113fef1f224caabf0d4dd"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Rename ugly version number + cd mobilesdk/* + cd 3.3.0.RC2 + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixtiprofiler.sed} builder.py + sed -i -f ${./fixso.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py < import System.Exit|> import System.Exit ( exitWith, ExitCode(..) )|' src/Main.lhs - ''; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.11.nix b/pkgs/development/tools/parsing/happy/1.19.4.nix similarity index 73% rename from pkgs/development/tools/parsing/happy/1.18.11.nix rename to pkgs/development/tools/parsing/happy/1.19.4.nix index 41f6d5c49a4b..e7cd358fb827 100644 --- a/pkgs/development/tools/parsing/happy/1.18.11.nix +++ b/pkgs/development/tools/parsing/happy/1.19.4.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; - version = "1.18.11"; - sha256 = "1hssiihzl7xipmn5bz71q30wbq2sj92lh2f7z4jarckhldwcqfi9"; + version = "1.19.4"; + sha256 = "0vcklr1y6yjf8z4wip4al2zw4qlfxcahbdxwpf6c9y31dkv9kr3b"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix new file mode 100644 index 000000000000..7ac4f6d39b7d --- /dev/null +++ b/pkgs/development/tools/quilt/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgs}: + +with pkgs; + +stdenv.mkDerivation rec { + name = "quilt-0.63"; + + src = fetchurl { + url = "mirror://savannah/quilt/${name}.tar.gz"; + sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52"; + }; + + buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; + + postInstall = '' + wrapProgram $out/bin/quilt --prefix PATH : \ + ${perl}/bin:${bash}/bin:${diffstat}/bin:${diffutils}/bin:${findutils}/bin:${patch}/bin + ''; + + meta = { + homepage = http://savannah.nongnu.org/projects/quilt; + description = "Easily manage large numbers of patches"; + + longDescription = '' + Quilt allows you to easily manage large numbers of + patches by keeping track of the changes each patch + makes. Patches can be applied, un-applied, refreshed, + and more. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix new file mode 100644 index 000000000000..90e31349e4f6 --- /dev/null +++ b/pkgs/development/tools/watchman/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre +, confFile ? config.watchman.confFile or null +}: + +stdenv.mkDerivation rec { + name = "watchman-${version}"; + + version = "2.9.8"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "watchman"; + rev = "v${version}"; + sha256 = "196d71ci7ki4p6xx49w55cqd0bqrx19nf79na3a91mrfa6f22sp6"; + }; + + buildInputs = [ autoconf automake pcre ]; + + configureFlags = [ + "--enable-conffile=${if confFile == null then "no" else confFile}" + "--with-pcre=yes" + ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with lib; { + description = "Watches files and takes action when they change"; + homepage = https://facebook.github.io/watchman; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux ++ darwin; + license = licenses.asl20; + }; +} diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 93277eb15a27..c52ce057df24 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, assertFailure, binary, deepseq, enummapsetTh, filepath , gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random , stm, text, transformers, unorderedContainers, vector diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index a162f8b853ac..1aab4ac0208f 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -11,5 +11,9 @@ export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" -@shell@ +if test $# -gt 0; then + exec "$@" +else + exec @shell@ +fi diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 3bf2e316deac..7afe895cb5c5 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk -, libxml2, libglade +, libxml2, libglade, intltool }: stdenv.mkDerivation rec { - version = "5.26"; + version = "5.29"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "0m8v9zxl1pyqndqqinhsvpc8s3byg397vy6i4ihkjiqrw5kdr91c"; + sha256 = "157jy1mh84h6p4mpzsgcadv6c660c212rmjgdpgpidcn0rsza664"; }; buildInputs = [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc + libXxf86misc intltool ]; patchPhase = diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 976e4dc687f3..d316d3a3cd3c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -88,8 +88,8 @@ let vimHelpTags = '' inherit buildPhase; installPhase = '' - target=$out/vim-plugins/$path - ensureDir $out/vim-plugins + target=$out/share/vim-plugins/${path} + ensureDir $out/share/vim-plugins cp -r . $target ${vimHelpTags} vimHelpTags $target @@ -114,14 +114,14 @@ in rec rev = "abfc3ee36adab11c0c0b9d086a164a69006fec79"; sha256 = "1d25dp5kgqickl06hqvx4j3z51zblhsn3q3by2hayyj3g2zps4gm"; }; - + name = "youcompleteme-git-abfc3ee"; buildInputs = [ python cmake clang.clang ]; configurePhase = ":"; buildPhase = '' - target=$out/vim-plugins/YouCompleteMe + target=$out/share/vim-plugins/YouCompleteMe mkdir -p $target cp -a ./ $target @@ -311,7 +311,7 @@ in rec preBuild = '' sed -ie '1 i\ - set runtimepath+=${vimproc}/vim-plugins/vimproc\ + set runtimepath+=${vimproc}/share/vim-plugins/vimproc\ ' autoload/vimshell.vim ''; @@ -346,4 +346,69 @@ in rec path = "vimproc"; }; + + colorsamplerpack = simpleDerivation rec { + version = "2012.10.28"; + name = "vim-colorsamplerpack-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; + name = "colorsamplerpack.zip"; + sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + }; + + buildInputs = [ unzip ]; + + path = "colorsamplerpack"; + }; + + yankring = simpleDerivation rec { + version = "18.0"; + name = "vim-yankring-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; + name = "yankring_180.zip"; + sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + }; + + buildInputs = [ unzip ]; + + path = "yankring"; + }; + + ctrlp = simpleDerivation rec { + version = "1.79"; + name = "vim-ctrlp-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=19448"; + name = "ctrlp_180.zip"; + sha256 = "1x9im8g0g27mxc3c9k7v0jg5bb1dmnbjygmqif5bizab5g69n2mi"; + }; + + buildInputs = [ unzip ]; + + path = "ctrlp"; + }; + + alternate = stdenv.mkDerivation rec { + version = "2.18"; + name = "vim-a-${version}"; + + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=7218"; + name = "a.vim"; + sha256 = "1q22vfkv60sshp9yj3mmfc8azavgzz7rpmaf72iznzq4wccy6gac"; + }; + unpackPhase = ":"; + installPhase = '' + ensureDir $out/share/vim-plugins/vim-a + cp ${src} $out/share/vim-plugins/vim-a/a.vim + ''; + }; + } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 3e95daba29e3..92b97ffb592e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; + NIX_LDFLAGS = "-lgcc_s"; + buildInputs = [ pkgconfig glib ncurses ] ++ optional luaSupport lua5 ++ optional wireless wirelesstools diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 7e7dd2dfda9d..a4b2c221b81a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -157,6 +157,13 @@ with stdenv.lib; BTRFS_FS_POSIX_ACL y UBIFS_FS_XATTR? y UBIFS_FS_ADVANCED_COMPR? y + ${optionalString (versionAtLeast version "3.6") '' + NFS_SWAP y + ''} + ${optionalString (versionAtLeast version "3.11") '' + NFS_V4_1 y # NFSv4.1 client support + NFS_V4_2 y + ''} NFSD_V2_ACL y NFSD_V3 y NFSD_V3_ACL y diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 6ee5345f498c..9f8c73f6ea7f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.45"; + version = "3.10.48"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0bsmqszc86d33g6qpwgrdckgrd1x37087br3vsc5151s2p22rk1f"; + sha256 = "14gz998vr9jb9blbk60phq3hwnl2yipd6fykkl5bd8gai5wph2l3"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 7d5ff606eb98..de73ef265167 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.23"; + version = "3.12.24"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0aa9vnyk4p6hg4fp4rm4a95cn4p16j2dfrhc3cfznpcdkpi5q9m7"; + sha256 = "01y9sz90d4l12m3f7gjmnasck85c2dqx74hwyccw5jk04r5pm2mx"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 9068fba12b00..f252080bbacc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.10"; + version = "3.14.12"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "10gf1r3xnix4v2az7i9dxnddmi377hhlbyblgm0nz9sxddgmk36z"; + sha256 = "1pzshv7cj87v5na7paqka9v8mbqn04q25r241fha56sm7ilxbnap"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 829bb55b76ff..9fa77a7a38ef 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15.3"; + version = "3.15.5"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0i8dmx1yiaraxb7gsjm7wpy0rv8038nbrwl2slzq749pgm4bd5bf"; + sha256 = "09j0ga3nc90fbfl9g3i8x9vp70hq7ddnnlbcazahrz4vn6mngqv2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 27efaac44889..455901932c2e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.95"; + version = "3.4.98"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1rv2jsfc2m12nk293v12rvvqnicyh73pwp6bcb28jdqdhm95k6l6"; + sha256 = "0kkd6q80w4rh1sjdd4j5a2fmib4mjwhsf5fm555jl2w3zsy0kr45"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index aa39091070e9..e107379363b8 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -104,7 +104,6 @@ installPhase() { # Test a bit. $out/bin/nvidia-settings --version - $out/bin/nvidia-smi --help > /dev/null fi } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 0c0f6ecc71ee..7176cb2b941f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "331.79"; + versionNumber = "340.24"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l"; + sha256 = "0c5iix6rihbx7mbfhznz0jjbc3kkccwyfxi56p76fvrbyan9dvam"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v"; + sha256 = "04yy26722fjf9k7y6r909g68nqnsglfd9xs1dk1nain1021p70iq"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 0665ff83ea78..f9aa80fba836 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.117"; in +let versionNumber = "304.123"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "16a09iinz3zgrvj8cywyxsy7i8kpan28b814xhfbl88zadyj0hy3"; + sha256 = "09gljwxw14img7hw0xdxd24cvpvlymdxssmxa9gikdrw2w04j0ym"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0kzcxfwnp4aw4q53vl57ypc9yck4yj1hfhy8v9wfjlxvi6w6cp0v"; + sha256 = "0vxw4gp78g06h5inwkhl989p9mq0m8rqipz9a67rdc4s364r243s"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 5ee25ea976ac..937f65089e97 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi"; + sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"; }; extraConfig = @@ -38,13 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ ./libnl.patch - # remove this patch after wpa_supplicant 2.1 - (fetchurl { - url ="http://projects.archlinux.org/svntogit/packages.git/plain/trunk/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch?h=packages/wpa_supplicant"; - sha256 = "0x1wl2nbl7v9kv80qvysfjhhg5a7lmgygv1y723flps6y8ngm19w"; - }) - ]; + patches = [ ./libnl.patch ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 3e49715b94d1..08ccbbd06c6b 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, texinfo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "polipo-${version}"; - version = "1.0.4.1"; + version = "1.1.1"; src = fetchurl { - url = "http://freehaven.net/~chrisd/polipo/${name}.tar.gz"; - sha256 = "1ykwkyvmdw6fsaj2hc40971pkwf60hvi9c43whijim00qvgbyvwd"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz"; + sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2"; }; buildInputs = [ texinfo ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; description = "A small and fast caching web proxy"; license = licenses.mit; - maintainers = [ maintainers.phreedom ]; + maintainers = with maintainers; [ phreedom emery ]; platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index b227832ad734..765ed3ee8e95 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: + +with stdenv.lib; + stdenv.mkDerivation rec { - name = "elasticsearch-1.2.1"; + name = "elasticsearch-1.2.2"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "11lirxl0hb0xfd57accsgldq1adrlv9pak2520jll2sj5gg71cmj"; + sha256 = "1vpvxndcq48rcsgw2jnzdh4fwnf141hf5wjxrjs1g7p2qw0d0cy8"; }; patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre utillinux ]; + buildInputs = [ makeWrapper jre ] ++ optional (!stdenv.isDarwin) utillinux; installPhase = '' mkdir -p $out @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - --prefix PATH : "${utillinux}/bin/" \ + ${optionalString (!stdenv.isDarwin) ''--prefix PATH : "${utillinux}/bin/"''} \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" --set JAVA_HOME "${jre}" diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index ed700fa63569..b2bdbe8aaeaf 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "bgs-${version}"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://github.com/Gottox/bgs/archive/${version}.tar.gz"; - sha256 = "67fe16e3483f30f940005856fbb3246e1f99cf58371470e0d6668a27acbaefb9"; + sha256 = "19xwslh74686qln0ylaql28z3ng45c7srrb3cxxvfp35lz7hjpf0"; }; buildInputs = [ libX11 libXinerama imlib2 ]; diff --git a/pkgs/tools/X11/wmctrl/64-bit-data.patch b/pkgs/tools/X11/wmctrl/64-bit-data.patch new file mode 100644 index 000000000000..3ec1c913ffea --- /dev/null +++ b/pkgs/tools/X11/wmctrl/64-bit-data.patch @@ -0,0 +1,32 @@ +Description: Correct 64 Architecture implementation of 32 bit data +Author: Chris Donoghue +Bug-Debian: http://bugs.debian.org/362068 + +--- wmctrl-1.07.orig/main.c ++++ wmctrl-1.07/main.c +@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis + * + * long_length = Specifies the length in 32-bit multiples of the + * data to be retrieved. ++ * ++ * NOTE: see ++ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html ++ * In particular: ++ * ++ * When the X window system was ported to 64-bit architectures, a ++ * rather peculiar design decision was made. 32-bit quantities such ++ * as Window IDs, atoms, etc, were kept as longs in the client side ++ * APIs, even when long was changed to 64 bits. ++ * + */ + if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False, + xa_prop_type, &xa_ret_type, &ret_format, +@@ -1441,6 +1451,8 @@ static gchar *get_property (Display *dis + + /* null terminate the result to make string handling easier */ + tmp_size = (ret_format / 8) * ret_nitems; ++ /* Correct 64 Architecture implementation of 32 bit data */ ++ if(ret_format==32) tmp_size *= sizeof(long)/4; + ret = g_malloc(tmp_size + 1); + memcpy(ret, ret_prop, tmp_size); + ret[tmp_size] = '\0'; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index f4705bdb0d41..3f691b8ecd45 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXmu glib pkgconfig ]; + patches = [ ./64-bit-data.patch ]; + meta = { homepage = http://tomas.styblo.name/wmctrl/; description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix new file mode 100644 index 000000000000..af634e3fd56c --- /dev/null +++ b/pkgs/tools/admin/sec/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, perl, stdenv }: + +stdenv.mkDerivation rec { + name = "sec-2.7.5"; + + src = fetchurl { + url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; + sha256 = "a21dcbb61aa99930f911b79e9412b875af12b08722a78295d210b896f23a0301"; + }; + + buildInputs = [ perl ]; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp sec $out/bin + cp sec.man $out/share/man/man1/sec.1 + ''; + doCheck = false; + + meta = { + homepage = "http://simple-evcorr.sourceforge.net/"; + license = "GPLv2"; + description = "Simple Event Correlator"; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index a77689c85fca..be5e0ef4abcd 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.48.3"; + version = "3.48.17"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "1lg5rrql01q3z7fwcij5p64r22x4vbswcky80gajx5f62kxlxn0r"; + sha256 = "03q8sk7qihw9x4bfgfhv6523khgj13nilqps28qy7ndpzpggw9vn"; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index c172930cfd2c..57bd21dff239 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.3.3"; + version = "2.4"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "17pjnb1nb8c1akr07hgac2pqd5fcv34f12g7iykbn9hgig5r1sxc"; + sha256 = "0yl3ca31ck732f4551svxw6lx1lrjr7rhld5v09v0bgm3z07nnrx"; }; buildInputs = [ curl jansson ]; + configureFlags = [ "CFLAGS=-O3" ]; + meta = { homepage = https://github.com/pooler/cpuminer; description = "CPU miner for Litecoin and Bitcoin"; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index f8b590cde213..739908e3699f 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, go }: let - version = "2.2.1"; + version = "2.4.0"; in stdenv.mkDerivation { name = "direnv-${version}"; src = fetchurl { url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; name = "direnv-${version}.tar.gz"; - sha256 = "6d55cb96189e20609a08133fe9392c50209cd435b4f77e3baaa0f423d82ae59a"; + sha256 = "aab8028cc1d68461dd1f6c3c9d000eef10273c52399fe5d1dd917f2f4a1a349a"; }; buildInputs = [ go ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; homepage = http://direnv.net; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.zimbatm ]; + platforms = go.meta.platforms; }; } diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 55e8367538ab..22bea399f033 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dvtm-0.11"; + name = "dvtm-0.12"; meta = { description = "Dynamic virtual terminal manager"; - homepage = "http://www.brain-dump.org/projects/dvtm"; + homepage = http://www.brain-dump.org/projects/dvtm; license = stdenv.lib.licenses.mit; platfroms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "11zb5wnvmcx8np2886hwaqijvhdw8l87lldxhgqikw2ncpgrz8h1"; + sha256 = "0qcwsxhg738rq3bh4yid15nz2rrjc9k7ay6c1qv15c3gkw86zc3f"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 2457668d5b02..fe9c46dac64f 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - name = "jdiskreport-1.4.0"; + name = "jdiskreport-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip; - sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd"; + url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip; + sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix new file mode 100644 index 000000000000..d3f18b1353c3 --- /dev/null +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: + +stdenv.mkDerivation rec { + name = "riemann-c-client-${version}"; + + version = "1.1.1"; + + src = fetchurl { + url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz"; + sha256 = "10nz20svf1nb6kymwp0x49nvwnxakby33r6jsadish1fjcvzki88"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; + + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + homepage = "https://github.com/algernon/riemann-c-client"; + description = "A C client library for the Riemann monitoring system"; + license = licenses.gpl3; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/dhcpcd/check-interface.patch b/pkgs/tools/networking/dhcpcd/check-interface.patch deleted file mode 100644 index 11685c0d45e4..000000000000 --- a/pkgs/tools/networking/dhcpcd/check-interface.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix a segfault in handle_interface: if we're adding an interface that -we already knew about (in particular due to a udev event), then -calling init_state/start_interface on ifp is bad because we later free -ifp. This leads to messages like: - - dhcpcd[1342]: eth0: IAID conflicts with one assigned to eth0 - -and then a crash: - - Invalid read of size 8 - at 0x41CD07: dhcp_handlepacket (dhcp.c:2555) - by 0x408A74: eloop_start (eloop.c:399) - by 0x4073B6: main (dhcpcd.c:1537) - - Address 0x54573d8 is 200 bytes inside a block of size 232 free'd - at 0x4C27507: free (in /nix/store/jafbjc2y6izmh3sk78fl65n55jll4mj8-valgrind-3.9.0/lib/valgrind/vgpreload_memcheck-amd64-linux.so) - by 0x40F0A8: free_interface (net.c:153) - by 0x405443: handle_interface (dhcpcd.c:764) by 0x57E0F06: ??? (udev.c:97) - by 0x42EB62: dev_handle_data (dev.c:153) - by 0x408A74: eloop_start (eloop.c:399) - by 0x4073B6: main (dhcpcd.c:1537) - -So ignore interfaces that we already know about. - -diff -ru -x '*~' dhcpcd-6.4.0-orig/dhcpcd.c dhcpcd-6.4.0/dhcpcd.c ---- dhcpcd-6.4.0-orig/dhcpcd.c 2014-06-14 22:13:12.000000000 +0200 -+++ dhcpcd-6.4.0/dhcpcd.c 2014-07-03 11:13:39.133186533 +0200 -@@ -774,11 +774,11 @@ - } else { - TAILQ_REMOVE(ifs, ifp, next); - TAILQ_INSERT_TAIL(ctx->ifaces, ifp, next); -- } -- if (action > 0) { -- init_state(ifp, ctx->argc, ctx->argv); -- run_preinit(ifp); -- dhcpcd_startinterface(ifp); -+ if (action > 0) { -+ init_state(ifp, ctx->argc, ctx->argv); -+ run_preinit(ifp); -+ dhcpcd_startinterface(ifp); -+ } - } - } - diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index c3eeb20a2dea..8e93c424cb1e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.4.0"; + name = "dhcpcd-6.4.2"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "04whlqg1lik1c690kpgmw5hh6qzim64bw0l4fpr4vb8cj74aj4q4"; + sha256 = "1dr08aqvazg4ncq5p93v6givwh7naj75dn2npgplf3dl2fg9zfzf"; }; - patches = [ /* ./lxc_ro_promote_secondaries.patch */ ./reload.patch ./check-interface.patch ]; + patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/dhcpcd/reload.patch b/pkgs/tools/networking/dhcpcd/reload.patch deleted file mode 100644 index 126ad105cbbf..000000000000 --- a/pkgs/tools/networking/dhcpcd/reload.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix segfault when reloading the configuration: free_globals() left the -ifac/ifdc variables at -1 instead of 0, causing a crash later in -splitv(). - ---- a/dhcpcd.c -+++ b/dhcpcd.c -@@ -143,16 +143,18 @@ - if (ctx->ifac) { - for (ctx->ifac--; ctx->ifac >= 0; ctx->ifac--) - free(ctx->ifav[ctx->ifac]); - free(ctx->ifav); - ctx->ifav = NULL; -+ ctx->ifac = 0; - } - if (ctx->ifdc) { - for (ctx->ifdc--; ctx->ifdc >= 0; ctx->ifdc--) - free(ctx->ifdv[ctx->ifdc]); - free(ctx->ifdv); - ctx->ifdv = NULL; -+ ctx->ifdc = 0; - } - - #ifdef INET - if (ctx->dhcp_opts) { - for (opt = ctx->dhcp_opts; - diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index fee3db878ac7..c88557262b25 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "siege-3.0.6"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + configureFlags = [ "--with-ssl=${openssl}" ]; + meta = with stdenv.lib; { description = "HTTP load tester"; maintainers = with maintainers; [ ocharles raskin ]; diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix index 16853cab7fca..85882749ad4b 100644 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix index 15fe5f1e22ce..72ed74149716 100644 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix index 140c36284055..4e0111e90e18 100644 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix index ed84d069d103..d54f8140cc6c 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix index a53460b6319c..9d9aa7e1d6b1 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix index 8f28f57c18f3..14fc25bc8dc7 100644 --- a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix index 041cc471cab5..31d43cc85d89 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck , random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix index ffcaee203b7d..8c136dc9dbb0 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck , random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index b81ab7cad424..19243bad902a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3636_9d0709e"; + name = "nix-1.8pre3666_5bcb982"; src = fetchurl { - url = "http://hydra.nixos.org/build/11854244/download/5/${name}.tar.xz"; - sha256 = "13h32d4nbkhvxhj9nyamxf6mfsi7mzvjz1bhyy63088vx468nhmm"; + url = "http://hydra.nixos.org/build/12516859/download/5/${name}.tar.xz"; + sha256 = "6b968ec6db727dad2dc1fb6d31395996bd7cad14fddadfa996661c1f2c142c32"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index b0bb090b64d0..6708cd1fbd18 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,10 +1,20 @@ -{stdenv, fetchurl, pkgconfig, curl, gpgme}: +{ stdenv, fetchurl, pkgconfig, curl, gpgme }: -stdenv.mkDerivation { - name = "opkg-0.1.8"; +stdenv.mkDerivation rec { + version = "0.2.2"; + name = "opkg-${version}"; src = fetchurl { - url = http://opkg.googlecode.com/files/opkg-0.1.8.tar.gz; - sha256 = "0q0w7hmc6zk7pnddamd5v8d76qnh3043lzh5np24jbb6plqbz57z"; + url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; + sha256 = "0ax10crp2grrpl20gl5iqfw37d5qz6h790lyyv2ali45agklqmda"; }; + buildInputs = [ pkgconfig curl gpgme ]; + + meta = with stdenv.lib; { + description = "A lightweight package management system based upon ipkg"; + homepage = http://code.google.com/p/opkg/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + }; } diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix new file mode 100644 index 000000000000..41e227cee7e3 --- /dev/null +++ b/pkgs/tools/security/volatility/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, buildPythonPackage, pycrypto }: + +buildPythonPackage rec { + namePrefix = ""; + name = "volatility-2.3.1"; + + src = fetchurl { + url = "http://volatility.googlecode.com/files/${name}.tar.gz"; + sha256 = "bb1411fc671e0bf550a31e534fb1991b2f940f1dce1ebe4ce2fb627aec40726c"; + }; + + doCheck = false; + + propagatedBuildInputs = [ pycrypto ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/volatility; + description = "advanced memory forensics framework"; + maintainers = with maintainers; [ bosu ]; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index c76a1a136771..bc4bca887c80 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,4 +1,29 @@ -{stdenv, fetchurl }: +{ stdenv, fetchurl +# optional: +, pkgconfig ? null # most of the extra deps need pkgconfig to be found +, curl ? null +, iptables ? null +, libcredis ? null +, libdbi ? null +, libgcrypt ? null +, libmemcached ? null, cyrus_sasl ? null +, libmodbus ? null +, libnotify ? null, gdk_pixbuf ? null +, liboping ? null +, libpcap ? null +, libsigrok ? null +, libvirt ? null +, libxml2 ? null +, lm_sensors ? null +, lvm2 ? null +, mysql ? null +, postgresql ? null +, protobufc ? null +, rabbitmq-c ? null +, rrdtool ? null +, varnish ? null +, yajl ? null +}: stdenv.mkDerivation rec { name = "collectd-5.4.1"; @@ -10,10 +35,21 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - meta = { + buildInputs = [ + pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl + libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt + lm_sensors libxml2 lvm2 mysql postgresql protobufc rabbitmq-c rrdtool + varnish yajl + ]; + + # for some reason libsigrok isn't auto-detected + configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok"; + + meta = with stdenv.lib; { + description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; - description = "collectd is a daemon which collects system performance statistics periodically"; - platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/system/efibootmgr/arbitrary-filenames.patch b/pkgs/tools/system/efibootmgr/arbitrary-filenames.patch deleted file mode 100644 index ae542ac87952..000000000000 --- a/pkgs/tools/system/efibootmgr/arbitrary-filenames.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur efibootmgr-0.5.4-orig/src/lib/efi.c efibootmgr-0.5.4/src/lib/efi.c ---- efibootmgr-0.5.4-orig/src/lib/efi.c 2008-01-03 15:34:01.000000000 +0100 -+++ efibootmgr-0.5.4/src/lib/efi.c 2012-03-13 22:25:51.000000000 +0100 -@@ -495,7 +495,8 @@ - int rc, edd_version=0; - uint8_t mbr_type=0, signature_type=0; - uint64_t start=0, size=0; -- efi_char16_t os_loader_path[40]; -+ efi_char16_t *os_loader_path; -+ size_t os_loader_path_size; - - memset(signature, 0, sizeof(signature)); - -@@ -535,7 +536,9 @@ - signature, - mbr_type, signature_type); - -- efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path)); -+ os_loader_path_size = sizeof(efi_char16_t) * (1 + strlen(opts.loader) / sizeof(char)); -+ os_loader_path = malloc(os_loader_path_size); -+ efichar_from_char(os_loader_path, opts.loader, os_loader_path_size); - p += make_file_path_device_path (p, os_loader_path); - p += make_end_device_path (p); - diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 618454d87a46..81206a132965 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,17 +1,15 @@ -{stdenv, fetchurl, pciutils, perl, zlib}: +{ stdenv, fetchgit, perl, efivar, pciutils, zlib }: -let version = "0.5.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "efibootmgr-${version}"; + version = "0.7.0"; - buildInputs = [ pciutils zlib perl ]; + buildInputs = [ perl efivar pciutils zlib ]; - patches = [ ./arbitrary-filenames.patch ]; - - src = fetchurl { - url = "http://linux.dell.com/efibootmgr/permalink/efibootmgr-${version}.tar.gz"; - sha256 = "0wcfgf8x4p4xfh38m9x3njwsxibm9bhnmvpjj94lj9sk9xxa8qmm"; + src = fetchgit { + url = "git://github.com/vathpela/efibootmgr.git"; + rev = "refs/tags/${name}"; + sha256 = "1nazmqxppx2xa8clv4bjdb1b6gyyimgjdj85n2hmf1smqr8krrmz"; }; postPatch = '' @@ -19,16 +17,14 @@ stdenv.mkDerivation { --replace "/usr/bin/perl" "${perl}/bin/perl" ''; - preBuild = '' - export makeFlags="BINDIR=$out/sbin" - ''; + installFlags = [ "BINDIR=$(out)/sbin" ]; - meta = { + meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; homepage = http://linux.dell.com/efibootmgr/; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ shlevy ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix new file mode 100644 index 000000000000..618623146baa --- /dev/null +++ b/pkgs/tools/system/efivar/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, popt }: + +stdenv.mkDerivation rec { + name = "efivar-${version}"; + version = "0.10"; + + src = fetchgit { + url = "git://github.com/vathpela/efivar.git"; + rev = "refs/tags/${version}"; + sha256 = "04fznbmrf860b4d4i8rshx3mgwbx06v187wf1rddvxxnpkq8920w"; + }; + + buildInputs = [ popt ]; + + installFlags = [ + "libdir=$(out)/lib" + "mandir=$(out)/share/man" + "includedir=$(out)/include" + "bindir=$(out)/bin" + ]; + + meta = with stdenv.lib; { + homepage = http://github.com/vathpela/efivar; + description = "Tools and library to manipulate EFI variables"; + platforms = platforms.linux; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 97020ce2e42f..3fe05e941b6c 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}: +{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}: stdenv.mkDerivation { - name = "rsyslog-7.4.7"; + name = "rsyslog-7.6.3"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz; - sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21"; + url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz; + sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd]; + buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging]; preConfigure = '' export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" diff --git a/pkgs/tools/system/sizes/default.nix b/pkgs/tools/system/sizes/default.nix index 9be2a709af57..c8c983b41704 100644 --- a/pkgs/tools/system/sizes/default.nix +++ b/pkgs/tools/system/sizes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, deepseq, dlist, lens, parallelIo, regexPosix , systemFileio, systemFilepath, text }: diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix new file mode 100644 index 000000000000..0c69bdd03c5d --- /dev/null +++ b/pkgs/tools/system/symlinks/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "symlinks-${version}"; + version = "1.4"; + + src = fetchurl { + url = "http://www.ibiblio.org/pub/Linux/utils/file/${name}.tar.gz"; + sha256 = "1683psyi8jwq6anhnkwwyaf7pfksf19v04fignd6vi52s2fnifxh"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man + cp symlinks $out/bin/ + cp symlinks.8 $out/share/man/ + ''; + + # No license is mentioned in the code but + # http://www.ibiblio.org/pub/Linux/utils/file/symlinks.lsm + # and other package managers list it as + # "(c) Mark Lord, freely distributable" + meta = with stdenv.lib; { + description = "A symbolic link maintenance utility"; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix new file mode 100644 index 000000000000..93cc7fa7c5da --- /dev/null +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, glib, syslogng +, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc }: + +stdenv.mkDerivation rec { + name = "syslog-ng-incubator-${version}"; + + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; + sha256 = "0zr0vlp7cq3qfhqhalf7rdyd54skswxnc9j9wi8sfmz3psy3vd4y"; + }; + + buildInputs = [ + autoconf automake libtool pkgconfig glib syslogng eventlog perl python + yacc riemann_c_client libivykis protobufc + ]; + + preConfigure = "autoreconf -i"; + + configureFlags = [ + "--without-ivykis" + "--with-riemann" + "--with-module-dir=$(out)/lib/syslog-ng" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/balabit/syslog-ng-incubator"; + description = "A collection of tools and modules for syslog-ng"; + license = licenses.gpl2; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ade7fd202d53..ce531a920223 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, regexCompat, texLive }: cabal.mkDerivation (self: { diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index b9e71a7cde23..94d84fec4cee 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2014.20140528"; + texmfVersion = "2014.20140626"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "09z3jp5if0llszm02x3f93izrspjh14g77034c677r0sj4xrb63w"; + sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g"; }; - langTexmfVersion = "2014.20140528"; + langTexmfVersion = "2014.20140626"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0c7rppqya74g8fb431i3bbga88xzjiarj540fcn34plar5wz4k31"; + sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -33,6 +33,9 @@ rec { sed -e s@/usr/bin/@@g -i $(grep /usr/bin/ -rl . ) + sed -e 's@dehypht-x-2013-05-26@dehypht-x-2014-05-21@' -i $(grep 'dehypht-x' -rl $out ) + sed -e 's@dehyphn-x-2013-05-26@dehyphn-x-2014-05-21@' -i $(grep 'dehyphn-x' -rl $out ) + sed -e 's@\).success - then builtins.toString - else null; - GIT_SSH = pkgs.writeScript "fetchgit-ssh" '' - #! ${pkgs.stdenv.shell} - exec -a ssh ${pkgs.openssh}/bin/ssh -F ${let - sshConfigFile = if (builtins.tryEval ).success - then - 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} "$@" - ''; - }); + fetchgitPrivate = import ../build-support/fetchgit/private.nix { + inherit fetchgit writeScript openssh stdenv; + }; fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; @@ -593,6 +577,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + bitbucket-cli = pythonPackages.bitbucket-cli; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; @@ -647,6 +633,8 @@ let syslogng = callPackage ../tools/system/syslog-ng { }; + syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + rsyslog = callPackage ../tools/system/rsyslog { }; mcrypt = callPackage ../tools/misc/mcrypt { }; @@ -958,6 +946,8 @@ let efibootmgr = callPackage ../tools/system/efibootmgr { }; + efivar = callPackage ../tools/system/efivar { }; + elasticsearch = callPackage ../servers/search/elasticsearch { }; enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { @@ -983,6 +973,8 @@ let exempi = callPackage ../development/libraries/exempi { }; + exercism = callPackage ../development/tools/exercism { }; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -1903,6 +1895,8 @@ let qshowdiff = callPackage ../tools/text/qshowdiff { }; + quilt = callPackage ../development/tools/quilt { }; + radvd = callPackage ../tools/networking/radvd { }; ranger = callPackage ../applications/misc/ranger { }; @@ -1941,6 +1935,8 @@ let rdmd = callPackage ../development/compilers/rdmd { }; + riemann_c_client = callPackage ../tools/misc/riemann-c-client { }; + ripmime = callPackage ../tools/networking/ripmime {}; rkflashtool = callPackage ../tools/misc/rkflashtool { }; @@ -2001,6 +1997,8 @@ let sdcv = callPackage ../applications/misc/sdcv { }; + sec = callPackage ../tools/admin/sec { }; + seccure = callPackage ../tools/security/seccure { }; setserial = builderDefsPackage (import ../tools/system/setserial) { @@ -2210,6 +2208,8 @@ let vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; + volatility = callPackage ../tools/security/volatility { }; + vidalia = callPackage ../tools/security/vidalia { }; vbetool = builderDefsPackage ../tools/system/vbetool { @@ -2254,6 +2254,8 @@ let wal_e = callPackage ../tools/backup/wal-e { }; + watchman = callPackage ../development/tools/watchman { }; + wbox = callPackage ../tools/networking/wbox {}; welkin = callPackage ../tools/graphics/welkin {}; @@ -2570,7 +2572,7 @@ let compcert = callPackage ../development/compilers/compcert {}; cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {}); - cryptol2 = haskellPackages.cryptol; + cryptol2 = haskellPackages_ghc763.cryptol; # doesn't compile with the lastest 7.8.3 release cython = pythonPackages.cython; cython3 = python3Packages.cython; @@ -2921,7 +2923,10 @@ let # Import Haskell infrastructure. - haskell = callPackage ./haskell-defaults.nix { inherit pkgs; }; + haskell = let pkgs_ = pkgs // { gmp = gmp.override { withStatic = true; }; }; + callPackage = newScope pkgs_; + newScope = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra); + in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; }; # Available GHC versions. @@ -2939,7 +2944,7 @@ let builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" ) haskell)); - haskellPackages = haskellPackages_ghc763; + haskellPackages = haskellPackages_ghc783; haskellPlatform = haskellPlatformPackages."2013_2_0_0"; haskellPackages_ghc6104 = haskell.packages_ghc6104; @@ -2947,15 +2952,10 @@ let haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc742 = haskell.packages_ghc742; - # For the default version, we build profiling versions of the libraries, too. - # The following three lines achieve that: the first two make Hydra build explicit - # profiling and non-profiling versions; the final respects the user-configured - # default setting. - haskellPackages_ghc763_no_profiling = recurseIntoAttrs haskell.packages_ghc763.noProfiling; - haskellPackages_ghc763_profiling = recurseIntoAttrs haskell.packages_ghc763.profiling; - haskellPackages_ghc763 = recurseIntoAttrs haskell.packages_ghc763.highPrio; - # Reasonably current HEAD snapshot. - haskellPackages_ghc782 = haskell.packages_ghc782; + haskellPackages_ghc763 = haskell.packages_ghc763; + haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; + haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; + haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); @@ -3053,17 +3053,17 @@ let jdkdistro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); + (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); oraclejdk7distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk8-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; }); jikes = callPackage ../development/compilers/jikes { }; @@ -3472,6 +3472,7 @@ let lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {}; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {}; + lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {}; luarocks = callPackage ../development/tools/misc/luarocks { lua = lua5; @@ -3553,17 +3554,26 @@ let llvm = llvm_33 ; }; + python = python2; + python2 = python27; + python3 = python34; + + # pythonPackages further below, but assigned here because they need to be in sync + pythonPackages = python2Packages; + python2Packages = python27Packages; + python3Packages = python34Packages; + + pythonFull = python2Full; + python2Full = python27Full; + python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; - python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; }; + python27 = callPackage ../development/interpreters/python/2.7 { }; python32 = callPackage ../development/interpreters/python/3.2 { }; python33 = callPackage ../development/interpreters/python/3.3 { }; python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); - python = python27; - python3 = python3Packages.python; pypy = callPackage ../development/interpreters/pypy/2.3 { }; - pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = []; postBuild = ""; @@ -4951,6 +4961,11 @@ let lua = lua5_1; }; + keybinder3 = callPackage ../development/libraries/keybinder3 { + automake = automake111x; + lua = lua5_1; + }; + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lcms = lcms1; @@ -5044,6 +5059,8 @@ let libcangjie = callPackage ../development/libraries/libcangjie { }; + libcredis = callPackage ../development/libraries/libcredis { }; + libctemplate = callPackage ../development/libraries/libctemplate { }; libcue = callPackage ../development/libraries/libcue { }; @@ -5197,6 +5214,8 @@ let useGTK = config.libiodbc.gtk or false; }; + libivykis = callPackage ../development/libraries/libivykis { }; + liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; liblastfm = callPackage ../development/libraries/liblastfm { }; @@ -5205,6 +5224,8 @@ let liblockfile = callPackage ../development/libraries/liblockfile { }; + liblogging = callPackage ../development/libraries/liblogging { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmhash = callPackage ../development/libraries/libmhash {}; @@ -5326,6 +5347,8 @@ let libmpcdec = callPackage ../development/libraries/libmpcdec { }; + libmp3splt = callPackage ../development/libraries/libmp3splt { }; + libmrss = callPackage ../development/libraries/libmrss { }; libmsn = callPackage ../development/libraries/libmsn { }; @@ -5377,6 +5400,8 @@ let libopus = callPackage ../development/libraries/libopus { }; + libosinfo = callPackage ../development/libraries/libosinfo {}; + libosip = callPackage ../development/libraries/osip {}; libosip_3 = callPackage ../development/libraries/osip/3.nix {}; @@ -6512,8 +6537,6 @@ let # python function with default python interpreter buildPythonPackage = pythonPackages.buildPythonPackage; - pythonPackages = python27Packages; - # `nix-env -i python-nose` installs for 2.7, the default python. # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works @@ -6523,7 +6546,15 @@ let python = python26; }; - python3Packages = python34Packages; + python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs; + python = python27; + })); + + python32Packages = import ./python-packages.nix { + inherit pkgs; + python = python32; + }; python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; @@ -6535,16 +6566,6 @@ let python = python34; }); - python32Packages = import ./python-packages.nix { - inherit pkgs; - python = python32; - }; - - python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; - python = python27; - })); - pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = pypy; @@ -8135,7 +8156,7 @@ let }; blender = callPackage ../applications/misc/blender { - python = python3; + python = python34; }; bristol = callPackage ../applications/audio/bristol { }; @@ -8246,10 +8267,11 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = haskellPackages.darcs.override { + darcs = haskellPackages_ghc763.darcs.override { # A variant of the Darcs derivation that containts only the executable and - # thus has no dependencies on other Haskell packages. - cabal = haskellPackages.cabal.override { + # thus has no dependencies on other Haskell packages. We have to use the older + # GHC 7.6.3 package set because darcs won't compile with 7.8.x. + cabal = haskellPackages_ghc763.cabal.override { extension = self : super : { isLibrary = false; configureFlags = "-f-library " + super.configureFlags or ""; @@ -8301,6 +8323,10 @@ let dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; + dwbWrapper = wrapFirefox + { browser = dwb; browserName = "dwb"; desktopName = "dwb"; + }; + dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; }; @@ -9047,6 +9073,8 @@ let ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + lighttable = callPackage ../applications/editors/lighttable {}; + links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/instant-messengers/linphone rec { @@ -9151,6 +9179,8 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; @@ -9164,6 +9194,8 @@ let mp3info = callPackage ../applications/audio/mp3info { }; + mp3splt = callPackage ../applications/audio/mp3splt { }; + mpc123 = callPackage ../applications/audio/mpc123 { }; mpg123 = callPackage ../applications/audio/mpg123 { }; @@ -9467,6 +9499,10 @@ let qt = qt4; }; + retroshare06 = callPackage ../applications/networking/p2p/retroshare/0.6.nix { + qt = qt4; + }; + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); @@ -9633,6 +9669,8 @@ let gpgSupport = true; }; + symlinks = callPackage ../tools/system/symlinks { }; + syncthing = callPackage ../applications/networking/syncthing { }; # linux only by now @@ -9735,6 +9773,8 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; + twister = callPackage ../applications/networking/p2p/twister { }; + twmn = callPackage ../applications/misc/twmn { }; twinkle = callPackage ../applications/networking/instant-messengers/twinkle { @@ -9778,12 +9818,8 @@ let macvim = callPackage ../applications/editors/vim/macvim.nix { }; - vimWrapper = wrapVim vim; - vimHugeX = vim_configurable; - vimHugeXWrapper = wrapVim vimHugeX; - vim_configurable = callPackage ../applications/editors/vim/configurable.nix { inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; @@ -9816,11 +9852,6 @@ let flags = [ "python" "X11" ]; # only flag "X11" by now }); - wrapVim = vim: import ../applications/editors/vim/wrapper.nix { - inherit stdenv makeWrapper writeText vim; - vimrc = config.vim.vimrc or ""; - }; - virtviewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; @@ -10020,6 +10051,8 @@ let xterm = callPackage ../applications/misc/xterm { }; + finalterm = callPackage ../applications/misc/finalterm { }; + xtrace = callPackage ../tools/X11/xtrace { }; xlaunch = callPackage ../tools/X11/xlaunch { }; @@ -10582,7 +10615,7 @@ let qtcurve = callPackage ../misc/themes/qtcurve { }; - quassel = callPackage ../applications/networking/irc/quassel { }; + quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; }; quasselDaemon = (self.quassel.override { monolithic = false; @@ -11250,7 +11283,7 @@ let viewnior = callPackage ../applications/graphics/viewnior { }; - vimPlugins = callPackage ../misc/vim-plugins { }; + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { webkit = webkitgtk2; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index ba785f3ef555..a81f8cae90ad 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -20,13 +20,13 @@ transformersCompat = super.transformersCompat_0_3_3; }; - ghc782Prefs = self : super : ghcHEADPrefs self super // { + ghc783Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; mtl = self.mtl_2_1_2; }; - ghc763Prefs = self : super : ghc782Prefs self super // { + ghc763Prefs = self : super : ghc783Prefs self super // { ariadne = super.ariadne.override { haskellNames = self.haskellNames.override { haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; }; @@ -49,7 +49,7 @@ networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 - vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; + vty_5_1_1 = super.vty_5_1_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; @@ -209,15 +209,15 @@ ghcBinary = pkgs.haskellPackages.ghcPlain; prefFun = ghcHEADPrefs; extraArgs = { - happy = pkgs.haskellPackages.happy_1_19_2; - alex = pkgs.haskellPackages.alex_3_1_3; + happy = pkgs.haskellPackages.happy; + alex = pkgs.haskellPackages.alex; }; }; - packages_ghc782 = - packages { ghcPath = ../development/compilers/ghc/7.8.2.nix; + packages_ghc783 = + packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; ghcBinary = ghc742Binary; - prefFun = ghc782Prefs; + prefFun = ghc783Prefs; }; packages_ghc763 = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b9740e509ee3..b393d93e4430 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -262,6 +262,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; + blazeFromHtml = callPackage ../development/libraries/haskell/blaze-from-html {}; + blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {}; @@ -411,6 +413,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; + clay = callPackage ../development/libraries/haskell/clay {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; clock = callPackage ../development/libraries/haskell/clock {}; @@ -553,6 +557,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dataenc = callPackage ../development/libraries/haskell/dataenc {}; + dataFix = callPackage ../development/libraries/haskell/data-fix {}; + dataHash = callPackage ../development/libraries/haskell/data-hash {}; dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; @@ -684,6 +690,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in editline = self.editline_0_2_1_1; ekg = callPackage ../development/libraries/haskell/ekg {}; + ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {}; ekgCore = callPackage ../development/libraries/haskell/ekg-core {}; elerea = callPackage ../development/libraries/haskell/elerea {}; @@ -698,6 +705,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in encoding = callPackage ../development/libraries/haskell/encoding {}; + engineIo = callPackage ../development/libraries/haskell/engine-io {}; + engineIoSnap = callPackage ../development/libraries/haskell/engine-io-snap {}; + enumerator = callPackage ../development/libraries/haskell/enumerator {}; enummapset = callPackage ../development/libraries/haskell/enummapset {}; @@ -873,6 +883,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gitit = callPackage ../development/libraries/haskell/gitit {}; + gitlib = callPackage ../development/libraries/haskell/gitlib {}; + + gitlibLibgit2 = callPackage ../development/libraries/haskell/gitlib-libgit2 {}; + + gitlibTest = callPackage ../development/libraries/haskell/gitlib-test {}; + glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs.gnome) libglade; gtkC = pkgs.gtk; @@ -940,10 +956,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libc = pkgs.stdenv.gcc.libc; }; - gtkglext = callPackage ../development/libraries/haskell/gtkglext {}; + gtkglext = callPackage ../development/libraries/haskell/gtkglext { gtkglext = pkgs.gnome2.gtkglext; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; - gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { inherit (pkgs.gnome) gtksourceview; @@ -1012,6 +1027,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; + haskellTokenUtils = callPackage ../development/libraries/haskell/haskell-token-utils {}; + haskore = callPackage ../development/libraries/haskell/haskore {}; hastache = callPackage ../development/libraries/haskell/hastache {}; @@ -1070,6 +1087,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; + haxl = callPackage ../development/libraries/haskell/haxl {}; + haxr = callPackage ../development/libraries/haskell/haxr {}; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; @@ -1088,6 +1107,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HDBCSqlite3 = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + HPDF = callPackage ../development/libraries/haskell/HPDF {}; + heist = callPackage ../development/libraries/haskell/heist {}; hflags = callPackage ../development/libraries/haskell/hflags {}; @@ -1100,6 +1121,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hinotify = callPackage ../development/libraries/haskell/hinotify {}; + hi = callPackage ../development/libraries/haskell/hi {}; + hint = callPackage ../development/libraries/haskell/hint {}; hit = callPackage ../development/libraries/haskell/hit {}; @@ -1112,6 +1135,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hledgerIrr = callPackage ../applications/office/hledger-irr {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; + hlibgit2 = callPackage ../development/libraries/haskell/hlibgit2 {}; + HList = callPackage ../development/libraries/haskell/HList {}; hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; @@ -1180,6 +1205,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspec = callPackage ../development/libraries/haskell/hspec {}; + hspecAttoparsec = callPackage ../development/libraries/haskell/hspec-attoparsec {}; + hspecWai = callPackage ../development/libraries/haskell/hspec-wai {}; hspec2 = callPackage ../development/libraries/haskell/hspec2 {}; @@ -1300,6 +1327,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {}; + jmacro = callPackage ../development/libraries/haskell/jmacro {}; + jmacroRpc = callPackage ../development/libraries/haskell/jmacro-rpc {}; + jmacroRpcHappstack = callPackage ../development/libraries/haskell/jmacro-rpc-happstack {}; + jmacroRpcSnap = callPackage ../development/libraries/haskell/jmacro-rpc-snap {}; + jpeg = callPackage ../development/libraries/haskell/jpeg {}; json = callPackage ../development/libraries/haskell/json {}; @@ -1336,6 +1368,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lambdabot = callPackage ../development/libraries/haskell/lambdabot {}; + lambdabotWrapper = callPackage ../development/libraries/haskell/lambdabot/wrapper.nix { + mueval = self.muevalWrapper.override { + additionalPackages = [ self.lambdabot ]; + }; + }; + lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {}; lambdacubeEngine = callPackage ../development/libraries/haskell/lambdacube-engine {}; @@ -1531,6 +1569,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mueval = callPackage ../development/libraries/haskell/mueval {}; + muevalWrapper = callPackage ../development/libraries/haskell/mueval/wrapper.nix {}; + multiarg = callPackage ../development/libraries/haskell/multiarg {}; multimap = callPackage ../development/libraries/haskell/multimap {}; @@ -1580,6 +1620,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; network = self.network_2_5_0_0; + networkCarbon = callPackage ../development/libraries/haskell/network-carbon {}; + networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; @@ -1682,8 +1724,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_11_0_2 = callPackage ../development/libraries/haskell/parsers/0.11.0.2.nix {}; - parsers = self.parsers_0_11_0_2; + parsers_0_11_0_3 = callPackage ../development/libraries/haskell/parsers/0.11.0.3.nix {}; + parsers = self.parsers_0_11_0_3; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1909,6 +1951,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {}; + regexTdfaRc = callPackage ../development/libraries/haskell/regex-tdfa-rc {}; + regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {}; regexPcre = callPackage ../development/libraries/haskell/regex-pcre {}; @@ -1959,8 +2003,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; - scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; - scientific = self.scientific_0_3_2_1; + scientific_0_3_3_0 = callPackage ../development/libraries/haskell/scientific/0.3.3.0.nix {}; + scientific = self.scientific_0_3_3_0; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -1982,12 +2026,17 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; + + shellish = callPackage ../development/libraries/haskell/shellish {}; + shellmate = callPackage ../development/libraries/haskell/shellmate {}; shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; shelly = self.shelly_1_5_3_1; + simpleConduit = callPackage ../development/libraries/haskell/simple-conduit {}; + simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; @@ -2036,6 +2085,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in socks = callPackage ../development/libraries/haskell/socks {}; + socketIo = callPackage ../development/libraries/haskell/socket-io {}; + sparse = callPackage ../development/libraries/haskell/sparse {}; spawn = callPackage ../development/libraries/haskell/spawn {}; @@ -2196,6 +2247,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tagged = callPackage ../development/libraries/haskell/tagged {}; + taggy = callPackage ../development/libraries/haskell/taggy {}; + + taggyLens = callPackage ../development/libraries/haskell/taggy-lens {}; + tagshare = callPackage ../development/libraries/haskell/tagshare {}; tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; @@ -2224,6 +2279,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tcacheAWS = callPackage ../development/libraries/haskell/tcache-AWS {}; + template = callPackage ../development/libraries/haskell/template {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; @@ -2333,7 +2390,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; - transformers = null; # core package since ghc >= 7.8.2 + transformers = null; # core package since ghc >= 7.8.x transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; @@ -2397,7 +2454,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {}; - unorderedContainers = self.unorderedContainers_0_2_4_0; + unorderedContainers_0_2_5_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.5.0.nix {}; + unorderedContainers = self.unorderedContainers_0_2_5_0; uri = callPackage ../development/libraries/haskell/uri {}; @@ -2465,7 +2523,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_1_0 = callPackage ../development/libraries/haskell/vty/5.1.0.nix {}; + vty_5_1_1 = callPackage ../development/libraries/haskell/vty/5.1.1.nix {}; vty = self.vty_4_7_5; vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; @@ -2629,6 +2687,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zipper = callPackage ../development/libraries/haskell/zipper {}; + zippers = callPackage ../development/libraries/haskell/zippers {}; + zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; @@ -2705,13 +2765,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {}; happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; - happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; - happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {}; - happy_1_19_3 = callPackage ../development/tools/parsing/happy/1.19.3.nix {}; - happy = self.happy_1_19_3; + happy_1_19_4 = callPackage ../development/tools/parsing/happy/1.19.4.nix {}; + happy = self.happy_1_19_4; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 81cbf0e7bdc8..1e8433cec7f7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4784,6 +4784,14 @@ let self = _self // overrides; _self = with self; { platforms = stdenv.lib.platforms.unix; }; }; + + ListBinarySearch = pkgs.buildPerlPackage { + name = "List-BinarySearch-0.20"; + src = pkgs.fetchurl { + url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.20.tar.gz; + sha256 = "1piyl65m38bwqaap13wkgs033wiwb6m5zmr5va86ya4696cir7wd"; + }; + }; ListMoreUtils = buildPerlPackage { name = "List-MoreUtils-0.33"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d93e4f33c514..b7e2c7a4c0b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -678,11 +678,11 @@ rec { }; beets = buildPythonPackage rec { - name = "beets-1.0.0"; + name = "beets-1.3.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz"; - md5 = "88ad09a93aa0d69ce813205cf23b2a6c"; + md5 = "59615a54b3ac3983159e77ff9dda373e"; }; # tests depend on $HOME setting @@ -694,9 +694,18 @@ rec { pythonPackages.mutagen pythonPackages.munkres pythonPackages.musicbrainzngs + pythonPackages.enum34 + pythonPackages.pylast + pythonPackages.rarfile + pythonPackages.flask modules.sqlite3 modules.readline ]; + + buildInputs = with pythonPackages; [ mock pyechonest six responses nose ]; + + # 10 tests are failing + doCheck = false; meta = { homepage = http://beets.radbox.org; @@ -705,6 +714,52 @@ rec { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; + + responses = pythonPackages.buildPythonPackage rec { + name = "responses-0.2.2"; + + propagatedBuildInputs = with pythonPackages; [ requests mock six pytest flake8 ]; + + doCheck = false; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz"; + md5 = "5d79fd425cf8d858dfc8afa6475395d3"; + }; + + }; + + rarfile = pythonPackages.buildPythonPackage rec { + name = "rarfile-2.6"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/rarfile/rarfile-2.6.tar.gz"; + md5 = "50ce3f3fdb9196a00059a5ea7b3739fd"; + }; + + meta = with stdenv.lib; { + description = "rarfile - RAR archive reader for Python"; + homepage = https://github.com/markokr/rarfile; + }; + }; + + pyechonest = pythonPackages.buildPythonPackage rec { + name = "pyechonest-8.0.2"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyechonest/pyechonest-8.0.2.tar.gz"; + md5 = "5586fe8ece7af4e24f71ea740185127e"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; + }; bitbucket_api = buildPythonPackage rec { @@ -726,6 +781,22 @@ rec { }; }; + bitbucket-cli = buildPythonPackage rec { + name = "bitbucket-cli-0.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/bitbucket-cli/${name}.tar.gz"; + md5 = "79cdbdc6c95dfa313d12cbdef406c9f2"; + }; + + pythonPath = [ requests ]; + + meta = with stdenv.lib; { + description = "Bitbucket command line interface"; + homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; + maintainers = [ maintainers.refnil ]; + }; + }; + bitstring = buildPythonPackage rec { name = "bitstring-3.1.2"; @@ -2043,6 +2114,16 @@ rec { }; + logster = buildPythonPackage { + name = "logster-7475c53822"; + src = fetchgit { + url = git://github.com/etsy/logster; + rev = "7475c53822"; + sha256 = "1ls007qmziwb50c5iikxhqin0xbn673gbd25m5k09861435cknvr"; + }; + }; + + paver = buildPythonPackage rec { version = "1.2.2"; name = "Paver-${version}"; @@ -2997,6 +3078,15 @@ rec { }; }; + enum34 = buildPythonPackage rec { + name = "enum34-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz"; + md5 = "9d57f5454c70c11707998ea26c1b0a7c"; + }; + + }; epc = buildPythonPackage rec { name = "epc-0.0.3"; @@ -3629,6 +3719,38 @@ rec { }; }; + httpretty = buildPythonPackage rec { + name = "httpretty-${version}"; + version = "0.8.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz"; + md5 = "50b02560a49fe928c90c53a49791f621"; + }; + + buildInputs = [ tornado requests httplib2 sure nose coverage ]; + + propagatedBuildInputs = [ urllib3 ]; + + postPatch = '' + sed -i -e 's/==.*$//' *requirements.txt + # XXX: Drop this after version 0.8.4 is released. + patch httpretty/core.py <