diff --git a/lib/lists.nix b/lib/lists.nix index fa8cbddfd94..2dda700bef3 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -234,8 +234,8 @@ rec { in [x] ++ remove x xs; # Intersects list 'e' and another list - intersectLists = e: filter (x: elem x e); + intersect = e: filter (x: elem x e); - # Subtracts list 'e' from another list - subtractLists = e: filter (x: !(elem x e)); + # Substracts list 'e' from another list + substract = e: filter (x: !(elem x e)); } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 956f7eb6492..12a5108c050 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -78,7 +78,11 @@ fuuzetsu = "Mateusz Kowalczyk "; gal_bolle = "Florent Becker "; garbas = "Rok Garbas "; + garrison = "Jim Garrison "; gavin = "Gavin Rogers "; + gebner = "Gabriel Ebner "; + giogadi = "Luis G. Torres "; + globin = "Robin Gloster "; goibhniu = "Cillian de Róiste "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; @@ -138,6 +142,7 @@ orbitz = "Malcolm Matalka "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; + pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; phausmann = "Philipp Hausmann "; phreedom = "Evgeny Egorochkin "; diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 177ebdd8db1..228c45b0c1f 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -49,4 +49,8 @@ on container networking.) switch. Note that this will not delete the root directory of the container in /var/lib/containers. - \ No newline at end of file +Declarative containers can be started and stopped using the +corresponding systemd service, e.g. systemctl start +container@database. + + diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 158609dcf79..eec2f1bb6f6 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -27,28 +27,38 @@ ids.uids = { root = 0; - nscd = 1; - sshd = 2; - ntp = 3; + #wheel = 1; # unused + #kmem = 2; # unused + #tty = 3; # unused messagebus = 4; # D-Bus haldaemon = 5; - nagios = 6; + #disk = 6; # unused vsftpd = 7; ftp = 8; bitlbee = 9; avahi = 10; + nagios = 11; atd = 12; - zabbix = 13; - postfix = 14; + postfix = 13; + #postdrop = 14; # unused dovecot = 15; tomcat = 16; + #audio = 17; # unused + #floppy = 18; # unused + #uucp = 19; # unused + #lp = 20; # unused pulseaudio = 22; # must match `pulseaudio' GID gpsd = 23; + #cdrom = 24; # unused + #tape = 25; # unused + #video = 26; # unused + #dialout = 27; # unused polkituser = 28; - uptimed = 29; + #utmp = 29; # unused ddclient = 30; davfs2 = 31; privoxy = 32; + #disnix = 33; # unused osgi = 34; tor = 35; cups = 36; @@ -70,18 +80,25 @@ fprot = 52; bind = 53; wwwrun = 54; + #adm = 55; # unused spamd = 56; + #networkmanager = 57; # unused nslcd = 58; + #scanner = 59; # unused nginx = 60; chrony = 61; + #systemd-journal = 62; # unused smtpd = 63; smtpq = 64; supybot = 65; iodined = 66; + #libvirtd = 67; # unused graphite = 68; statsd = 69; transmission = 70; postgres = 71; + #vboxusers = 72; # unused + #vboxsf = 73; # unused smbguest = 74; # unused varnish = 75; datadog = 76; @@ -102,13 +119,13 @@ minidlna = 91; elasticsearch = 92; tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. - zope2 = 94; + #connman = 94; # unused firebird = 95; - redis = 96; + #keys = 96; # unused haproxy = 97; mongodb = 98; openldap = 99; - memcached = 100; + #users = 100; # unused cgminer = 101; munin = 102; logcheck = 103; @@ -129,6 +146,7 @@ foundationdb = 118; newrelic = 119; starbound = 120; + #grsecurity = 121; # unused hydra = 122; spiped = 123; teamspeak = 124; @@ -138,7 +156,7 @@ znc = 128; polipo = 129; mopidy = 130; - unifi = 131; + #docker = 131; # unused gdm = 132; dhcpd = 133; siproxd = 134; @@ -180,7 +198,19 @@ panamax = 170; marathon = 171; exim = 172; + #fleet = 173; # unused + #input = 174; # unused sddm = 175; + tss = 176; + memcached = 177; + nscd = 178; + ntp = 179; + zabbix = 180; + redis = 181; + sshd = 182; + unifi = 183; + uptimed = 184; + zope2 = 185; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -200,15 +230,16 @@ ftp = 8; bitlbee = 9; avahi = 10; + #nagios = 11; # unused atd = 12; postfix = 13; postdrop = 14; dovecot = 15; + tomcat = 16; audio = 17; floppy = 18; uucp = 19; lp = 20; - tomcat = 21; pulseaudio = 22; # must match `pulseaudio' UID gpsd = 23; cdrom = 24; @@ -217,21 +248,30 @@ dialout = 27; #polkituser = 28; # currently unused, polkitd doesn't need a group utmp = 29; + #ddclient = 30; # unused davfs2 = 31; privoxy = 32; disnix = 33; osgi = 34; tor = 35; - ghostOne = 40; + #cups = 36; # unused + #foldingathome = 37; # unused + #sabnzd = 38; # unused + #kdm = 39; # unused + ghostone = 40; git = 41; fourstore = 42; - fourstorehttpd = 43; + fourstorehttp = 43; virtuoso = 44; + #rtkit = 45; # unused dovecot2 = 46; + #dovenull = 47; # unused + #unbound = 48; # unused prayer = 49; mpd = 50; clamav = 51; fprot = 52; + #bind = 53; # unused wwwrun = 54; adm = 55; spamd = 56; @@ -239,6 +279,7 @@ nslcd = 58; scanner = 59; nginx = 60; + #chrony = 61; # unused systemd-journal = 62; smtpd = 63; smtpq = 64; @@ -246,6 +287,7 @@ iodined = 66; libvirtd = 67; graphite = 68; + #statsd = 69; # unused transmission = 70; postgres = 71; vboxusers = 72; @@ -268,11 +310,17 @@ quassel = 89; amule = 90; minidlna = 91; - haproxy = 92; - openldap = 93; + #elasticsearch = 92; # unused + #tcpcryptd = 93; # unused connman = 94; - munin = 95; + firebird = 95; keys = 96; + haproxy = 97; + #mongodb = 98; # unused + openldap = 99; + munin = 102; + #logcheck = 103; # unused + #nix-ssh = 104; # unused dictd = 105; couchdb = 106; searx = 107; @@ -280,8 +328,12 @@ jenkins = 109; systemd-journal-gateway = 110; notbit = 111; + #ngircd = 112; # unused btsync = 113; + #minecraft = 114; # unused monetdb = 115; + #ripped = 116; # unused + #murmur = 117; # unused foundationdb = 118; newrelic = 119; starbound = 120; @@ -291,39 +343,62 @@ teamspeak = 124; influxdb = 125; nsd = 126; - firebird = 127; + #gitolite = 127; # unused znc = 128; polipo = 129; mopidy = 130; docker = 131; gdm = 132; - tss = 133; + #dhcpcd = 133; # unused siproxd = 134; mlmmj = 135; + #neo4j = 136; # unused riemann = 137; riemanndash = 138; + #radvd = 139; # unused + #zookeeper = 140; # unused + #dnsmasq = 141; # unused uhub = 142; + #yandexdisk = 143; # unused + #collectd = 144; # unused + #consul = 145; # unused mailpile = 146; redmine = 147; seeks = 148; prosody = 149; i2pd = 150; + #dnscrypt-proxy = 151; # unused systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; + #etcd = 156; # unused + #docker-registry = 157; # unused hbase = 158; opentsdb = 159; scollector = 160; bosun = 161; kubernetes = 162; + #peerflix = 163; # unused + #chronos = 164; # unused gitlab = 165; nylon = 168; panamax = 170; + #marathon = 171; # unused exim = 172; fleet = 173; input = 174; sddm = 175; + tss = 176; + #memcached = 177; # unused + #nscd = 178; # unused + #ntp = 179; # unused + #zabbix = 180; # unused + #redis = 181; # unused + #sshd = 182; # unused + #unifi = 183; # unused + #uptimed = 184; # unused + #zope2 = 185; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ef1e9d450c8..23809796878 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -60,6 +60,7 @@ ./programs/dconf.nix ./programs/environment.nix ./programs/info.nix + ./programs/ibus.nix ./programs/light.nix ./programs/nano.nix ./programs/screen.nix @@ -353,6 +354,7 @@ ./services/web-servers/varnish/default.nix ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix + ./services/x11/unclutter.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix diff --git a/nixos/modules/programs/ibus.nix b/nixos/modules/programs/ibus.nix new file mode 100644 index 00000000000..b8702a743d8 --- /dev/null +++ b/nixos/modules/programs/ibus.nix @@ -0,0 +1,51 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.ibus; +in +{ + options = { + + programs.ibus = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable IBus input method"; + }; + plugins = mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + IBus plugin packages + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ibus ]; + + gtkPlugins = [ pkgs.ibus ]; + qtPlugins = [ pkgs.ibus-qt ]; + + environment.variables = + let + env = pkgs.buildEnv { + name = "ibus-env"; + paths = [ pkgs.ibus ] ++ cfg.plugins; + }; + in { + GTK_IM_MODULE = "ibus"; + QT_IM_MODULE = "ibus"; + XMODIFIERS = "@im=ibus"; + + IBUS_COMPONENT_PATH = "${env}/share/ibus/component"; + }; + + services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon --daemonize --xim --cache=none"; + }; +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index bd9b897158d..6ca73eea5f6 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -9,7 +9,7 @@ let cfg = config.programs.ssh; cfgd = config.services.openssh; - askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + askPassword = cfg.askPassword; askPasswordWrapper = pkgs.writeScript "ssh-askpass-wrapper" '' @@ -26,6 +26,12 @@ in programs.ssh = { + askPassword = mkOption { + type = types.string; + default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + description = ''Program used by SSH to ask for passwords.''; + }; + forwardX11 = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1efc278aeb2..e820b2cb9ce 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -112,6 +112,9 @@ in zipModules ([] # VirtualBox ++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ] +# Tarsnap +++ obsolete [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ] + # proxy ++ obsolete [ "nix" "proxy" ] [ "networking" "proxy" "default" ] diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index f29e7a5ad81..92f020edce5 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,43 +1,61 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption types concatMapStrings; cfg = config.security.apparmor; in + { - options = { - security.apparmor = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the AppArmor Mandatory Access Control system."; - }; + #### interface + options = { - profiles = mkOption { - type = types.listOf types.path; - default = []; - description = "List of files containing AppArmor profiles."; - }; - }; - }; + security.apparmor = { - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.apparmor ]; - systemd.services.apparmor = { - wantedBy = [ "local-fs.target" ]; - path = [ pkgs.apparmor ]; + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the AppArmor Mandatory Access Control system."; + }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -rKv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - ExecStop = concatMapStrings (profile: - ''${pkgs.apparmor}/sbin/apparmor_parser -Rv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; '' - ) cfg.profiles; - }; - }; - }; + profiles = mkOption { + type = types.listOf types.path; + default = []; + description = "List of files containing AppArmor profiles."; + }; + + }; + + }; + + #### implementation + config = mkIf cfg.enable { + + environment.systemPackages = [ + pkgs.apparmor-utils + ]; + + systemd.services.apparmor = { + wantedBy = [ "local-fs.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; '' + ) cfg.profiles; + ExecStop = concatMapStrings (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; '' + ) cfg.profiles; + }; + }; + + security.pam.services.apparmor.text = '' + ## The AppArmor service changes hats according to order: first try + ## user, then group, and finally fall back to a hat called "DEFAULT" + ## + ## For now, enable debugging as this is an experimental feature. + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + ''; + + }; } diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 66eeab7503d..8cd40093348 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Enable the testing grsecurity patch, based on Linux 3.18. + Enable the testing grsecurity patch, based on Linux 3.19. ''; }; @@ -245,7 +245,7 @@ in message = '' If grsecurity is enabled, you must select either the stable patch (with kernel 3.14), or the testing patch (with - kernel 3.18) to continue. + kernel 3.19) to continue. ''; } { assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable); diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 9abfb41087b..5afe5f8f46f 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -17,10 +17,10 @@ let log_file "syslog" user "${cfg.user}" group "${cfg.group}" - ${if cfg.network.host != "any" then - "bind_to_address ${cfg.network.host}" else ""} - ${if cfg.network.port != 6600 then - "port ${toString cfg.network.port}" else ""} + + ${optionalString (cfg.network.host != "any") ''bind_to_address "${cfg.network.host}"''} + ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 1b0bcadca15..155161945cd 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -12,6 +12,7 @@ let keyfile ${config.services.tarsnap.keyfile} ${optionalString cfg.nodump "nodump"} ${optionalString cfg.printStats "print-stats"} + ${optionalString cfg.printStats "humanize-numbers"} ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes} ${optionalString cfg.aggressiveNetworking "aggressive-networking"} ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)} @@ -27,46 +28,39 @@ in type = types.bool; default = false; description = '' - If enabled, NixOS will periodically create backups of the - specified directories using the tarsnap - backup service. This installs a systemd - service called tarsnap-backup which is - periodically run by cron, or you may run it on-demand. - - See the Tarsnap Getting - Started page. + Enable periodic tarsnap backups. ''; }; keyfile = mkOption { - type = types.path; + type = types.str; default = "/root/tarsnap.key"; description = '' - Path to the keyfile which identifies the machine - associated with your Tarsnap account. This file can - be created using the - tarsnap-keygen utility, and - providing your Tarsnap login credentials. + The keyfile which associates this machine with your tarsnap + account. + Create the keyfile with tarsnap-keygen. + + The keyfile name should be given as a string and not a path, to + avoid the key being copied into the Nix store. ''; }; cachedir = mkOption { - type = types.path; + type = types.nullOr types.path; default = "/var/cache/tarsnap"; description = '' - Tarsnap operations use a "cache directory" which - allows Tarsnap to identify which blocks of data have - been previously stored; this directory is specified - via the cachedir option. If the - cache directory is lost or out of date, tarsnap - creation/deletion operations will exit with an error - message instructing you to run tarsnap - --fsck to regenerate the cache directory. + The cache allows tarsnap to identify previously stored data + blocks, reducing archival time and bandwidth usage. + + Should the cache become desynchronized or corrupted, tarsnap + will refuse to run until you manually rebuild the cache with + tarsnap --fsck. + + Set to null to disable caching. ''; }; - config = mkOption { + archives = mkOption { type = types.attrsOf (types.submodule ( { options = { @@ -74,41 +68,44 @@ in type = types.bool; default = true; description = '' - If set to true, then don't - archive files which have the - nodump flag set. + Exclude files with the nodump flag. ''; }; printStats = mkOption { type = types.bool; default = true; - description = "Print statistics when creating archives."; + description = '' + Print global archive statistics upon completion. + The output is available via + systemctl status tarsnap@archive-name. + ''; }; checkpointBytes = mkOption { type = types.nullOr types.str; - default = "1G"; + default = "1GB"; description = '' - Create a checkpoint per a particular amount of - uploaded data. By default, Tarsnap will create - checkpoints once per GB of data uploaded. At - minimum, checkpointBytes must be - 1GB. + Create a checkpoint every checkpointBytes + of uploaded data (optionally specified using an SI prefix). - Can also be set to null to - disable checkpointing. + 1GB is the minimum value. A higher value is recommended, + as checkpointing is expensive. + + Set to null to disable checkpointing. ''; }; period = mkOption { type = types.str; - default = "15 01 * * *"; + default = "01:15"; + example = "hourly"; description = '' - This option defines (in the format used by cron) - when tarsnap is run for backups. The default is to - backup the specified paths at 01:15 at night every - day. + Create archive at this interval. + + The format is described in + systemd.time + 7. ''; }; @@ -116,11 +113,11 @@ in type = types.bool; default = false; description = '' - Aggressive network behaviour: Use multiple TCP - connections when writing archives. Use of this - option is recommended only in cases where TCP - congestion control is known to be the limiting - factor in upload performance. + Upload data over multiple TCP connections, potentially + increasing tarsnap's bandwidth utilisation at the cost + of slowing down all other network traffic. Not + recommended unless TCP congestion is the dominant + limiting factor. ''; }; @@ -134,8 +131,7 @@ in type = types.listOf types.str; default = []; description = '' - Exclude files and directories matching the specified - patterns. + Exclude files and directories matching these patterns. ''; }; @@ -143,12 +139,10 @@ in type = types.listOf types.str; default = []; description = '' - Include only files and directories matching the - specified patterns. + Include only files and directories matching these + patterns (the empty list includes everything). - Note that exclusions specified via - excludes take precedence over - inclusions. + Exclusions have precedence over inclusions. ''; }; @@ -156,10 +150,10 @@ in type = types.bool; default = false; description = '' - Attempt to reduce tarsnap memory consumption. This - option will slow down the process of creating - archives, but may help on systems where the average - size of files being backed up is less than 1 MB. + Reduce memory consumption by not caching small files. + Possibly beneficial if the average file size is smaller + than 1 MB and the number of files is lower than the + total amount of RAM in KB. ''; }; @@ -167,11 +161,9 @@ in type = types.bool; default = false; description = '' - Try even harder to reduce tarsnap memory - consumption. This can significantly slow down - tarsnap, but reduces its memory usage by an - additional factor of 2 beyond what the - lowmem option does. + Reduce memory consumption by a factor of 2 beyond what + lowmem does, at the cost of significantly + slowing down the archiving process. ''; }; }; @@ -188,25 +180,22 @@ in gamedata = { directories = [ "/var/lib/minecraft "]; - period = "*/30 * * * *"; + period = "*:30"; }; } ''; description = '' - Configuration of a Tarsnap archive. In the example, your - machine will have two tarsnap archives: - gamedata (backed up every 30 minutes) and - nixos (backed up at 1:15 AM every night by - default). You can control individual archive backups using - systemctl, using the - tarsnap@nixos or - tarsnap@gamedata units. For example, - systemctl start tarsnap@nixos will - immediately create a new NixOS archive. By default, archives - are suffixed with the timestamp of when they were started, - down to second resolution. This means you can use GNU - sort to sort output easily. + Tarsnap archive configurations. Each attribute names an archive + to be created at a given time interval, according to the options + associated with it. When uploading to the tarsnap server, + archive names are suffixed by a 1 second resolution timestamp. + + For each member of the set is created a timer which triggers the + instanced tarsnap@ service unit. You may use + systemctl start tarsnap@archive-name to + manually trigger creation of archive-name at + any time. ''; }; }; @@ -216,38 +205,45 @@ in assertions = (mapAttrsToList (name: cfg: { assertion = cfg.directories != []; - message = "Must specify directories for Tarsnap to back up"; - }) cfg.config) ++ + message = "Must specify paths for tarsnap to back up"; + }) cfg.archives) ++ (mapAttrsToList (name: cfg: - { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem); + { assertion = !(cfg.lowmem && cfg.verylowmem); message = "You cannot set both lowmem and verylowmem"; - }) cfg.config); + }) cfg.archives); systemd.services."tarsnap@" = { - description = "Tarsnap Backup of '%i'"; + description = "Tarsnap archive '%i'"; requires = [ "network.target" ]; path = [ pkgs.tarsnap pkgs.coreutils ]; scriptArgs = "%i"; script = '' - mkdir -p -m 0755 $(dirname ${cfg.cachedir}) - mkdir -p -m 0600 ${cfg.cachedir} + mkdir -p -m 0755 ${dirOf cfg.cachedir} + mkdir -p -m 0700 ${cfg.cachedir} DIRS=`cat /etc/tarsnap/$1.dirs` exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS ''; + + serviceConfig = { + IOSchedulingClass = "idle"; + NoNewPrivileges = "true"; + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH"; + }; }; - services.cron.systemCronJobs = mapAttrsToList (name: cfg: - "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap@${name}" - ) cfg.config; + systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}" + { timerConfig.OnCalendar = cfg.period; + wantedBy = [ "timers.target" ]; + }) cfg.archives; environment.etc = (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf" { text = configFile cfg; - }) cfg.config) // + }) cfg.archives) // (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs" { text = concatStringsSep " " cfg.directories; - }) cfg.config); + }) cfg.archives); environment.systemPackages = [ pkgs.tarsnap ]; }; diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index d7f6c188feb..220b154bd97 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -128,12 +128,12 @@ in users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton { name = "tss"; group = "tss"; - uid = config.ids.uids.nginx; + uid = config.ids.uids.tss; }); users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton { name = "tss"; - gid = config.ids.gids.nginx; + gid = config.ids.gids.tss; }); }; } diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 887ea79c34b..09e48ec4bff 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -18,42 +18,8 @@ with lib; }; config = mkOption { - type = types.lines; - default = - '' - global - log 127.0.0.1 local6 - maxconn 24000 - daemon - nbproc 1 - - defaults - mode http - option httpclose - - # Remove requests from the queue if people press stop button - option abortonclose - - # Try to connect this many times on failure - retries 3 - - # If a client is bound to a particular backend but it goes down, - # send them to a different one - option redispatch - - monitor-uri /haproxy-ping - - timeout connect 7s - timeout queue 300s - timeout client 300s - timeout server 300s - - # Enable status page at this URL, on the port HAProxy is bound to - stats enable - stats uri /haproxy-status - stats refresh 5s - stats realm Haproxy statistics - ''; + type = types.nullOr types.lines; + default = null; description = '' Contents of the HAProxy configuration file, haproxy.conf. @@ -66,6 +32,11 @@ with lib; config = mkIf cfg.enable { + assertions = [{ + assertion = cfg.config != null; + message = "You must provide services.haproxy.config."; + }]; + systemd.services.haproxy = { description = "HAProxy"; after = [ "network.target" ]; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 679aa81a13d..b573a356b35 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -183,7 +183,7 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - systemd.services.cupsd = + systemd.services.cups = { description = "CUPS Printing Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1b38ea3b679..135113b3ceb 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -9,28 +9,16 @@ let homeDir = "/var/lib/transmission"; downloadDir = "${homeDir}/Downloads"; incompleteDir = "${homeDir}/.incomplete"; + settingsDir = "${homeDir}/.config/transmission-daemon"; - settingsFile = "${settingsDir}/settings.json"; + settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); # Strings must be quoted, ints and bools must not (for settings.json). toOption = x: if x == true then "true" else if x == false then "false" else if isInt x then toString x - else toString ''\"${x}\"''; - - # All lines in settings.json end with a ',' (comma), except for the last - # line. This is standard JSON. But a comma can also appear *inside* some - # fields, notably the "rpc-whitelist" field. This is difficult to handle in - # sed so we simply ignore it and say that if you want to change the option at - # the last line of settings.json, you have to do it manually. At this time of - # writing, the last option is "utp-enable":true. - attrsToSedArgs = as: - concatStrings (concatLists (mapAttrsToList (name: value: - #map (x: '' -e 's=\(\"${name}\":\)[^,]*\(.*\)=\1 ${toOption x}\2=' '') # breaks if comma inside value field - map (x: '' -e 's=\(\"${name}\":\).*=\1 ${toOption x},=' '') # always append ',' (breaks last line in settings.json) - (if isList value then value else [value])) - as)); + else toString ''"${x}"''; # for users in group "transmission" to have access to torrents fullSettings = cfg.settings // { umask = 2; }; @@ -73,7 +61,7 @@ in boolean values must not. See https://trac.transmissionbt.com/wiki/EditConfigFiles for - documentation and/or look at ${settingsFile}. + documentation. ''; }; @@ -95,7 +83,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. serviceConfig.ExecStartPre = '' - ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs fullSettings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}" + ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json" ''; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 7e91e7b60ee..2c5e433003c 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.fcgiwrap; - in { options = { @@ -21,29 +20,53 @@ in { description = "Number of processes to prefork."; }; - bindSocket = mkOption { - type = types.string; - default = "unix:/run/fcgiwrap.sock"; - description = '' - Socket to bind to. Valid socket URLs are: - unix:/path/to/socket for Unix sockets - tcp:dot.ted.qu.ad:port for IPv4 sockets - tcp6:[ipv6_addr]:port for IPv6 sockets - ''; + socketType = mkOption { + type = types.addCheck types.str (t: t == "unix" || t == "tcp" || t == "tcp6"); + default = "unix"; + description = "Socket type: 'unix', 'tcp' or 'tcp6'."; + }; + + socketAddress = mkOption { + type = types.str; + default = "/run/fcgiwrap.sock"; + example = "1.2.3.4:5678"; + description = "Socket address. In case of a UNIX socket, this should be its filesystem path."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + description = "User permissions for the socket."; + }; + + group = mkOption { + type = types.nullOr types.str; + default = null; + description = "Group permissions for the socket."; }; }; }; config = mkIf cfg.enable { - systemd.services.fcgiwrap = { after = [ "nss-user-lookup.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional (cfg.socketType != "unix") "multi-user.target"; serviceConfig = { - ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} -s ${cfg.bindSocket}"; - }; + ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} ${ + if (cfg.socketType != "unix") then "-s ${cfg.socketType}:${cfg.socketAddress}" else "" + }"; + } // (if cfg.user != null && cfg.group != null then { + User = cfg.user; + Group = cfg.group; + } else { } ); }; + systemd.sockets = if (cfg.socketType == "unix") then { + fcgiwrap = { + wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = cfg.socketAddress; + }; + } else { }; }; } diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0af1b58b7ca..0f21ef01263 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -102,6 +102,9 @@ in ''; serviceConfig = { ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 9c3c65dcfaa..02e51577e3e 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -88,7 +88,9 @@ in }; environment.systemPackages = - [ + filter isDerivation (builtins.attrValues plasma5) + ++ filter isDerivation (builtins.attrValues kf5) + ++ [ pkgs.qt4 # qtconfig is the only way to set Qt 4 theme kdeApps.kde-baseapps @@ -97,13 +99,12 @@ in kdeApps.konsole kdeApps.oxygen-icons + kdeApps.kde-runtime + pkgs.hicolor_icon_theme pkgs.orion # GTK theme, nearly identical to Breeze - ] - ++ filter isDerivation (builtins.attrValues plasma5) - ++ filter isDerivation (builtins.attrValues kf5) - ++ phononBackendPackages; + ] ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; @@ -121,6 +122,8 @@ in fonts.fonts = [ plasma5.oxygen-fonts ]; + programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass"; + # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 6a14a163c19..fce5bf11f05 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -46,7 +46,6 @@ in pkgs.which # Needed by the xfce's xinitrc script. pkgs.xfce.exo pkgs.xfce.gtk_xfce_engine - pkgs.xfce.libxfcegui4 # For the icons. pkgs.xfce.mousepad pkgs.xfce.ristretto pkgs.xfce.terminal diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 47d94dbe73b..e7ddb7ff254 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -18,6 +18,9 @@ let exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} ''; + theme = pkgs.gnome3.gnome_themes_standard; + icons = pkgs.gnome3.gnome_icon_theme; + # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. @@ -26,19 +29,16 @@ let buildInputs = [ pkgs.makeWrapper ]; buildCommand = '' - mkdir -p $out/gtk-3.0/ - - # This wrapper ensures that we actually get ?? (fonts should be OK now) + # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ - --set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \ - --set XDG_CONFIG_HOME $out/ - - # We need this to ensure that it actually tries to find icons from gnome-icon-theme - cat - > $out/gtk-3.0/settings.ini << EOF - [Settings] - gtk-icon-theme-name=gnome - EOF + --prefix PATH : "${pkgs.glibc}/bin" \ + --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \ + --set GTK_PATH "${theme}:${pkgs.gtk3}" \ + --set GTK_EXE_PREFIX "${theme}" \ + --set GTK_DATA_PREFIX "${theme}" \ + --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \ + --set XDG_CONFIG_HOME "${theme}/share" cat - > $out/lightdm-gtk-greeter.desktop << EOF [Desktop Entry] @@ -50,13 +50,11 @@ let ''; }; - hiddenUsers = config.services.xserver.displayManager.hiddenUsers; - usersConf = writeText "users.conf" '' [UserList] minimum-uid=500 - hidden-users=${concatStringsSep " " hiddenUsers} + hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/sbin/nologin ''; @@ -73,10 +71,19 @@ let greeter-session = ${cfg.greeter.name} ''; + gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" + '' + [greeter] + theme-name = Adwaita + icon-theme-name = Adwaita + background = ${cfg.background} + ''; + in { options = { services.xserver.displayManager.lightdm = { + enable = mkOption { default = false; description = '' @@ -95,6 +102,13 @@ in }; }; + background = mkOption { + default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"; + description = '' + The background image or color to use. + ''; + }; + }; }; @@ -112,6 +126,7 @@ in ''; }; + environment.etc."lightdm/lightdm-gtk-greeter.conf".source = gtkGreeterConf; environment.etc."lightdm/lightdm.conf".source = lightdmConf; environment.etc."lightdm/users.conf".source = usersConf; @@ -123,7 +138,7 @@ in users.extraUsers.lightdm = { createHome = true; - home = "/var/lib/lightdm"; + home = "/var/lib/lightdm-data"; group = "lightdm"; uid = config.ids.uids.lightdm; }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 020e8795045..c14c13b1cba 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -25,6 +25,8 @@ let [Users] MaximumUid=${toString config.ids.uids.nixbld} + HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} + HideShells=/run/current-system/sw/sbin/nologin [XDisplay] MinimumVT=${toString xcfg.tty} diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix index 6e6e88e6721..f8386b5e333 100644 --- a/nixos/modules/services/x11/hardware/multitouch.nix +++ b/nixos/modules/services/x11/hardware/multitouch.nix @@ -2,9 +2,15 @@ with lib; -let cfg = config.services.xserver.multitouch; in - -{ +let cfg = config.services.xserver.multitouch; + disabledTapConfig = '' + Option "MaxTapTime" "0" + Option "MaxTapMove" "0" + Option "TapButton1" "0" + Option "TapButton2" "0" + Option "TapButton3" "0" + ''; +in { options = { @@ -30,6 +36,33 @@ let cfg = config.services.xserver.multitouch; in description = "Whether to ignore touches detected as being the palm (i.e when typing)"; }; + tapButtons = mkOption { + type = types.bool; + default = true; + example = false; + description = "Whether to enable tap buttons."; + }; + + buttonsMap = mkOption { + type = types.listOf types.int; + default = [3 2 0]; + example = [1 3 2]; + description = "Remap touchpad buttons."; + apply = map toString; + }; + + additionalOptions = mkOption { + type = types.str; + default = ""; + example = '' + Option "ScaleDistance" "50" + Option "RotateDistance" "60" + ''; + description = '' + Additional options for mtrack touchpad driver. + ''; + }; + }; }; @@ -46,12 +79,17 @@ let cfg = config.services.xserver.multitouch; in Identifier "Touchpads" Driver "mtrack" Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}" + Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" + Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" + Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" + ${optionalString (!cfg.tapButtons) disabledTapConfig} ${optionalString cfg.invertScroll '' Option "ScrollUpButton" "5" Option "ScrollDownButton" "4" Option "ScrollLeftButton" "7" Option "ScrollRightButton" "6" ''} + ${cfg.additionalOptions} EndSection ''; diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix new file mode 100644 index 00000000000..556d9e187fd --- /dev/null +++ b/nixos/modules/services/x11/unclutter.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: +with lib; +let cfg = config.services.unclutter; +in { + options = { + services.unclutter.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable unclutter to hide your mouse cursor when inactive"; + }; + + services.unclutter.arguments = mkOption { + description = "Arguments to pass to unclutter command"; + default = "-idle 1"; + type = types.uniq types.string; + }; + }; + + config = mkIf cfg.enable { + systemd.services.unclutter = { + description = "unclutter"; + requires = [ "display-manager.service" ]; + after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; + serviceConfig.ExecStart = '' + ${pkgs.unclutter}/bin/unclutter ${cfg.arguments} + ''; + environment = { DISPLAY = ":0"; }; + serviceConfig.Restart = "always"; + }; + }; +} diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 5d1bb631b54..778cdc5d30d 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -16,7 +16,7 @@ with lib; Enable sensitivity and speed configuration for trackpoints. ''; }; - + sensitivity = mkOption { default = 128; example = 255; @@ -44,7 +44,7 @@ with lib; Enable scrolling while holding the middle mouse button. ''; }; - + }; }; @@ -70,7 +70,7 @@ with lib; '' Section "InputClass" Identifier "Trackpoint Wheel Emulation" - MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" + MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" MatchDevicePath "/dev/input/event*" Option "EmulateWheel" "true" Option "EmulateWheelButton" "2" diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index 141e7097405..2f40283b3e1 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -82,7 +82,7 @@ in systemd.services.prlshprint = { description = "Parallels Shared Printer Tool"; wantedBy = [ "multi-user.target" ]; - bindsTo = [ "cupsd.service" ]; + bindsTo = [ "cups.service" ]; serviceConfig = { Type = "forking"; ExecStart = "${prl-tools}/bin/prlshprint"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 80137de33b3..cf2f25bfeee 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; - sha256 = "0h3jn400dj6qxl1gd4max7wl30cib2wczf9dd3qnbw42wngpdvx2"; + sha256 = "17jxsxsrsz3qy2hxdpw78vcbnnd0nq614iy42ypzhw4pdpz0s1l7"; }; buildInputs = [ autoreconfHook pkgconfig openssl diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix new file mode 100644 index 00000000000..3840d06dd46 --- /dev/null +++ b/pkgs/applications/audio/ario/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, + libunique, gnutls, libxml2, curl, mpd_clientlib, dbus_glib, libnotify, + libsoup, avahi, taglib + }: + +stdenv.mkDerivation rec { + version = "1.5.1"; + name = "ario-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ario-player/${name}.tar.gz"; + sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88"; + }; + + patches = [ ./glib-single-include.patch ]; + + buildInputs = [ + pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls + libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib + ]; + + meta = { + description = "GTK2 client for MPD (Music player daemon)"; + homepage = "http://ario-player.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch new file mode 100644 index 00000000000..45e0a1738f8 --- /dev/null +++ b/pkgs/applications/audio/ario/glib-single-include.patch @@ -0,0 +1,40 @@ +From: Michael Biebl +Origin: vendor +Bug-Debian: http://bugs.debian.org/665506 +Subject: Including individual glib headers no longer supported + +--- a/src/ario-profiles.h ++++ b/src/ario-profiles.h +@@ -20,7 +20,7 @@ + #ifndef __ARIO_PROFILES_H + #define __ARIO_PROFILES_H + +-#include ++#include + #include "servers/ario-server.h" + + G_BEGIN_DECLS +--- a/src/plugins/ario-plugin-info.c ++++ b/src/plugins/ario-plugin-info.c +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include "plugins/ario-plugin-info-priv.h" + #include "ario-debug.h" +--- a/src/ario-util.h ++++ b/src/ario-util.h +@@ -18,8 +18,8 @@ + */ + + #include "servers/ario-server.h" +-#include "glib/gslist.h" +-#include "gdk/gdkpixbuf.h" ++#include ++#include + + /* Number of covers used to generate the drag & drop image */ + #define MAX_COVERS_IN_DRAG 3 diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 663e1827b85..6d28c038f23 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz"; - sha256 = "0p0lfy3vmxjf9nwajzyhl2jscpmbi26qqqsy1hsa4ljc0plfz60p"; + sha256 = "1g76z7ha3hd53vbqaq9n1qg6s3lw8zzaw51iny6y2bz0j1xqwcsr"; }; buildInputs = [ diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix new file mode 100644 index 00000000000..b90c6a0ea36 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "cyclone-${version}"; + version = "0.1-alpha55"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz"; + sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for file in `grep -r -l g_canvas.h` + do + sed -i 's|#include "g_canvas.h"|#include "${puredata}/include/pd/g_canvas.h"|g' $file + done + for file in `grep -r -l m_imp.h` + do + sed -i 's|#include "m_imp.h"|#include "${puredata}/include/pd/m_imp.h"|g' $file + done + ''; + + installPhase = '' + mkdir -p $out/cyclone + cp -r bin/* $out/cyclone + ''; + + meta = { + description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; + homepage = http://puredata.info/downloads/cyclone; + license = stdenv.lib.licenses.tcltk; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix new file mode 100644 index 00000000000..9046ec0a87f --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "helmholtz"; + + src = fetchurl { + url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + name = "helmholtz.zip"; + sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv helmholtz~/src/helmholtz\~.cpp . + mv helmholtz~/src/Helmholtz.cpp . + mv helmholtz~/src/include/ . + mv helmholtz~/src/Makefile . + rm -rf helmholtz~/src/ + rm helmholtz~/helmholtz~.pd_darwin + rm helmholtz~/helmholtz~.dll + rm -rf __MACOSX + ''; + + patchPhase = '' + sed -i "s@current: pd_darwin@current: pd_linux@g" Makefile + sed -i "s@-Wl@@g" Makefile + ''; + + installPhase = '' + cp -r helmholtz~/ $out/ + ''; + + meta = { + description = "Time domain pitch tracker for Pure Data"; + homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix new file mode 100644 index 00000000000..dc4d0375961 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "maxlib-${version}"; + version = "1.5.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz"; + sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; + }; + + buildInputs = [ puredata ]; + + patchPhase = '' + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + sed -i "s@/usr@$out@g" Makefile + ''; + + postInstall = '' + mv $out/local/lib/pd-externals/maxlib/ $out + rm -rf $out/local/ + ''; + + meta = { + description = "A library of non-tilde externals for puredata, by Miller Puckette"; + homepage = http://puredata.info/downloads/maxlib; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix new file mode 100644 index 00000000000..5f76b208e14 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, puredata }: + +stdenv.mkDerivation rec { + name = "mrpeach-${version}"; + version = "1.1"; + + # this was to only usable url I could find: + # - The main url changes hash: http://pure-data.cvs.sourceforge.net/viewvc/pure-data/externals/mrpeach/?view=tar + # - There are lot's of places where this SW is available as part of a big pkg: pd-extended, pd-l2ork + # - It's just 211K + + src = fetchurl { + url = "http://slackonly.com/pub/korgie/sources/pd_mrpeach-2011.10.21.tar.gz"; + sha256 = "12jqba3jsdrk20ib9wc2wiivki88ypcd4mkzgsri9siywbbz9w8x"; + }; + + buildInputs = [puredata ]; + + patchPhase = '' + for D in net osc + do + sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile + for i in ${puredata}/include/pd/*; do + ln -s $i $D/ + done + done + ''; + + buildPhase = '' + for D in net osc + do + cd $D + make + cd .. + done + ''; + + installPhase = '' + for D in net osc + do + cd $D + make install + cd .. + done + ''; + + fixupPhase = '' + mv $out/lib/pd-externals/net $out + mv $out/lib/pd-externals/osc $out + rm -rf $out/lib + ''; + + meta = { + description = "A collection of Pd objectclasses for OSC-messages"; + homepage = http://puredata.info/downloads/osc; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix new file mode 100644 index 00000000000..fc7fc5ee3d0 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + name = "puremapping"; + + src = fetchurl { + url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip"; + name = "puremapping"; + sha256 = "1ygzxsfj3rnzjkpmgi4wch810q8s5vm1gdam6a938hbbvamafgvc"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/puremapping + mv puremapping/ $out + ''; + + meta = { + description = "Set of externals to facilitate the use of sensors within Pure Data and to create complex relations between input and output of a dynamic system"; + homepage = http://www.chnry.net/ch/?090-Pure-Mapping&lang=en; + license = stdenv.lib.licenses.gpl1; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix new file mode 100644 index 00000000000..f8a25256bb0 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip, puredata }: + +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "timbreid-${version}"; + + src = fetchurl { + url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip"; + sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p"; + }; + + buildInputs = [ unzip puredata ]; + + unpackPhase = '' + unzip $src + mv timbreID-0.6.0-src/tID/* . + rm -rf timbreID-0.6.0-src/tID/ + rm -rf timbreID-0.6.0-src/INSTALL.txt + ''; + + installPhase = '' + mkdir -p $out/ + cp -r *.pd $out/ + cp -r *.pd_linux $out/ + cp -r *.wav $out/ + ''; + + meta = { + description = "A collection of audio feature analysis externals for puredata"; + homepage = http://williambrent.conflations.com/pages/research.html; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix new file mode 100644 index 00000000000..68996e9e6e4 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, autoconf, automake, puredata }: + +stdenv.mkDerivation rec { + name = "zexy-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; + }; + + buildInputs = [ autoconf automake puredata ]; + + patchPhase = '' + cd src/ + for i in ${puredata}/include/pd/*; do + ln -s $i . + done + patchShebangs + ./bootstrap.sh + ./configure --enable-lpt=no --prefix=$out + ''; + + postInstall = '' + mv $out/lib/pd/extra/zexy $out + rm -rf $out/lib + ''; + + meta = { + description = "The swiss army knife for puredata"; + homepage = http://puredata.info/downloads/zexy; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix new file mode 100644 index 00000000000..0a30037b226 --- /dev/null +++ b/pkgs/applications/audio/puredata/wrapper.nix @@ -0,0 +1,23 @@ +{ stdenv, buildEnv, puredata, makeWrapper, plugins }: + +let +puredataFlags = map (x: "-path ${x}/") plugins; +drv = buildEnv { + name = "puredata-with-plugins-" + (builtins.parseDrvName puredata.name).version; + + paths = [ puredata ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${puredata}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pd \ + --add-flags "${toString puredataFlags}" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 176888328a5..171fefc8a09 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -6,8 +6,6 @@ #ToDo: bad icons with gtk2; # avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from -#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory - let ver_branch = "2.0"; version = "2.0.0"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 0c0ddc3158a..a3cdbb6afb9 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.171.0"; + version = "0.187.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0syl3rljk2k8j6fy8xq59qhf13b8a4awpi5cvn1kka56y0vmhxs5"; + sha256 = "0s6173dg5m52zc8kqwlgjn113d84cskrv9v29fb0nrvwvkv2xzmw"; name = "${name}.deb"; }; @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/atom patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node + $out/share/atom/resources/app/apm/bin/node wrapProgram $out/bin/atom \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" wrapProgram $out/bin/apm \ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e04e438b8ba..41be00bdb63 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -246,11 +246,11 @@ in { description = "Eclipse Classic"; sources = { "x86_64-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk-x86_64.tar.gz; sha256 = "0ncm56ylwxw9z8rk8ccgva68c2yr9yrf1kcr1zkgw6p87xh1yczd"; }; "i686-linux" = fetchurl { - url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/eclipse-SDK-4.3.1-linux-gtk.tar.gz; sha256 = "1zxsh838khny7mvl01h28xna6xdh01yi4mvls28zj22v0340lgsg"; }; }; @@ -261,14 +261,29 @@ in { 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; + url = http://archive.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; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/eclipse-SDK-4.4-linux-gtk.tar.gz; sha256 = "0hjc4zrsmik6vff851p0a4ydnx99840j2xrx8348kk6h0af8vx6z"; }; }; }; + eclipse_sdk_442 = buildEclipse { + name = "eclipse-sdk-4.4.2"; + description = "Eclipse Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz; + sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l"; + + }; + "i686-linux" = fetchurl { + url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz; + sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d"; + }; + }; + }; } diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 5ef19874531..c023da0bc95 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -9,10 +9,10 @@ let in stdenv.mkDerivation rec { - name = "gobby-0.4.94"; + name = "gobby-0.5.0"; src = fetchurl { url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00"; + sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 429de65b568..ba4a4173da7 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -254,37 +254,37 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jh0sxi5dpgpw7ga018fby7zvb4i9k49vwl8422lfcrgckdz9nv2"; + sha256 = "16na04sp9q7z10kjx8wpf9k9bv9vgv7rmd9jnrn72nhwd7bp0n1i"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.1"; - build = "139.574"; + version = "4.0.5"; + build = "139.1547"; description = "PyCharm 4.0 Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04yjhg6vi2kz00sy8zg4wkz26ai90vbp0cnd850ynsab0jsy24w4"; + sha256 = "17cxznv7q47isym6l7kbp3jdzdgj02jayygy42x4bwjmg579v1gg"; }; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.2"; - build = "PS-139.732"; + version = "8.0.3"; + build = "PS-139.1348"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; + sha256 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b"; }; }; diff --git a/pkgs/applications/editors/jedit/build.xml.patch b/pkgs/applications/editors/jedit/build.xml.patch index 2dabaaaed0c..2f630f18ab7 100644 --- a/pkgs/applications/editors/jedit/build.xml.patch +++ b/pkgs/applications/editors/jedit/build.xml.patch @@ -1,6 +1,6 @@ ---- a/build.xml 2013-07-28 18:03:55.000000000 +0100 -+++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 -@@ -42,16 +42,6 @@ +--- a/build.xml 2015-02-04 08:47:37.000000000 +0100 ++++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 +@@ -43,16 +43,6 @@ @@ -17,7 +17,7 @@ -@@ -89,51 +79,8 @@ +@@ -90,51 +80,8 @@ value="true"/> @@ -39,7 +39,7 @@ - - +- unless="ivy.done"> - - +- unless="ivy.done"> - - -@@ -238,37 +185,6 @@ +@@ -239,37 +186,6 @@ @@ -108,13 +108,14 @@ - +- description="run unit tests" +- unless="skip.tests"> - - - + + +- -@@ -611,7 +503,7 @@ +@@ -622,7 +512,7 @@ -@@ -655,7 +547,7 @@ +@@ -668,7 +558,7 @@ -@@ -679,7 +571,7 @@ +@@ -692,7 +582,7 @@ -@@ -703,7 +595,7 @@ +@@ -716,7 +606,7 @@ -@@ -838,7 +730,7 @@ +@@ -851,7 +741,7 @@ -@@ -1143,7 +1035,7 @@ +@@ -1154,7 +1044,7 @@ -@@ -1271,7 +1163,7 @@ +@@ -1295,7 +1185,7 @@ -@@ -1567,7 +1459,7 @@ +@@ -1592,7 +1482,7 @@ http://get.adobe.com/flashplayer/ - version = "11.2.202.442"; + version = "11.2.202.451"; 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 = "08ni1mllp98d7wawz35lx8ydymya8nspb90mq29ivbyrkx5aal28"; + sha256 = "0jlk3bgpv998ajm5wlxngxy82h3mcd847wm8mkvmyfmjn4x9dv7z"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "00728q8jp40llpsfw2n5q9w29isyy3a64xlisjizyh3chb6bkkdm"; + sha256 = "1lpvx6dz3hdf3jhs3xdf09jyh1563msq0icr832432d4a1jgqkds"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3f99094ffd4..257b676686b 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,13 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.7.0"; + version = "2.9.7.2"; + name = "snort-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; - sha256 = "16z4mi7bri7ygvc0j4hhl2pgcw6xwxah1h3wk5vpy2yj8pmayf4p"; + sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix new file mode 100644 index 00000000000..9b16404b620 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver +, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }: + +let + pn = "choqok"; + v = "1.5"; +in + +stdenv.mkDerivation rec { + name = "${pn}-${v}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz"; + sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4"; + }; + + buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs + automoc4 pkgconfig phonon qca2 qjson qoauth ]; + + meta = with stdenv.lib; { + description = "A KDE microblogging client"; + repositories.git = git://anongit.kde.org/choqok; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms; + }; +} diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index cc29aeafef9..b7f4c8abde3 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.25"; + version = "0.10.26"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "fcb6fbcd37bdcf07d2960d143209b7697ee705286754ead4cc5e6bd95cd0acb8"; + sha256 = "023vnns8ns2pgvqjisw466mw7323rv61cbl1indpfai412y7xjbk"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bee1b738d12..9283ee1274c 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, qt4, cmake, sqlite}: +{ stdenv, fetchurl, qt4, cmake, sqlite }: stdenv.mkDerivation { - name = "tagainijisho-1.0.2"; + name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.2/tagainijisho-1.0.2.tar.gz; - sha256 = "0gvwsphy2a1b2npxkzvaf91rbzb00zhi2anxd5102h6ld5m52jhl"; + url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; buildInputs = [ qt4 cmake sqlite ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a313a566c4e..b206fc671b5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -100,4 +100,6 @@ rec { gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; git-extras = callPackage ./git-extras { }; + + git-cola = callPackage ./git-cola { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix new file mode 100644 index 00000000000..eee17911cea --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: + +pythonPackages.buildPythonPackage rec { + name = "git-cola-${version}"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; + sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1"; + }; + + buildInputs = [ makeWrapper gettext ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ]; + + # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but + # "import __future__" must be placed above that. This removes the argv[0] line. + postFixup = '' + wrapPythonPrograms + + sed -i "$out/bin/.git-dag-wrapped" -e '{ + /import sys; sys.argv/d + }' + + sed -i "$out/bin/.git-cola-wrapped" -e '{ + /import sys; sys.argv/d + }' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/git-cola/git-cola; + description = "A sleek and powerful Git GUI"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bobvanderlinden ]; + }; +} diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index c97e9c762a5..bd35ebb5266 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.2.4"; + version = "3.3.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1g7nfvapxj5k44dyp0p08v37s0zmrj2vl0rjgfd8297x0afidm08"; + sha256 = "1yi72lv05p6hr8ngplz56rncs9wv6c16z8ki6f96yw5c833igik7"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index e38e00bc61f..f41d0e839ac 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -18,7 +18,7 @@ let mkdir -p $d sauce="." [ -d ${namespace} ] && sauce=${namespace} - cp -R $sauce/* $d + cp -R "$sauce/"* $d ''; }; @@ -59,13 +59,13 @@ in plugin = "genesis"; namespace = "plugin.video.genesis"; - version = "2.4.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "lambda81"; repo = "lambda-addons"; - rev = "1eb1632063e18f3f30e9fdbed2a15cf1e9c05315"; - sha256 = "1gzx0jq4gyhkpdd21a70lhww9djr5dlgyl93b4l7dhgr3hnzxccl"; + rev = "34af083980598177684eeb6e1e73da336b84575a"; + sha256 = "1fh3j4ymkrx9flpvnlyjp1q4avfmjv5a6yfwl3cmqnslkkp6kn9n"; }; meta = with stdenv.lib; { @@ -81,17 +81,17 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.9"; + version = "4.0.14"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "29a754e49584d1ca32f0c07b87304669cf266bb0"; - sha256 = "0k7mwaknw4h1jlq7ialbzgxxpb11j8bk29dx2gimp40lvnyw4yhz"; + rev = "a6041aa6cf8f8461c0ebb093d901320822539094"; + sha256 = "1nxa2855i1if4vsflhb88i9s12flp2yzgan2wzdv2117cmll4pvd"; }; meta = with stdenv.lib; { - homepage = "http://forum.kodi.org/showthread.php?tid=67110"; + homepage = "http://forum.kodi.tv/showthread.php?tid=67110"; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 1fa77128c04..74d4196e47c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -18,12 +18,12 @@ assert withGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.6.0"; + version = "7.7.0"; name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "1n6waln6r9jx26al3k2nh6wi8p1q6lv2fs48nbc1lj9s2fc35pkl"; + sha256 = "0a602d5jvq0ap4pa64p80al8nmyp37a380bi5i4sqdpvp298h78r"; }; buildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index dec3a5fc28d..86e5d9cb9eb 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, freetype, yasm +, aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null @@ -103,6 +104,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig freetype ] + ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi ++ optionals x11Support [ libX11 libXext mesa ] diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix new file mode 100644 index 00000000000..a7e8cd8c1b9 --- /dev/null +++ b/pkgs/applications/video/qarte/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: + +stdenv.mkDerivation { + name = "qarte-2.2.0"; + src = fetchbzr { + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; + rev = "146"; + sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv qarte $out/bin/ + substituteInPlace $out/bin/qarte \ + --replace '/usr/bin/python' "${python.interpreter}" \ + --replace '/usr/share' "$out/share" + wrapProgram $out/bin/qarte \ + --prefix PYTHONPATH : "${pyqt4}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ + --prefix PATH : "${rtmpdump}/bin" + + mkdir -p $out/share/man/man1/ + mv qarte.1 $out/share/man/man1/ + + mkdir -p $out/share/qarte + mv * $out/share/qarte/ + ''; + + meta = { + homepage = https://launchpad.net/qarte; + description = "A recorder for Arte TV Guide and Arte Concert"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 9307b9e1d1b..6ae4100c827 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.7"; + name = "xine-ui-0.99.9"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; + sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd"; }; nativeBuildInputs = [ pkgconfig shared_mime_info ]; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index d7008d6a8ca..a8d2b42bb3b 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.9"; + version = "4.9.1"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0n6hfma058iykfxnl1m23mkh8y5sx1x80s3fxfdngbd9wc41kqxy"; + sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp"; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix new file mode 100644 index 00000000000..11e5460fecb --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }: + +stdenv.mkDerivation { + name = "alsamixer.app-0.2.1"; + src = fetchgit { + url = git://repo.or.cz/dockapps.git; + rev = "38c74350b02f35824554ce0c4f0f251d71762040"; + sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext alsaLib ]; + + postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app"; + + installPhase = '' + mkdir -pv $out/bin; + cp AlsaMixer.app $out/bin/AlsaMixer; + ''; + + meta = { + description = "Alsa mixer application for Windowmaker"; + homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix new file mode 100644 index 00000000000..6fe49745fa7 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: + +stdenv.mkDerivation { + name = "wmsm.app-0.2.1"; + src = fetchurl { + url = http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2; + sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/wmsm"; + + installPhase = '' + substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install" + mkdir -pv $out/bin; + make PREFIX=$out/bin install; + ''; + + meta = { + description = "System monitor for Windowmaker"; + homepage = "http://linux-bsd-unix.strefa.pl"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 35608bd3eb6..3e140fac97e 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -79,7 +79,11 @@ if $cpid == 0 $unshare.call CLONE_NEWNS | CLONE_NEWUSER # Map users and groups to the parent namespace - write_file '/proc/self/setgroups', 'deny' + begin + # setgroups is only available since Linux 3.19 + write_file '/proc/self/setgroups', 'deny' + rescue + end write_file '/proc/self/uid_map', "#{uid} #{uid} 1" write_file '/proc/self/gid_map', "#{gid} #{gid} 1" diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 57864b4934b..67484857ee1 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/${name} < $out/libexec/run < leaveDotGit; stdenv.mkDerivation { inherit name; @@ -50,7 +51,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev leaveDotGit fetchSubmodules; + inherit url rev leaveDotGit fetchSubmodules deepClone; GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; @@ -64,4 +65,3 @@ stdenv.mkDerivation { preferLocalBuild = true; } - diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index b2bffc781b3..7bafd78d76a 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_18 test-patch; + else mkKernel pkgs.linux_3_19 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 56fa9f51a47..7696632ef92 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "fira-3.111"; + name = "fira-4.002"; src = fetchurl { - url = "http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip"; - sha256 = "3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457"; + url = http://www.carrois.com/downloads/fira_4_0/FiraFonts4002.zip; + sha256 = "1vh4hx8ffmh2p7mxxbcp5zbcz8kzpzxaggdqnhj5i4vi329n5hfw"; }; buildInputs = [unzip]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.carrois.com/fira-3-1/; + homepage = http://www.carrois.com/fira-4-0/; description = "Sans-serif and monospace font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix new file mode 100644 index 00000000000..3757b10754b --- /dev/null +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, fetchurl +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +}: + +let version = "20061014"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-db-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + }; + buildInputs = + [ + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ]; + + meta = with stdenv.lib; { + description = "Monitor database for DDCcontrol"; + homepage = "http://ddccontrol.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index bcb49b6cafe..4a394b3b897 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { done ''; - patches = [ ./search_providers_dir.patch ]; + patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; meta = with stdenv.lib; { description = "Single sign-on framework for GNOME"; diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch new file mode 100644 index 00000000000..e25105a303f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch @@ -0,0 +1,19 @@ +diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c +index 7dc23c2..fcb1384 100644 +--- a/panels/network/connection-editor/vpn-helpers.c ++++ b/panels/network/connection-editor/vpn-helpers.c +@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) + if (!so_path) + goto next; + +- /* Remove any path and extension components, then reconstruct path +- * to the SO in LIBDIR +- */ +- so_name = g_path_get_basename (so_path); +- g_free (so_path); +- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); +- g_free (so_name); +- + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!module) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 1e1ef0cf846..4d6ac29f53d 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4 -, gtk, gtksourceview, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util +, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }: stdenv.mkDerivation rec { p_name = "mousepad"; - ver_maj = "0.3"; + ver_maj = "0.4"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; + sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool libxfce4util libxfcegui4 - gtk gtksourceview dbus dbus_glib + [ pkgconfig intltool libxfce4util + gtk gtksourceview dbus dbus_glib makeWrapper ]; - # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax - # highlighting (in fact Mousepad segfaults without it). - propagatedUserEnvPkgs = [ gtksourceview ]; + preFixup = '' + wrapProgram "$out/bin/mousepad" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" + ''; meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 694db49f589..7588616ac1f 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "exo"; ver_maj = "0.10"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; + sha256 = "1g9651ra395v2fmzb943l68b9pg0rfxc19x97a62crchxwa4nw4m"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 44f5a95224e..8f8cfff76cd 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }: stdenv.mkDerivation rec { p_name = "garcon"; - ver_maj = "0.2"; - ver_min = "1"; + ver_maj = "0.4"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1xq14wayk07cil04yhrdkjhacz9dbldcl9i59sbrgrgznaw49dj8"; + sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib libxfce4util ]; + buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 360e4a0a250..b66faf2390b 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, enableGtk3Support ? false, gtk3 }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk }: stdenv.mkDerivation rec { p_name = "gtk-xfce-engine"; - ver_maj = "3.0"; + ver_maj = "2.10"; ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0vd0ly81540f9133abza56mlqqx1swp0j70ll8kf948sva0wy0zb"; + sha256 = "4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed027f7063d"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: gtk3 - buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk3; + buildInputs = [ pkgconfig intltool gtk ]; meta = { homepage = http://www.xfce.org/; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index cb2975d8214..1739cfbb87a 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "libxfce4ui"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; + sha256 = "11rrhqxnfwx5jls3nlg9s2x8saag9f2zqk9cdm6hr3bs6cr9a781"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 8483aec7a46..6893d7cfb20 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "libxfce4util"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78"; + sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Basic utility non-GUI functions for Xfce"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 5ce88921fa8..b53ee4c45c5 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -4,13 +4,14 @@ stdenv.mkDerivation rec { p_name = "thunar-volman"; ver_maj = "0.8"; - ver_min = "0"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; + sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; + buildInputs = [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index fdf4211f099..abcfd656c50 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { p_name = "thunar"; ver_maj = "1.6"; - ver_min = "3"; + ver_min = "6"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2"; - sha256 = "17api7nc3h93k2mzrfmw6ygc0fqmg78ja0qbkzd9rhhsi3v0c9ws"; + sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index fab6152c99a..1fc895ea412 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -4,11 +4,11 @@ libgsf, poppler, bzip2 }: stdenv.mkDerivation rec { p_name = "tumbler"; ver_maj = "0.1"; - ver_min = "30"; + ver_min = "31"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7"; + sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index 01848d66696..25bd04f9ec4 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-appfinder"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5"; + sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index 671f57faeb3..5541011a501 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-dev-tools"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y1byfjciqhxqfxbjfp22bn5lxk3a01ng7zfjha8h5mzzfxlk5pp"; + sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 7fa8862ea3b..5a8cc9dc0e5 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-panel"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1mkmhhmy70izja6d6di65hay9ybqi8615pwjbx0lgqk53gnm4c2p"; + sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 2a1e772e4a5..c75eb787757 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; - ver_maj = "1.3"; - ver_min = "2"; + ver_maj = "1.4"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0lv29ycws185qr89xn01vcddkvpddk7q6hni0s6d0nqvjavycg0j"; + sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index ac268184ded..0f2c30befb7 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -6,23 +6,15 @@ stdenv.mkDerivation rec { p_name = "xfce4-session"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "10zwki7v55a325abr57wczcb5g7ml99cqk1p8ls8qycqqfyzlm01"; + sha256 = "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - patches = [(fetchpatch { - name = "suspend+hibernate-via-logind.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch" - + "?h=packages/xfce4-session&id=f84637fa2b"; - sha256 = "1pnm1w9invyxjdbfm7p0brf9krl9jy8ab2ilwvizymp5i0vnj0xc"; - })]; - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch index 51ac265dcb1..2683b3c3dfd 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch +++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch @@ -1,12 +1,11 @@ -diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml ---- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml 2013-05-05 18:12:54.000000000 +0200 -+++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml 2013-08-15 15:57:48.538586286 +0200 +--- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100 ++++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100 @@ -7,7 +7,7 @@ - + - + - + \ No newline at end of file diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index ee5ae15fca1..4c2de64561d 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui -, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon }: +, libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }: #TODO: optional packages stdenv.mkDerivation rec { p_name = "xfce4-settings"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi"; + sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -17,10 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./xfce4-settings-default-icon-theme.patch ]; buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade + [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon - #gtk libxfce4util libxfcegui4 libwnck dbus_glib - #xfconf libglade xorg.iceauth ]; configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 9ed2be4a740..f12f96895cd 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfconf"; - ver_maj = "4.10"; + ver_maj = "4.12"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; + sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 6353f6d6c33..45a89b93748 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; - ver_maj = "4.10"; - ver_min = "3"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1kkj6axcbj82v3n2hkzsdranpqrxaarnyjxkpfs29dyqajjjpjh9"; + sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index 4b190889c85..7e4c57ad941 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { p_name = "xfwm4"; - ver_maj = "4.10"; - ver_min = "1"; + ver_maj = "4.12"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0h57gwjs3j5f8ly0gmhl620338fg4qvlzs8gpqs9wxzblvxl831q"; + sha256 = "0fnc2ps4k733n9qfpxrz047h1myyqjzxczl7fmkjmqwshvicpx19"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - #TODO: kde systray, docs buildInputs = [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf libwnck libstartup_notification diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index d769072acb7..459158a136a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,4 +1,6 @@ -{ config, pkgs, newScope }: let +{ config, pkgs, newScope }: + +let callPackage = newScope (deps // xfce_self); diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index f2a8ef4d9ea..072da2bc576 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-cpufreq-plugin"; - ver_maj = "1.0"; - ver_min = "0"; + ver_maj = "1.1"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; + sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index ad9c45820af..7aca910b8a8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk}: with stdenv.lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index ede0495b8de..3be77ab77ca 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Dictionary plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 8e402edbeb6..eba05af69c0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Sticky notes plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; + broken = true; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix index e73ad925630..603a68cc5f6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre -, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: +, libxfce4util, xfce4panel, libxfce4ui, xfconf, gtk }: with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-verve-plugin"; ver_maj = "1.0"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "18zi8lam82xwjm5zdnilg3ffxpp5z8vjad3kjvdsyxdhsdza84fh"; + sha256 = "1y4vvk3nk1haq39xw0gzscsnnj059am1p3acgq9mj0miyiz8971v"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ]; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix index 18fe0ffe204..002f34daa13 100644 --- a/pkgs/development/compilers/ats/default.nix +++ b/pkgs/development/compilers/ats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats-${version}"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz"; - sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6"; + sha256 = "0l2kj1fzhxwsklwmn5yj2vp9rmw4jg0b18bzwqz72bfi8i39736k"; }; # this is necessary because atxt files usually include some .hats files diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 3c5a52c0c40..ee7ca20ddf7 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -5,16 +5,14 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; - homepage = "http://haskell.org/ghc"; - src = fetchurl { - url = "${homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; buildInputs = [ghc libedit perl gmp]; - configureFlags=[ + configureFlags = [ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" "--with-gcc=${stdenv.cc}/bin/gcc" @@ -23,38 +21,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; meta = { - inherit homepage; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; inherit (ghc.meta) license platforms; }; - - passthru = { - corePackages = [ - [ "Cabal" "1.6.0.3" ] - [ "array" "0.2.0.0" ] - [ "base" "3.0.3.1" ] - [ "base" "4.1.0.0" ] - [ "bytestring" "0.9.1.4" ] - [ "containers" "0.2.0.1" ] - [ "directory" "1.0.0.3" ] - [ "extensible-exceptions" "0.1.1.0" ] - [ "filepath" "1.1.0.2" ] - [ "ghc" "6.10.4" ] - [ "ghc-prim" "0.1.0.0" ] - [ "haddock" "2.4.2" ] - [ "haskell98" "1.0.1.0" ] - [ "hpc" "0.5.0.3" ] - [ "integer" "0.1.0.1" ] - [ "old-locale" "1.0.0.1" ] - [ "old-time" "1.0.0.2" ] - [ "packedstring" "0.1.0.1" ] - [ "pretty" "1.0.1.0" ] - [ "process" "1.0.1.1" ] - [ "random" "1.0.0.1" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.1" ] - [ "template-haskell" "2.3.0.1" ] - [ "unix" "2.3.2.0" ] - ]; - }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 05eff1b5d90..2364fe1d5b9 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { echo "${buildMK}" > mk/build.mk ''; - configureFlags=[ + configureFlags = [ "--with-gcc=${stdenv.cc}/bin/gcc" ]; @@ -36,50 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; - - # TODO: requires a comment as to what it does and why it is needed. - passthru = { - corePackages = [ - [ "Cabal" "1.8.0.2" ] - [ "array" "0.3.0.0" ] - [ "base" "3.0.3.2" ] - [ "base" "4.2.0.0" ] - [ "bin-package-db" "0.0.0.0" ] - [ "bytestring" "0.9.1.5" ] - [ "containers" "0.3.0.0" ] - [ "directory" "1.0.1.0" ] - [ "dph-base" "0.4.0" ] - [ "dph-par" "0.4.0" ] - [ "dph-prim-interface" "0.4.0" ] - [ "dph-prim-par" "0.4.0" ] - [ "dph-prim-seq" "0.4.0" ] - [ "dph-seq" "0.4.0" ] - [ "extensible-exceptions" "0.1.1.1" ] - [ "ffi" "1.0" ] - [ "filepath" "1.1.0.3" ] - [ "ghc" "6.12.1" ] - [ "ghc-binary" "0.5.0.2" ] - [ "ghc-prim" "0.2.0.0" ] - [ "haskell98" "1.0.1.1" ] - [ "hpc" "0.5.0.4" ] - [ "integer-gmp" "0.2.0.0" ] - [ "old-locale" "1.0.0.2" ] - [ "old-time" "1.0.0.3" ] - [ "pretty" "1.0.1.1" ] - [ "process" "1.0.1.2" ] - [ "random" "1.0.0.2" ] - [ "rts" "1.0" ] - [ "syb" "0.1.0.2" ] - [ "template-haskell" "2.4.0.0" ] - [ "time" "1.1.4" ] - [ "unix" "2.4.0.0" ] - [ "utf8-string" "0.3.4" ] - ]; - }; } diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 47888679f24..7938e45605b 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150123"; + version = "7.10.0.20150315"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc2/${name}-src.tar.xz"; - sha256 = "0in5zsr2z545yln55c7mwi07x3za0874yxbpsj5xsb4vn3wrcrbn"; + url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; + sha256 = "0drj8llsf17iqlr04dp0xd5ypfsv5cgcm7ncvh675sas2rw5qhjx"; }; buildInputs = [ ghc perl ]; diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix index 7be005fb763..913e65de59a 100644 --- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix +++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix @@ -61,7 +61,7 @@ let version = if isRelease then meta = with stdenv.lib; { homepage = http://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin ]; license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; platforms = platforms.linux; }; @@ -132,7 +132,7 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; - enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 + enableParallelBuilding = true; preCheck = "export TZDIR=${tzdata}/share/zoneinfo"; diff --git a/pkgs/development/compilers/rustc/patches/alpha2.patch b/pkgs/development/compilers/rustc/patches/alpha2.patch index 8c15af5aca9..8165a42cf85 100644 --- a/pkgs/development/compilers/rustc/patches/alpha2.patch +++ b/pkgs/development/compilers/rustc/patches/alpha2.patch @@ -42,3 +42,14 @@ index ef849bb..e090b99 100644 } } +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl Iterator for Subpaths { + } + + fn main() { +- let mut walker: Subpaths = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index a0ecdaeb049..f82f85fb162 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -15,11 +15,11 @@ index ca59b1c..65ee7bf 100755 # do not fail if one of the above fails, as all we need is a working rustc! exit 0 diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index 6bf7453..319f9af 100644 +index ed44bf8..2b84627 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs -@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, - paths: &[&Path]) -> ProcessOutput { +@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, + paths: &[&Path]) -> Output { let ar = match *maybe_ar_prog { Some(ref ar) => &ar[..], - None => "ar" @@ -28,10 +28,10 @@ index 6bf7453..319f9af 100644 let mut cmd = Command::new(ar); diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs -index ea5001a..911445c 100644 +index 3087a8e..578448f 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs -@@ -350,8 +350,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri +@@ -352,8 +352,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -42,3 +42,14 @@ index ea5001a..911445c 100644 } } +diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs +index 049e08d..30b9d2a 100644 +--- a/src/test/run-pass/issue-20797.rs ++++ b/src/test/run-pass/issue-20797.rs +@@ -90,5 +90,5 @@ impl Iterator for Subpaths { + } + + fn main() { +- let mut walker: Subpaths = Subpaths::walk(&Path::new("/home")).unwrap(); ++ let mut walker: Subpaths = Subpaths::walk(&Path::new("/tmp")).unwrap(); + } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c09cf799a16..1f634f3f55f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -58,6 +58,7 @@ self: super: { }); # The package doesn't know about the AL include hierarchy. + # https://github.com/phaazon/al/issues/1 al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; # Depends on code distributed under a non-free license. @@ -199,6 +200,12 @@ self: super: { # https://github.com/mvoidex/hsdev/issues/11 hsdev = dontHaddock super.hsdev; + hs-mesos = overrideCabal super.hs-mesos (drv: { + # Pass _only_ mesos; the correct protobuf is propagated. + extraLibraries = [ pkgs.mesos ]; + preConfigure = "sed -i -e /extra-lib-dirs/d -e 's|, /usr/include, /usr/local/include/mesos||' hs-mesos.cabal"; + }); + # Upstream notified by e-mail. permutation = dontCheck super.permutation; @@ -276,15 +283,15 @@ self: super: { # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw + aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw - bindings-GLFW = dontCheck super.bindings-GLFW; # http://hydra.cryp.to/build/497379/log/raw + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an active X11 display bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; - boundingboxes = dontCheck super.boundingboxes; # https://github.com/fumieval/boundingboxes/issues/1 buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw @@ -315,7 +322,7 @@ self: super: { ghc-parmake = dontCheck super.ghc-parmake; gitlib-cmdline = dontCheck super.gitlib-cmdline; git-vogue = dontCheck super.git-vogue; - GLFW-b = dontCheck super.GLFW-b; + GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; @@ -420,9 +427,6 @@ self: super: { # Needs llvm to compile. bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm; - # https://github.com/chrisdone/hindent/issues/83 - hindent = dontCheck super.hindent; - # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; @@ -500,9 +504,6 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/ekmett/exceptions/issues/40 - exceptions = dontCheck super.exceptions; - # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); @@ -624,36 +625,35 @@ self: super: { blip = markBroken super.blip; # https://github.com/tych0/xcffib/issues/37 - xcffib = markBroken super.xcffib; - - # https://github.com/snapframework/snap/issues/141 - # snap = overrideCabal super.snap (drv: { preConfigure = "sed -i -e 's|lens .*<4.8|lens|' snap.cabal"; }); + xcffib = dontCheck super.xcffib; } // { # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; - version = "2.0"; + version = "20150310"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - sha256 = "5cc98f530303a82885e2f23d2c83f67f1a3767bfdd5ed3340e45858f1a0f04e1"; - rev = "6a445468030b064e4f71b43c269ba506e7e2f779"; + rev = "267d0495209822ad819b58cb472a0da54f5a0b72"; + sha256 = "1sdsjwf1cda4bpriiv1vfx0pa26087hzw7vviacvgbmn0xh6wm8g"; + deepClone = true; }; isLibrary = false; isExecutable = true; buildDepends = with self; [ - aeson base bytestring Cabal containers deepseq deepseq-generics - directory filepath hackage-db monad-par monad-par-extras mtl pretty - prettyclass process QuickCheck regex-posix SHA split transformers - utf8-string + aeson base bytestring Cabal containers deepseq-generics directory + filepath hackage-db lens monad-par monad-par-extras mtl pretty + prettyclass process regex-posix SHA split transformers utf8-string cartel ]; testDepends = with self; [ aeson base bytestring Cabal containers deepseq deepseq-generics - directory doctest filepath hackage-db hspec monad-par + directory doctest filepath hackage-db hspec lens monad-par monad-par-extras mtl pretty prettyclass process QuickCheck regex-posix SHA split transformers utf8-string ]; + buildTools = [ pkgs.gitMinimal ]; + preConfigure = "runhaskell $setupCompileFlags generate-cabal-file >cabal2nix.cabal"; homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; license = pkgs.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 219fe85b176..a70597e6ee5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -89,9 +89,6 @@ self: super: { # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; - # https://github.com/peti/jailbreak-cabal/issues/5 - ReadArgs = dontCheck super.ReadArgs; - # Until the changes have been pushed to Hackage haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 568a4d46c54..dc43d296ba3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -79,6 +79,7 @@ self: super: { tidal-midi = dontDistribute super.tidal-midi; # These packages need mtl 2.2.x directly or indirectly via dependencies. + amazonka = markBroken super.amazonka; apiary-purescript = markBroken super.apiary-purescript; clac = dontDistribute super.clac; highlighter2 = markBroken super.highlighter2; @@ -98,44 +99,3 @@ self: super: { incremental-computing = dontCheck super.incremental-computing; } - -// # packages relating to amazonka - -(let - Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; - amazonkaEnv = self: super: { - mkDerivation = drv: super.mkDerivation (drv // { - doCheck = false; - hyperlinkSource = false; - buildTools = (drv.buildTools or []) ++ [ ( - if pkgs.stdenv.lib.elem drv.pname [ - "Cabal" - "time" - "unix" - "directory" - "process" - "jailbreak-cabal" - ] then null else Cabal - ) ]; - }); - mtl = self.mtl_2_2_1; - transformers = self.transformers_0_4_3_0; - transformers-compat = disableCabalFlag super.transformers-compat "three"; - hscolour = super.hscolour; - time = self.time_1_5_0_1; - unix = self.unix_2_7_1_0; - directory = self.directory_1_2_1_0; - process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; }); - inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch amazonka-glacier amazonka-ecs; - }; - amazonka = super.amazonka.overrideScope amazonkaEnv; - amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv; - amazonka-core = super.amazonka-core.overrideScope amazonkaEnv; - amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv; - amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv; - amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv; - amazonka-ssm = super.amazonka-ssm.overrideScope amazonkaEnv; -in { - inherit amazonkaEnv; - inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier amazonka-ssm; -}) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 68ea13ab775..f1d5d43de05 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1748,6 +1748,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "CLI" = callPackage + ({ mkDerivation, base, directory, doctest, split, time }: + mkDerivation { + pname = "CLI"; + version = "0.1.0.0"; + sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall"; + buildDepends = [ base directory split time ]; + testDepends = [ base doctest ]; + description = "CLI tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "CMCompare" = callPackage ({ mkDerivation, array, base, BiobaseInfernal, BiobaseXNA, cmdargs , containers, lens @@ -3974,8 +3986,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "EstProgress"; - version = "0.1.0.0"; - sha256 = "16krghh2x6m0bzwrzgalry5rl9gp7x19w5n00dhbg0q28mk668sv"; + version = "0.2.0.0"; + sha256 = "0xq2r7mbgs00hf1c8c2ffgsk7jjzd932br59rgkg06qym14dp3b3"; buildDepends = [ base mtl ]; homepage = "http://alkalisoftware.net"; description = "Methods for estimating the progress of functions"; @@ -4734,6 +4746,7 @@ self: { isLibrary = false; isExecutable = true; buildDepends = [ base bimap ]; + jailbreak = true; homepage = "https://github.com/xnil/GGg"; description = "GGg cipher"; license = stdenv.lib.licenses.mit; @@ -4866,12 +4879,12 @@ self: { }) {}; "GLURaw" = callPackage - ({ mkDerivation, base, freeglut, mesa, OpenGLRaw }: + ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }: mkDerivation { pname = "GLURaw"; - version = "1.4.0.2"; - sha256 = "10sy0zag1wfrrq137azv3xazcgs21zb6bp84xzh518qbhiiycjhg"; - buildDepends = [ base OpenGLRaw ]; + version = "1.5.0.0"; + sha256 = "1y3qbq1qaxnylrb86all96xdja1d62adilyyky0glsbl9dqnzr4j"; + buildDepends = [ base OpenGLRaw transformers ]; extraLibraries = [ freeglut mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -4902,11 +4915,11 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.4"; - sha256 = "1bjc33cnlcb29hfyq2141cj2g2pklg5296hg1jpg246j0bcy9fcf"; + version = "0.8.5"; + sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; buildDepends = [ - array base bytestring containers cpphs directory filepath - JuicyPixels linear OpenGL OpenGLRaw transformers vector + array base bytestring containers directory filepath JuicyPixels + linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; description = "Miscellaneous OpenGL utilities"; @@ -7782,6 +7795,7 @@ self: { version = "5.2.0.16"; sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s"; buildDepends = [ array base containers StateVar transformers ]; + jailbreak = true; homepage = "https://github.com/meteficha/Hipmunk"; description = "A Haskell binding for Chipmunk"; license = "unknown"; @@ -8815,6 +8829,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Kalman" = callPackage + ({ mkDerivation, base, hmatrix }: + mkDerivation { + pname = "Kalman"; + version = "0.1.0.0"; + sha256 = "0l4z7l90s14z24rlzdpl1rh7vjgpk7adbavza6k3144p1an5rfqp"; + buildDepends = [ base hmatrix ]; + homepage = "https://github.com/idontgetoutmuch/Kalman"; + description = "A slightly extended Kalman filter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "KdTree" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -10173,6 +10199,7 @@ self: { version = "0.1.0.1"; sha256 = "0k5v37qrhb8i5hfx9jvkggjmry2jrzw967s17l2x561qmm59c2rb"; buildDepends = [ array base bimap containers Munkres ]; + jailbreak = true; description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -10778,12 +10805,12 @@ self: { winmm = null; winspool = null;}; "ObjectName" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "ObjectName"; - version = "1.0.1.1"; - sha256 = "18bqaqxzafhmnf1r4qc0qnxdiv00i4zis89yinvpwjqbiwlwakda"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg"; + buildDepends = [ base transformers ]; homepage = "https://github.com/svenpanne/ObjectName"; description = "Explicitly handled object names"; license = stdenv.lib.licenses.bsd3; @@ -10981,12 +11008,12 @@ self: { }) {}; "OpenGLRaw" = callPackage - ({ mkDerivation, base, mesa }: + ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.3.0.0"; - sha256 = "03hlk0j03a963534swqvagrckl9y2s8hh07a7pczc104nw45jxln"; - buildDepends = [ base ]; + version = "2.4.0.0"; + sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; @@ -11490,18 +11517,18 @@ self: { "Plot-ho-matic" = callPackage ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers - , data-default-class, generic-accessors, glib, gtk, lens, linear - , spatial-math, stm, text, time + , data-default-class, generic-accessors, glib, gtk, lens, text + , time }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.0"; - sha256 = "00dza3lkgaivxyxy7q8z936zmlpxr4nk0lgq3vyg524pd4hq38sg"; + version = "0.5.0.2"; + sha256 = "0i55milm63y0djnni3sg40pydxw5ls4gjsj18g8f5rbbdjx6y95q"; isLibrary = true; isExecutable = true; buildDepends = [ base cairo Chart Chart-cairo containers data-default-class - generic-accessors glib gtk lens linear spatial-math stm text time + generic-accessors glib gtk lens text time ]; description = "Real-time line plotter for protobuf-like data"; license = stdenv.lib.licenses.bsd3; @@ -12302,8 +12329,8 @@ self: { }: mkDerivation { pname = "Redmine"; - version = "0.0.1"; - sha256 = "0ifs2gca5sgmaqrby3fc410n5k357102c8jh3fh77rhdc3m8l8bd"; + version = "0.0.3"; + sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls http-conduit MissingH network old-locale old-time resourcet text @@ -12763,8 +12790,8 @@ self: { ({ mkDerivation, array, base, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.2"; - sha256 = "1cl5bsc5mr3silcmbjylgw5qa04pf2np9mippxnsa4p3dk089gkh"; + version = "0.3.3"; + sha256 = "05d37ax0j8dp1h1w6pxkf1415mzn4gasdhn7gbsr8ay46iv1r4fr"; buildDepends = [ array base mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; @@ -13504,12 +13531,12 @@ self: { }) {}; "StateVar" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.0.1.1"; - sha256 = "0h2cykrbnq4aq8dmi59mmnagvzz00lfagqx3476y2ygqc7v1iisl"; - buildDepends = [ base ]; + version = "1.1.0.0"; + sha256 = "0zixg7wzqvllxrlxhlqfchxfbpridckfam1wb81n6lfl2kq676d1"; + buildDepends = [ base stm transformers ]; homepage = "https://github.com/haskell-opengl/StateVar"; description = "State variables"; license = stdenv.lib.licenses.bsd3; @@ -17184,8 +17211,8 @@ self: { ({ mkDerivation, base, c2hs, openal }: mkDerivation { pname = "al"; - version = "0.1.1.2"; - sha256 = "0cb6vvjc23nb7qfdkyc7g197rgb7shjyxv6q5kd9jdxr3rl1apf4"; + version = "0.1.1.3"; + sha256 = "09ppkvzkka3c5hiawkz7lcrwp6sa8bhbg10m9hfp9rk4g9339czy"; buildDepends = [ base ]; buildTools = [ c2hs ]; extraLibraries = [ openal ]; @@ -18468,6 +18495,7 @@ self: { base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; + jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -18945,8 +18973,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.0"; - sha256 = "1z0wky3xhkgayxf6fzrj7dnll6r948vgqsvfhhjh32ybadmi97bm"; + version = "1.4.2"; + sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19672,12 +19700,11 @@ self: { pname = "arithmoi"; version = "0.4.1.1"; sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "d12980bee5be68b204594ee91c026599ec930613be6c05106ea27d93d96c0433"; + editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - jailbreak = true; homepage = "https://bitbucket.org/dafis/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; @@ -19899,8 +19926,8 @@ self: { }: mkDerivation { pname = "ascii-progress"; - version = "0.2.1.0"; - sha256 = "0r3an905by72w7r9pd00rf7fn061v668bh4x6apllmpxid7a7pm7"; + version = "0.2.1.1"; + sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20888,6 +20915,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "auto" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, deepseq + , profunctors, random, semigroups, transformers + }: + mkDerivation { + pname = "auto"; + version = "0.2.0.3"; + sha256 = "1aplwr8lgl3x0sskjwlp85zrqj13468r9ddn5rzbaqj4j3kbpvcx"; + buildDepends = [ + base bytestring cereal containers deepseq profunctors random + semigroups transformers + ]; + jailbreak = true; + homepage = "https://github.com/mstksg/auto"; + description = "Denotative, locally stateful programming DSL & platform"; + license = stdenv.lib.licenses.mit; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -21570,8 +21615,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.2.5"; - sha256 = "0n5zc0k5fdpcljvrw38ma7x8q3dbqjbw98ji2mqb4rxbkqxz75jh"; + version = "0.3.1"; + sha256 = "13j69i6jmx4qibavr7rwwrnmabf7l5rqd8hs308n0xdnwmvfldbx"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22853,10 +22898,10 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "bimap"; - version = "0.2.4"; - sha256 = "1ib54plfsxzmf9wbbdayfdsrcx4s5ffna3ca5ps928fy78wsx4fr"; + version = "0.3.0"; + sha256 = "1j9rrxzzggvajz8laf58nda9hgf5lqsqxxc556690yyliln0gii1"; buildDepends = [ base containers ]; - homepage = "http://code.haskell.org/bimap"; + homepage = "https://github.com/joelwilliamson/bimap"; description = "Bidirectional mapping between two key types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -25311,18 +25356,12 @@ self: { }) {}; "boundingboxes" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, random - , test-framework, test-framework-quickcheck2, test-framework-th - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "boundingboxes"; - version = "0.2.2"; - sha256 = "09yj85ikpdgzbibpdk0mw9vcaklmqlbhwpm6knz595596wr25fcx"; + version = "0.2.3"; + sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; buildDepends = [ base lens ]; - testDepends = [ - base lens linear QuickCheck random test-framework - test-framework-quickcheck2 test-framework-th - ]; homepage = "https://github.com/fumieval/boundingboxes"; description = "A generic boundingbox for an arbitrary vector"; license = stdenv.lib.licenses.bsd3; @@ -25449,6 +25488,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "broccoli" = callPackage + ({ mkDerivation, base, containers, stm, time }: + mkDerivation { + pname = "broccoli"; + version = "0.4.1.0"; + sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh"; + buildDepends = [ base containers stm time ]; + description = "Small library for interactive functional programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bsd-sysctl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -25661,10 +25711,9 @@ self: { ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { pname = "buildable"; - version = "0.1.0.2"; - sha256 = "1p9xi5ms7rxgzn5jxv5nv8bynyfb9ll952k0j7di5s7zbga8v1pg"; + version = "0.1.0.3"; + sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx"; buildDepends = [ base bytestring containers dlist text ]; - jailbreak = true; description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; }) {}; @@ -26394,8 +26443,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.23.1"; - sha256 = "1vzng536z711hvv0ln40d863hwi103iywkhdsziy62nmxdq1afy5"; + version = "0.24.1"; + sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26536,8 +26585,8 @@ self: { }: mkDerivation { pname = "cabal-db"; - version = "0.1.11"; - sha256 = "0kxj7xf0r1waxxi25g46a2wj43dcd3b1lkdn20l4r7m3r44y1nd7"; + version = "0.1.12"; + sha256 = "1phksjb1ahg0dbgsxsckgmqvvhrzvpn02c3w26gbiq9diindx267"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26671,6 +26720,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-helper" = callPackage + ({ mkDerivation, base, bytestring, Cabal, data-default, directory + , filepath, mtl, process, template-haskell, temporary, transformers + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.2.0.0"; + sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring Cabal data-default directory filepath mtl process + template-haskell temporary transformers + ]; + description = "Simple interface to Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl @@ -27458,18 +27525,15 @@ self: { }) {}; "calculator" = callPackage - ({ mkDerivation, base, containers, haskeline, mtl, parsec - , QuickCheck - }: + ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }: mkDerivation { pname = "calculator"; - version = "0.2.2.0"; - sha256 = "18v58sgbx1g5bir0vwgbhfs347p95f36jw3fqj4nfzs5na0rrrvz"; + version = "0.3.0.1"; + sha256 = "067rnx1ixdnhqan2kwscqh6325ml523km7dg2apx1ksm51hl3gvc"; isLibrary = false; isExecutable = true; - buildDepends = [ base containers haskeline mtl parsec QuickCheck ]; - testDepends = [ base containers mtl parsec QuickCheck ]; - jailbreak = true; + buildDepends = [ base containers haskeline parsec ]; + testDepends = [ base containers parsec QuickCheck ]; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl"; license = stdenv.lib.licenses.gpl2; @@ -27990,8 +28054,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.2.1"; - sha256 = "1vza24ikj3ixryh2hf2xj28m1zjclqq9lsxp57pwzjx31djkb54s"; + version = "0.4.2.2"; + sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq ghc-prim text unordered-containers vector @@ -29017,8 +29081,8 @@ self: { ({ mkDerivation, array, attoparsec, base, bytestring, containers }: mkDerivation { pname = "chesshs"; - version = "0.2.0"; - sha256 = "1v9qhnknqn8bsxzdcwskhssmmhbrr0d1rrxqm6ssf6j2jvv3diay"; + version = "0.2.1"; + sha256 = "0dydib3rf735wljyqij2g03xi0yxfviga5ws708nhg64f4kv8cfv"; buildDepends = [ array attoparsec base bytestring containers ]; homepage = "http://arnovanlumig.com/chesshs.html"; description = "Simple library for validating chess moves and parsing PGN files"; @@ -29497,6 +29561,7 @@ self: { base containers optparse-applicative plailude pretty-tree safe split ]; + jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -29614,62 +29679,64 @@ self: { "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, containers, directory, filepath, ghc, ghc-paths - , hashable, haskeline, lens, mtl, process, text, transformers - , unbound, unix, unordered-containers + , clash-prelude, clash-systemverilog, clash-vhdl, containers + , directory, filepath, ghc, hashable, haskeline, lens, mtl, process + , text, transformers, unbound-generics, unix, unordered-containers }: mkDerivation { pname = "clash-ghc"; - version = "0.4.1"; - sha256 = "0s6q7xld7v673r7bsr2sj64gdlfrzkf46ginqrcr2dmvbiwkkjrk"; + version = "0.5"; + sha256 = "0nkk1k96yg4lpwn7axdm8xnsc3b389839c0gxgavvqlhdz7hkkcj"; isLibrary = false; isExecutable = true; buildDepends = [ - array base bifunctors bytestring clash-lib clash-prelude containers - directory filepath ghc ghc-paths hashable haskeline lens mtl - process text transformers unbound unix unordered-containers + array base bifunctors bytestring clash-lib clash-prelude + clash-systemverilog clash-vhdl containers directory filepath ghc + hashable haskeline lens mtl process text transformers + unbound-generics unix unordered-containers ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring - , concurrent-supply, containers, contravariant, deepseq, directory - , errors, fgl, filepath, hashable, lens, ListLike, mtl, pretty - , process, template-haskell, text, time, transformers, unbound - , unordered-containers, uu-parsinglib, wl-pprint-text + , concurrent-supply, containers, deepseq, directory, errors, fgl + , filepath, hashable, lens, mtl, pretty, process, template-haskell + , text, time, transformers, unbound-generics, unordered-containers + , uu-parsinglib, wl-pprint-text }: mkDerivation { pname = "clash-lib"; - version = "0.4.1"; - sha256 = "001jldfwbfl3cvsqkd2q9qhpdv0najagzvzz94rx6jf4wal9dsx1"; + version = "0.5"; + sha256 = "17wpqs99w7mrwxky1jrq3gm012w4y40zb2i8d4qsk25dkhkkw1ng"; buildDepends = [ aeson attoparsec base bytestring concurrent-supply containers - contravariant deepseq directory errors fgl filepath hashable lens - ListLike mtl pretty process template-haskell text time transformers - unbound unordered-containers uu-parsinglib wl-pprint-text + deepseq directory errors fgl filepath hashable lens mtl pretty + process template-haskell text time transformers unbound-generics + unordered-containers uu-parsinglib wl-pprint-text ]; - homepage = "http://christiaanb.github.io/clash2"; + homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; - license = "unknown"; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude" = callPackage ({ mkDerivation, base, data-default, ghc-prim, integer-gmp - , template-haskell, th-lift + , singletons, template-haskell, th-lift }: mkDerivation { pname = "clash-prelude"; - version = "0.6.0.1"; - sha256 = "0d929g7js15aagd1pa2lfbhd1yiykd0ngp6fv522yhy1yyijn1l7"; + version = "0.7"; + sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; buildDepends = [ - base data-default ghc-prim integer-gmp template-haskell th-lift + base data-default ghc-prim integer-gmp singletons template-haskell + th-lift ]; homepage = "http://christiaanb.github.io/clash2/"; description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "clash-prelude-quickcheck" = callPackage @@ -29680,10 +29747,45 @@ self: { version = "0.1.0.0"; sha256 = "0rn02hf5vj4yirh13y9h2jh2818lhchpabg5v6yqhngdj8rxys34"; buildDepends = [ base clash-prelude containers mtl QuickCheck ]; + jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; }) {}; + "clash-systemverilog" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-systemverilog"; + version = "0.5"; + sha256 = "1vmwrazyipq0ab3dvnbdzv9y7apr7fw8m4zdb4ligair8x3g2fbr"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "clash-vhdl" = callPackage + ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl + , text, unordered-containers, wl-pprint-text + }: + mkDerivation { + pname = "clash-vhdl"; + version = "0.5"; + sha256 = "1wh2fwyaxl33a38yxqz7vd23inakmad7zxg18y56ln5fb50hz4r5"; + buildDepends = [ + base clash-lib clash-prelude fgl lens mtl text unordered-containers + wl-pprint-text + ]; + homepage = "http://www.clash-lang.org/"; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "classify" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -30403,18 +30505,22 @@ self: { }) {}; "clustering" = callPackage - ({ mkDerivation, base, containers, hierarchical-clustering - , mwc-random, tasty, tasty-hunit, vector + ({ mkDerivation, base, binary, containers, hierarchical-clustering + , matrices, mwc-random, primitive, split, tasty, tasty-hunit + , tasty-quickcheck, vector }: mkDerivation { pname = "clustering"; - version = "0.1.0"; - sha256 = "04x6q7da64b2v326mbralkc13zb3b5x1fwdc3by703hf7mv28kd4"; - buildDepends = [ base containers vector ]; - testDepends = [ - base hierarchical-clustering mwc-random tasty tasty-hunit vector + version = "0.1.1"; + sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + buildDepends = [ + base binary containers matrices mwc-random primitive vector ]; - description = "fast clustering algorithms"; + testDepends = [ + base binary hierarchical-clustering mwc-random split tasty + tasty-hunit tasty-quickcheck vector + ]; + description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; }) {}; @@ -30469,6 +30575,18 @@ self: { license = "unknown"; }) {}; + "cmark" = callPackage + ({ mkDerivation, base, mtl, syb, text }: + mkDerivation { + pname = "cmark"; + version = "0.1.0.1"; + sha256 = "0js8hhl6j16yywq27rz4jcyibac7zwkkryjqfsdq6wapb3z0d4ad"; + buildDepends = [ base mtl syb text ]; + homepage = "https://github.com/jgm/commonmark-hs"; + description = "Haskell bindings to libcmark, CommonMark parser and renderer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmath" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -30911,6 +31029,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "collection-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, text }: + mkDerivation { + pname = "collection-json"; + version = "0.1.0.0"; + sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc"; + buildDepends = [ aeson base bytestring text ]; + homepage = "https://github.com/danchoi/collection-json.hs"; + description = "Collection+JSON hypermedia type tools"; + license = stdenv.lib.licenses.mit; + }) {}; + "collections" = callPackage ({ mkDerivation, array, base, bytestring, containers, QuickCheck }: mkDerivation { @@ -31216,8 +31346,8 @@ self: { }: mkDerivation { pname = "comonad"; - version = "4.2.3"; - sha256 = "1zs967yx1qv7382qks7fy42qxy7d20mkiw2bxrnk5m1x339hqysj"; + version = "4.2.4"; + sha256 = "0wycd7ir3bjrf9k1fh81jl09lk9s99fg8z25lwhb8bc70q50sab8"; buildDepends = [ base containers contravariant distributive semigroups tagged transformers transformers-compat @@ -32004,8 +32134,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.7.0"; - sha256 = "1q4iq9wmiazv743gdypqc9797z1c0gdk1lzyzvlk4811ka263508"; + version = "1.1.7.1"; + sha256 = "1qpqjcqy44l92s21aivd2gvb7zz574102mld19a44w0n3yxvljx3"; buildDepends = [ attoparsec base blaze-builder bytestring conduit directory filepath monad-control network primitive process resourcet stm @@ -32500,6 +32630,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "context-free-grammar" = callPackage + ({ mkDerivation, array, base, containers, control-monad-omega + , dlist, HUnit, mtl, pretty, QuickCheck, quickcheck-properties + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "context-free-grammar"; + version = "0.0.1"; + sha256 = "11xns7rfxb9s9adzkd2v1s46s8lay6yd32r83p63k96z570ccpj2"; + buildDepends = [ + array base containers control-monad-omega dlist mtl pretty + template-haskell + ]; + testDepends = [ + base containers HUnit pretty QuickCheck quickcheck-properties + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + jailbreak = true; + homepage = "http://github.com/nedervold/context-free-grammar"; + description = "Basic algorithms on context-free grammars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "context-stack" = callPackage ({ mkDerivation, base, classy-prelude, mtl, unordered-containers }: mkDerivation { @@ -32582,15 +32737,15 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, foreign-var, semigroups, transformers + ({ mkDerivation, base, semigroups, StateVar, transformers , transformers-compat, void }: mkDerivation { pname = "contravariant"; - version = "1.2.2.1"; - sha256 = "0w1kgx85wbf96f1hr50b6nh9pqjbqbn4axfd419b38xy09j61j75"; + version = "1.3"; + sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; buildDepends = [ - base foreign-var semigroups transformers transformers-compat void + base semigroups StateVar transformers transformers-compat void ]; homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; @@ -32641,15 +32796,15 @@ self: { }: mkDerivation { pname = "control-monad-exception"; - version = "0.11.1"; - sha256 = "1lzv5xggc7nyw62jq9plc3lzg06yx3sbd9jzji0pc6xcbqn2m4qn"; + version = "0.11.2"; + sha256 = "0vdms5if6c04459ksix5q38l9cflgc5bwnchd422fp2qfji5j14p"; buildDepends = [ base failure lifted-base monad-control monadloc transformers transformers-base ]; homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34785,9 +34940,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, pretty }: mkDerivation { pname = "cuda"; - version = "0.6.5.1"; - sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; - editedCabalFile = "4a72db38c131b220e445e389755d48338769d9a08e826244dcfb7b1182c21c00"; + version = "0.6.6.0"; + sha256 = "0xa8wfqrgc0br7cr3g5j0i30kna07bci7vx05iw46fv445rhjv5y"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring pretty ]; @@ -34824,7 +34978,6 @@ self: { sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg"; buildDepends = [ base cuda ]; buildTools = [ c2hs ]; - jailbreak = true; homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; @@ -34884,12 +35037,12 @@ self: { }) {}; "current-locale" = callPackage - ({ mkDerivation, base, old-locale, process }: + ({ mkDerivation, base, old-locale, process, split }: mkDerivation { pname = "current-locale"; - version = "0.1.0.1"; - sha256 = "185fgzh8nvf2gl5hzg3xmab4xlp2wm2nw485g5nikzx99y3zr1b6"; - buildDepends = [ base old-locale process ]; + version = "0.2.0.1"; + sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5"; + buildDepends = [ base old-locale process split ]; homepage = "https://github.com/koterpillar/current-locale"; description = "Get the current system locale in System.Locale format"; license = stdenv.lib.licenses.mit; @@ -38411,6 +38564,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-rubiks-cube" = callPackage + ({ mkDerivation, base, data-default-class, diagrams-lib, lens }: + mkDerivation { + pname = "diagrams-rubiks-cube"; + version = "0.1.0.0"; + sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv"; + buildDepends = [ base data-default-class diagrams-lib lens ]; + homepage = "https://github.com/timjb/rubiks-cube"; + description = "Library for drawing the Rubik's Cube"; + license = stdenv.lib.licenses.mit; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg , bytestring, colour, containers, diagrams-core, diagrams-lib @@ -39643,6 +39808,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-zookeeper" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq + , distributed-process, distributed-process-monad-control + , enclosed-exceptions, hspec, hzk, lifted-base, monad-control, mtl + , network, network-transport, network-transport-tcp, transformers + }: + mkDerivation { + pname = "distributed-process-zookeeper"; + version = "0.2.0.0"; + sha256 = "1v8jm5i4kjds7xcmzrhxg9lcz49l9ip7mm8gwjz3f3lgdxm2ykxi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring containers deepseq distributed-process hzk + mtl network network-transport network-transport-tcp transformers + ]; + testDepends = [ + base bytestring deepseq distributed-process + distributed-process-monad-control enclosed-exceptions hspec hzk + lifted-base monad-control network network-transport + network-transport-tcp transformers + ]; + jailbreak = true; + homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; + description = "A Zookeeper back-end for Cloud Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-static" = callPackage ({ mkDerivation, base, binary, bytestring, containers, rank1dynamic }: @@ -41102,31 +41295,33 @@ self: { }) {}; "dynobud" = callPackage - ({ mkDerivation, base, bytestring, cairo, casadi-bindings - , casadi-bindings-core, cereal, Chart, Chart-cairo, Chart-gtk - , cmdargs, colour, containers, data-default, data-default-class - , distributive, glib, gtk, hmatrix, HUnit, jacobi-roots, lens - , linear, mtl, not-gloss, process, QuickCheck, reflection + ({ mkDerivation, base, binary, bytestring, casadi-bindings + , casadi-bindings-core, Chart, Chart-gtk, cmdargs, colour + , containers, data-default-class, distributive, generic-accessors + , hmatrix, hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl + , not-gloss, Plot-ho-matic, process, QuickCheck, reflection , semigroups, spatial-math, stm, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , unordered-containers, vector, zeromq4-haskell + , test-framework-hunit, test-framework-quickcheck2 + , unordered-containers, vector, vector-binary-instances + , zeromq4-haskell }: mkDerivation { pname = "dynobud"; - version = "1.1.0.0"; - sha256 = "1bgzas5ywvvym0xgi1bajkx2z65wpzrc6p2r77dk0wlmdrpgb1rf"; + version = "1.3.0.0"; + sha256 = "1zxwx777n08flmwcd7c9w8rkkcpvkzagwhy0axaxl9n0anyf8q1i"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring cairo casadi-bindings casadi-bindings-core cereal - Chart Chart-cairo Chart-gtk cmdargs colour containers data-default - data-default-class distributive glib gtk hmatrix jacobi-roots lens - linear mtl not-gloss process reflection semigroups spatial-math stm - text time unordered-containers vector zeromq4-haskell + base binary bytestring casadi-bindings casadi-bindings-core Chart + Chart-gtk cmdargs colour containers data-default-class distributive + generic-accessors hmatrix jacobi-roots lens linear mtl not-gloss + Plot-ho-matic process reflection semigroups spatial-math stm + unordered-containers vector vector-binary-instances zeromq4-haskell ]; testDepends = [ - base casadi-bindings hmatrix HUnit linear QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector + base binary casadi-bindings hmatrix hmatrix-gsl HUnit linear + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector ]; jailbreak = true; description = "your dynamic optimization buddy"; @@ -41707,18 +41902,23 @@ self: { }) {}; "ehs" = callPackage - ({ mkDerivation, base, dlist, haskell-src-meta, parsec - , template-haskell + ({ mkDerivation, base, bytestring, haskell-src-meta, parsec + , template-haskell, text, time, transformers }: mkDerivation { pname = "ehs"; - version = "0.1.0.1"; - sha256 = "1g1mq956jd9fnh17zzgpyfc4b8pc10iqfgmm691hskx6wf6lc641"; + version = "0.7.0"; + sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; + editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base dlist haskell-src-meta parsec template-haskell + base bytestring haskell-src-meta parsec template-haskell text time + transformers ]; + jailbreak = true; homepage = "http://github.com/minpou/ehs/"; - description = "embedded Haskell by using quasiquotes"; + description = "Embedded haskell template using quasiquotes"; license = stdenv.lib.licenses.mit; }) {}; @@ -41740,14 +41940,15 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "eigen"; - version = "1.0.0"; - sha256 = "1957jq0fv3migj9807ifa0iws8x8ysxz0a6mhrvblvz0dl175vr6"; - buildDepends = [ base vector ]; + version = "2.0.1"; + sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; + buildDepends = [ base primitive vector ]; + testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; - description = "Haskel binding for Eigen library"; + description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42683,11 +42884,11 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "envparse"; - version = "0.1.0"; - sha256 = "1rlqb5wcqws0rz66cd704swmcx93617ai25hsx4ah45r18qs3qsh"; + version = "0.2.0"; + sha256 = "069blfr1kwcd938x2yarbkvbi9nal1fi4qpmyccrb4vx2llqrxkb"; buildDepends = [ base containers ]; testDepends = [ base containers hspec ]; - homepage = "http://example.com/"; + homepage = "https://supki.github.io/envparse"; description = "Parse environment variables"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -43260,18 +43461,15 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , directory, filepath, http-conduit, http-types, network, process - , regex-compat, transformers, utf8-string + ({ mkDerivation, base, base-unicode-symbols, transformers + , utf8-string }: mkDerivation { pname = "eternal"; - version = "0.0.9"; - sha256 = "0kp25p26fsyqn4877wqjhbwfy7m0fnh7lfw0p5njmlx6kqbwi79n"; + version = "0.1.1"; + sha256 = "151b9qcdyh0vixn0y4s9h54g1h0kk1hwcgh5xcx9qp7bgy0h8wv9"; buildDepends = [ - base bytestring conduit conduit-extra directory filepath - http-conduit http-types network process regex-compat transformers - utf8-string + base base-unicode-symbols transformers utf8-string ]; description = "everything breaking the Fairbairn threshold"; license = stdenv.lib.licenses.bsd3; @@ -43369,15 +43567,17 @@ self: { }) {}; "euler" = callPackage - ({ mkDerivation, base, happy, hlint, hspec, process, regex-posix - , xml + ({ mkDerivation, base, directory, happy, hlint, hspec, process + , regex-posix, xml }: mkDerivation { pname = "euler"; - version = "0.6.0"; - sha256 = "0dqm4cq9hb7l6xa84y53v6l226f8qfw5avpbsc0zikx50jlz0q2g"; + version = "0.8.0"; + sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; buildDepends = [ base ]; - testDepends = [ base happy hlint hspec process regex-posix xml ]; + testDepends = [ + base directory happy hlint hspec process regex-posix xml + ]; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -43619,12 +43819,12 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.8.0.1"; - sha256 = "0qsbcmhr5ilmdw4wc3f316nsnrmhlqzrgdi15a6sv72nlk09kwsb"; + version = "0.8.0.2"; + sha256 = "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7"; buildDepends = [ base mtl stm transformers transformers-compat ]; testDepends = [ base mtl QuickCheck stm test-framework test-framework-quickcheck2 - transformers + transformers transformers-compat ]; homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; @@ -44273,8 +44473,8 @@ self: { ({ mkDerivation, base, bytestring, hspec, QuickCheck }: mkDerivation { pname = "farmhash"; - version = "0.1.0.1"; - sha256 = "1dm3msrlrfhm20qc1d5a42w4sspmdwgmdkm75xprmyvpyivh2alb"; + version = "0.1.0.2"; + sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring hspec QuickCheck ]; homepage = "https://github.com/abhinav/haskell-farmhash"; @@ -44447,8 +44647,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.0"; - sha256 = "1xrsa9hj70792fv8lbd820n7k44q2xhjzplzc4j7np4l8nd9n6l5"; + version = "0.23.1.1"; + sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44804,6 +45004,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "feed-crawl" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection + , http-conduit, http-types, hxt, text, transformers + }: + mkDerivation { + pname = "feed-crawl"; + version = "0.1.0.0"; + sha256 = "1q68z0288sl4il2i2mm94b51xgfdzxvljralqd6rr650qbgbbbgy"; + buildDepends = [ + base bytestring conduit connection http-conduit http-types hxt text + transformers + ]; + homepage = "https://github.com/danchoi/feed-crawl"; + description = "Feed crawling utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "feed2lj" = callPackage ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string @@ -44892,6 +45109,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "feldspar-signal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "feldspar-signal"; + version = "0.0.0.1"; + sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx"; + buildDepends = [ base ]; + homepage = "https://github.com/markus-git/feldspar-signal"; + description = "Signal Processing extension for Feldspar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fences" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46201,8 +46430,8 @@ self: { }: mkDerivation { pname = "fluent-logger"; - version = "0.2.0.0"; - sha256 = "02sh7q9l874rbjdwj66grz0y0cbnd2wc5413x4mrvg095i8g9zww"; + version = "0.2.1.0"; + sha256 = "0lzn1wrqq7mnxlf8axb4nj90mq9c4w299dilp9k4s4s9lzag2gib"; buildDepends = [ base bytestring cereal containers messagepack network network-socket-options random stm text time vector @@ -46457,8 +46686,8 @@ self: { }: mkDerivation { pname = "force-layout"; - version = "0.3.0.9"; - sha256 = "109n0rlwpbrpsa0j4vcab61zmc1j01ln141v19zjv4dm5al14bd5"; + version = "0.3.0.10"; + sha256 = "0s3q1az0fvx1kn79nsz3d7d4gampcz4yyp9nmqj9baip1lws6k36"; buildDepends = [ base containers data-default-class lens vector-space vector-space-points @@ -48097,12 +48326,13 @@ self: { ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { pname = "gearbox"; - version = "1.0.0.2"; - sha256 = "15ip1vb1b82ympfylm1m1hxw2nkcmhnqhj2bl4v8mw61zcvznky7"; + version = "1.0.0.3"; + sha256 = "1j68vrb0fxschslh3q5i1afv0vx8q6qgv1bipfr3p77cqazp26zx"; isLibrary = false; isExecutable = true; buildDepends = [ base GLUT OpenGLRaw Vec ]; jailbreak = true; + homepage = "http://code.mathr.co.uk/gearbox"; description = "zooming rotating fractal gears graphics demo"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -48243,8 +48473,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.1.0.0"; - sha256 = "0ssyrdn0cqm7gq3rp3dqkg7il2llagdri719z03ywj96qjh4vxw5"; + version = "0.1.0.1"; + sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95"; buildDepends = [ base linear spatial-math ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -48782,8 +49012,8 @@ self: { }: mkDerivation { pname = "ghc-core-html"; - version = "0.1.1"; - sha256 = "0l0474kpzvzzwkbz9mcjl4fnasznb1crynjcsk3hmnjq8syhmm97"; + version = "0.1.2"; + sha256 = "1yhyi99cbnfk2a65j9v6hinp0rpmc341z55dvqvli1wx5c9i7gf6"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -48879,16 +49109,19 @@ self: { "ghc-exactprint" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, ghc-syb-utils, HUnit, mtl, random, syb + , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.0.1"; - sha256 = "0z6ff4pf3dnz8slg7sfmq86ygzxqn87idv5d63h4qyg8pwvv6zvx"; - buildDepends = [ base containers ghc ghc-paths syb ]; + version = "0.1.1.0"; + sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + buildDepends = [ + base containers directory filepath ghc ghc-paths ghc-syb-utils mtl + syb + ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils - HUnit mtl random syb + HUnit mtl random stm syb ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; @@ -49316,8 +49549,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.3.5"; - sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx"; + version = "0.3.6"; + sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -50171,8 +50404,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2.3"; - sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b"; + version = "0.7.3"; + sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -52472,13 +52705,12 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.1"; - sha256 = "0r368b4gw32yxi7xx85ljaw72plbw1i659kwjqiigmd2s54ids5h"; + version = "0.2.0.3"; + sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; isLibrary = false; isExecutable = true; buildDepends = [ base cairo containers filepath gtk ]; - jailbreak = true; - homepage = "http://gitorious.org/maximus/gulcii"; + homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -53269,8 +53501,8 @@ self: { }: mkDerivation { pname = "hack2-handler-snap-server"; - version = "2014.11.17"; - sha256 = "0cfc2d6px0n33a3wl7s7k0l7nq9rfi1lxchlwjjb6wyp4f6mg4bb"; + version = "2015.3.9"; + sha256 = "1qs5mncl44p410ni8hbpgvmv81158z62mcg66fmnnlrkwdr1bbh7"; buildDepends = [ air base blaze-builder bytestring case-insensitive containers data-default directory enumerator hack2 mtl network snap-core @@ -54025,8 +54257,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.6.0"; - sha256 = "1bjrj6q215c3abwnf7y39731n598jqi4hr3pajkl0qm2n1rfkyxb"; + version = "4.6.7.0"; + sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54045,7 +54277,6 @@ self: { system-filepath tagsoup test-framework test-framework-hunit test-framework-quickcheck2 text time ]; - jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; @@ -54406,16 +54637,16 @@ self: { "handsy" = callPackage ({ mkDerivation, base, bytestring, data-default-class, operational - , process, process-extras, retry, shell-escape, split, tasty - , tasty-hunit, tasty-th, transformers + , process-extras, retry, shell-escape, split, tasty, tasty-hunit + , tasty-th, transformers }: mkDerivation { pname = "handsy"; - version = "0.0.12"; - sha256 = "0awiffsgwa2vmib9yq9zamkr4zm1vw9xxj3g47d1ljq3jg93nn3f"; + version = "0.0.13"; + sha256 = "0v79p5gcz9b0s2x910ddhcpxxagiyx59zajxndikp9a0nxx8x0l5"; buildDepends = [ - base bytestring data-default-class operational process - process-extras retry shell-escape split transformers + base bytestring data-default-class operational process-extras retry + shell-escape split transformers ]; testDepends = [ base bytestring tasty tasty-hunit tasty-th ]; homepage = "https://github.com/utdemir/handsy"; @@ -54502,18 +54733,24 @@ self: { }) { pfq = null;}; "hapistrano" = callPackage - ({ mkDerivation, base, either, filepath, lens, old-locale, process - , time, transformers + ({ mkDerivation, base, base-compat, directory, either, filepath + , hspec, mtl, old-locale, process, temporary, time, transformers }: mkDerivation { pname = "hapistrano"; - version = "0.1.0.2"; - sha256 = "172hdvs8rnxwv3dy56024f4yc9f9hbs03wz3hfpdcqfj0a9lix65"; + version = "0.2.0.1"; + sha256 = "0k8715gaay1fjwgdsjk3h7vffj0bx217l1yn8wr6sfh4v7azg1f6"; isLibrary = true; isExecutable = true; buildDepends = [ - base either filepath lens old-locale process time transformers + base base-compat either filepath mtl old-locale process time + transformers ]; + testDepends = [ + base base-compat directory either filepath hspec mtl old-locale + process temporary time transformers + ]; + homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; }) {}; @@ -55512,8 +55749,8 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.2.3.1"; - sha256 = "1ybsdzm5lzx8zwf9dcw1f6sf29xk4j9whcs578d6fmif2ggm7gym"; + version = "1.2.3.2"; + sha256 = "0h9295pv2sgbaqlwpwbx2bap6nngm0jcdhkqham1wpjwyxqgqrlc"; buildDepends = [ base bytestring ghc-prim integer-gmp text ]; testDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -56220,8 +56457,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.10"; - sha256 = "0av67yxcnnamg0420v9wzydnm07hfkc58zs0fn6827zrxmxzqcv2"; + version = "0.3.0.12"; + sha256 = "1kh1xglqcz8yg1660ham0k4y0mxs63x75hv9xxjk2ms5386jpj6c"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base monad-control mtl resourcet @@ -59293,8 +59530,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.6"; - sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; + version = "1.2.7"; + sha256 = "1fqjqzfg3fif67ic75pavsnfjb9lxk5cf82chxs2hrkx41gm4gr6"; buildDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -59755,19 +59992,19 @@ self: { }) {}; "hfoil" = callPackage - ({ mkDerivation, base, directory, gloss, haskeline, hmatrix, HTTP - , MissingH, transformers + ({ mkDerivation, base, directory, haskeline, hmatrix, HTTP, linear + , not-gloss, parsec, transformers }: mkDerivation { pname = "hfoil"; - version = "0.1.2"; - sha256 = "0q52xj7bajs8kn66cg7vfgbxp66nwnfl832csrz3bygi9vhv8kxw"; + version = "0.2.0.1"; + sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4"; isLibrary = true; isExecutable = true; buildDepends = [ - base directory gloss haskeline hmatrix HTTP MissingH transformers + base directory haskeline hmatrix HTTP linear not-gloss parsec + transformers ]; - jailbreak = true; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60394,8 +60631,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.4.0"; - sha256 = "0kdy3rdjh4kjlxqfdqxnnaa9cw4avpykqv6ryvw95nxqqraqpm65"; + version = "4.4.1"; + sha256 = "1hc71zzc8apl619449g9sp50wc6qprzd91c69rr3zf1pi77208qg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60406,6 +60643,7 @@ self: { base data-default directory haskell-src-exts hspec monad-loops mtl text ]; + homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61085,8 +61323,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "0.24"; - sha256 = "1f32lg12i9s075xfbl3f5vhanjg8ms5ilw0hgpbsfh8g9nvlvffc"; + version = "0.24.1"; + sha256 = "0k09bdr3y975581mpqpmg4jynghl8v4j2386nzqprh0k6a602nv8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61181,8 +61419,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "0.24"; - sha256 = "1r0qlah45z1p180d245fyji8xnxv9ipgg9m1dr56s4xaw910f6ns"; + version = "0.24.1"; + sha256 = "1clzy72f34b497hsjkfjpgkhmn0dl19an9j4r11mn2q8z06106nc"; buildDepends = [ array base blaze-markup bytestring cmdargs containers csv Decimal directory filepath HUnit mtl old-locale old-time parsec pretty-show @@ -61253,8 +61491,8 @@ self: { }: mkDerivation { pname = "hlibBladeRF"; - version = "0.1.0.4"; - sha256 = "0xs56kszgwm2hz1fl2cajzbygm8n3883bz3j7qqckw14iw81c25b"; + version = "0.1.0.6"; + sha256 = "15k15afy04kld6ar317lk441js873fcyk8qh92r98hnhbpq3nrmw"; buildDepends = [ base bindings-DSL bytestring ]; testDepends = [ base hlint ]; pkgconfigDepends = [ libbladeRF ]; @@ -61428,8 +61666,8 @@ self: { }: mkDerivation { pname = "hmatrix"; - version = "0.16.1.4"; - sha256 = "1bxhps1imw3iik0wvwa4x95kqa1qsm5jqwz16nalaclg2cynaaws"; + version = "0.16.1.5"; + sha256 = "1da1iy2rzz51l69nixacsl7gqhkzld1w8z5h0klkha3mcnf1kkkq"; buildDepends = [ array base binary bytestring deepseq random split storable-complex vector @@ -61468,12 +61706,12 @@ self: { }) {}; "hmatrix-glpk" = callPackage - ({ mkDerivation, base, glpk, hmatrix }: + ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.4.0.2"; - sha256 = "0ixsybmhm3fiwb3kgxm0bgnbbxkgv0k42k8phd7k78mhhsd5jmng"; - buildDepends = [ base hmatrix ]; + version = "0.4.1.0"; + sha256 = "0jy00mblbqp7bx0nxmvzfpa94b21fbl4cam0mha673hzq11rfrxi"; + buildDepends = [ base containers hmatrix ]; extraLibraries = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; @@ -64979,6 +65217,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hsilop" = callPackage + ({ mkDerivation, base, haskeline }: + mkDerivation { + pname = "hsilop"; + version = "0.1.0.0"; + sha256 = "1yaghdyw94ynq5wg6qk5yswrwwf4vx6j7kpl43alym8dh754npw5"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base haskeline ]; + homepage = "https://github.com/Rnhmjoj/hsilop"; + description = "RPN calculator"; + license = stdenv.lib.licenses.mit; + }) {}; + "hsimport" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, directory, dyre , filepath, haskell-src-exts, lens, mtl, split, tasty, tasty-golden @@ -66707,8 +66959,8 @@ self: { }: mkDerivation { pname = "htsn-import"; - version = "0.2.3"; - sha256 = "1c10p1l5rm98c4gyxhmxkhmlv3w6068ca399xjb762wp72xsyz8n"; + version = "0.2.4"; + sha256 = "1mm098a748dmwzzak0ciam7dq80l3iv4hvk8c1crr03dbybr8rq3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -66762,8 +67014,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.8"; - sha256 = "10vflra58ndyq861zswshpcnqdx9acglb2m8f2yzha0slihwda77"; + version = "0.4.8.1"; + sha256 = "08dd730ix5j0y7jrzrb8d0i153g2jmvklj97npdizmqhwxjfwiis"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive clock containers cookie data-default-class deepseq @@ -68344,6 +68596,7 @@ self: { base hydrogen-cli-args hydrogen-data hydrogen-multimap hydrogen-parsing hydrogen-prelude hydrogen-syntax ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.mit; @@ -68360,6 +68613,7 @@ self: { buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-cli-args/"; description = "Hydrogen Command Line Arguments Parser"; license = stdenv.lib.licenses.mit; @@ -68372,6 +68626,7 @@ self: { version = "0.14"; sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88"; buildDepends = [ base hydrogen-parsing hydrogen-prelude ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-data/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.bsd3; @@ -68396,6 +68651,7 @@ self: { version = "0.14"; sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; buildDepends = [ base containers hydrogen-prelude parsec ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; description = "Hydrogen Parsing Utilities"; license = stdenv.lib.licenses.mit; @@ -68409,8 +68665,8 @@ self: { }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.14"; - sha256 = "05xpxgvpllay8rqs5hbkr5pf8i1aanr72651xkz02qp864g0i822"; + version = "0.15"; + sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; buildDepends = [ array base cereal containers directory filepath hashable hydrogen-multimap hydrogen-version network nicify process random @@ -68434,6 +68690,7 @@ self: { base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid ]; + jailbreak = true; homepage = "https://scravy.de/hydrogen-syntax/"; description = "Hydrogen Syntax"; license = stdenv.lib.licenses.bsd3; @@ -68613,8 +68870,8 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.4.2"; - sha256 = "05nhspfsf6nzkv9jivzrf39l24mmm7sb3p8k3sabgb058k3a4h28"; + version = "0.4.2.1"; + sha256 = "069mbxdjlj36lyxr8bqkh1d05bhly64wk5lk71mz73lzcyaivcxi"; buildDepends = [ base containers unordered-containers ]; testDepends = [ base containers directory doctest filepath unordered-containers @@ -71711,8 +71968,8 @@ self: { ({ mkDerivation, base, Cabal }: mkDerivation { pname = "jailbreak-cabal"; - version = "1.2"; - sha256 = "1lwghsykfjx4zmcxk615lkyckrngj6d5rfyizif8vn5pjksygdsr"; + version = "1.3"; + sha256 = "1i4a8azbq74r3pb4hvb816amy13z03afpq4jvyps3s399id6zhx2"; isLibrary = false; isExecutable = true; buildDepends = [ base Cabal ]; @@ -72300,8 +72557,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9"; - sha256 = "1r37hhhhc97sxqrcijss80c0380f36bh6f2y4navwih7r3a2ci8j"; + version = "0.9.1"; + sha256 = "18l5027vc68hnnxrxlnyl59vkkg95a92m1zzms0dqiby2r6pxdcn"; buildDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -73141,8 +73398,8 @@ self: { }: mkDerivation { pname = "keter"; - version = "1.3.8"; - sha256 = "1128ik8ad4s5nd2c4vjs7nm9db44hyd6w0z19642klyrxlhmr67w"; + version = "1.3.9.1"; + sha256 = "0b86f7j9yr4q24q88fwd2j4disns8mcwabrqgcz3hghrh6rhpgg9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -73594,8 +73851,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.6"; - sha256 = "14r28h3pywv87ksnw65jid90v2d3s4lzxm0m7i6wvww5080z804a"; + version = "2.16.8"; + sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -73781,6 +74038,7 @@ self: { attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; + jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -74849,14 +75107,14 @@ self: { , hslogger, hslua, hspec, http-conduit, http-types, HUnit, iconv , lens, lens-aeson, luautils, mtl, operational , optparse-applicative, parallel-io, parsec, parsers, pcre-utils - , process, regex-pcre-builtin, scientific, split, stateWriter, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml + , process, regex-pcre-builtin, scientific, split, stm + , strict-base-types, temporary, text, time, transformers-compat + , unix, unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.0.1"; - sha256 = "1bhhbr50xzb095nikfhc99sd5qmhzd81rg0z922x807r38kkdgnx"; + version = "1.1.0"; + sha256 = "1mda3ip071qx7xfhv3d4q1pdivhycsdk9fxykm7hcs9a7a4c5jls"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -74865,14 +75123,13 @@ self: { Glob hashable hruby hslogger hslua hspec http-conduit http-types iconv lens lens-aeson luautils mtl operational optparse-applicative parallel-io parsec parsers pcre-utils process regex-pcre-builtin - scientific split stateWriter stm strict-base-types text time - transformers unix unordered-containers vector yaml + scientific split stm strict-base-types text time + transformers-compat unix unordered-containers vector yaml ]; testDepends = [ ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -75445,8 +75702,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.1.2"; - sha256 = "0inj841fdh6d8d2i5r2mnsw14fxzdcg92n91gfbaginds4mhjf7d"; + version = "0.3.2.0"; + sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -75554,7 +75811,7 @@ self: { pname = "lens"; version = "4.7"; sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; - editedCabalFile = "a991d37b9cd348226fcdd0b99b079bede892c172b1ddf8a88142b01f80cd5775"; + editedCabalFile = "1904ef544ff972225b7d36db9d386047814905a063b7d9559baf3f8ace3d7725"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable mtl @@ -75589,6 +75846,7 @@ self: { pname = "lens"; version = "4.8"; sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; + editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ array base bifunctors bytestring comonad containers contravariant distributive exceptions filepath free ghc-prim hashable @@ -76919,8 +77177,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.4.0.0"; - sha256 = "0kq4xcpgzrpadibh5ahli5pvb5rd9h1gnd1dzxddjz3plgxil803"; + version = "0.4.0.1"; + sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my"; buildDepends = [ base containers free hoopl linearscan transformers ]; @@ -77265,6 +77523,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lipsum-gen" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "lipsum-gen"; + version = "0.1.0.2"; + sha256 = "07bkxv6cmjf75jy31gbzs4nkjlynhkg8qv2idl71xilgzpnalk3c"; + buildDepends = [ base QuickCheck ]; + description = "Generators for random sequences of English-like nonsense text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip @@ -77729,8 +77998,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.4.3"; - sha256 = "0mxi58dihbwj4534swhy5zlga5w1q2h4jrfvi33kw0pf12hvxqjv"; + version = "3.4.4.4"; + sha256 = "1rx07pk6g46k4652mznga7v51pp6bi32h3wk0dnmihn8n4536m4x"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -78070,8 +78339,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.9.3"; - sha256 = "1l07pi7lnwyk3y747f7bgr1200p6apyfn7bch5v30kh7dy0wyi8m"; + version = "0.10.0.1"; + sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2"; buildDepends = [ base binary bytes cereal comonad deepseq distributive generic-deriving hashable hashable-extras safecopy semigroupoids @@ -78123,8 +78392,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.0.1"; - sha256 = "1v8n4x3mspsf5q0b9xf5rf8c6xwqc5qvyv1s0zjsqw823i2vkgag"; + version = "0.13.1"; + sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -78746,8 +79015,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.3"; - sha256 = "0fr8f641rkazi4ff5s0gr72v5chd2f7dl600v8rj4fp2vmxwwhjc"; + version = "0.4.0.4"; + sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12"; buildDepends = [ base blaze-builder lucid text transformers ]; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; @@ -79046,6 +79315,7 @@ self: { pname = "machines"; version = "0.4.1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; + editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ base comonad containers free mtl pointed profunctors semigroups transformers void @@ -81022,6 +81292,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mgeneric" = callPackage + ({ mkDerivation, base, containers, lens, mtl, template-haskell }: + mkDerivation { + pname = "mgeneric"; + version = "0.0.0.0"; + sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + buildDepends = [ base containers lens mtl template-haskell ]; + homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; + description = "Generics with multiple parameters"; + license = stdenv.lib.licenses.mit; + }) {}; + "mi" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, split , template-haskell @@ -84418,6 +84700,7 @@ self: { async base contravariant managed mmorph pipes pipes-concurrency transformers ]; + jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84573,7 +84856,7 @@ self: { homepage = "https://github.com/bos/mysql"; description = "A low-level MySQL client library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) mysql; inherit (pkgs) zlib;}; + }) { mysql = null; inherit (pkgs) zlib;}; "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql @@ -85583,6 +85866,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-anonymous-i2p" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, exceptions, hspec + , hspec-attoparsec, hspec-expectations, mtl, network + , network-attoparsec, network-simple, text, transformers, uuid + }: + mkDerivation { + pname = "network-anonymous-i2p"; + version = "0.9.2"; + sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + buildDepends = [ + attoparsec base bytestring exceptions mtl network + network-attoparsec network-simple text transformers uuid + ]; + testDepends = [ + attoparsec base bytestring exceptions hspec hspec-attoparsec + hspec-expectations mtl network network-simple transformers uuid + ]; + homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; + description = "Haskell API for I2P anonymous networking"; + license = stdenv.lib.licenses.mit; + }) {}; + "network-api-support" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, http-client, http-client-tls, http-types, text @@ -85608,8 +85913,8 @@ self: { }: mkDerivation { pname = "network-attoparsec"; - version = "0.12.1"; - sha256 = "0nxd4rn4n87m5h3wi72rrm0bm7nx9b23bqsjbz3q05wi77cmg8c9"; + version = "0.12.2"; + sha256 = "1w08py367mmwfg5lff6y9s6hdpg1nbjf7v6vv9s19aw6saxak44p"; buildDepends = [ attoparsec base bytestring enclosed-exceptions exceptions lifted-base monad-control mtl network transformers @@ -85689,8 +85994,8 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.1.0.2"; - sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax"; + version = "1.1.1"; + sha256 = "0wq074k6nwn3h1ww1an7n6i9zx6ii9hsm9vw6x51w22mp787dj1p"; buildDepends = [ base bytestring conduit conduit-extra connection cprng-aes data-default monad-control network streaming-commons system-fileio @@ -86744,19 +87049,18 @@ self: { }) {}; "not-gloss" = callPackage - ({ mkDerivation, base, binary, cereal, GLUT, OpenGLRaw - , spatial-math, time + ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT + , OpenGLRaw, spatial-math, time }: mkDerivation { pname = "not-gloss"; - version = "0.7.0.2"; - sha256 = "1mizah0fwpk3nqk772qmp225kpbwbhikr70qrjzwgmlak9n8f54y"; + version = "0.7.2.1"; + sha256 = "0jkdfkkacb4qsf9f229z79ihrzm9xsgc7pnw96ainmnhjgvfmihj"; buildDepends = [ - base binary cereal GLUT OpenGLRaw spatial-math time + base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -87301,17 +87605,17 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, free, hashable - , profunctors, stm, transformers, unordered-containers, void - , witherable + ({ mkDerivation, base, containers, either, exceptions, free + , hashable, monad-stm, profunctors, stm, transformers + , unordered-containers, void, witherable }: mkDerivation { pname = "objective"; - version = "1.0.1"; - sha256 = "1jycikj070mkrw43h44ynvh2f73n1p2ajxyxy7r0a57hl9l6rwba"; + version = "1.0.2"; + sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; buildDepends = [ - base containers either free hashable profunctors stm transformers - unordered-containers void witherable + base containers either exceptions free hashable monad-stm + profunctors stm transformers unordered-containers void witherable ]; homepage = "https://github.com/fumieval/objective"; description = "Extensible objects"; @@ -87618,8 +87922,8 @@ self: { ({ mkDerivation, base, contravariant, ghc-prim, transformers }: mkDerivation { pname = "one-liner"; - version = "0.5"; - sha256 = "0addkdy8nh3z4h77hskg6930jn00z3sd5fzyajpyi9mfkch0mz91"; + version = "0.5.1"; + sha256 = "0nb3cix82nvs06v5mv1xa6076j5cvwyx2jrn7dmyrpf67a76kfh0"; buildDepends = [ base contravariant ghc-prim transformers ]; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; @@ -87696,7 +88000,7 @@ self: { pname = "opaleye"; version = "0.3.1"; sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; - editedCabalFile = "aad8d4a8bcd52a4668a5f04362af0a1443924b44369f753a184ae170a9a5ca9d"; + editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; buildDepends = [ attoparsec base case-insensitive contravariant old-locale postgresql-simple pretty product-profunctors profunctors semigroups @@ -88930,14 +89234,14 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.1"; - sha256 = "1wbgm0s45smi8gix0byapkiarbb416fv765fc329qsvl295xlyqq"; + version = "1.12.4.2"; + sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9"; buildDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "pandoc-unlit" = callPackage @@ -89950,8 +90254,8 @@ self: { ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.0.1"; - sha256 = "00w6r2zpw5h2db7h8k3y6l1kryi8jvn1rf5wamx0a634ga606czc"; + version = "0.1.1.0"; + sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -90921,17 +91225,19 @@ self: { }) {}; "pgdl" = callPackage - ({ mkDerivation, base, bytestring, Cabal, configurator, directory - , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui + ({ mkDerivation, array, base, bytestring, Cabal, configurator + , directory, filepath, HTTP, network-uri, process, tagsoup, text + , vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "7.6"; - sha256 = "1vgvf7xbzkmb5nbxgaf552i18p22pkj9wgyz3mhbg1m0j2jr1dnj"; + version = "7.77"; + sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; + editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; isLibrary = false; isExecutable = true; buildDepends = [ - base bytestring Cabal configurator directory filepath HTTP + array base bytestring Cabal configurator directory filepath HTTP network-uri process tagsoup text vty vty-ui ]; description = "pgdownloader"; @@ -91258,6 +91564,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pinboard" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , HsOpenSSL, http-streams, http-types, io-streams, mtl, old-locale + , random, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pinboard"; + version = "0.1"; + sha256 = "1zm2qad94dsdglqb79jphac81cff5sjyya8644nbsz10jl39y508"; + buildDepends = [ + aeson base bytestring containers either HsOpenSSL http-streams + http-types io-streams mtl old-locale random text time transformers + unordered-containers + ]; + homepage = "https://github.com/jonschoning/pinboard"; + description = "Access to the Pinboard API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pipes" = callPackage ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework , test-framework-quickcheck2, transformers @@ -91878,8 +92203,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time, unix }: mkDerivation { pname = "plailude"; - version = "0.5.1"; - sha256 = "0c9q2pb7v1qv9v7xl8vcj3jncqsphz13accppxd7k6chmirrdnkh"; + version = "0.6.0"; + sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; buildDepends = [ base bytestring mtl time unix ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; @@ -91995,6 +92320,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plot-gtk-ui" = callPackage + ({ mkDerivation, base, cairo, colour, fixed-vector, gtk, hmatrix + , plot, text, vector + }: + mkDerivation { + pname = "plot-gtk-ui"; + version = "0.0.3.0"; + sha256 = "12slwfhhrzjyscxbs5f8nqayqcbk1lh7b4cla419lbwixhbs3zbg"; + buildDepends = [ + base cairo colour fixed-vector gtk hmatrix plot text vector + ]; + homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; + description = "A quick way to use Mathematica like Manipulation abilities"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "plot-gtk3" = callPackage ({ mkDerivation, base, glib, gtk3, hmatrix, mtl, plot, process }: mkDerivation { @@ -93367,8 +93708,8 @@ self: { }: mkDerivation { pname = "prednote"; - version = "0.30.0.0"; - sha256 = "0srmjh4hzsg341bjgixz4kvhlc15bbzyx2spcd8hi25m0l0ji0m9"; + version = "0.32.0.0"; + sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -93526,6 +93867,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preprocess-haskell" = callPackage + ({ mkDerivation, base, base-unicode-symbols, basic-prelude + , bytestring, Cabal, containers, cpphs, deepseq, directory + , file-embed, foldl, haskell-src-exts, here, system-filepath + , temporary, text, turtle, unix + }: + mkDerivation { + pname = "preprocess-haskell"; + version = "0.0.1.1"; + sha256 = "1jglriabjw44f9phx7ah87wwmri64a61v236dzs58snagzdiq84r"; + buildDepends = [ + base base-unicode-symbols basic-prelude bytestring Cabal containers + cpphs deepseq directory file-embed foldl haskell-src-exts here + system-filepath temporary text turtle unix + ]; + description = "Preprocess Haskell Repositories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "preprocessor-tools" = callPackage ({ mkDerivation, base, mtl, parsec, syb }: mkDerivation { @@ -93591,13 +93951,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pretty_1_1_2_1" = callPackage + "pretty_1_1_3_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }: mkDerivation { pname = "pretty"; - version = "1.1.2.1"; - sha256 = "128bgw9qgm256f28ffb49dvqs9js01m9q6mj6dhg4nlcbpz5fhav"; - editedCabalFile = "ebd25419c2eacdf4212ba30592975908255c84b928a228fe5b045bc4f32c102a"; + version = "1.1.3.1"; + sha256 = "0v1g7gr8nki1bka5dxagayx9azj2gyyd5y23202pnk53synj2lzh"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim QuickCheck ]; homepage = "http://github.com/haskell/pretty"; @@ -94184,7 +94543,7 @@ self: { pname = "product-profunctors"; version = "0.6"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; - editedCabalFile = "d0b625cde02d967598b57bca429c61e9496b164b36db238b8f896d649230f4d1"; + editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; testDepends = [ base profunctors ]; homepage = "https://github.com/tomjaguarpaw/product-profunctors"; @@ -94473,8 +94832,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.1.0"; - sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4"; + version = "2.2.1"; + sha256 = "0dc1km96k58m98ww7z2n8d167ihr5b7vws4y2va4nl30ghpfga56"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -96018,8 +96377,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.3"; - sha256 = "01bmh77cjcz7phl4fzn97hzjnjx3wicr12m7nrdyflw2zckxycwl"; + version = "0.4.2"; + sha256 = "1kwbv7qvpjwdcnj6l26dpyw0xl3irhd5igwda4xx509llc8j8n3s"; buildDepends = [ base containers parsec ]; testDepends = [ base Cabal containers hspec parsec QuickCheck ]; jailbreak = true; @@ -97008,6 +97367,7 @@ self: { version = "1.0.1.0"; sha256 = "1gfxs3wfdkkarxil2an5l58syrm2vajj0qpshzabzchni32yxic8"; buildDepends = [ base readline StateVar ]; + jailbreak = true; description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -97083,10 +97443,8 @@ self: { }: mkDerivation { pname = "record"; - version = "0.2.1"; - sha256 = "12swkcpzcif5bzfp961fx75a7bi0x79z6f16qh7im41amy2zpg19"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "11ddiz2i4rx0rydcm82j8gwf9zr26if78ij539hfdyi2zbvyri85"; buildDepends = [ attoparsec base base-prelude template-haskell text transformers ]; @@ -97469,6 +97827,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex" = callPackage + ({ mkDerivation, base, containers, dependent-map, dependent-sum + , lens, mtl, primitive, semigroups, template-haskell, these + }: + mkDerivation { + pname = "reflex"; + version = "0.0.1"; + sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + buildDepends = [ + base containers dependent-map dependent-sum lens mtl primitive + semigroups template-haskell these + ]; + jailbreak = true; + description = "Higher-order Functional Reactive Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reform" = callPackage ({ mkDerivation, base, containers, mtl, text }: mkDerivation { @@ -99098,9 +99473,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.0"; - sha256 = "1z0227d43dj3c1yh74lh71qihggj21pl7i6mwarb6kam2ziwp7mk"; - editedCabalFile = "4940711977084fce3b86efa958906ba38df63ac450eaf7093ef36268a4c25fe7"; + version = "0.17.0.1"; + sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -99111,7 +99485,6 @@ self: { base fclabels haskell-src-exts HUnit rest-core test-framework test-framework-hunit ]; - jailbreak = true; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -101187,11 +101560,12 @@ self: { }: mkDerivation { pname = "satchmo"; - version = "2.9.3"; - sha256 = "1vb8j6qm6n4v3621y3gz1hf8h1lygp624c4i3s5kzx6vxmm9d368"; + version = "2.9.6"; + sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; buildDepends = [ array base bytestring containers directory minisat mtl process ]; + testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; @@ -102009,6 +102383,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scroll" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , data-default, IfElse, monad-loops, mtl, ncurses + , optparse-applicative, random, text, unix, vector + }: + mkDerivation { + pname = "scroll"; + version = "1.20150314"; + sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring case-insensitive containers data-default IfElse + monad-loops mtl ncurses optparse-applicative random text unix + vector + ]; + homepage = "https://joeyh.name/code/scroll/"; + description = "scroll(6), a roguelike game"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "scrypt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, entropy , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -102209,8 +102604,8 @@ self: { }: mkDerivation { pname = "search"; - version = "0.1"; - sha256 = "1d996dkirvv22kkli5vpaxy2ismyiwd4jyzfvbxyqc79lqanf2gh"; + version = "0.1.0.1"; + sha256 = "0w9pfyw33zrfjy70bwslbgyns1jswshzxcz71cgbfl4q5hjbmvkw"; buildDepends = [ base ghc-prim profunctors semigroupoids tagged transformers ]; @@ -102601,8 +102996,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.1"; - sha256 = "0vakqqdhjn7a049k1sx86ah5x85c005hrxri2xl9qcd690bvrs6f"; + version = "0.3.2"; + sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -103875,8 +104270,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.2"; - sha256 = "1njnmhs5y6nmmy8yrx87x98aqsjkivrsyxz01ybdjg0y7n5r1cva"; + version = "0.6.3"; + sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v"; buildDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -104216,6 +104611,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signals" = callPackage + ({ mkDerivation, array, base, constraints, containers, data-reify + , exception-mtl, exception-transformers, language-c-quote + , mainland-pretty, mtl, operational + }: + mkDerivation { + pname = "signals"; + version = "0.0.0.1"; + sha256 = "12l5vixyv6j3fz8j9rwahf5ifvibqb38kc9j7xg36akc5v2n11s2"; + buildDepends = [ + array base constraints containers data-reify exception-mtl + exception-transformers language-c-quote mainland-pretty mtl + operational + ]; + homepage = "https://github.com/markus-git/signals"; + description = "Stream Processing for Embedded Domain Specific Languages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "signed-multiset" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -104513,14 +104927,13 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.3.0"; - sha256 = "0blr8j52q8q1mdmb66byll3pnhzqmrlwc8jjz40km86bj73n1c7h"; + version = "0.3.1"; + sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; buildDepends = [ base containers deepseq directory filepath MonadCatchIO-transformers mtl old-locale SafeSemaphore text time transformers ]; - jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -104728,8 +105141,8 @@ self: { }: mkDerivation { pname = "simple-sql-parser"; - version = "0.4.0"; - sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + version = "0.4.1"; + sha256 = "0hz5acbkn9i46c8hpx258vkyj0q9ii4kh5wsjjj79avlnal2gz8q"; isLibrary = true; isExecutable = true; buildDepends = [ base mtl parsec pretty ]; @@ -105653,9 +106066,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "0.13.3.2"; - sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; - editedCabalFile = "2ffeb6e3e6d6d54819bc8c7d58c4bdabf1911599c4e83ededbda4f5719c0298f"; + version = "0.14.0"; + sha256 = "11vf7v1aqbm1lzb5jjjna6j8gj7757xkc8zk820z9d73ak8bq7m8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -105791,6 +106203,7 @@ self: { attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -105825,6 +106238,7 @@ self: { async base containers monad-loops MonadCatchIO-transformers snap stm time transformers ]; + jailbreak = true; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; @@ -106000,6 +106414,7 @@ self: { sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106099,6 +106514,7 @@ self: { base bytestring css-text directory filepath lens snap text utf8-string ]; + jailbreak = true; homepage = "https://github.com/zmthy/snaplet-css-min"; description = "A Snaplet for CSS minification"; license = stdenv.lib.licenses.mit; @@ -106128,8 +106544,8 @@ self: { }: mkDerivation { pname = "snaplet-fay"; - version = "0.3.3.10"; - sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll"; + version = "0.3.3.11"; + sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -106394,6 +106810,7 @@ self: { MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106445,6 +106862,7 @@ self: { aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text ]; + jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -106461,6 +106879,7 @@ self: { buildDepends = [ base configurator hedis lens mtl network snap text transformers ]; + jailbreak = true; homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -106602,6 +107021,7 @@ self: { SafeSemaphore snap snap-core sqlite-simple stm test-framework test-framework-hunit text time transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -108359,8 +108779,8 @@ self: { }: mkDerivation { pname = "stable-tree"; - version = "0.6.1"; - sha256 = "02asd3qrnydmw70ibf2w2q6phkvrls1yvlrbwmwhqz839ry0jhyx"; + version = "0.7.0"; + sha256 = "0mcb983sdwfsf39gd8zsls7pgndqrnnzvxsz8kn9c5nqjxwdll4p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -109234,17 +109654,19 @@ self: { }) {}; "stomp-queue" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, mime, network, split - , stompl, time, utf8-string + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, mime, mtl, network-conduit-tls, split, stompl + , time, utf8-string }: mkDerivation { pname = "stomp-queue"; - version = "0.1.4"; - sha256 = "0qn6mnplwqzz05g1k8ib4q7ga6if2iw3y9a5yba61gn1ghhwhgl9"; + version = "0.2.0"; + sha256 = "0xd9sdyjasp8ncb5qyzkx77a3wrybcajxdpvndx0viykma6bfmqr"; buildDepends = [ - attoparsec base bytestring mime network split stompl time - utf8-string + attoparsec base bytestring conduit conduit-extra mime mtl + network-conduit-tls split stompl time utf8-string ]; + jailbreak = true; homepage = "http://github.com/toschoo/mom"; description = "Stompl Client Library"; license = "LGPL"; @@ -110747,6 +111169,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syncthing-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, containers + , derive, either, http-client, http-client-tls, lens, old-locale + , quickcheck-instances, regex-posix, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , wreq + }: + mkDerivation { + pname = "syncthing-hs"; + version = "0.1.1.0"; + sha256 = "0377mykydnwdbwjbbfr56nrdh2c18ik5m9jj2wgw7qg2npnfyj2v"; + buildDepends = [ + aeson base bytestring connection containers either http-client + http-client-tls lens old-locale regex-posix text time transformers + unordered-containers wreq + ]; + testDepends = [ + aeson base bytestring containers derive either lens + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + transformers wreq + ]; + homepage = "https://github.com/jetho/syncthing-hs"; + description = "Haskell bindings for the Syncthing REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "synt" = callPackage ({ mkDerivation, argparser, base, haskell-src-exts, hpc, hspec , regexpr, split, Synt @@ -113328,8 +113776,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.0.1"; - sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn"; + version = "0.8.0.2"; + sha256 = "11hzqfik99zydvsnwy4ihpgqvsiq398pxnw777bcaqzdrvyw7fa7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -113890,8 +114338,8 @@ self: { ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; - version = "0.3.0.5"; - sha256 = "1xirbzcnsb8lvadsz8m6jg8yxc3wrf40dnvs66kdmhwjbg6kv4rh"; + version = "0.3.0.6"; + sha256 = "03qv93pyqk8all39knsf0mzmbfdck5x61kqnyn8rbisw5c1ymx6j"; buildDepends = [ base containers syb template-haskell ]; testDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; @@ -114312,18 +114760,20 @@ self: { }) {}; "threads-supervisor" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + ({ mkDerivation, base, bytestring, QuickCheck, retry, stm, tasty , tasty-hunit, tasty-quickcheck, time, transformers , unordered-containers }: mkDerivation { pname = "threads-supervisor"; - version = "1.0.2.0"; - sha256 = "1k8p8l8fvvc9qrw0qgbbfy9r6h3i1mfkmfzy1g2rsq9kcsc0821r"; - buildDepends = [ base stm time unordered-containers ]; + version = "1.0.3.0"; + sha256 = "1iipljryqj1g06bqmlyvkxagq7l3rfx7w5d1ci5dw22qsrijnkmn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base retry stm time unordered-containers ]; testDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck - time transformers + base bytestring QuickCheck retry stm tasty tasty-hunit + tasty-quickcheck time transformers ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; @@ -114562,14 +115012,14 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.29"; - sha256 = "05p6iga6lzshk6vzywpxd6g53r7hqyvs1rq90v00lpxkiwyqxs6i"; + version = "0.4.30"; + sha256 = "1awc2xgq4vn8nnfij3cnklcayh9d4khwpldm75jbghqi75921jni"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers websockets ]; - homepage = "http://yaxu.org/tidal/"; + homepage = "http://tidal.lurk.org/"; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -115161,6 +115611,23 @@ self: { license = "unknown"; }) {}; + "titlecase" = callPackage + ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "titlecase"; + version = "0.1.0.0"; + sha256 = "09zq7z3icziad12ssn663l32k6c5z31azzlhg789q635ab3dckn0"; + buildDepends = [ base blaze-markup semigroups text ]; + testDepends = [ + base semigroups tasty tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/nkaretnikov/titlecase"; + description = "Convert English words to title case"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tkhs" = callPackage ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework , test-framework-hunit, utf8-string, vty @@ -115295,21 +115762,20 @@ self: { }) {}; "tn" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , optparse-applicative, text, time + ({ mkDerivation, base, bytestring, containers, directory, process + , safe, text, time, yaml }: mkDerivation { pname = "tn"; - version = "0.2.0.0"; - sha256 = "0m402p4ik8z07dj08wm0jy6w82fzgmsrf1v4v2chg9qb505qigm4"; + version = "1.0.2"; + sha256 = "0rk7zqzwxc1sjar0n3k919snjpxw7an9vgxjh6b407mkzvz62n94"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson aeson-pretty base bytestring optparse-applicative text time + base bytestring containers directory process safe text time yaml ]; - jailbreak = true; - description = "A journaling program for Linux"; - license = stdenv.lib.licenses.bsd3; + description = "A simple daily journal program"; + license = stdenv.lib.licenses.gpl3; }) {}; "tnet" = callPackage @@ -115618,6 +116084,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "touched" = callPackage + ({ mkDerivation, base, cmdargs, directory, process, time }: + mkDerivation { + pname = "touched"; + version = "0.1.0.3"; + sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base cmdargs directory process time ]; + jailbreak = true; + description = "Library (and cli) to execute a procedure on file change"; + license = stdenv.lib.licenses.mit; + }) {}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, containers , data-default-class, data-interval, deepseq, exceptions @@ -117961,8 +118441,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.0.2.1"; - sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i"; + version = "0.1"; + sha256 = "10flwmkmpnkxib1v9f5qv11wnvjmnn3aiag4f2qgpdc3hadq6j0q"; buildDepends = [ base containers contravariant mtl transformers transformers-compat ]; @@ -119926,16 +120406,17 @@ self: { }) {}; "validate-input" = callPackage - ({ mkDerivation, base, bytestring, either, mtl, pcre-heavy - , stringable, text + ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy + , QuickCheck, stringable, text }: mkDerivation { pname = "validate-input"; - version = "0.1.0.0"; - sha256 = "1xbpgc2zkaszjydy15ir11vlrwg4pgclm6ldnjxmv3p2v1cswxq6"; + version = "0.2.0.0"; + sha256 = "0ijlkfizxpjy7r0bh59zfj1jyn77gqd0ryz8k19v7znckq7bxgls"; buildDepends = [ base bytestring either mtl pcre-heavy stringable text ]; + testDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/agrafix/validate-input"; description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; @@ -120120,8 +120601,8 @@ self: { }: mkDerivation { pname = "vcache-trie"; - version = "0.1"; - sha256 = "0aln3vin1jah4c7hnhdbm4w5vsiqf3kgf48z6xdyzc0zwhv7mf1k"; + version = "0.1.1"; + sha256 = "12nfik4fp5snxf8w3kp6r6v327i9izs18aflj90ib0gq267qrlnk"; buildDepends = [ array base bytestring bytestring-builder vcache ]; homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; @@ -121045,8 +121526,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.2.7"; - sha256 = "158fycy2l6pahc0bb64vbadrs1xsw095f1m0d2802blb0h0z8ajn"; + version = "5.2.8"; + sha256 = "01wra0gfv94wbv0blrixix0bggjg9cg72axgg3r9brp7qmh1qv14"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -121759,23 +122240,22 @@ self: { }) {}; "wai-middleware-throttle" = callPackage - ({ mkDerivation, base, bytestring, haddock, hlint, hspec - , http-types, HUnit, network, process, regex-compat, stm, text - , token-bucket, transformers, unordered-containers, wai, wai-extra + ({ mkDerivation, base, bytestring, containers, haddock, hlint + , hspec, http-types, HUnit, network, process, regex-compat, stm + , token-bucket, transformers, wai, wai-extra }: mkDerivation { pname = "wai-middleware-throttle"; - version = "0.1.0.1"; - sha256 = "1404i9f8pcvhpa2kjz5rc7r18f5dk7889v576i5k41faxb749ig0"; + version = "0.2.0.0"; + sha256 = "1dnpx3byb1q8g41kj55qgw6vrjm4rv4sa6qbd12pafwabcgx4l74"; buildDepends = [ - base bytestring http-types network stm text token-bucket - transformers unordered-containers wai + base containers http-types network stm token-bucket transformers + wai ]; testDepends = [ base bytestring haddock hlint hspec http-types HUnit process - regex-compat stm transformers unordered-containers wai wai-extra + regex-compat stm transformers wai wai-extra ]; - jailbreak = true; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122067,6 +122547,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "waitra" = callPackage + ({ mkDerivation, aeson, base, http-types, regex-applicative, tasty + , tasty-hunit, text, wai, wai-extra + }: + mkDerivation { + pname = "waitra"; + version = "0.0.2.0"; + sha256 = "1hzwxwaw5w38bmsyh15mggrawjbfn1bnkjjjv4aigynv19kdjf03"; + buildDepends = [ + aeson base http-types regex-applicative text wai + ]; + testDepends = [ + aeson base http-types regex-applicative tasty tasty-hunit wai + wai-extra + ]; + homepage = "https://github.com/futurice/waitra"; + description = "A very simple Wai router"; + license = stdenv.lib.licenses.mit; + }) {}; + "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec @@ -122137,8 +122637,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.2"; - sha256 = "1jhra0iq7iph4cn5lq98892rapzws2nsf1pyb70gpww4l3bgjfzd"; + version = "3.0.3"; + sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -123184,13 +123684,13 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.1.1"; - sha256 = "1i0jvxc1llcq5aayzgqhkz51mqh96pdadml6gi94h2z3yj20nicg"; + version = "0.1.2.1"; + sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; - description = "Generalization of catMaybes"; + description = "Generalization of filter and catMaybes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -124144,8 +124644,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.0"; - sha256 = "1388nw6ikk8myqq9h9if3fkdlxhzj7fs9l3hyfiv77k499j3iln9"; + version = "0.2.1"; + sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -126326,8 +126826,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.4"; - sha256 = "0xd5rx9gpaj8m5v1ln3lgi6xhk2lw43c8ykdiqhp3583aybjkvnm"; + version = "1.4.5"; + sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -126401,8 +126901,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.1"; - sha256 = "1ynhxzc4q80zamyyabjhiz7mgh7wjzqm23xlx67x7lpwz0q18hpb"; + version = "1.4.8.2"; + sha256 = "0syfgwyj5cgs2rl26g8mz2sz3vr39g813ljz441asrqv80mz4xww"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -126579,8 +127079,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.4.4"; - sha256 = "1vy4gscw3rgglbiq0v4l0zjmvan2sk6sgd93402hw64xwxwzc35c"; + version = "1.4.4.1"; + sha256 = "14v4vhrbca0281im2bnvk36bm7i1r8yanxhv7lvrq5y5nqbc5bl3"; buildDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -127700,20 +128200,20 @@ self: { "yst" = callPackage ({ mkDerivation, aeson, base, containers, csv, directory, filepath - , HDBC, HDBC-sqlite3, HStringTemplate, old-locale, old-time, pandoc - , parsec, scientific, split, text, time, unordered-containers - , xhtml, yaml + , HDBC, HDBC-sqlite3, HStringTemplate, lucid, old-locale, old-time + , pandoc, parsec, scientific, split, text, time + , unordered-containers, yaml }: mkDerivation { pname = "yst"; - version = "0.4.1.1"; - sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; + version = "0.5.0.2"; + sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3"; isLibrary = false; isExecutable = true; buildDepends = [ aeson base containers csv directory filepath HDBC HDBC-sqlite3 - HStringTemplate old-locale old-time pandoc parsec scientific split - text time unordered-containers xhtml yaml + HStringTemplate lucid old-locale old-time pandoc parsec scientific + split text time unordered-containers yaml ]; homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; @@ -127881,7 +128381,7 @@ self: { description = "Bindings to ZeroMQ 2.1.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq3-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, lifted-base @@ -127923,7 +128423,7 @@ self: { description = "Bindings to ZeroMQ 3.x"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeromq4-haskell" = callPackage ({ mkDerivation, async, base, bytestring, containers, exceptions @@ -127944,7 +128444,7 @@ self: { homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; - }) { zeromq = null;}; + }) { inherit (pkgs) zeromq;}; "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix new file mode 100644 index 00000000000..8600d17f366 --- /dev/null +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }: + +stdenv.mkDerivation rec { + name = "gnu-apl-${version}"; + version = "1.4"; + + src = fetchurl { + url = "mirror://gnu/apl/apl-${version}.tar.gz"; + sha256 = "0fl9l4jb5wpnb54kqkphavi657z1cv15h9qj2rqy2shf33dk3nk9"; + }; + + buildInputs = [ liblapack readline gettext ncurses ]; + + postInstall = '' + cp -r support-files/ $out/share/doc/ + find $out/share/doc/support-files -name 'Makefile*' -delete + ''; + + meta = { + description = "Free interpreter for the APL programming language."; + homepage = http://www.gnu.org/software/apl/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + platforms = stdenv.lib.platforms.linux; + + longDescription = '' + GNU APL is a free interpreter for the programming language APL, with an + (almost) complete implementation of ISO standard 13751 aka. Programming + Language APL, Extended. GNU APL was written and is being maintained by + Jürgen Sauermann. + ''; + }; +} diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index dab983a1349..49740fddb46 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -189,6 +189,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-maintainer-zts"]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -229,6 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); ztsSupport = config.php.zts or false; + calendarSupport = config.php.calendar or false; }; configurePhase = '' @@ -256,12 +261,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index 70380889bd3..fac04654847 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -193,6 +193,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + calendar = { + configureFlags = ["--enable-calendar"]; + }; }; cfg = { @@ -227,6 +230,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' @@ -254,12 +258,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index bf0f2076c1c..6559ecfa658 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -193,6 +193,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [freetds]; }; + + calendar = { + configureFlags = ["--enable-calendar"]; + }; + }; cfg = { @@ -227,6 +232,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) fpmSupport = config.php.fpm or true; gmpSupport = config.php.gmp or true; mssqlSupport = config.php.mssql or (!stdenv.isDarwin); + calendarSupport = config.php.calendar or true; }; configurePhase = '' @@ -254,12 +260,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) sha256 = "0vfhvwn84lrz9psf10sjnwljbna1r7yqxq3lmsh5qajifl3lraxd"; }; - meta = { + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = stdenv.lib.licenses.php301; + maintainers = with maintainers; [ globin ]; }; - patches = [ ./fix-5.4.patch ]; + patches = [ ./fix-paths.patch ]; }) diff --git a/pkgs/development/interpreters/php/fix-5.4.patch b/pkgs/development/interpreters/php/fix-paths.patch similarity index 100% rename from pkgs/development/interpreters/php/fix-5.4.patch rename to pkgs/development/interpreters/php/fix-paths.patch diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index b01ea401b38..c843a00b836 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { src = fetchurl { name = "Botan-${version}.tgz"; - url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz"; + urls = [ + "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz" + "http://botan.randombit.net/releases/Botan-${version}.tgz" + ]; inherit sha256; }; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 87a3e49b89b..f586d6fd622 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "14"; - sha256 = "1laa6d8w9v39a2pfmilj62jwc67r0jbq5f3xdlffd3kvkdnwcysb"; + revision = "15"; + sha256 = "1rkv84v09llbxyvh33szi7zsjm19l02j7h60n9g7jhhc2w667jk0"; openssl = null; }) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix new file mode 100644 index 00000000000..4dce56a8f1a --- /dev/null +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, eigen +, fetchurl +, cmake +, google-gflags ? null +, glog ? null +, runTests ? false +}: + +# google-gflags is required to run tests +assert runTests -> google-gflags != null; + +let + version = "1.10.0"; + + # glog currently doesn't build on darwin + # Issue: https://code.google.com/p/google-glog/issues/detail?id=121 + useGlog = glog != null && !stdenv.isDarwin; + +in +stdenv.mkDerivation { + name = "ceres-solver-${version}"; + + src = fetchurl { + url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; + sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; + }; + + buildInputs = [ cmake ] + ++ stdenv.lib.optional useGlog glog + ++ stdenv.lib.optional (google-gflags != null) google-gflags; + + inherit eigen; + + doCheck = runTests; + + checkTarget = "test"; + + cmakeFlags = " + -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 + ${if !useGlog then "-DMINIGLOG=ON" else ""} + "; + + meta = with stdenv.lib; { + description = "C++ library for modeling and solving large, complicated optimization problems"; + license = licenses.bsd3; + homepage = "http://ceres-solver.org"; + maintainers = with stdenv.lib.maintainers; [ giogadi ]; + inherit version; + }; +} diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 8c513978cfd..69ef08b91d9 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zeromq4}: +{ stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { baseName="czmq"; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9"; }; - buildInputs = [ zeromq4 ]; + buildInputs = [ zeromq ]; - meta = { - license = stdenv.lib.licenses.mpl20; + meta = with stdenv.lib; { homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh deleted file mode 100644 index 6ac1d223b47..00000000000 --- a/pkgs/development/libraries/eglibc/builder.sh +++ /dev/null @@ -1,63 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - -preConfigure() { - - for i in libc/configure libc/io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # Include source for debugging - mkdir -p $out/src - cp -R libc ports $out/src - ln -s $out/src/ports $out/src/libc/ports - # glibc wants -O2 minimum - export CFLAGS="-pipe -g -O2" - - mkdir $NIX_BUILD_TOP/build - cd $NIX_BUILD_TOP/build - - configureScript=$out/src/libc/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/eglibc/default.nix b/pkgs/development/libraries/eglibc/default.nix deleted file mode 100644 index a27d0f53fbf..00000000000 --- a/pkgs/development/libraries/eglibc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchsvn, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation rec { - name = "eglibc-2.10"; - - src = fetchsvn { - url = svn://svn.eglibc.org/branches/eglibc-2_10; - rev = 8690; - sha256 = "029hklrx2rlhsb5r2csd0gapjm0rbr8n28ib6jnnhms12x302viq"; - }; - - inherit kernelHeaders installLocales; - - configureFlags = [ - "--with-headers=${kernelHeaders}/include" - "--without-fp" - "--enable-add-ons=libidn,ports,nptl" - "--disable-profile" - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - ]; - - builder = ./builder.sh; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 2e3db4c2d73..f3c9b95d6b4 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4"; src = fetchurl { - url = "https://files.dyne.org/.xsend.php?file=frei0r/releases/${name}.tar.gz"; + url = "https://files.dyne.org/frei0r/releases/${name}.tar.gz"; sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; }; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix new file mode 100644 index 00000000000..fc4b2b47959 --- /dev/null +++ b/pkgs/development/libraries/hiredis/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "hiredis-${version}"; + version = "0.12.1"; + + src = fetchgit { + url = "git://github.com/redis/hiredis"; + rev = "37c06facda57af9bad68f50c18edfa22d6ef76f7"; + sha256 = "1z1rzhh1659g8i5bl78k1i1imlz2prwirhzbkn6j7hvq4mxbf2yz"; + }; + + PREFIX = "\${out}"; + + meta = with stdenv.lib; { + homepage = https://github.com/redis/hiredis; + description = "Minimalistic C client for Redis >= 1.2"; + licenses = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix new file mode 100644 index 00000000000..b08f5b7dd76 --- /dev/null +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jemalloc-3.6.0"; + + src = fetchurl { + url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; + sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71"; + }; + + meta = with stdenv.lib; { + homepage = http://www.canonware.com/jemalloc/index.html; + description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 4bca61d5b14..13b50286380 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # gcc 4.8 optimisations break judy. # http://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = '' + preConfigure = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) '' configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 6d96b1b5082..c7fdbc060ec 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -19,6 +19,7 @@ with stdenv.lib; with autonix; let mkDerivation = drv: + let inherit (builtins.parseDrvName drv.name) version; in stdenv.mkDerivation (drv // { setupHook = ./setup-hook.sh; @@ -32,7 +33,7 @@ let ] ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = drv.meta or + meta = { license = with stdenv.lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -40,7 +41,9 @@ let platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; - }; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); + } // (drv.meta or {}); }); renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; @@ -108,12 +111,16 @@ let [ ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch ]; - meta = { - license = with stdenv.lib.licenses; [ bsd2 ]; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - homepage = "http://www.kde.org"; - }; + meta = + let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in + { + license = with stdenv.lib.licenses; [ bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + inherit version; + branch = intersperse "." (take 2 (splitString "." version)); + }; }; frameworkintegration = super.frameworkintegration // { diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 4e6dd6d5b02..c5b0c715620 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "levmar-2.5"; + name = "levmar-2.6"; src = fetchurl { url = "http://www.ics.forth.gr/~lourakis/levmar/${name}.tgz"; - sha256 = "0xcx9fvymr0j5kmfy5cqaa2lxf1c64vv25z2a28w43pkxz1nl3xp"; + sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 04e85bcfc33..41a8b391eb3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57"; - libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273"; - libav_11 = libavFun "11.2" "52ba52cabe5d86b45ce62f56e11fa7912c6e5083"; + libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; + libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714"; + libav_11 = libavFun "11.3" "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a"; }; libavFun = version : sha1 : stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 6f61d9b3cad..542aa3cb340 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -1,31 +1,61 @@ -{ stdenv, fetchurl, libdbi, mysql ? null, sqlite ? null }: +{ stdenv, fetchurl, libdbi +, mysql ? null, sqlite ? null, postgresql ? null +}: +with stdenv.lib; stdenv.mkDerivation rec { - name = "libdbi-drivers-0.8.3-1"; + name = "libdbi-drivers-0.9.0"; src = fetchurl { url = "mirror://sourceforge/libdbi-drivers/${name}.tar.gz"; - sha256 = "0wng59xnq8jjyp6f3bfjrhjvqrswamrjykdnxq6rqxnfk11r9faa"; + sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql sqlite ]; + buildInputs = [ libdbi mysql sqlite postgresql ]; - configureFlags = - [ "--disable-docs" - "--enable-libdbi" - "--with-dbi-incdir=${libdbi}/include" - "--with-dbi-libdir=${libdbi}/lib" - ] ++ stdenv.lib.optionals (mysql != null) - [ "--with-mysql" - "--with-mysql-incdir=${mysql}/include/mysql" - "--with-mysql-libdir=${mysql}/lib/mysql" - ] ++ stdenv.lib.optionals (sqlite != null) - [ "--with-sqlite3" - "--with-sqlite3-incdir=${sqlite}/include/sqlite" - "--with-sqlite3-libdir=${sqlite}/lib/sqlite" - ]; + postPatch = '' + sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; + ''; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--disable-docs" + "--enable-libdbi" + "--with-dbi-incdir=${libdbi}/include" + "--with-dbi-libdir=${libdbi}/lib" + ] ++ optionals (mysql != null) [ + "--with-mysql" + "--with-mysql-incdir=${mysql}/include/mysql" + "--with-mysql-libdir=${mysql}/lib/mysql" + ] ++ optionals (postgresql != null) [ + "--with-pgsql" + "--with-pgsql_incdir=${postgresql}/include" + "--with-pgsql_libdir=${postgresql}/lib" + ] ++ optionals (sqlite != null) [ + "--with-sqlite3" + "--with-sqlite3-incdir=${sqlite}/include/sqlite" + "--with-sqlite3-libdir=${sqlite}/lib/sqlite" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + # Remove the unneeded var/lib directories + rm -rf $out/var + ''; meta = { + homepage = http://libdbi-drivers.sourceforge.net/; description = "Database drivers for libdbi"; + platforms = platforms.all; + license = licenses.lgpl21; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 11bb4965a4e..4f6b9dd099d 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdbi-0.8.3"; + name = "libdbi-0.9.0"; src = fetchurl { url = "mirror://sourceforge/libdbi/${name}.tar.gz"; - sha256 = "1qx5d5ikx65k73ir9rf557ri6j99ihsnjqqyznqsf7dvprb1ir3j"; + sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; - configureFlags = "--disable-docs"; - - meta = { + meta = with stdenv.lib; { + homepage = http://libdbi.sourceforge.net/; description = "DB independent interface to DB"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 271311cf46c..ad37f9010c5 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,8 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libestr-0.1.9"; + +stdenv.mkDerivation rec { + name = "libestr-0.1.10"; + src = fetchurl { - url = http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz; - sha256 = "06km9mlw5qq4aa7503l81d0qcghzl0n3lh0z41r1xjpa04nnwb42"; + url = "http://libestr.adiscon.com/files/download/${name}.tar.gz"; + sha256 = "0g3hmh3wxgjbn5g6cgy2l0ja806jd0ayp22bahcds3kmdq95wrdx"; + }; + + meta = with stdenv.lib; { + homepage = http://libestr.adiscon.com/; + description = "some essentials for string handling"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libevhtp/default.nix b/pkgs/development/libraries/libevhtp/default.nix new file mode 100644 index 00000000000..f909d6d8ff2 --- /dev/null +++ b/pkgs/development/libraries/libevhtp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, openssl, libevent }: + +stdenv.mkDerivation rec { + name = "libevhtp-${version}"; + version = "1.2.10"; + + src = fetchFromGitHub { + owner = "ellzey"; + repo = "libevhtp"; + rev = version; + sha256 = "0z5cxa65zp89vkaj286gp6fpmc5fylr8bmd17g3j1rgc42nysm6a"; + }; + + buildInputs = [ cmake openssl libevent ]; + + buildPhase = "cmake"; + + meta = with stdenv.lib; { + description = "A more flexible replacement for libevent's httpd API"; + homepage = "https://github.com/ellzey/libevhtp"; + license = licenses.bsd3; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 1a39e094153..ad0fa8589f3 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -11,10 +11,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.5.5"; + name = "libinfinity-0.6.5"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "1i4cnwbvfv56m7zyyf9wki2bj000r8md414yv3cf1jdz4jbyxij7"; + sha256 = "1idsxb6rz4i55g3vi2sv7hmm57psbccpb57yc4jgphaq6ydgqsr6"; }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index 7a754a28e3d..aa75acb7d6d 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,18 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, systemd }: +{ stdenv, fetchurl, pkgconfig +, systemd ? null +}: stdenv.mkDerivation rec { - name = "liblogging-1.0.4"; + name = "liblogging-1.0.5"; src = fetchurl { url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; - sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc"; + sha256 = "02w94j344q0ywlj4mdf9fnzwggdsn3j1yn43sdlsddvr29lw239i"; }; buildInputs = [ pkgconfig systemd ]; - meta = { + configureFlags = [ + "--enable-rfc3195" + "--enable-stdlog" + (if systemd != null then "--enable-journal" else "--disable-journal") + "--enable-man-pages" + ]; + + meta = with stdenv.lib; { + homepage = http://www.liblogging.org/; description = "Lightweight signal-safe logging library"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix new file mode 100644 index 00000000000..f9095be8425 --- /dev/null +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libestr, json_c, pcre }: + +stdenv.mkDerivation rec { + name = "liblognorm-1.1.1"; + + src = fetchurl { + url = "http://www.liblognorm.com/files/download/${name}.tar.gz"; + sha256 = "1wi28n5ahajvl64wfn7jpvnskccd6837i0cyq8w8cvrm362b6pd7"; + }; + + buildInputs = [ pkgconfig libestr json_c pcre ]; + + configureFlags = [ "--enable-regexp" ]; + + meta = with stdenv.lib; { + homepage = http://www.liblognorm.com/; + description = "help to make sense out of syslog data, or, actually, any event data that is present in text form"; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix new file mode 100644 index 00000000000..4cbc51ea678 --- /dev/null +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "libmongo-client-0.1.8"; + + src = fetchFromGitHub { + owner = "algernon"; + repo = "libmongo-client"; + rev = name; + sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; + }; + + buildInputs = [ autoreconfHook pkgconfig ]; + propagatedBuildInputs = [ glib ]; + + postPatch = '' + # Fix when uses glib in public headers + sed -i 's/Requires.private/Requires/g' src/libmongo-client.pc.in + ''; + + meta = with stdenv.lib; { + homepage = http://algernon.github.io/libmongo-client/; + description = "An alternative C driver for MongoDB"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libmsgpack/CMakeLists.patch b/pkgs/development/libraries/libmsgpack/0.5-CMake.patch similarity index 100% rename from pkgs/development/libraries/libmsgpack/CMakeLists.patch rename to pkgs/development/libraries/libmsgpack/0.5-CMake.patch diff --git a/pkgs/development/libraries/libmsgpack/0.5.nix b/pkgs/development/libraries/libmsgpack/0.5.nix new file mode 100644 index 00000000000..4f14dcd8b13 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/0.5.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "0.5.9"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "19cmlxfr0sc2b08a1mq9plk9fj5l1i20f69j4pvbhlnah3xqfdjs"; + }; + + patches = [ ./0.5-CMake.patch ]; +}) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index d9f4bfcc750..4bec67f8513 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,22 +1,12 @@ -{ stdenv, fetchurl, cmake}: +{ callPackage, fetchFromGitHub, ... } @ args: -stdenv.mkDerivation rec { - version = "0.5.9"; - name = "libmsgpack-${version}"; +callPackage ./generic.nix (args // rec { + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/msgpack/msgpack-c/archive/cpp-${version}.tar.gz"; - sha256 = "0xy204srq5grng7p17hwdxpfzbsfrn89gi4c3k62a23p4f9z0szq"; + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; }; - - buildInputs = [ cmake ]; - patches = [ ./CMakeLists.patch ]; - - meta = with stdenv.lib; { - description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; - maintainers = [ maintainers.redbaron ]; - license = licenses.asl20; - platforms = platforms.all; - }; -} +}) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix new file mode 100644 index 00000000000..72943c098ba --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -0,0 +1,20 @@ +{ stdenv, cmake +, version, src, patches ? [ ] +, ... +}: + +stdenv.mkDerivation rec { + name = "libmsgpack-${version}"; + + inherit src patches; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "MessagePack implementation for C and C++"; + homepage = http://msgpack.org; + maintainers = with maintainers; [ redbaron wkennington ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 783739dda71..1e445b20f68 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { name = "libnet-${version}"; - version = "1.2-rc2"; + version = "1.2-rc3"; src = fetchurl { url = "mirror://sourceforge/libnet-dev/${name}.tar.gz"; - sha256 = "1pc74p839a7wvhjdgy0scj7c4yarr6mqdqvj56k6sp8pkc763az7"; + sha256 = "0qsapqa7dzq9f6lb19kzilif0pj82b64fjv5bq086hflb9w81hvj"; }; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/sam-github/libnet; description = "Portable framework for low-level network packet construction"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix new file mode 100644 index 00000000000..626b5220ebf --- /dev/null +++ b/pkgs/development/libraries/librelp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: + +stdenv.mkDerivation rec { + name = "librelp-1.2.7"; + + src = fetchurl { + url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; + sha256 = "1lfpd06cchi1mhlxwq0xhmbx42b8isx9677v9h80c9vpf4f4lhrs"; + }; + + buildInputs = [ pkgconfig gnutls zlib ]; + + meta = with stdenv.lib; { + homepage = http://www.librelp.com/; + description = "a reliable logging library"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index c35f0a7efe5..e15daf2d42d 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0z2g609526pc8zmz2frkmhlfgvn8cmj5agj5yq5b33s0f44kfbzb"; + sha256 = "0km0m4y442gf0sn4g31cljhvfi3l627fw4lljyd12x47j8sqbq78"; }; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "http://www.libressl.org"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix new file mode 100644 index 00000000000..4316b2dda6b --- /dev/null +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -0,0 +1,21 @@ +{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }: + +stdenv.mkDerivation rec { + name = "libtermkey-${version}"; + + version = "0.17"; + + src = fetchzip { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz"; + sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildInputs = [ libtool pkgconfig ncurses ]; + + meta = with lib; { + description = "Terminal keypress reading library"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 989373315d0..09888035b81 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, autoconf, libjpeg, libpng12, libX11, zlib }: +{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: -let version = "3.5.0-2015-02-18"; in +let version = "3.5.0.30"; in stdenv.mkDerivation { name = "libxcomp-${version}"; - src = fetchgit { - url = git://code.x2go.org/nx-libs.git; - rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; - sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; }; meta = with stdenv.lib; { description = "NX compression library"; - homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = with licenses; gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 84a7a9b4ccf..b9962c2a2d7 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, cmake, openssl, popt, xmlto }: +{ stdenv, fetchFromGitHub, cmake, openssl, popt, xmlto }: stdenv.mkDerivation rec { - version = "0.4.1"; name = "rabbitmq-c-${version}"; + version = "0.6.0"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93"; + src = fetchFromGitHub { + owner = "alanxz"; + repo = "rabbitmq-c"; + rev = "v${version}"; + sha256 = "00264mvwwcibd36w9a3s3cv2x7pvz88al64q2maaw1kbd9mg1ky5"; }; buildInputs = [ cmake openssl popt xmlto ]; - meta = { + meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; homepage = https://github.com/alanxz/rabbitmq-c; - license = with stdenv.lib.licenses; mit; - platforms = with stdenv.lib.platforms; linux; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index cd7cc2e5505..8ba2d52741f 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchgit, pkgs }: +{ stdenv, fetchFromGitHub, zlib, perl }: stdenv.mkDerivation rec { + name = "rdkafka-${version}"; version = "0.8.5"; - name = "rdkafka"; - # Maintenance repo for libtar (Arch Linux uses this) - src = fetchgit { - url = "https://github.com/edenhill/librdkafka.git"; - rev = "refs/tags/${version}"; - sha256 = "05a83hmpz1xmnln0wa7n11ijn08zxijdvpdswyymxbdlg69w31y1"; + src = fetchFromGitHub { + owner = "edenhill"; + repo = "librdkafka"; + rev = version; + sha256 = "0qx5dnq9halqaznmbwg44p1wl64pzl485r4054569rbx9y9ak1zy"; }; - patchPhase = "patchShebangs ."; - - buildInputs = [ pkgs.zlib pkgs.perl ]; + buildInputs = [ zlib perl ]; + + postPatch = '' + patchShebangs . + ''; meta = with stdenv.lib; { description = "librdkafka - Apache Kafka C/C++ client library"; homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.boothead ]; + maintainers = with maintainers; [ boothead wkennington ]; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 32118e182ac..98a71993253 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.7.4"; + name = "sqlite-3.8.8.3"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080704.tar.gz"; - sha1 = "70ca0b8884a6b145b7f777724670566e2b4f3cde"; + url = "http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz"; + sha1 = "2fe3f6226a2a08a2e814b97cd53e36bb3c597112"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco np ]; }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8a523593c4b..9aad51f9fad 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.1"; + name = "talloc-2.1.2"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y"; + sha256 = "13c365f7y8idjf2v1jxdjpkc3lxdmsxxfxjx1ymianm7zjiph393"; }; buildInputs = [ diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix new file mode 100644 index 00000000000..11f3294b289 --- /dev/null +++ b/pkgs/development/libraries/unibilium/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig }: + +stdenv.mkDerivation rec { + name = "unibilium-${version}"; + + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "mauke"; + repo = "unibilium"; + rev = "v${version}"; + sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + buildInputs = [ libtool pkgconfig ]; + + meta = with lib; { + description = "A very basic terminfo library"; + license = with licenses; [ lgpl3Plus ]; + }; +} diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 33285897d11..50eba33670f 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -1,18 +1,21 @@ -{stdenv, fetchurl, libuuid}: +{ stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { - name = "zeromq-3.2.4"; + name = "zeromq-3.2.5"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0n9gfhwgkwq08kvvgk5zxjga08v628ij5chddk5w4ravr10s35nz"; + sha256 = "0911r7q4i1x9gnfinj39vx08fnz59mf05vl75zdkws36lib3wr89"; }; buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { branch = "3"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + license = licenses.gpl3; + platform = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index db4c8fb8b94..eaa719b92c9 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libuuid}: +{ stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { name = "zeromq-4.0.5"; @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix new file mode 100644 index 00000000000..5eb4fbfd6b1 --- /dev/null +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "xml-light"; + version = "2.4"; +in +stdenv.mkDerivation { + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/ncannasse/${pname}/archive/${version}.tar.gz"; + sha256 = "10b55qf6mvdp11ny3h0jv6k6wrs78jr9lhsiswl0xya7z8r8j0a2"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + buildPhase = '' + make all + make opt + ''; + + installPhase = '' + make install_ocamlfind + mkdir -p $out/share + cp -vai doc $out/share/ + ''; + + meta = { + description = "Minimal Xml parser and printer for OCaml"; + longDescription = '' + Xml-Light provides functions to parse an XML document into an OCaml + data structure, work with it, and print it back to an XML + document. It support also DTD parsing and checking, and is + entirely written in OCaml, hence it does not require additional C + library. + ''; + homepage = "http://tech.motion-twin.com/xmllight.html"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/python-modules/boto-1.9-python-2.7.patch b/pkgs/development/python-modules/boto-1.9-python-2.7.patch deleted file mode 100644 index 79ff9a7e4af..00000000000 --- a/pkgs/development/python-modules/boto-1.9-python-2.7.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix Boto 1.9 on Python 2.7. - -https://github.com/boto/boto/commit/6760075073c34d6dddb7e13b80dfa8d09f0f4f79 - -diff --git a/boto/connection.py b/boto/connection.py -index c5779e2..71942f1 100644 ---- a/boto/connection.py -+++ b/boto/connection.py -@@ -252,8 +252,9 @@ class AWSAuthConnection(object): - # versions, it would append ":443" to the hostname sent - # in the Host header and so we needed to make sure we - # did the same when calculating the V2 signature. In 2.6 -+ # (and higher!) - # it no longer does that. Hence, this kludge. -- if sys.version[:3] == "2.6" and port == 443: -+ if sys.version[:3] in ('2.6', '2.7') and port == 443: - signature_host = self.host - else: - signature_host = '%s:%d' % (self.host, port) diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch new file mode 100644 index 00000000000..7895e223c6b --- /dev/null +++ b/pkgs/development/python-modules/boto/content-length-str.patch @@ -0,0 +1,16 @@ +Cherry-picked from https://github.com/boto/boto/pull/2932 + +This fix is required for things like docker-registry to interact with S3. Will +be obsolete after the next boto release (> 2.36.0) + +--- a/boto/connection.py ++++ b/boto/connection.py +@@ -381,7 +381,7 @@ class HTTPRequest(object): + if 'Content-Length' not in self.headers: + if 'Transfer-Encoding' not in self.headers or \ + self.headers['Transfer-Encoding'] != 'chunked': +- self.headers['Content-Length'] = len(self.body) ++ self.headers['Content-Length'] = str(len(self.body)) + + + class HTTPResponse(http_client.HTTPResponse): diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 2709caaab06..7098771cc6e 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pmd-4.2.6"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + name = "pmd-${version}"; + version = "5.2.3"; + + buildInputs = [ unzip ]; src = fetchurl { - url = mirror://sourceforge/pmd/pmd-bin-4.2.6.zip ; - sha256 = "0gg1px2jmqn09f5vjzgy9gck37qjm9p2d7gf9grsmrr2xncbipp8"; + url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; + sha256 = "03frkyiii7304qrcypdqcxqxjf5n3p59zjib0r802mbbx1nzcisn"; }; installPhase = '' diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix new file mode 100644 index 00000000000..9a0afdc8e1d --- /dev/null +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -0,0 +1,48 @@ +{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}: + +stdenv.mkDerivation rec { + version = "4.0.3.16.84"; + name = "sqldeveloper-${version}"; + + src = requireFile { + name = "${name}-no-jre.zip"; + url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html; + sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g"; + }; + + buildInputs = [ makeWrapper unzip ]; + + buildCommand = '' + mkdir -p $out/bin + # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed + echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper + + cd $out + unzip ${src} + cp -r sqldeveloper/* $out/ + # Activate the needed shell script + rm $out/sqldeveloper.sh + chmod +x $out/bin/sqldeveloper + chmod +x $out/sqldeveloper/bin/sqldeveloper + + wrapProgram $out/bin/sqldeveloper \ + --set JAVA_HOME "${oraclejdk7}" + ''; + + meta = with stdenv.lib; { + description = "Oracle's Oracle DB GUI client."; + longDescription = '' + Oracle SQL Developer is a free integrated development environment that + simplifies the development and management of Oracle Database in both + traditional and Cloud deployments. SQL Developer offers complete + end-to-end development of your PL/SQL applications, a worksheet for + running queries and scripts, a DBA console for managing the database, + a reports interface, a complete data modeling solution, and a migration + platform for moving your 3rd party databases to Oracle. + ''; + homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html; + license = licenses.unfree; + maintainers = [ maintainers.ardumont ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix new file mode 100644 index 00000000000..a06426e9cf4 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.10.x.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, perl, autoconf, makeWrapper }: + +stdenv.mkDerivation rec { + name = "automake-1.10.3"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.gz"; + sha256 = "fda9b22ec8705780c8292510b3376bb45977f45a4f7eb3578c5ad126d7758028"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + # Run the test suite in parallel. + enableParallelBuilding = true; + + meta = { + branch = "1.10"; + homepage = http://www.gnu.org/software/automake/; + description = "GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = [ ]; + }; +} diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index cf1ec5edbcd..27e59af34fc 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uncrustify-0.60"; + name = "uncrustify"; + version = "0.61"; src = fetchurl { - url = "mirror://sourceforge/uncrustify/${name}.tar.gz"; - sha256 = "1v3wlkh669mfzbyg68xz7c1hj3kj7l6cavbvbj3jr47ickc3wzsa"; + url = "mirror://sourceforge/uncrustify/${name}-${version}.tar.gz"; + sha256 = "1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 042e29f2970..cda1162c947 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,33 +1,25 @@ { stdenv, runCommand, nodejs, neededNatives}: { - name, version ? "", src, + name, src, # by default name of nodejs interpreter e.g. "nodejs-${name}" namePrefix ? nodejs.interpreterName + "-", # Node package name - pkgName ? - if version != "" then stdenv.lib.removeSuffix "-${version}" name else - (builtins.parseDrvName name).name, + pkgName ? (builtins.parseDrvName name).name, # List or attribute set of dependencies deps ? {}, # List or attribute set of peer depencies - peerDependencies ? {}, - - # List or attribute set of optional dependencies - optionalDependencies ? {}, - - # List of optional dependencies to skip - skipOptionalDependencies ? [], + peerDependencies ? [], # Whether package is binary or library - bin ? false, + bin ? null, - # Additional flags passed to npm install - flags ? "", + # Flags passed to npm install + flags ? [], # Command to be run before shell hook preShellHook ? "", @@ -35,12 +27,6 @@ # Command to be run after shell hook postShellHook ? "", - # Same as https://docs.npmjs.com/files/package.json#os - os ? [], - - # Same as https://docs.npmjs.com/files/package.json#cpu - cpu ? [], - # Attribute set of already resolved deps (internal), # for avoiding infinite recursion resolvedDeps ? {}, @@ -51,72 +37,42 @@ with stdenv.lib; let + npmFlags = concatStringsSep " " (map (v: "--${v}") flags); + + sources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv $(find . -type d -mindepth 1 -maxdepth 1) $out + ''; + + # Convert deps to attribute set + attrDeps = if isAttrs deps then deps else + (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); + + # All required node modules, without already resolved dependencies + requiredDeps = removeAttrs attrDeps (attrNames resolvedDeps); + + # Recursive dependencies that we want to avoid with shim creation + recursiveDeps = removeAttrs attrDeps (attrNames requiredDeps); + + peerDeps = filter (dep: dep.pkgName != pkgName) peerDependencies; + self = let - sources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv $(find . -type d -mindepth 1 -maxdepth 1) $out - ''; - - platforms = if os == [] then nodejs.meta.platforms else - fold (entry: platforms: - let - filterPlatforms = - stdenv.lib.platforms.${removePrefix "!" entry} or []; - in - # Ignore unknown platforms - if filterPlatforms == [] then platforms - else - if hasPrefix "!" entry then - subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms - else - platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms) - ) [] os; - - mapDependencies = deps: f: rec { - # Convert deps to attribute set - attrDeps = if isAttrs deps then deps else - (listToAttrs (map (dep: nameValuePair dep.name dep) deps)); - - # All required node modules, without already resolved dependencies - # Also override with already resolved dependencies - requiredDeps = mapAttrs (name: dep: - dep.override { - resolvedDeps = resolvedDeps // { "${name}" = self; }; - } - ) (filterAttrs f (removeAttrs attrDeps (attrNames resolvedDeps))); - - # Recursive dependencies that we want to avoid with shim creation - recursiveDeps = filterAttrs f (removeAttrs attrDeps (attrNames requiredDeps)); - }; - - _dependencies = mapDependencies deps (name: dep: - dep.pkgName != pkgName); - _optionalDependencies = mapDependencies optionalDependencies (name: dep: - (builtins.tryEval dep).success && - !(elem dep.pkgName skipOptionalDependencies) - ); - _peerDependencies = mapDependencies peerDependencies (name: dep: - dep.pkgName != pkgName); - - requiredDependencies = - _dependencies.requiredDeps // - _optionalDependencies.requiredDeps // - _peerDependencies.requiredDeps; - - recursiveDependencies = - _dependencies.recursiveDeps // - _optionalDependencies.recursiveDeps // - _peerDependencies.recursiveDeps; + # Pass resolved dependencies to dependencies of this package + deps = map ( + dep: dep.override { + resolvedDeps = resolvedDeps // { "${name}" = self; }; + } + ) (attrValues requiredDeps); patchShebangs = dir: '' - node=`type -p node` - coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ - xargs sed --follow-symlinks -i \ - -e 's@#!/usr/bin/env node@#!'"$node"'@' \ - -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ - -e 's@#!/.*/node@#!'"$node"'@' \ - -e 's@#!/.*/coffee@#!'"$coffee"'@' || true + node=`type -p node` + coffee=`type -p coffee || true` + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ + -e 's@#!/usr/bin/env node@#!'"$node"'@' \ + -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ + -e 's@#!/.*/node@#!'"$node"'@' \ + -e 's@#!/.*/coffee@#!'"$coffee"'@' || true ''; in stdenv.mkDerivation ({ @@ -194,9 +150,9 @@ let # We do not handle shrinkwraps yet rm npm-shrinkwrap.json 2>/dev/null || true - mkdir ../build-dir + mkdir build-dir ( - cd ../build-dir + cd build-dir mkdir node_modules # Symlink or copy dependencies for node modules @@ -208,7 +164,12 @@ let '' else '' cp -R ${dep}/lib/node_modules/${dep.pkgName} node_modules/ '' - ) (attrValues requiredDependencies)} + ) deps} + + # Symlink peer dependencies + ${concatMapStrings (dep: '' + ln -sv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ + '') peerDeps} # Create shims for recursive dependenceies ${concatMapStrings (dep: '' @@ -219,10 +180,10 @@ let "version": "${getVersion dep}" } EOF - '') (attrValues recursiveDependencies)} + '') (attrValues recursiveDeps)} ) - export HOME=$PWD/../build-dir + export HOME=$PWD/build-dir runHook postConfigure ''; @@ -231,14 +192,14 @@ let # If source was a file, repackage it, so npm pre/post publish hooks are not triggered, if [[ -f $src ]]; then - GZIP=-1 tar -czf ../build-dir/package.tgz ./ + tar --exclude='build-dir' -czf build-dir/package.tgz ./ export src=$HOME/package.tgz else export src=$PWD fi # Install package - (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src --fetch-retries 0 ${flags}) + (cd $HOME && npm --registry http://www.example.com --nodedir=${sources} install $src ${npmFlags}) runHook postBuild ''; @@ -253,7 +214,7 @@ let ${concatMapStrings (dep: '' rm node_modules/${dep.pkgName}/package.json rmdir node_modules/${dep.pkgName} - '') (attrValues recursiveDependencies)} + '') (attrValues recursiveDeps)} mkdir -p $out/lib/node_modules @@ -272,10 +233,10 @@ let done fi - # Move peer dependencies to node_modules + # Symlink dependencies ${concatMapStrings (dep: '' mv node_modules/${dep.pkgName} $out/lib/node_modules - '') (attrValues _peerDependencies.requiredDeps)} + '') peerDeps} # Install binaries and patch shebangs mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true @@ -298,36 +259,23 @@ let mkdir -p node_modules ${concatMapStrings (dep: '' ln -sfv ${dep}/lib/node_modules/${dep.pkgName} node_modules/ - '') (attrValues requiredDependencies)} + '') deps} ${postShellHook} ''; - # Stipping does not make a lot of sense in node packages - dontStrip = true; - - meta = { - inherit platforms; - maintainers = [ stdenv.lib.maintainers.offline ]; - }; - passthru.pkgName = pkgName; - } // (filterAttrs (n: v: all (k: n != k) ["deps" "resolvedDeps" "optionalDependencies"]) args) // { + } // (filterAttrs (n: v: n != "deps" && n != "resolvedDeps") args) // { name = namePrefix + name; # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; - nativeBuildInputs = - (args.nativeBuildInputs or []) ++ neededNatives ++ - (attrValues requiredDependencies); + # Make buildNodePackage useful with --run-env + nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives; # Expose list of recursive dependencies upstream, up to the package that # caused recursive dependency - recursiveDeps = - (flatten ( - map (dep: remove name dep.recursiveDeps) (attrValues requiredDependencies) - )) ++ - (attrNames recursiveDependencies); + recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps); }); in self diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 4d4eb7659e1..e01999b2ecc 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -6,13 +6,13 @@ , cherrypy , sqlite3 }: -let - version = "2.2.1"; +let + version = "2.3.2"; in buildPythonPackage rec { name = "mnemosyne-${version}"; src = fetchurl { url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; - sha256 = "7f5dd06a879b9ab059592355412182ee286e78e124aa25d588cacf9e4ab7c423"; + sha256 = "0jkrw45i4v24p6xyq94z7rz5948h7f5dspgs5mcdaslnlp2accfp"; }; pythonPath = [ pyqt4 @@ -51,7 +51,7 @@ in buildPythonPackage rec { uploaded to a central server for analysis. This data will be valuable to study the behaviour of our memory over a very long time period. The results will be used to improve the scheduling algorithms behind the - software even further. + software even further. ''; }; } diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index bbf12065cc7..a94f388b322 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -29,13 +29,12 @@ stdenv.mkDerivation { cp -R * $out/ mv $out/*.so $out/lib - rm $out/libstdc++.so.6 ln -s $out/PA $out/bin/PA ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index d9de1254915..2c41a11ab57 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/stuntrally/stuntrally.git; rev = "refs/tags/${version}"; - sha256 = "0zyzkac11dv9c1rxknydkisg2iw1rmi72psidl7jmq8v3rrqxk4r"; + sha256 = "1lsh7z7sjfwpdybg6vbwqx1zxsgbfp2n60n7xl33v225p32qh1qf"; }; tracks = fetchgit { url = git://github.com/stuntrally/tracks.git; rev = "refs/tags/${version}"; - sha256 = "1j237dbhd1ik5mj8whbvlff5da9vzzgiskcj5nzfpw1vb1jpdjvd"; + sha256 = "1614j6q1d2f69l58kkqndndvf6svcghhw8pzc2s1plf6k87h67mg"; }; preConfigure = '' @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/vdrift-ogre/; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix new file mode 100644 index 00000000000..a8d8b2a9e1c --- /dev/null +++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix @@ -0,0 +1,196 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, perl, which +, glibc, flex, bison, python27, swig, dbus, pam +}: + +let + apparmor-series = "2.9"; + apparmor-patchver = "1"; + apparmor-version = "${apparmor-series}.${apparmor-patchver}"; + + apparmor-meta = component: with stdenv.lib; { + homepage = http://apparmor.net/; + description = "Linux application security system - ${component}"; + license = licenses.gpl2; + maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; + platforms = platforms.linux; + }; + + apparmor-sources = fetchurl { + url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; + sha256 = "a63b8724c36c29ed438c9e3ca403bfeeb6c998a45990e300aa1b10faa23a0a22"; + }; + + libapparmor = stdenv.mkDerivation { + name = "libapparmor-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + autoconf + automake + bison + flex + dbus # requires patch to dbus ... + glibc + libtool + perl + pkgconfig + python27 + swig + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + ### libapparmor + substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h" + ''; + + buildPhase = '' + ### libapparmor + cd ./libraries/libapparmor + ./autogen.sh + ./configure --prefix="$out" --with-python + make + ''; + + installPhase = '' + make install + ''; + + meta = apparmor-meta "library"; + }; + + apparmor-utils = stdenv.mkDerivation { + name = "apparmor-utils-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + python27 + libapparmor + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ''; + + buildPhase = '' + cd ./utils + make LANGS="" + ''; + + installPhase = '' + make install LANGS="" DESTDIR="$out" BINDIR="$out/bin" + ''; + + meta = apparmor-meta "user-land utilities"; + }; + + apparmor-parser = stdenv.mkDerivation { + name = "apparmor-parser-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + bison + flex + which + ]; + + prePatch = '' + ### common + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" + substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + ### apparmor-parser + substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" + substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" + substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + ## techdoc.pdf still doesn't build ... + substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" + ''; + + buildPhase = '' + cd ./parser + make LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include + ''; + + installPhase = '' + make install LANGS="" USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include DESTDIR="$out" DISTRO="unknown" + ''; + + meta = apparmor-meta "rule parser"; + }; + + apparmor-pam = stdenv.mkDerivation { + name = "apparmor-pam-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + libapparmor + pam + pkgconfig + which + ]; + + buildPhase = '' + cd ./changehat/pam_apparmor + make USE_SYSTEM=1 + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "PAM service"; + }; + + apparmor-profiles = stdenv.mkDerivation { + name = "apparmor-profiles-${apparmor-version}"; + src = apparmor-sources; + + buildInputs = [ + which + ]; + + buildPhase = '' + cd ./profiles + make + ''; + + installPhase = '' + make install DESTDIR="$out" + ''; + + meta = apparmor-meta "profiles"; + }; + + apparmor-kernel-patches = stdenv.mkDerivation { + name = "apparmor-kernel-patches-${apparmor-version}"; + src = apparmor-sources; + + phases = ''unpackPhase installPhase''; + + installPhase = '' + mkdir "$out" + cp -R ./kernel-patches "$out" + ''; + + meta = apparmor-meta "kernel patches"; + }; + +in + +{ + inherit libapparmor apparmor-utils apparmor-parser apparmor-pam + apparmor-profiles apparmor-kernel-patches; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c802d3f266d..c1939f3218e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -53,7 +53,6 @@ with stdenv.lib; NUMA? y # Disable some expensive (?) features. - KPROBES n PM_TRACE_RTC n # Enable various subsystems. @@ -195,6 +194,12 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.14") '' CEPH_FS_POSIX_ACL y ''} + SQUASHFS_FILE_DIRECT y + SQUASHFS_DECOMP_MULTI_PERCPU y + SQUASHFS_XATTR y + SQUASHFS_ZLIB y + SQUASHFS_LZO y + SQUASHFS_XZ y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem @@ -300,9 +305,14 @@ with stdenv.lib; # Tracing. FTRACE y + KPROBES y FUNCTION_TRACER y FTRACE_SYSCALLS y SCHED_TRACER y + STACK_TRACER y + UPROBE_EVENT y + FUNCTION_PROFILER y + RING_BUFFER_BENCHMARK n # Devtmpfs support. DEVTMPFS y diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 93ddecbf4a5..154c9633cdb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -2,7 +2,6 @@ import ./generic.nix (args // rec { version = "3.18.9"; - # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c2d35ce4d2e..f239d459967 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -66,16 +66,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.35"; - revision = "201503071140"; + revision = "201503092203"; branch = "stable"; - sha256 = "076kmzyrmg8g82xhaccysdgblfkdd21rfn8wvdpf6kxavg8xn855"; + sha256 = "0l8m0ixh0qcgwy8vcmfl8pal93wc03ahc3ci3sca79nx33a050v9"; }; grsecurity_unstable = grsecPatch - { kversion = "3.18.9"; - revision = "201503071142"; + { kversion = "3.19.1"; + revision = "201503122205"; branch = "test"; - sha256 = "0acrz6v827y8pdrl26wb652hmq0qglkwdgq0ffrw6k052f5lpfx2"; + sha256 = "0g22wfmlim163gmsl4cn4nq4zif8zni3cpkk7cr93z92r9kafp4y"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index be375ea310f..efd3515ff24 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , withGtk ? false, gtk ? null }: with lib; @@ -21,8 +21,9 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang + # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; - buildInputs = [ elfutils python perl newt slang pkgconfig] ++ + buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++ stdenv.lib.optional withGtk gtk; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 28bf24babdc..80e87d8aacc 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "0v14dvkg19yabh0ijy8fbrvapxvc36dwhvp90py3baq7qb44wrc7"; + sha256 = "15708pm5l1bgxg1bgic82hqvmn3gcq83mi1l8akhz9qlykh5sfdq"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix new file mode 100644 index 00000000000..0273fed3ec4 --- /dev/null +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation { + name = "perf-tools-20150130"; + + src = fetchFromGitHub { + owner = "brendangregg"; + repo = "perf-tools"; + rev = "85414b01247666c9fefad25a1406c8078011c936"; + sha256 = "1g15nnndcmxd1k9radcvfpn223pp627vs9wh90yiy73v03g7b8cs"; + }; + + buildInputs = [ perl ]; + + patchPhase = + '' + for i in execsnoop iolatency iosnoop kernel/funcslower killsnoop opensnoop; do + substituteInPlace $i \ + --replace /usr/bin/gawk "$(type -p gawk)" \ + --replace /usr/bin/mawk /no-such-path \ + --replace /usr/bin/getconf "$(type -p getconf)" \ + --replace awk=awk "awk=$(type -p gawk)" + done + + rm -rf examples deprecated + ''; + + installPhase = + '' + d=$out/libexec/perf-tools + mkdir -p $d $out/share + cp -prvd . $d/ + ln -s $d/bin $out/bin + mv $d/man $out/share/ + ''; + + meta = { + platforms = lib.platforms.linux; + homepage = https://github.com/brendangregg/perf-tools; + description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; + maintainers = [ lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 2007cd83518..680ac295cff 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-05"; + version = "2015-03-12"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "417104bdd3c7ce07ec58674dd078f9891c3bc780"; - sha256 = "0w6cr6avi3raxdzqzljn840k1vcvakqrb88jifsqnd5asws5v8wm"; + rev = "4c7b7eedcde7fababf457ca04445e6d9d1617e29"; + sha256 = "1v0rb4rfs48c66wihfmigc6cmqk6j5r5xlkv5d03shb9h5ypff84"; }; patches = [ diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix index 5b7d96c14cf..bf672aa89d8 100644 --- a/pkgs/servers/dns/mesos-dns/default.nix +++ b/pkgs/servers/dns/mesos-dns/default.nix @@ -11,8 +11,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "mesosphere"; repo = "mesos-dns"; - rev = "29940029d4b0c17142373c3280a8b452722b665b"; - sha256 = "1fycywhdyymibsahjqx9vnigk3pdis3hnmfbxp74pmd9xqqlyv1n"; + rev = "f37051fc5a723eb021797e7d57d92755c011a28e"; + sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15"; }; # Avoid including the benchmarking test helper in the output: diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index 96724ec52f5..a67afd45f39 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -10,8 +10,8 @@ let - version = "2.0.12"; - sha256 = "125yga0h155fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; + version = "2.0.13"; + sha256 = "125yga0h055fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; in diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 362885417b7..2cc3cc69d3f 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -56,6 +56,11 @@ stdenv.mkDerivation rec { zlib ncurses libcap ]; + postPatch = '' + # Removes absolute paths in scripts + sed -i 's,/sbin/,,g' ctdb/config/functions + ''; + enableParallelBuilding = true; configureFlags = [ @@ -111,6 +116,19 @@ stdenv.mkDerivation rec { stripAllList = [ "bin" "sbin" ]; + postFixup = '' + export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" + read -r -d "" SCRIPT << EOF + [ -z "\$SAMBA_LIBS" ] && exit 1; + BIN='{}'; + OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')"; + ALL_LIBS="\$(echo -e "\$SAMBA_LIBS\n\$OLD_LIBS" | sort | uniq | tr '\n' ':')"; + patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; + patchelf --shrink-rpath "\$BIN"; + EOF + find $out -type f -exec $SHELL -c "$SCRIPT" \; + ''; + meta = with stdenv.lib; { homepage = http://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6280f2a8266..23a09f1d54e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,21 +1,55 @@ -{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }: +{ stdenv, fetchurl, cmake, ncurses, openssl, pcre, boost, judy, bison, libxml2 +, libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames +}: +with stdenv.lib; stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.16"; + version = "10.0.17"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "1r6dxzgzwl0qshw67168sjnzzwspmwb7kl618f23wkhp7rgll4s4"; + sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww"; }; - buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libaio - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ] + ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; - cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; + cmakeFlags = [ + "-DBUILD_CONFIG=mysql_release" + "-DDEFAULT_CHARSET=utf8" + "-DDEFAULT_COLLATION=utf8_general_ci" + "-DENABLED_LOCAL_INFILE=ON" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + "-DWITH_READLINE=ON" + "-DWITH_ZLIB=system" + "-DWITH_SSL=system" + "-DWITH_PCRE=system" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_EXTRA_CHARSETS=complex" + "-DWITH_EMBEDDED_SERVER=ON" + "-DWITH_ARCHIVE_STORAGE_ENGINE=1" + "-DWITH_BLACKHOLE_STORAGE_ENGINE=1" + "-DWITH_INNOBASE_STORAGE_ENGINE=1" + "-DWITH_PARTITION_STORAGE_ENGINE=1" + "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1" + "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1" + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; @@ -30,13 +64,13 @@ stdenv.mkDerivation rec { --replace basedir=\"\" basedir=\"$out\" ''; - passthru.mysqlVersion = "5.5"; + passthru.mysqlVersion = "5.6"; - meta = { + meta = with stdenv.lib; { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 194f4b2bcb3..c0b8403a9bc 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, postgresql }: stdenv.mkDerivation rec { - name = "pgpool-II-3.4.0"; + name = "pgpool-II-3.4.1"; src = fetchurl { url = "http://www.pgpool.net/download.php?f=${name}.tar.gz"; - sha256 = "1aind5rbdld5ip92xlh4f6dgvdc4zxzgzi5n33xbvdrsrvagbc4j"; + sha256 = "11fy4lvh2n04zmywy4vhp229yxdw8fbirrlvz44j1vnarkb664pd"; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bb3be6e8b51..bf124282876 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -61,6 +61,15 @@ in preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; + mkfontscale = attrs: attrs // { + patches = lib.singleton (args.fetchpatch { + name = "mkfontscale-fix-sig11.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=113951"; + sha256 = "0i2xf768mz8kvm7i514v0myna9m6jqw82f9a03idabdpamxvwnim"; + }); + patchFlags = [ "-p0" ]; + }; + libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb"; @@ -293,6 +302,7 @@ in ]; patches = commonPatches; configureFlags = [ + "--enable-kdrive" # not built by default "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 67d07d6eb3b..098dd82eec7 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchgit, autoconf, libxcomp }: +{ stdenv, fetchurl, autoconf, libxcomp }: -let version = "3.5.0-2015-02-18"; in +let version = "3.5.0.30"; in stdenv.mkDerivation { name = "nxproxy-${version}"; - src = fetchgit { - url = git://code.x2go.org/nx-libs.git; - rev = "2b2a02f93f552a38de8f72a971fa3f3ff42b3298"; - sha256 = "11n7dv1cn9icjgyxmsbac115vmbaar47cmp8k76vd516f2x41dw9"; + src = fetchurl { + url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz"; + sha256 = "0npwlfv9p5fwnf30fpkfw08mq11pgbvp3d2zgnhh8ykf3yj8dgv0"; }; meta = with stdenv.lib; { description = "NX compression proxy"; - homepage = "http://code.x2go.org/gitweb?p=nx-libs.git;a=summary"; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = with licenses; gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; @@ -25,5 +24,5 @@ stdenv.mkDerivation { autoconf ''; - installTargets = [ "install.bin" ]; + makeFlags = [ "exec_prefix=$(out)" ]; } diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 2906e365cb6..4583dc1ba77 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl , pkgconfig, rlog }: -let version = "1.8-rc1"; in +let version = "1.8"; in stdenv.mkDerivation rec { name = "encfs-${version}"; src = fetchFromGitHub { - sha256 = "17a09pg7752nlbgm2nmrwhm90kv2z3dj20xs79qvvr6x7rdgzck8"; + sha256 = "1dp3558x9v5hqnjnrlnd0glrkcc23anl2mxhjirhhw8dyh1lzl5z"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix new file mode 100644 index 00000000000..df0790877ac --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }: + +let version = "1.5.4"; +in stdenv.mkDerivation { + name = "ibus-anthy-${version}"; + + meta = with stdenv.lib; { + description = "IBus interface to the anthy input method"; + homepace = https://code.google.com/p/ibus/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; + }; + + buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ]; + + postFixup = '' + for file in "$out"/libexec/*; do + wrapProgram "$file" \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0 + done + ''; + + src = fetchurl { + url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz"; + sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031"; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix new file mode 100644 index 00000000000..c538d36ec59 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-qt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ibus, cmake, pkgconfig, qt4, icu, doxygen }: + +stdenv.mkDerivation rec { + name = "ibus-qt-${version}"; + version = "1.3.2"; + + src = fetchurl { + url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz"; + sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76"; + }; + + buildInputs = [ + ibus cmake pkgconfig qt4 icu doxygen + ]; + + cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/ibus/; + description = "Qt4 interface to the ibus input method"; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix similarity index 100% rename from pkgs/development/libraries/ibus/default.nix rename to pkgs/tools/inputmethods/ibus/default.nix diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix new file mode 100644 index 00000000000..2d5d10054b5 --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchurl +, intltool +, libtool +, autoconf +, automake110x +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +, ddccontrol-db +}: + +let version = "0.4.2"; in +stdenv.mkDerivation { + name = "ddccontrol-${version}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ + intltool + libtool + autoconf + automake110x + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ddccontrol-db + ]; + + prePatch = '' + newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + mv configure.ac configure.ac.old + oldPath="\$" + oldPath+="{datadir}\/ddccontrol-db" + sed "s/$oldPath/$newPath/" configure.ac + rm configure.ac.old + ''; + preConfigure = '' + autoreconf --install + ''; + + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + homepage = "http://ddccontrol.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; + }; +} + diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index b1e5e4dbd1c..00b0c31201a 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}: +{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}: stdenv.mkDerivation { name = "grub-0.97-patch-1.12"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); # Autoconf/automake required for the splashimage patch. - buildInputs = [autoconf automake]; + buildInputs = [autoconf automake texinfo]; prePatch = '' unpackFile $gentooPatches @@ -47,6 +47,7 @@ stdenv.mkDerivation { preConfigure = '' autoreconf + automake --add-missing ''; passthru.grubTarget = ""; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix new file mode 100644 index 00000000000..3b276a7117f --- /dev/null +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: + +stdenv.mkDerivation rec { + name = "mpdscribble-${version}"; + version = "0.22"; + + src = fetchurl { + url = + "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + }; + + buildInputs = [ mpd_clientlib curl glib pkgconfig ]; + + preConfigure = '' + export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion} + export LIBMPDCLIENT_CFLAGS=${mpd_clientlib} + ''; + + meta = with stdenv.lib; { + description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix new file mode 100644 index 00000000000..767a61c2bb5 --- /dev/null +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchFromGitHub, perl}: + +stdenv.mkDerivation rec { + pname = "vmtouch"; + version = "git-20150310"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "hoytech"; + repo = "vmtouch"; + rev = "4e1b106e59942678c1e6e490e2c7ca7df50eb7a3"; + sha256 = "1m37gvlypyfizd33mfyfha4hhwiyfzsj8gb2h5im6wzis4j15d0y"; + }; + + buildInputs = [perl]; + + makeFlags = "PREFIX=$(out)"; + + meta = { + description = "Portable file system cache diagnostics and control"; + longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; + homepage = "http://hoytech.com/vmtouch/vmtouch.html"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.garrison ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b423aa301f9..f6332874b3a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip, pandoc }: let - version = "2015.01.30.2"; + version = "2015.03.09"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "00ymx254qgic9ka7wb41cinv1w0ijq6l0f5k2cfspi958jqql9lm"; + sha256 = "0mxpm79xdzzckc5rysjx17pxm9bldk7s13im7l9xd4pjrhy411xz"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index cb3e1445aa3..38514a5604b 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -1,28 +1,38 @@ { stdenv, fetchurl, python2, python2Packages, makeWrapper }: stdenv.mkDerivation rec { - version = "2.0.0-rc2"; + version = "2.0.0"; name = "ASynK-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz"; - sha256 = "14s53ijn9fpxr490ypnn92zk6h5rdadf7j3z98rah1h7l659qi1b"; + sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1"; }; - propagatedBuildInputs = with python2Packages; [ python2 makeWrapper tornado requests dateutil ]; + propagatedBuildInputs = with python2Packages; + [ python2 makeWrapper tornado requests dateutil + vobject gdata caldavclientlibrary-asynk ]; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/lib cp asynk.py $out/bin/ cp state.init.json $out/ cp -R config $out/ - cp -R lib $out/ + cp lib/*.py $out/lib # */ + cp -R lib/s $out/lib/ cp -R asynk $out/ substituteInPlace $out/bin/asynk.py \ --replace "ASYNK_BASE_DIR = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR = \"$out\"" + for file in `find $out/asynk -type f`; do + # Oh yeah, tab characters! + substituteInPlace $file \ + --replace 'from vobject import vobject' 'from vobject import *' \ + --replace 'from vobject import vobject' 'from vobject import *' + done + wrapProgram "$out/bin/asynk.py" \ --prefix PYTHONPATH : "$PYTHONPATH" ''; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 23c484e9479..6dcb6e7f317 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1wdlyklqjvslcbvyx7ch4aziwvjbpj852k59m02gakisq9bywfcd"; + sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3"; }; buildInputs = [ geoip getopt openssl perl ]; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index d4463b42ec6..55a99dd2729 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw"; }; - buildInputs = [ python pythonPackages.Babel pythonPackages.urwid ]; + buildInputs = [ + python pythonPackages.Babel + pythonPackages.urwid pythonPackages.notify + ]; patches = [ ./no-var-install.patch @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 16f90ec5ca2..4e143bed519 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "DisnixWebService-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20213076/download/4/DisnixWebService-0.3.tar.bz2; - sha256 = "0m3hk8nfgfnmd503pkpb6n2z944haq2n22d44q6n6zzqnfkjm175"; + url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2; + sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index ee1e70a8582..98213d9cf34 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7"; + name = "disnix-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20213001/download/4/disnix-0.3pre42e23349a7b4ca84fce6293f79470647a5f5c8e7.tar.gz; - sha256 = "08f16gi8dg39ll5ph6rs4wdw9dg4sdgnikpg1x40slzcrckvnkhm"; + url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz; + sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 4e8f7cc17ec..52312ca7191 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add"; + name = "disnixos-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/20213021/download/3/disnixos-0.2pre7a84a34a2e36dd3fbd399d3b9f27168a9d2a0add.tar.gz; - sha256 = "1dc9q8i9vhw0851w9b7giv570rly172mmqfr6khr2r88npc642xc"; + url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz; + sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 340a7704d7c..6fa95f060d7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d"; + name = "dysnomia-0.3"; src = fetchurl { - url = http://hydra.nixos.org/build/20212674/download/1/dysnomia-0.3preddaef7a1d97dbfd88369b87795d0dae536ca3d9d.tar.gz; - sha256 = "0z41gxh3idlfardm5hwy65qxy7drrbcl3dndinr2qksqx4yjafi1"; + url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz; + sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index fccaacbe04f..db71408d12d 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, texinfo, gettext +, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext, texinfo , pcsclite }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 - autoreconfHook texinfo gettext + autoreconfHook gettext texinfo ]; configureFlags = diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index db14a5b0e0c..a109e9ca6a6 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "srm-" + version; - version = "1.2.14"; + version = "1.2.15"; src = fetchurl { - url = "mirror://sourceforge/project/srm/1.2.14/srm-1.2.14.tar.gz"; - sha256 = "1irwwpb7yhmii2v4vz1fjkmmhw7w7qd1ak9arn9zfg3mgcnwl32q"; + url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz"; + sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 150cb49a9c4..750ab370872 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "0x2jch8v57z59inncvmq2nr12j0f5by10mgj7sv9cabysj07xb45" else - "07g78gh909gcg4bqdmj1ag1kkl3707qi6l4wa9cm81r364192hha"; + "0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82" else + "f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185"; }; patchPhase = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index d18c2737854..2f62ce31949 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,23 +1,102 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}: +{ stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages +, krb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null +, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null +, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null +, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null +, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null +}: -stdenv.mkDerivation { - name = "rsyslog-7.6.3"; +with stdenv.lib; +let + mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; +in +stdenv.mkDerivation rec { + name = "rsyslog-8.8.0"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz; - sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1"; + url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; + sha256 = "1sx0j5icp172rzcpybjpfw53aj34w8j7k3f1ga0pmbv58r3pwyhl"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging]; + buildInputs = [ + pkgconfig libestr json_c zlib pythonPackages.docutils + krb5 jemalloc mysql postgresql libdbi net_snmp libuuid curl gnutls + libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka + libmongo-client czmq rabbitmq-c hiredis + ] ++ stdenv.lib.optional stdenv.isLinux systemd; - preConfigure = '' - export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" - ''; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + (mkFlag true "largefile") + (mkFlag true "regexp") + (mkFlag (krb5 != null) "gssapi-krb5") + (mkFlag true "klog") + (mkFlag true "kmsg") + (mkFlag (systemd != null) "imjournal") + (mkFlag true "inet") + (mkFlag (jemalloc != null) "jemalloc") + (mkFlag true "unlimited-select") + (mkFlag true "usertools") + (mkFlag (mysql != null) "mysql") + (mkFlag (postgresql != null) "pgsql") + (mkFlag (libdbi != null) "libdbi") + (mkFlag (net_snmp != null) "snmp") + (mkFlag (libuuid != null) "uuid") + (mkFlag (curl != null) "elasticsearch") + (mkFlag (gnutls != null) "gnutls") + (mkFlag (libgcrypt != null) "libgcrypt") + (mkFlag true "rsyslogrt") + (mkFlag true "rsyslogd") + (mkFlag true "mail") + (mkFlag (liblognorm != null) "mmnormalize") + (mkFlag true "mmjsonparse") + (mkFlag true "mmaudit") + (mkFlag true "mmanon") + (mkFlag true "mmutf8fix") + (mkFlag true "mmcount") + (mkFlag true "mmsequence") + (mkFlag true "mmfields") + (mkFlag true "mmpstrucdata") + (mkFlag (openssl != null) "mmrfc5424addhmac") + (mkFlag (librelp != null) "relp") + (mkFlag (libgt != null) "guardtime") + (mkFlag (liblogging != null) "liblogging-stdlog") + (mkFlag (liblogging != null) "rfc3195") + (mkFlag true "imfile") + (mkFlag false "imsolaris") + (mkFlag true "imptcp") + (mkFlag true "impstats") + (mkFlag true "omprog") + (mkFlag (libnet != null) "omudpspoof") + (mkFlag true "omstdout") + (mkFlag (systemd != null) "omjournal") + (mkFlag true "pmlastmsg") + (mkFlag true "pmcisconames") + (mkFlag true "pmciscoios") + (mkFlag true "pmaixforwardedfrom") + (mkFlag true "pmsnare") + (mkFlag true "omruleset") + (mkFlag true "omuxsock") + (mkFlag true "mmsnmptrapd") + (mkFlag (hadoop != null) "omhdfs") + (mkFlag (rdkafka != null) "omkafka") + (mkFlag (libmongo-client != null) "ommongodb") + (mkFlag (czmq != null) "imzmq3") + (mkFlag (czmq != null) "imczmq") + (mkFlag (czmq != null) "omzmq3") + (mkFlag (czmq != null) "omczmq") + (mkFlag (rabbitmq-c != null) "omrabbitmq") + (mkFlag (hiredis != null) "omhiredis") + (mkFlag true "generate-man-pages") + ]; meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index cec906e1f43..4fcc0680ada 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; + sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; }; buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index f7d8f1254c5..6cf9ac3e5ce 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,13 +1,13 @@ args: with args; rec { - version = "0.7"; + version = "0.8"; name = "moderntimeline-${version}"; src = fetchurl { urls = [ "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" ]; - sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876"; + sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index a1eee51b34d..49fe7dc681f 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -3,10 +3,10 @@ , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.25"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0dp5nxq491gymq806za0dk4hngfmq65ysrqbn0ypajqbbl6vf71n"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index 84dc7c3c071..a87dd568322 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchgit, which, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "euca2ools-2.1.3"; + name = "euca2ools-2.1.4"; namePrefix = ""; src = fetchgit { url = https://github.com/eucalyptus/euca2ools.git; - rev = "8ae2ecc"; - sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; + rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; + sha256 = "0f52jqw3s79w391lbzlh83lp55j73clvwmn2np4fy6kxc4j49da1"; }; pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; - doCheck = false; - meta = { homepage = http://open.eucalyptus.com/downloads; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 302ba09b22a..024f0a3c1f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -697,6 +697,10 @@ let cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + ceres-solver = callPackage ../development/libraries/ceres-solver { + google-gflags = null; # only required for examples/tests + }; + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; @@ -779,7 +783,37 @@ let syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; - rsyslog = callPackage ../tools/system/rsyslog { }; + rsyslog = callPackage ../tools/system/rsyslog { + libgcrypt = libgcrypt_1_6; + czmq = null; # Currently Broken + hadoop = null; # Currently Broken + }; + + rsyslog-light = callPackage ../tools/system/rsyslog { + krb5 = null; + systemd = null; + jemalloc = null; + mysql = null; + postgresql = null; + libdbi = null; + net_snmp = null; + libuuid = null; + curl = null; + gnutls = null; + libgcrypt = null; + liblognorm = null; + openssl = null; + librelp = null; + libgt = null; + liblogging = null; + libnet = null; + hadoop = null; + rdkafka = null; + libmongo-client = null; + czmq = null; + rabbitmq-c = null; + hiredis = null; + }; mcrypt = callPackage ../tools/misc/mcrypt { }; @@ -955,6 +989,12 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + ibus = callPackage ../tools/inputmethods/ibus { }; + + ibus-qt = callPackage ../tools/inputmethods/ibus-qt { }; + + ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; clamav = callPackage ../tools/security/clamav { }; @@ -1043,6 +1083,10 @@ let detox = callPackage ../tools/misc/detox { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; + + ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -1187,7 +1231,7 @@ let ettercap = callPackage ../applications/networking/sniffers/ettercap { }; - euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; + euca2ools = callPackage ../tools/virtualization/euca2ools { }; evtest = callPackage ../applications/misc/evtest { }; @@ -1358,7 +1402,6 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { - libiconv = libiconvOrLibc; ruby = ruby_2_1_3; }; @@ -1380,6 +1423,8 @@ let inherit (xorg) libXpm; }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnufdisk = callPackage ../tools/system/fdisk { guile = guile_1_8; }; @@ -1612,7 +1657,7 @@ let ihaskell-with-packages = callPackage ../development/tools/haskell/ihaskell/ng-wrapper.nix { inherit (pythonPackages) ipython; inherit (haskellngPackages) ihaskell ghcWithPackages; - packages = self: []; + packages = self: config.ihaskell.packages or []; }; imapproxy = callPackage ../tools/networking/imapproxy { }; @@ -1762,8 +1807,12 @@ let libevdev = callPackage ../development/libraries/libevdev { }; + libevhtp = callPackage ../development/libraries/libevhtp { }; + liboauth = callPackage ../development/libraries/liboauth { }; + libtermkey = callPackage ../development/libraries/libtermkey { }; + libtidy = callPackage ../development/libraries/libtidy { }; libtirpc = callPackage ../development/libraries/ti-rpc { }; @@ -1776,6 +1825,8 @@ let libmbim = callPackage ../development/libraries/libmbim { }; + libmongo-client = callPackage ../development/libraries/libmongo-client { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; @@ -2402,6 +2453,10 @@ let openmpi = callPackage ../development/libraries/openmpi { }; + qarte = callPackage ../applications/video/qarte { + sip = pythonPackages.sip_4_16; + }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; @@ -2991,6 +3046,8 @@ let vlan = callPackage ../tools/networking/vlan { }; + vmtouch = callPackage ../tools/misc/vmtouch { }; + volumeicon = callPackage ../tools/audio/volumeicon { }; wakelan = callPackage ../tools/networking/wakelan { }; @@ -4138,6 +4195,8 @@ let xmlm = callPackage ../development/ocaml-modules/xmlm { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; @@ -4213,6 +4272,8 @@ let smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { }; + stalin = callPackage ../development/compilers/stalin { }; strategoPackages = recurseIntoAttrs strategoPackages018; @@ -4416,7 +4477,7 @@ let mesos = callPackage ../applications/networking/cluster/mesos { sasl = cyrus_sasl; inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; - pythonProtobuf = pythonPackages.protobuf; + pythonProtobuf = pythonPackages.protobuf2_5; }; mesos-dns = callPackage ../servers/dns/mesos-dns { }; @@ -4718,6 +4779,8 @@ let automake = automake114x; + automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; + automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; @@ -4976,8 +5039,6 @@ let hyenae = callPackage ../tools/networking/hyenae { }; - ibus = callPackage ../development/libraries/ibus { }; - icmake = callPackage ../development/tools/build-managers/icmake { }; iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { @@ -5685,11 +5746,6 @@ let libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; - eglibc = callPackage ../development/libraries/eglibc { - kernelHeaders = linuxHeaders; - installLocales = config.glibc.locales or false; - }; - # Only supported on Linux glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; @@ -5906,6 +5962,8 @@ let libusb = libusb1; }; + hiredis = callPackage ../development/libraries/hiredis { }; + hivex = callPackage ../development/libraries/hivex { inherit (perlPackages) IOStringy; }; @@ -5980,6 +6038,8 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; + jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; jetty_util = callPackage ../development/libraries/java/jetty-util { }; @@ -6332,6 +6392,8 @@ let liblogging = callPackage ../development/libraries/liblogging { }; + liblognorm = callPackage ../development/libraries/liblognorm { }; + libltc = callPackage ../development/libraries/libltc { }; libmcrypt = callPackage ../development/libraries/libmcrypt {}; @@ -6345,6 +6407,7 @@ let libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libnatspec = callPackage ../development/libraries/libnatspec { }; @@ -6365,6 +6428,8 @@ let libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; + librelp = callPackage ../development/libraries/librelp { }; + libresample = callPackage ../development/libraries/libresample {}; librevenge = callPackage ../development/libraries/librevenge {}; @@ -6382,10 +6447,7 @@ let # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = - if stdenv.isGlibc - then stdenv.cc.libc - else callPackage ../development/libraries/libiconv { }; + libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal; libiconvReal = callPackage ../development/libraries/libiconv { }; @@ -7472,6 +7534,8 @@ let uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; + unibilium = callPackage ../development/libraries/unibilium { }; + unicap = callPackage ../development/libraries/unicap {}; tsocks = callPackage ../development/libraries/tsocks { }; @@ -7661,6 +7725,7 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; + zeromq = zeromq4; cppzmq = callPackage ../development/libraries/cppzmq {}; @@ -8143,6 +8208,8 @@ let mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; + mpdscribble = callPackage ../tools/misc/mpdscribble { }; + miniHttpd = callPackage ../servers/http/mini-httpd {}; mlmmj = callPackage ../servers/mail/mlmmj { }; @@ -8231,7 +8298,7 @@ let mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { }; - mysql = mysql51; + mysql = mariadb; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -8270,6 +8337,10 @@ let postgresql = postgresql93; }; + pgpool94 = callPackage ../servers/sql/pgpool/default.nix { + postgresql = postgresql94; + }; + pgpool = pgpool92; postgresql = postgresql92; @@ -8509,6 +8580,13 @@ let perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; + apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { }; + libapparmor = apparmor_2_9.libapparmor; + apparmor-pam = apparmor_2_9.apparmor-pam; + apparmor-parser = apparmor_2_9.apparmor-parser; + apparmor-profiles = apparmor_2_9.apparmor-profiles; + apparmor-utils = apparmor_2_9.apparmor-utils; + atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; @@ -9156,6 +9234,8 @@ let config = config.pcmciaUtils.config or null; }; + perf-tools = callPackage ../os-specific/linux/perf-tools { }; + plymouth = callPackage ../os-specific/linux/plymouth { }; pmount = callPackage ../os-specific/linux/pmount { }; @@ -9705,6 +9785,8 @@ let inherit (gnome) libgnomecanvas libgnomecanvasmm; }); + ario = callPackage ../applications/audio/ario { }; + arora = callPackage ../applications/networking/browsers/arora { }; atom = callPackage ../applications/editors/atom { @@ -9774,6 +9856,8 @@ let batti = callPackage ../applications/misc/batti { }; + cbatticon = callPackage ../applications/misc/cbatticon { }; + bazaar = callPackage ../applications/version-management/bazaar { }; bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { @@ -9928,6 +10012,8 @@ let cvs2svn = callPackage ../applications/version-management/cvs2svn { }; + cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; + d4x = callPackage ../applications/misc/d4x { }; darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: { @@ -10437,6 +10523,7 @@ let pythonSupport = false; }; gitSVN = gitAndTools.gitSVN; + git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27; @@ -10593,6 +10680,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -11016,6 +11105,8 @@ let vaapiSupport = config.mpv.vaapiSupport or false; }; + mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; + mrxvt = callPackage ../applications/misc/mrxvt { }; mudlet = callPackage ../games/mudlet { @@ -11086,6 +11177,8 @@ let lua = lua5; }; + maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; + mupdf = callPackage ../applications/misc/mupdf { openjpeg = openjpeg_2_0_1; }; @@ -11271,6 +11364,9 @@ let pulseview = callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; + puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; + + puremapping = callPackage ../applications/audio/pd-plugins/puremapping { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; @@ -11675,6 +11771,8 @@ let gtk = gtk3; }; + timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -11904,8 +12002,12 @@ let windowmaker = callPackage ../applications/window-managers/windowmaker { }; + alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; + wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; + wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; + wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; winswitch = callPackage ../tools/X11/winswitch { }; @@ -12258,6 +12360,8 @@ let zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + girara = callPackage ../applications/misc/girara { gtk = gtk3; stdenv = overrideCC stdenv gcc49; @@ -12722,6 +12826,8 @@ let calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; + choqok = callPackage ../applications/networking/instant-messengers/choqok { }; + colord-kde = callPackage ../tools/misc/colord-kde { }; digikam = if builtins.compareVersions "4.9" kde4.release == 1 then @@ -12913,8 +13019,8 @@ let kde5 = kf5_stable // plasma5_stable // kdeApps_stable; - xfce = xfce4_10; - xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); + xfce = xfce4-12; + xfce4-12 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; @@ -13461,6 +13567,13 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; + # Remember to check the default lightdm wallpaper + nixos-artwork = fetchgit { + url = "git://github.com/NixOS/nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 57d5410a3bf..fb1ee300b35 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -263,6 +263,29 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + deferred = melpaBuild rec { + version = "0.3.2"; + pname = "deferred"; + + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-${pname}"; + rev = "896d4b53210289afe489e1ee7db4e12cb9248109"; + sha256 = "0ysahdyvlg240dynwn23kk2d9kb432zh2skr1gydm3rxwn6f18r0"; + }; + + meta = { + description = "Simple asynchronous functions for emacs-lisp"; + longDescription = '' + deferred.el provides facilities to manage asynchronous tasks. + The API and implementations were translated from JSDeferred (by cho45) + and Mochikit.Async (by Bob Ippolito) in JavaScript. + ''; + homepage = https://github.com/kiwanami/emacs-deferred; + license = gpl3Plus; + }; + }; + diminish = melpaBuild rec { pname = "diminish"; version = "0.44"; @@ -320,9 +343,9 @@ let self = _self // overrides; pname = "evil"; version = "20141020"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; packageRequires = [ goto-chg undo-tree ]; meta = { @@ -504,9 +527,9 @@ let self = _self // overrides; pname = "goto-chg"; version = "1.6"; src = fetchgit { - url = "git://gitorious.org/evil/evil"; + url = "https://gitorious.org/evil/evil.git"; rev = "999ec15587f85100311c031aa8efb5d50c35afe4"; - sha256 = "0yiqpzsm5sr7xdkixdvfg312dk9vsdcmj69gizk744d334yn8rsz"; + sha256 = "5f67643d19a31172e68f2f195959d33bcd26c2786eb71e67eb27eb52f5bf387a"; }; files = [ "lib/goto-chg.el" ]; meta = { license = gpl3Plus; }; @@ -643,6 +666,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + monokai-theme = melpaBuild rec { + pname = "monokai-theme"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "oneKelvinSmith"; + repo = "monokai-emacs"; + rev = "v${version}"; + sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz"; + }; + meta = { license = gpl3Plus; }; + }; + nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; org-plus-contrib = melpaBuild rec { @@ -658,6 +693,28 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + org-trello = melpaBuild rec { + pname = "org-trello"; + version = "0.6.9.2"; + src = fetchFromGitHub { + owner = "org-trello"; + repo = pname; + rev = "5656f32d3624b3c82014658aef88ffa47c0fca7b"; + sha256 = "0781prmxbx3lmylma63vw80rix7dmhy8861jz4cbqmkfid6d3x73"; + }; + packageRequires = [ request-deferred deferred dash s ]; + files = [ "org-trello-*.el" ]; + meta = { + description = "Org minor mode - 2-way sync org & trello"; + longDescription = '' + Org-trello is an emacs minor mode that extends org-mode with + Trello abilities. + ''; + homepage = https://org-trello.github.io; + license = gpl3Plus; + }; + }; + pkg-info = melpaBuild rec { pname = "pkg-info"; version = "20140610"; @@ -696,6 +753,58 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + request = melpaBuild rec { + pname = "request"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-${pname}"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + + request-deferred = melpaBuild rec { + pname = "request-deferred"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "tkf"; + repo = "emacs-request"; + rev = "adf7de452f9914406bfb693541f1d280093c4efd"; + sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; + }; + + packageRequires = [ request deferred ]; + + meta = with stdenv.lib; { + description = "Easy HTTP request for Emacs Lisp"; + longDescription = '' + Request.el is a HTTP request library with multiple backends. It supports + url.el which is shipped with Emacs and curl command line program. User + can use curl when s/he has it, as curl is more reliable than url.el. + Library author can use request.el to avoid imposing external dependencies + such as curl to users while giving richer experience for users who have curl. + ''; + homepage = https://github.com/tkf/emacs-request; + license = gpl3Plus; + }; + }; + rich-minority = melpaBuild rec { pname = "rich-minority"; version = "0.1.1"; @@ -919,4 +1028,17 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + zenburn-theme = melpaBuild rec { + pname = "zenburn-theme"; + version = "2.2"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = "zenburn-emacs"; + rev = "v${version}"; + sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv"; + }; + meta = { license = gpl3Plus; }; + }; + + }; in self diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b3afb09412..625aea9046e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5104,6 +5104,8 @@ let self = _self // overrides; _self = with self; { LocaleGettext = buildPerlPackage { name = "LocaleGettext-1.05"; + buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.gettext; + NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lintl" else null; src = fetchurl { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 600768536ca..6f99cd76cfa 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -95,4 +95,36 @@ let self = with self; { buildInputs = [ pkgs.geoip ]; }; + redis = buildPecl { + name = "redis-2.2.5"; + + sha256 = "0hrk0lf8h6l30zrjld29csl186zb1cl2rz1gfn9dma33np4iisyw"; + }; + + composer = pkgs.stdenv.mkDerivation rec { + name = "composer-${version}"; + version = "1.0.0-alpha9"; + + src = pkgs.fetchurl { + url = "https://getcomposer.org/download/1.0.0-alpha9/composer.phar"; + sha256 = "1x7i9xs9xggq0qq4kzrwh2pky8skax0l829zwwsy3hcvch3irvrk"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/composer/composer.phar + makeWrapper ${php}/bin/php $out/bin/composer \ + --add-flags "$out/libexec/composer/composer.phar" + ''; + + meta = with pkgs.lib; { + description = "Dependency Manager for PHP"; + license = licenses.mit; + homepage = https://getcomposer.org/; + maintainers = with maintainers; [offline]; + }; + }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c959f74538f..fa16501e892 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -809,6 +809,31 @@ let }; }; + caldavclientlibrary-asynk = buildPythonPackage rec { + version = "asynkdev"; + name = "caldavclientlibrary-asynk-${version}"; + + src = pkgs.fetchgit { + url = "https://github.com/skarra/CalDAVClientLibrary.git"; + rev = "06699b08190d50cc2636b921a654d67db0a967d1"; + sha256 = "1i6is7lv4v9by4panrd9w63m4xsmhwlp3rq4jjj3azwg5jm10940"; + }; + + meta = { + description = "CalDAVCLientLibrary is a Python library and tool for CalDAV"; + + longDescription = '' + CalDAVCLientLibrary is a Python library and tool for CalDAV. + + This package is the unofficial CalDAVCLientLibrary Python + library maintained by the author of Asynk and is needed for + that package. + ''; + + homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; + maintainers = with maintainers; [ pjones ]; + }; + }; bedup = buildPythonPackage rec { name = "bedup-20140413"; @@ -1110,6 +1135,8 @@ let buildInputs = [ self.nose self.mock ]; propagatedBuildInputs = [ self.requests self.httpretty ]; + patches = [ ../development/python-modules/boto/content-length-str.patch ]; + meta = { homepage = https://github.com/boto/boto; @@ -1770,7 +1797,7 @@ let src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; + md5 = "055d82e6849d882ec6cf2ae1faca8e56"; }; meta = { @@ -2405,12 +2432,12 @@ let }; docker_registry = buildPythonPackage rec { - name = "docker-registry-0.9.0"; + name = "docker-registry-0.9.1"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz"; - md5 = "65eb9fd05b94f7f9fbbb5e2e8ca62912"; + sha256 = "1svm1h59sg4bwj5cy10m016gj0xpiin15nrz5z66h47sbkndvlw3"; }; DEPS = "loose"; @@ -2418,7 +2445,7 @@ let doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy setuptools backports_lzma pyasn1 + requests2 rsa sqlalchemy9 setuptools backports_lzma pyasn1 m2crypto ]; patchPhase = "> requirements/main.txt"; @@ -2615,13 +2642,13 @@ let evdev = buildPythonPackage rec { - version = "0.4.6"; + version = "0.4.7"; name = "evdev-${version}"; disabled = isPy34; # see http://bugs.python.org/issue21121 src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz"; - sha256 = "08bzyr3zc8ijnv25bysmmvzircblh42ja15f6ijdzmqqw8vfaij8"; + sha256 = "1mz8cfncpxc1wbk2nj7apl0ssqc0vfndysxchq3wabd9vzx5p71k"; }; buildInputs = with self; [ pkgs.linuxHeaders ]; @@ -3057,15 +3084,15 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/mailchimp/mailchimp-${version}.tar.gz"; sha256 = "0351ai0jqv3dzx0xxm1138sa7mb42si6xfygl5ak8wnfc95ff770"; - }; - + }; + # Test fails because specific version of docopt is searched # (Possible fix: Needs upstream patching in the library) doCheck = false; buildInputs = with self; [ docopt ]; - propagatedBuildInputs = with self; [ requests ]; + propagatedBuildInputs = with self; [ requests ]; meta = { description = "A CLI client and Python API library for the MailChimp email platform"; @@ -6504,7 +6531,7 @@ let sha256 = "0vkyg9dmj29hzk7fy77f42p7bfj28skyzsjsjry4wqr3z6xnzrkx"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose pkgs.openssl ]; propagatedBuildInputs = with self; [ pkgs.mysql pkgs.zlib ]; @@ -6571,12 +6598,12 @@ let nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5.1"; + name = "nbxmpp-0.5.2"; src = pkgs.fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/6"; - sha256 = "0agr0ikfdmna5rjvm7lm0mx52cdwqp5b2xbx3inagp70whmdv219"; + url = "https://python-nbxmpp.gajim.org/downloads/7"; + sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn"; }; meta = { @@ -10869,6 +10896,35 @@ let }; }; + syncthing-gtk = buildPythonPackage rec { + version = "0.6.2"; + name = "syncthing-gtk-${version}"; + src = pkgs.fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-gtk"; + rev = "v${version}"; + sha256 = "0dfs5kzdj9ld20i23w6ldj7z761rwnnbqkr0l12wkgcxi58jcqds"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.syncthing pygobject3 dateutil pkgs.gtk3 pyinotify pkgs.libnotify pkgs.psmisc ]; + + patchPhase = '' + substituteInPlace "scripts/syncthing-gtk" \ + --replace "/usr/share" "$out/share" \ + ''; + + + meta = with stdenv.lib; { + description = " GTK3 & python based GUI for Syncthing "; + maintainers = [ maintainers.DamienCassou ]; + platforms = pkgs.syncthing.meta.platforms; + homepage = "https://github.com/syncthing/syncthing-gtk"; + license = stdenv.lib.licenses.gpl2; + }; + }; + tarsnapper = buildPythonPackage rec { name = "tarsnapper-0.2.1"; disabled = isPy3k; @@ -13485,6 +13541,7 @@ let }; }; + moreItertools = buildPythonPackage rec { name = "more-itertools-2.2"; @@ -13494,7 +13551,7 @@ let url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; }; - + propagatedBuildInputs = with self; [ nose ]; meta = { @@ -13504,6 +13561,7 @@ let }; }; + uncertainties = buildPythonPackage rec { name = "uncertainties-2.4.6.1"; @@ -13513,7 +13571,7 @@ let }; buildInputs = with self; [ nose numpy ]; - + meta = { homepage = "http://pythonhosted.org/uncertainties/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; @@ -13522,6 +13580,23 @@ let }; + funcy = buildPythonPackage rec { + name = "funcy-1.4"; + + src = pkgs.fetchurl { + url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; + sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; + }; + + meta = with stdenv.lib; { + description = "Collection of fancy functional tools focused on practicality."; + homepage = "http://funcy.readthedocs.org/"; + license = stdenv.lib.licenses.bsd3; + + }; + }; + + # python2.7 specific packages } // optionalAttrs isPy27 ( with self; @@ -13823,20 +13898,5 @@ let }; }; - funcy = buildPythonPackage rec { - name = "funcy-1.4"; - - src = pkgs.fetchurl { - url = "https://github.com/Suor/funcy/archive/1.4.tar.gz"; - sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7"; - }; - - meta = with stdenv.lib; { - description = "Collection of fancy functional tools focused on practicality."; - homepage = "http://funcy.readthedocs.org/"; - license = stdenv.lib.licenses.bsd3; - }; - }; - }); in pythonPackages